diff --git a/vim/.vimrc b/vim/.vimrc index 2e83f91..6b302b2 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -91,13 +91,6 @@ Plug 'tpope/vim-projectionist' Plug 'simnalamburt/vim-mundo' nnoremap u :MundoToggle -Plug 'Shougo/deoplete.nvim' | Plug 'roxma/nvim-yarp' | Plug 'roxma/vim-hug-neovim-rpc' - let g:deoplete#enable_at_startup=1 - let g:deoplete#file#enable_buffer_path=1 - -Plug 'carlitux/deoplete-ternjs', { 'do': 'npm install -g tern' } - let g:deoplete#sources#ternjs#filetypes = [ 'jsx', 'javascript.jsx' ] - Plug 'w0rp/ale' nmap (ale_previous_wrap) nmap (ale_next_wrap) @@ -129,15 +122,6 @@ Plug 'SirVer/ultisnips' let g:UltiSnipsJumpForwardTrigger="" let g:UltiSnipsJumpBackwardTrigger="" -Plug 'ludovicchabant/vim-gutentags' - let g:gutentags_cache_dir="~/.tags" - let g:gutentags_file_list_command = { - \ 'markers': { - \ '.git': 'git ls-files', - \ '.hg': 'hg files', - \ }, - \ } - Plug 'pangloss/vim-javascript' Plug 'mxw/vim-jsx' let g:jsx_ext_required = 0 @@ -153,6 +137,25 @@ Plug 'janko-m/vim-test' nmap t :TestNearest nmap T :TestFile +" vim 8 plugins +if v:version >= 800 + Plug 'Shougo/deoplete.nvim' | Plug 'roxma/nvim-yarp' | Plug 'roxma/vim-hug-neovim-rpc' + let g:deoplete#enable_at_startup=1 + let g:deoplete#file#enable_buffer_path=1 + + Plug 'carlitux/deoplete-ternjs', { 'do': 'npm install -g tern' } + let g:deoplete#sources#ternjs#filetypes = [ 'jsx', 'javascript.jsx' ] + + Plug 'ludovicchabant/vim-gutentags' + let g:gutentags_cache_dir="~/.tags" + let g:gutentags_file_list_command = { + \ 'markers': { + \ '.git': 'git ls-files', + \ '.hg': 'hg files', + \ }, + \ } +endif + " debug Plug 'tweekmonster/startuptime.vim' @@ -168,7 +171,9 @@ set secure " Text Formatting {{{ set list -set breakindent +if v:version > 800 + set breakindent +endif set showbreak=↳ set textwidth=0