diff options
Diffstat (limited to '.vimrc')
| -rw-r--r-- | .vimrc | 42 |
1 files changed, 36 insertions, 6 deletions
@@ -13,7 +13,7 @@ Plugin 'VundleVim/Vundle.vim' Plugin 'mileszs/ack.vim' -Plugin 'autozimu/LanguageClient-neovim' +"Plugin 'autozimu/LanguageClient-neovim' Plugin 'tpope/vim-surround' Plugin 'tpope/vim-repeat' @@ -25,12 +25,25 @@ Plugin 'zchee/deoplete-jedi' Plugin 'sirtaj/vim-openscad' Plugin 'tmhedberg/matchit' Plugin 'kien/ctrlp.vim' -Plugin 'Shougo/deoplete.nvim' + +if has("nvim") + Plugin 'Shougo/deoplete.nvim' +else + Plugin 'Shougo/deoplete.nvim' + Plugin 'roxma/nvim-yarp' + Plugin 'roxma/vim-hug-neovim-rpc' +endif Plugin 'agude/vim-eldar' Plugin 'scrooloose/nerdtree' +" Track the engine. +Plugin 'SirVer/ultisnips' + +" Snippets are separated from the engine. Add this if you want them: +Plugin 'honza/vim-snippets' + call vundle#end() " required filetype plugin indent on " required @@ -88,8 +101,25 @@ let g:LanguageClient_serverCommands = { \ 'rust': ['rustup', 'run', 'stable', 'rls'], \ } -nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR> -nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR> -nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR> -nnoremap <F5> :call LanguageClient_contextMenu()<CR> +"nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR> +"nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR> +"nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR> +"nnoremap <F5> :call LanguageClient_contextMenu()<CR> + + +" Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe. +let g:UltiSnipsExpandTrigger="<c-b>" +let g:UltiSnipsJumpForwardTrigger="<c-b>" +let g:UltiSnipsJumpBackwardTrigger="<c-z>" + +" If you want :UltiSnipsEdit to split your window. +let g:UltiSnipsEditSplit="vertical" + + +inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>" +inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>" + +" Run binding +nnoremap <F5> :!terminator -e '"%:p" ;read -n 1'<CR> +set completeopt-=preview |