From 95a85a6893aeee4a9ef54df94b63521f67ae97c4 Mon Sep 17 00:00:00 2001 From: Jonathan Hodgson Date: Mon, 19 Aug 2019 08:43:10 +0100 Subject: [PATCH] Adds fzf in place of command t --- .gitmodules | 6 +++--- .vimrc | 13 ++++++++++--- bundle/command-t | 1 - bundle/fzf.vim | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) delete mode 160000 bundle/command-t create mode 160000 bundle/fzf.vim diff --git a/.gitmodules b/.gitmodules index fec44fc..d1b728d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -69,9 +69,6 @@ [submodule "bundle/vim-jinja"] path = bundle/vim-jinja url = https://github.com/lepture/vim-jinja.git -[submodule "bundle/command-t"] - path = bundle/command-t - url = https://github.com/wincent/command-t.git [submodule "bundle/vim-lion"] path = bundle/vim-lion url = git@github.com:tommcdo/vim-lion.git @@ -90,3 +87,6 @@ [submodule "bundle/vim-snippets"] path = bundle/vim-snippets url = git@github.com:honza/vim-snippets.git +[submodule "bundle/fzf.vim"] + path = bundle/fzf.vim + url = https://github.com/junegunn/fzf.vim.git diff --git a/.vimrc b/.vimrc index 66b7bca..b24824d 100644 --- a/.vimrc +++ b/.vimrc @@ -138,6 +138,16 @@ let g:UltiSnipsEditSplit="vertical" " Lion let g:lion_squeeze_spaces = 1 +" FZF +" Prefixes all of the fzf commands +let g:fzf_command_prefix = 'Fzf' +" Mappings for common Fzf commands +nnoremap f = :FzfFiles +nnoremap b = :FzfBuffers +nnoremap h = :FzfHelptags +nnoremap / = :FzfRg + + " Quick tex options {{{2 " HTML {{{3 @@ -440,9 +450,6 @@ inoremap :exe "norm Ypf lDB\"A nnoremap ev :vsplit $MYVIMRC nnoremap sv :source $MYVIMRC -" use command t to search help topics -nmap h (CommandTHelp) - " add new line without entering insert mode nnoremap o nnoremap O diff --git a/bundle/command-t b/bundle/command-t deleted file mode 160000 index 57e112c..0000000 --- a/bundle/command-t +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57e112c12c99185e062a4330896cfaf422d1ea64 diff --git a/bundle/fzf.vim b/bundle/fzf.vim new file mode 160000 index 0000000..359a80e --- /dev/null +++ b/bundle/fzf.vim @@ -0,0 +1 @@ +Subproject commit 359a80e3a34aacbd5257713b6a88aa085337166f