diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index e9795b8..ecdc3e7 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -58,7 +58,7 @@ Plug 'Xuyuanp/nerdtree-git-plugin', { 'on': 'NERDTreeToggle' } " show git status " Fuzzy matching Plug 'lotabout/skim.vim' -Plug 'marty-oehme/notational-fzf-vim' +Plug 'marty-oehme/notational-fzf-vim', { 'branch': 'origin/switch-fzf-to-skim' } Plug 'dyng/ctrlsf.vim' " Language Integration @@ -535,22 +535,6 @@ let g:skim_action = { command! -bang -nargs=* Rg call fzf#vim#rg_interactive(, fzf#vim#with_preview('right:50%:hidden', 'alt-h')) -" FZF buffers and files in current workdir -noremap s :Buffers -" FZF most recently used / MRU, bound to S since it is essentially a larger -" go-back intention than just buffers -noremap S :History -noremap f :Files - -" FZF general full-text search in cwd with rg -noremap :Rg -" FZF note full-text search with notational-velocity like functions -noremap n :NV -noremap N :NV! - -" FZF git diff -noremap gd :GFiles? - " Configure notational-fzf-vim let g:nv_search_paths = [ g:wiki_root ] let g:nv_wrap_preview_text=1 @@ -575,10 +559,25 @@ function! SearchWiki() endfunction " search in wiki with ctrlsf, in fullscreen window -nnoremap wF :execute(":call SearchWiki()") -" fuzzy search wiki with leaderf -nnoremap wf :execute(":call RgWiki()") -vnoremap CtrlSFVwordPath +nnoremap wf :execute(":call SearchWiki()") + +" FUZZY FINDING +" FZF buffers and files in current workdir +noremap s :Buffers +" FZF most recently used / MRU, bound to S since it is essentially a larger +" go-back intention than just buffers +noremap S :History +noremap f :Files + +" FZF general full-text search in cwd with rg +noremap :Rg +" FZF note full-text search with notational-velocity like functions (in wiki +" directory) +noremap n :NV +noremap N :NV! + +" FZF git diff +noremap gd :GFiles? " insert a citation of a source using bib ref (uses academia library) nnoremap c :CiteRef