Native LSP, more Lua, less CoC

1 files changed, 73 insertions, 47 deletions

diff --git a/init.vim b/init.vim
index ecafaeac..3cf40d62 100644
--- a/init.vim
+++ b/init.vim
@@ -4,64 +4,70 @@
 " _/ // / / / / /__| |/ / / / / / / /
 "/___/_/ /_/_/\__(_)___/_/_/ /_/ /_/
 
-
 " General Settings
 if !exists('g:vscode')
-  source $HOME/.config/nvim/plug-config/polyglot.vim
+  source ~/.config/nvim/plug-config/polyglot.vim
 endif
-source $HOME/.config/nvim/vim-plug/plugins.vim
-source $HOME/.config/nvim/general/settings.vim
-source $HOME/.config/nvim/general/functions.vim
-source $HOME/.config/nvim/keys/mappings.vim
+source ~/.config/nvim/vim-plug/plugins.vim
+source ~/.config/nvim/general/settings.vim
+source ~/.config/nvim/general/functions.vim
+source ~/.config/nvim/keys/mappings.vim
 
 if exists('g:vscode')
   " VS Code extension
-  source $HOME/.config/nvim/vscode/settings.vim
-  source $HOME/.config/nvim/plug-config/easymotion.vim
-  source $HOME/.config/nvim/plug-config/highlightyank.vim
+  source ~/.config/nvim/vscode/settings.vim
+  source ~/.config/nvim/plug-config/easymotion.vim
+  source ~/.config/nvim/plug-config/highlightyank.vim
 else
 
   " Themes
-  source $HOME/.config/nvim/themes/syntax.vim
-  source $HOME/.config/nvim/themes/nvcode.vim
+  source ~/.config/nvim/themes/syntax.vim
+  source ~/.config/nvim/themes/nvcode.vim
 
   " Plugin Configuration
