diff options
-rw-r--r-- | .gitmodules | 9 | ||||
m--------- | vim/pack/plugins/start/denite | 0 | ||||
m--------- | vim/pack/plugins/start/fzf | 0 | ||||
m--------- | vim/pack/plugins/start/fzf.vim | 0 | ||||
-rw-r--r-- | vimrc | 36 |
5 files changed, 21 insertions, 24 deletions
diff --git a/.gitmodules b/.gitmodules index 144a519..3fee8d6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,9 +67,6 @@ [submodule "vim/bundle/ledger"] path = vim/pack/filetype/start/ledger url = git://github.com/ledger/vim-ledger -[submodule "vim/pack/local/start/denite"] - path = vim/pack/plugins/start/denite - url = git://github.com/Shougo/denite.nvim [submodule "vim/pack/local/start/ale"] path = vim/pack/plugins/start/ale url = git://github.com/w0rp/ale @@ -91,3 +88,9 @@ [submodule "zsh/fzf"] path = sh/fzf url = git://github.com/junegunn/fzf +[submodule "vim/pack/plugins/start/fzf.vim"] + path = vim/pack/plugins/start/fzf.vim + url = git://github.com/junegunn/fzf.vim +[submodule "vim/pack/plugins/start/fzf"] + path = vim/pack/plugins/start/fzf + url = git://github.com/junegunn/fzf diff --git a/vim/pack/plugins/start/denite b/vim/pack/plugins/start/denite deleted file mode 160000 -Subproject 57118402ea4e0d23ae8990fc5424428e165515e diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf new file mode 160000 +Subproject eb3afc03b57a20d1062880efe8e000abceeba3e diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim new file mode 160000 +Subproject 17d24ae31d119f8bdd88a5149a831ca35baf726 @@ -70,24 +70,18 @@ let g:ale_history_log_output = 0 " commentary {{{ map <silent><Leader>x :Commentary<CR> " }}} -" denite {{{ -autocmd vimrc VimEnter * call denite#custom#map('insert', '<Tab>', '<denite:move_to_next_line>') -autocmd vimrc VimEnter * call denite#custom#map('insert', '<S-Tab>', '<denite:move_to_previous_line>') -autocmd vimrc VimEnter * call denite#custom#source('line', 'sorters', []) -if executable('ag') - autocmd vimrc VimEnter * call denite#custom#var('file_rec', 'command', ['ag', '--hidden', '-l', '.']) - autocmd vimrc VimEnter * call denite#custom#var('grep', 'command', ['ag']) - autocmd vimrc VimEnter * call denite#custom#var('grep', 'default_opts', ['--hidden']) - autocmd vimrc VimEnter * call denite#custom#var('grep', 'recursive_opts', []) - autocmd vimrc VimEnter * call denite#custom#var('grep', 'pattern_opt', []) - autocmd vimrc VimEnter * call denite#custom#var('grep', 'separator', []) -endif -nnoremap <silent>t :Denite -direction=dynamictop buffer file_rec<CR> -nnoremap <silent>b :Denite -direction=dynamictop buffer<CR> -nnoremap <silent>ff :Denite -direction=dynamictop grep:.::!<CR> -nnoremap <silent>fh :Denite -direction=dynamictop help<CR> -nnoremap <silent>ft :Denite -direction=dynamictop filetype<CR> -nnoremap <silent>f/ :Denite -direction=dynamictop line<CR> +" fzf {{{ +let g:fzf_layout = { 'up': '~40%' } +command! -bang -nargs=* Ag + \ call fzf#vim#ag(<q-args>, + \ "--hidden", + \ <bang>0 ? fzf#vim#with_preview('up:60%') + \ : fzf#vim#with_preview('right:50%', '?'), + \ <bang>0) +nnoremap <silent> t :Files<CR> +nnoremap <silent> ff :Ag<CR> +nnoremap <silent> fh :Helptags<CR> +nnoremap <silent> ft :Filetypes<CR> " }}} " gundo {{{ if has("python") @@ -141,9 +135,9 @@ let g:rainbow_brace = 1 let g:startify_list_order = ['dir', 'bookmarks', 'commands'] let g:startify_files_number = 7 let g:startify_commands = [ - \ {'t': ['Open file', 'Denite -direction=dynamictop buffer file_rec']}, - \ {'ff': ['Grep', 'Denite -direction=dynamictop grep:.::!']}, - \ {'fh': ['Help', 'Denite -direction=dynamictop help']}, + \ {'t': ['Open file', 'Files']}, + \ {'ff': ['Grep', 'Ag']}, + \ {'fh': ['Help', 'Helptags']}, \ ] let g:startify_change_to_vcs_root = 1 let g:startify_custom_indices = [ |