summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
m---------.vim/bundle/ctrlp.vim0
m---------.vim/bundle/fzf.vim0
-rw-r--r--.vimrc7
4 files changed, 7 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index ebc220a..3a3c81a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,9 +32,6 @@
[submodule "gundo.vim"]
path = .vim/bundle/gundo.vim
url = https://github.com/sjl/gundo.vim.git
-[submodule "ctrlp.vim"]
- path = .vim/bundle/ctrlp.vim
- url = https://github.com/ctrlpvim/ctrlp.vim.git
[submodule "vim-sleuth"]
path = .vim/bundle/vim-sleuth
url = https://github.com/tpope/vim-sleuth.git
@@ -71,3 +68,6 @@
[submodule ".vim/bundle/vim-commentary"]
path = .vim/bundle/vim-commentary
url = https://github.com/tpope/vim-commentary
+[submodule ".vim/bundle/fzf.vim"]
+ path = .vim/bundle/fzf.vim
+ url = https://github.com/junegunn/fzf.vim
diff --git a/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim
deleted file mode 160000
-Subproject bde7a2950adaa82e894d7bdf69e3e7383e40d22
diff --git a/.vim/bundle/fzf.vim b/.vim/bundle/fzf.vim
new file mode 160000
+Subproject 8d56bdd6ade7899f0b0a10cfc219804b4ccbc10
diff --git a/.vimrc b/.vimrc
index e330506..4654c6a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -170,6 +170,8 @@ nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
" Automatically import
nmap <leader>ai <Plug>(JavaComplete-Imports-AddMissing)
+nnoremap <C-p> :Files<cr>
+
" }}}
" airline {{{
@@ -193,9 +195,8 @@ let g:ale_linters = {
\}
" }}}
-" ctrlp
-let g:ctrlp_max_files = 1000000
-let g:ctrlp_cmd = 'CtrlPMixed'
+" fzf
+let $FZF_DEFAULT_COMMAND='fd --type file --follow --hidden --exclude .git'
" supertab
let g:SuperTabDefaultCompletionType = "context"