-  source $HOME/.config/nvim/keys/which-key.vim
-  source $HOME/.config/nvim/plug-config/vim-commentary.vim
-  source $HOME/.config/nvim/plug-config/rnvimr.vim
-  source $HOME/.config/nvim/plug-config/better-whitespace.vim
-  source $HOME/.config/nvim/plug-config/fzf.vim
-  source $HOME/.config/nvim/plug-config/codi.vim
-  source $HOME/.config/nvim/plug-config/vim-wiki.vim
-  luafile $HOME/.config/nvim/lua/nvcodeline.lua
-  luafile $HOME/.config/nvim/lua/treesitter.lua
-  source $HOME/.config/nvim/plug-config/coc/coc.vim
-  source $HOME/.config/nvim/plug-config/coc/coc-extensions.vim
-  source $HOME/.config/nvim/plug-config/easymotion.vim
-  source $HOME/.config/nvim/plug-config/goyo.vim
-  source $HOME/.config/nvim/plug-config/vim-rooter.vim
-  source $HOME/.config/nvim/plug-config/start-screen.vim
-  source $HOME/.config/nvim/plug-config/gitgutter.vim
-  source $HOME/.config/nvim/plug-config/git-messenger.vim
-  source $HOME/.config/nvim/plug-config/closetags.vim
-  source $HOME/.config/nvim/plug-config/floaterm.vim
-  source $HOME/.config/nvim/plug-config/barbar.vim
-  source $HOME/.config/nvim/plug-config/far.vim
-  source $HOME/.config/nvim/plug-config/tagalong.vim
-  source $HOME/.config/nvim/plug-config/bracey.vim
-  source $HOME/.config/nvim/plug-config/asynctask.vim
-  source $HOME/.config/nvim/plug-config/window-swap.vim
-  source $HOME/.config/nvim/plug-config/markdown-preview.vim
-  source $HOME/.config/nvim/plug-config/neovide.vim
-  luafile $HOME/.config/nvim/lua/plug-colorizer.lua
-  luafile $HOME/.config/nvim/lua/config-telescope.lua
-  source $HOME/.config/nvim/plug-config/vimspector.vim
-  " source $HOME/.config/nvim/plug-config/sneak.vim
-  " source $HOME/.config/nvim/plug-config/rainbow.vim
-  " source $HOME/.config/nvim/plug-config/illuminate.vim
-  " source $HOME/.config/nvim/plug-config/vista.vim
-  " source $HOME/.config/nvim/plug-config/xtabline.vim
-  " source $HOME/.config/nvim/plug-config/ale.vim
+  source ~/.config/nvim/keys/which-key.vim
+  source ~/.config/nvim/plug-config/vim-commentary.vim
+  source ~/.config/nvim/plug-config/rnvimr.vim
+  source ~/.config/nvim/plug-config/codi.vim
+  source ~/.config/nvim/plug-config/vim-wiki.vim
+  source ~/.config/nvim/plug-config/easymotion.vim
+  source ~/.config/nvim/plug-config/goyo.vim
+  source ~/.config/nvim/plug-config/vim-rooter.vim
+  source ~/.config/nvim/plug-config/start-screen.vim
+  source ~/.config/nvim/plug-config/gitgutter.vim
+  source ~/.config/nvim/plug-config/git-messenger.vim
+  source ~/.config/nvim/plug-config/closetags.vim
+  source ~/.config/nvim/plug-config/floaterm.vim
+  source ~/.config/nvim/plug-config/barbar.vim
+  source ~/.config/nvim/plug-config/far.vim
+  source ~/.config/nvim/plug-config/tagalong.vim
+  source ~/.config/nvim/plug-config/bracey.vim
+  source ~/.config/nvim/plug-config/markdown-preview.vim
+  source ~/.config/nvim/plug-config/nvimtree-config.vim
+  source ~/.config/nvim/lua/lsp-wrapper.vim
+  luafile ~/.config/nvim/lua/plugins/galaxyline-config.lua
+  luafile ~/.config/nvim/lua/plugins/nvimtree-config.lua
+  luafile ~/.config/nvim/lua/plugins/treesitter-config.lua
+  luafile ~/.config/nvim/lua/plugins/colorizer-config.lua
+  luafile ~/.config/nvim/lua/plugins/telescope-config.lua
+  luafile ~/.config/nvim/lua/lsp/lsp-kind.lua
+  luafile ~/.config/nvim/lua/plugins/compe-config.lua
+  luafile ~/.config/nvim/lua/plugins/lspsaga-config.lua
+  " LSP
+  source ~/.config/nvim/plug-config/lsp-config.vim
+  luafile ~/.config/nvim/lua/lsp/lsp-config.lua
+  luafile ~/.config/nvim/lua/lsp/lua-ls.lua
+  luafile ~/.config/nvim/lua/lsp/python-ls.lua
+  luafile ~/.config/nvim/lua/lsp/bash-ls.lua
+  luafile ~/.config/nvim/lua/lsp/css-ls.lua
+  luafile ~/.config/nvim/lua/lsp/docker-ls.lua
+  luafile ~/.config/nvim/lua/lsp/graphql-ls.lua
+  luafile ~/.config/nvim/lua/lsp/html-ls.lua
+  luafile ~/.config/nvim/lua/lsp/javascript-ls.lua
+  luafile ~/.config/nvim/lua/lsp/json-ls.lua
+  luafile ~/.config/nvim/lua/lsp/vim-ls.lua
+  luafile ~/.config/nvim/lua/lsp/yaml-ls.lua
+  " https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md
 endif
 source $HOME/.config/nvim/plug-config/quickscope.vim
 
@@ -73,3 +79,23 @@ endif
 " Better nav for omnicomplete TODO figure out why this is being overridden
 inoremap <expr> <c-j> ("\<C-n>")
 inoremap <expr> <c-k> ("\<C-p>")
+
+" TODO highlight groups for native LSP diagnostics
+" add back other docs for compe
+nnoremap <silent> K <cmd>lua require('lspsaga.hover').render_hover_doc()<CR>
+
+" -- scroll down hover doc or scroll in definition preview
+nnoremap <silent> <C-f> <cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>
+" -- scroll up hover doc
+nnoremap <silent> <C-b> <cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>
+" signature
+nnoremap <silent> gs <cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>
+
+
+" Lightbulb
+autocmd CursorHold,CursorHoldI * lua require'nvim-lightbulb'.update_lightbulb()
+        
+"TODO
+" fix space and tab triggering completion all the time
+" autoimport jsx
+" snippets