diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim index c75c56d..09b63e9 100644 --- a/after/ftplugin/haskell.vim +++ b/after/ftplugin/haskell.vim @@ -182,4 +182,3 @@ let g:tagbar_type_haskell = { let g:vista_ctags_cmd = { \ 'haskell': 'hasktags -x -o - -c', \ } -let g:vista_fzf_preview = ['right:0%'] diff --git a/after/plugin/plugin_settings.vim b/after/plugin/plugin_settings.vim index 4ebc01d..adbc928 100644 --- a/after/plugin/plugin_settings.vim +++ b/after/plugin/plugin_settings.vim @@ -284,28 +284,6 @@ let NERDCreateDefaultMappings=0 let g:haddock_browser='/usr/bin/firefox' let g:haddock_browser_callformat='%s file://%s >/dev/null 2>&1 &' -" fzf -" --column: Show column number -" --line-number: Show line number -" --no-heading: Do not show file headings in results -" --fixed-strings: Search term as a literal string -" --ignore-case: Case insensitive search -" --no-ignore: Do not respect .gitignore, etc... -" --hidden: Search hidden files and folders -" --follow: Follow symlinks -" --glob: Additional conditions for search (in this case ignore everything in the .git/ folder) -" --color: Search color options -command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(), 1, 0) - -function! WithGitRoot() - let groot = systemlist('git -C ' . expand('%:p:h') . ' rev-parse --show-toplevel')[0] - return v:shell_error ? {} : {'dir': groot} -endfunction - -command! -nargs=* Rag - \ call fzf#vim#ag(, WithGitRoot()) - - " fastfold let g:fastfold_savehook = 1 let g:fastfold_fold_command_suffixes = ['x','X','a','A','o','O','c','C'] diff --git a/plugin/keys.vim b/plugin/keys.vim index be0fa5a..4b11aa5 100644 --- a/plugin/keys.vim +++ b/plugin/keys.vim @@ -308,7 +308,6 @@ inoremap :TagbarToggle " vista nmap :Vista!! -" nmap :Vista finder fzf " NERDComment nnoremap :call NERDComment("n", "Toggle") @@ -319,20 +318,11 @@ nmap :YcmCompleter GoTo:wincmd o " vim-clap nnoremap ag :Clap grep2 ++query= -" nnoremap tg :call fzf#vim#tags(expand(''), {'options': '--exact --select-1 --exit-0'}) nnoremap tg :Clap proj_tags ++query= nmap :Clap files nmap :Clap tags nmap :Clap buffers -" fzf -" nnoremap ag :call fzf#vim#ag(expand(''), WithGitRoot()) -" nnoremap tg :call fzf#vim#tags(expand(''), {'options': '--exact --select-1 --exit-0'}) -" nnoremap tg :Tags =expand("") -" nmap :GFiles -" nmap :Tags -" nmap :Buffers - " gitgutter nmap ggt :GitGutterToggle nmap nh (GitGutterNextHunk) diff --git a/vimrc b/vimrc index de94e41..0b78cb3 100644 --- a/vimrc +++ b/vimrc @@ -39,8 +39,6 @@ Plug 'sjbach/lusty' " Plug 'vim-airline/vim-airline' " Plug 'vim-airline/vim-airline-themes' Plug 'nixprime/cpsm', { 'do': 'PY3=ON ./install.sh' } -" Plug 'junegunn/fzf', { 'do': './install --bin' } -" Plug 'junegunn/fzf.vim' Plug 'liuchengxu/vista.vim' Plug 'sbdchd/neoformat' Plug 'AndrewRadev/bufferize.vim'