commit b03890b393b72e62b1bf69e3257402f4c6be2219
parent ff75f0f604a7414adceb6b6e9895aedce53e65ea
Author: Alex Balgavy <a.balgavy@gmail.com>
Date: Tue, 21 May 2019 15:30:31 +0200
vim: use fzf if installed, fall back on :next
Former-commit-id: 30b2bb639be2195059cf3d60277a5d8940a88ba9
Diffstat:
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/vim/map.vimrc b/vim/map.vimrc
@@ -117,5 +117,8 @@ nnoremap <leader>sq :call CloseSession()<CR>
" native file browsing
nnoremap <leader>f :call ToggleNetrw()<CR>
-" native fuzzy find (:find doesn't do multiple files)
-nnoremap <leader>F :next **/*
+" fall back on native fuzzy find if fzf not installed
+" (using :next because :find doesn't do multiple files)
+if mapcheck("<leader>F") == ""
+ nnoremap <leader>F :next **/*
+endif
diff --git a/vim/plugins.vimrc b/vim/plugins.vimrc
@@ -94,7 +94,7 @@ let g:tagbar_type_markdown = {
Plug 'vimwiki/vimwiki'
nmap <leader><CR> <Plug>VimwikiSplitLink
nmap <leader>v<CR> <Plug>VimwikiVSplitLink
-let g:vimwiki_list = [{'path': '$HOME/Dropbox/vimwiki',
+let g:vimwiki_list = [{'path': '$HOME/Dropbox/vimwiki',
\ 'template_path': '$HOME/Dropbox/vimwiki/templates',
\ 'template_default': 'default',
\ 'template_ext': '.html'}]
@@ -134,10 +134,6 @@ Plug 'vim-scripts/AnsiEsc.vim'
" Disable hlsearch after finished searching
Plug 'romainl/vim-cool'
-" Easy table making (unnecessary because vimwiki has this built in)
-" but leaving in case I need it sometime.
-" Plug 'dhruvasagar/vim-table-mode'
-
" Vimtex {{{
Plug 'lervag/vimtex'
let g:tex_flavor='latex'
@@ -157,16 +153,26 @@ let g:vimwiki_table_mappings = 0 " avoid vimwiki conflict
cabbrev USE UltiSnipsEdit
" }}}
+" Dokumentary {{{
" Improve what K does
Plug 'gastonsimone/vim-dokumentary'
let g:dokumentary_docprgs = {'ruby': 'ri {0} | col -b'}
+" }}}
+" Abolish {{{
" Work with variants of words easily
Plug 'tpope/vim-abolish'
let g:abolish_save_file = $DOTFILES.'/vim/abolish_save_file.vim'
+" }}}
Plug 'romainl/vim-devdocs'
Plug 'rking/ag.vim'
-nnoremap <leader>/ :Ag
+nnoremap <leader>/ :Ag<space>
+
+Plug '/usr/local/opt/fzf'
+Plug 'junegunn/fzf.vim'
+nnoremap <leader>F :Files<CR>
+nnoremap <leader>G :Lines<CR>
+
call plug#end()
