diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 208584a..f6b62a7 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -9,16 +9,12 @@ call plug#begin() -" better completion -Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } -if filereadable(expand("~/.config/deoplete")) - let g:deoplete#enable_at_startup = 1 -endif -Plug 'deoplete-plugins/deoplete-clang' -Plug 'deoplete-plugins/deoplete-jedi' -Plug 'deoplete-plugins/deoplete-go', { 'do': 'make' } -Plug 'deoplete-plugins/deoplete-docker' -Plug 'carlitux/deoplete-ternjs', { 'do': 'npm install -g tern' } +" language server protocol + +Plug 'prabirshrestha/vim-lsp' +Plug 'mattn/vim-lsp-settings' +Plug 'prabirshrestha/asyncomplete.vim' +Plug 'prabirshrestha/asyncomplete-lsp.vim' " rust diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index 727c017..e2f1398 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -260,6 +260,7 @@ esac # Install Rust $rust && download_rust +$rust && rustup component add rls rust-analysis rust-src # Install dust @@ -275,23 +276,6 @@ $nicetohave && download_minio_client # Install editor plugins -# Neovim bindings, Deoplete Python -case $ID in - macos) $deoplete && pip3 install --no-cache-dir --user neovim jedi;; - alpine) $deoplete && packages_add py3-pynvim py3-jedi;; - fedora|debian|ubuntu) $deoplete && packages_add python3-neovim python3-jedi;; -esac -# Deoplete clang -case $ID in - macos) $deoplete && brew install llvm --with-clang;; - alpine) $deoplete && packages_add clang clang-extra-tools;; - fedora) $deoplete && packages_add clang clang-tools-extra;; - debian|ubuntu) $deoplete && packages_add clang clang-format;; -esac -# Deoplete Go -$deoplete && $go && go get -u github.com/stamblerre/gocode -$deoplete && touch ~/.config/deoplete -$deoplete || rm -f ~/.config/deoplete # Plug install download_nvim_plug nvim +PlugInstall +qa || true