diff options
| -rw-r--r-- | .gitmodules | 9 | ||||
| -rw-r--r-- | agignore | 1 | ||||
| m--------- | vim/pack/local/start/denite | 0 | ||||
| m--------- | vim/pack/local/start/unite | 0 | ||||
| m--------- | vim/pack/local/start/unite-tag | 0 | ||||
| -rw-r--r-- | vimrc | 56 |
6 files changed, 21 insertions, 45 deletions
diff --git a/.gitmodules b/.gitmodules index 7fdac5c..a2cdac0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,9 +40,6 @@ [submodule "vim/bundle/startify"] path = vim/pack/local/start/startify url = git://github.com/mhinz/vim-startify -[submodule "vim/bundle/unite"] - path = vim/pack/local/start/unite - url = git://github.com/Shougo/unite.vim [submodule "vim/bundle/vimproc"] path = vim/pack/local/start/vimproc url = git://github.com/Shougo/vimproc.vim @@ -61,9 +58,6 @@ [submodule "zsh/opp"] path = zsh/opp url = git://github.com/hchbaw/opp.zsh -[submodule "vim/bundle/unite-tag"] - path = vim/pack/local/start/unite-tag - url = git://github.com/tsukkee/unite-tag [submodule "vim/bundle/typescript"] path = vim/bundle/typescript url = git://github.com/leafgarland/typescript-vim @@ -100,3 +94,6 @@ [submodule "vim/bundle/ledger"] path = vim/pack/local/start/ledger url = git://github.com/ledger/vim-ledger +[submodule "vim/pack/local/start/denite"] + path = vim/pack/local/start/denite + url = git://github.com/Shougo/denite.nvim @@ -4,3 +4,4 @@ node_modules/ *.d *.pdf *.map +/.git/ diff --git a/vim/pack/local/start/denite b/vim/pack/local/start/denite new file mode 160000 +Subproject 85e4eb72cc4cbbc73b1291c6ce8714503d890fa diff --git a/vim/pack/local/start/unite b/vim/pack/local/start/unite deleted file mode 160000 -Subproject 53d9f345a02976497cc99a4c7f5e4cf6114b6c2 diff --git a/vim/pack/local/start/unite-tag b/vim/pack/local/start/unite-tag deleted file mode 160000 -Subproject 478585124a52bea51344bc61f4b9a85a791591a @@ -655,6 +655,23 @@ let g:bufferline_echo = 0 let g:bufferline_rotate = 1 let g:bufferline_fixed_index = -2 " }}} +" denite {{{ +autocmd VimEnter * call denite#custom#map('insert', '<Tab>', '<denite:move_to_next_line>') +autocmd VimEnter * call denite#custom#map('insert', '<S-Tab>', '<denite:move_to_previous_line>') +if executable('ag') + autocmd VimEnter * call denite#custom#var('file_rec', 'command', ['ag', '--hidden', '-g', '']) + autocmd VimEnter * call denite#custom#var('grep', 'command', ['ag']) + autocmd VimEnter * call denite#custom#var('grep', 'default_opts', ['--hidden']) + autocmd VimEnter * call denite#custom#var('grep', 'recursive_opts', []) + autocmd VimEnter * call denite#custom#var('grep', 'pattern_opt', []) + autocmd 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> +" }}} " foldtext {{{ let g:Foldtext_enable = 1 let g:Foldtext_tex_enable = 1 @@ -758,45 +775,6 @@ let g:Textobj_defs = [ \[',', 'Textobj_arg'], \] " }}} -" unite {{{ -let g:unite_data_directory = '~/.vim/data/unite' -let g:unite_source_rec_max_cache_files = 65536 -let g:unite_enable_start_insert = 1 -let g:unite_enable_short_source_names = 1 -let g:unite_source_grep_max_candidates = 200 -if executable('ag') - " Use ag in unite grep source. - let g:unite_source_grep_command = 'ag' - let g:unite_source_grep_default_opts = - \ '--line-numbers --nocolor --nogroup --hidden --ignore ' . - \ '''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' - let g:unite_source_grep_recursive_opt = '' -endif -let rec_exclude = '\(' - \. '\(^\|/\)\.\|' - \. '\~$\|' - \. '\<\(__pycache__\|node_modules\|blib\|nytprof\|egg-info\)\|' - \. '\.\(' - \. 'o\|exe\|dll\|bak\|orig\|swp\|bs\|pyc\|' - \. 'png\|jpg\|gif\|pdf\|doc\|d\|vsprops\|pbxproj\|sln' - \. '\)$' - \. '\)' -if filereadable("dist.ini") - let rec_exclude .= '\|^' . fnamemodify('.', ':p:h:t') . '-' -endif -autocmd VimEnter call unite#custom#source('file_rec/async', 'ignore_pattern', rec_exclude) -autocmd VimEnter call unite#custom#source('file_rec/async', 'converters', ['converter_relative_word']) -autocmd FileType unite call s:unite_my_settings() -function! s:unite_my_settings() - nmap <silent><buffer> \ <Plug>(unite_exit) - imap <silent><buffer> <Tab> <Plug>(unite_select_next_line) - imap <silent><buffer> <S-Tab> <Plug>(unite_select_previous_line) - autocmd InsertLeave <buffer> call feedkeys("\<Plug>(unite_exit)") -endfunction -nnoremap <silent>t :Unite -silent -profile-name=with_dir buffer file_rec/async<CR> -nnoremap <silent>& :Unite -silent grep:.<CR> -" }}} -" unite-tag " vimproc " Load plugins that don't use vim's format {{{ runtime macros/matchit.vim |