diff --git a/nvim/init.vim b/nvim/init.vim index 7a35de9..1d10393 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -42,13 +42,13 @@ Plug 'zchee/deoplete-go', { 'do': 'make' } Plug 'eraserhd/parinfer-rust', { 'do': 'cargo build --release' } " Haskell Plug 'neovimhaskell/haskell-vim', { 'for': [ 'haskell', 'cabal' ] } -" Language Client -Plug 'autozimu/LanguageClient-neovim', { - \ 'branch': 'next', - \ 'do': 'fish install.sh', - \ } " For autocompletion Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +" Autocomplete for Python +Plug 'zchee/deoplete-jedi' +" Autocomplete for Rust +Plug 'sebastianmarkow/deoplete-rust' +Plug 'rust-lang/rust.vim' " Initialize plugin system call plug#end() @@ -112,7 +112,6 @@ set magic " Use 'magic' patterns (extended regular expressions). set autoread " Autoload file if it changes on disk set rtp+=/usr/bin/fzf -set rtp+=~/.config/nvim/plugged/LanguageClient-neovim set completeopt-=preview @@ -189,6 +188,8 @@ let g:cabal_indent_section = 2 " Use deoplete let g:deoplete#enable_at_startup = 1 +let g:deoplete#sources#rust#racer_binary='/home/sanchayan/.cargo/bin/racer' +let g:deoplete#sources#rust#rust_source_path='/home/sanchayan/GitSources/rust/src' let g:airline#extensions#tabline#enabled = 2 let g:airline#extensions#tabline#fnamemod = ':t' @@ -201,20 +202,3 @@ let g:airline_left_alt_sep = '|' let g:airline_right_sep = ' ' let g:airline_right_alt_sep = '|' -" For Language Client -set hidden -let g:LanguageClient_serverCommands = { - \ 'haskell': ['hie-wrapper'], - \ 'rust': ['/usr/bin/rustup', 'run', 'stable', 'rls'], - \ 'python': ['/usr/bin/pyls'], - \ } -let g:LanguageClient_rootMarkers = ['*.cabal', 'stack.yaml', 'Cargo.toml'] - -nnoremap lc :call LanguageClient_contextMenu() -nnoremap lh :call LanguageClient#textDocument_hover() -nnoremap ld :call LanguageClient#textDocument_definition() -nnoremap ln :call LanguageClient#textDocument_rename() -nnoremap lf :call LanguageClient#textDocument_formatting() -nnoremap lr :call LanguageClient#textDocument_references() -nnoremap la :call LanguageClient#textDocument_codeAction() -nnoremap ls :call LanguageClient#textDocument_documentSymbol()