diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d913130..9199b9d 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -12,13 +12,6 @@ require("statusline") -- ./lua/statusline.lua require("polyjuice") -- ~/.local/src/polyjuice/lua/polyjuice.lua --- LSP -require("lsp") -- ./lua/lsp/init.lua -require("lsp.c") -- ./lua/lsp/c.lua -require("lsp.lua") -- ./lua/lsp/lua.lua -require("lsp.python") -- ./lua/lsp/python.lua -require("lsp.tex") -- ./lua/lsp/python.lua - -- auto complete require("plugin.compe") -- ./lua/plugin/compe.lua diff --git a/.config/nvim/lua/lsp/init.lua b/.config/nvim/lua/lsp/init.lua index 32d39a7..c7e5d03 100644 --- a/.config/nvim/lua/lsp/init.lua +++ b/.config/nvim/lua/lsp/init.lua @@ -3,6 +3,8 @@ -- License : GPLv3 -- Description : neovim lsp config file +local lsp = {} + vim.fn.sign_define( "LspDiagnosticsSignError", { @@ -63,3 +65,11 @@ vim.lsp.protocol.CompletionItemKind = { "  ", -- Operator "  ", -- TypeParameter } + +function lsp.setup() + local ft = vim.bo.filetype + if ft == "cpp" then ft = "c" end + require("lsp." .. ft) -- ./.lua +end + +return lsp diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 3b5237b..4c19d85 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -39,7 +39,12 @@ return require("packer").startup(function() } -- LSP - use "neovim/nvim-lspconfig" + use { + "neovim/nvim-lspconfig", + opt = true, + ft = { "c", "cpp", "lua", "python", "tex"}, + config = function() require("lsp").setup() end + } -- auto completion use "hrsh7th/nvim-compe"