diff --git a/.vimrc.plugins b/.vimrc.plugins index 218553da..96b25bc0 100644 --- a/.vimrc.plugins +++ b/.vimrc.plugins @@ -17,6 +17,7 @@ Plug 'godlygeek/tabular' Plug 'https://github.com/cyplo/vim-colors-solarized.git' Plug 'jremmen/vim-ripgrep' Plug 'neoclide/coc.nvim', {'tag': '*', 'do': './install.sh'} +Plug 'neoclide/coc-rls' Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } Plug 'junegunn/fzf.vim' Plug 'kien/ctrlp.vim' diff --git a/.vimrc.plugins-settings b/.vimrc.plugins-settings index ac8967eb..59c9599b 100644 --- a/.vimrc.plugins-settings +++ b/.vimrc.plugins-settings @@ -13,33 +13,6 @@ let g:fzf_command_prefix = 'Fzf' command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(), 1, 0) let g:ctrlp_show_hidden = 1 -" code smarts - completion, navigation -let g:asyncomplete_remove_duplicates = 1 -let g:asyncomplete_smart_completion = 1 -let g:asyncomplete_auto_popup = 1 - -au User lsp_setup call lsp#register_server({ - \ 'name': 'rls', - \ 'cmd': {server_info->['rustup', 'run', 'stable', 'rls']}, - \ 'whitelist': ['rust'], - \ }) - -if executable('gopls') - au User lsp_setup call lsp#register_server({ - \ 'name': 'gopls', - \ 'cmd': {server_info->['gopls', '-mode', 'stdio']}, - \ 'whitelist': ['go'], - \ }) -endif - -if executable('go-langserver') - au User lsp_setup call lsp#register_server({ - \ 'name': 'go-langserver', - \ 'cmd': {server_info->['go-langserver', '-gocodecompletion']}, - \ 'whitelist': ['go'], - \ }) -endif - let g:lsp_signs_enabled = 1 let g:lsp_diagnostics_echo_cursor = 1 diff --git a/.zshrc b/.zshrc index 15c0b910..ca38c65a 100644 --- a/.zshrc +++ b/.zshrc @@ -44,3 +44,5 @@ export PATH="$PATH:$HOME/.rvm/bin" alias tmate="tmux detach-client -E 'tmate;tmux'" + +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"