Merge branch 'master' of github.com:wunki/wunki-dotfiles

wunki · Nov 8, 2015 · b7a9a27 · b7a9a27
2 parents 96db6a7 + fb11af4
commit b7a9a27
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/fish/functions/fish_user_key_bindings.fish b/fish/functions/fish_user_key_bindings.fish
@@ -0,0 +1,2 @@
+
+fzf_key_bindings
diff --git a/fish/functions/fzf_key_bindings.fish b/fish/functions/fzf_key_bindings.fish
@@ -0,0 +1 @@
+/Users/wunki/.local/share/.fzf/shell/key-bindings.fish
diff --git a/vim/vimrc b/vim/vimrc
@@ -30,7 +30,14 @@ Plug 'bronson/vim-trailing-whitespace'                   " remove trailing white
 Plug 'majutsushi/tagbar'                                 " sidebar to jump to regions
 Plug 'Shougo/vimproc', {'do': 'gmake'}                   " command execution
 Plug 'Shougo/neocomplete.vim'                            " autocompletion
-Plug 'kien/ctrlp.vim'                                    " fast file switching
+
+" Fuzzy file finder
+Plug 'junegunn/fzf', { 'dir': $XDG_DATA_HOME . '/.fzf', 'do': 'yes n \| ./install --all' }
+let g:fzf_action = {
+      \ 'ctrl-s': 'split',
+      \ 'ctrl-v': 'vsplit'
+      \ }
+nnoremap <c-p> :FZF<cr>
 
 " Looks
 Plug 'jnurmine/Zenburn'