diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 8448de6..c25d69a 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -15,6 +15,7 @@ require("polyjuice") -- colorscheme require("lsp") -- ./lua/lsp/init.lua require("lsp.maps") -- ./lua/lsp/maps.lua require("lsp.c") -- ./lua/lsp/c.lua +require("lsp.lua") -- ./lua/lsp/lua.lua require("lsp.python") -- ./lua/lsp/python.lua -- auto complete diff --git a/.config/nvim/lua/globals.lua b/.config/nvim/lua/globals.lua index e3c1d28..62bc300 100644 --- a/.config/nvim/lua/globals.lua +++ b/.config/nvim/lua/globals.lua @@ -1,4 +1,7 @@ globals = { + lsp_path = vim.fn.stdpath("data").. "/lsp", + + -- misc sign_error = "", sign_warning = "", sign_hint = "", diff --git a/.config/nvim/lua/lsp/lua.lua b/.config/nvim/lua/lsp/lua.lua index caf8f2a..11567ec 100644 --- a/.config/nvim/lua/lsp/lua.lua +++ b/.config/nvim/lua/lsp/lua.lua @@ -6,7 +6,7 @@ local system_name = "Linux" -- set the path to the sumneko installation; if you previously installed via the now deprecated :LspInstall, use -local sumneko_root_path = vim.fn.stdpath('cache')..'/lspconfig/sumneko_lua/lua-language-server' +local sumneko_root_path = globals.lsp_path .. "/sumneko_lua" local sumneko_binary = sumneko_root_path.."/bin/"..system_name.."/lua-language-server" require'lspconfig'.sumneko_lua.setup { diff --git a/.gitmodules b/.gitmodules index adcdc69..dfbd1ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule ".local/src/slock"] path = .local/src/slock url = git@github.com:swy7ch/slock.git +[submodule ".local/share/nvim/lsp/sumneko_lua"] + path = .local/share/nvim/lsp/sumneko_lua + url = git@github.com:sumneko/lua-language-server.git diff --git a/.local/share/nvim/lsp/sumneko_lua b/.local/share/nvim/lsp/sumneko_lua new file mode 160000 index 0000000..4f1f6d4 --- /dev/null +++ b/.local/share/nvim/lsp/sumneko_lua @@ -0,0 +1 @@ +Subproject commit 4f1f6d4dbc7940b5f117e25b3528712ff4b221ef