diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix index ff6f38c..153f1ec 100644 --- a/home-manager/neovim/default.nix +++ b/home-manager/neovim/default.nix @@ -49,7 +49,7 @@ in xclip # language servers - sumneko-lua-language-server + lua-language-server rnix-lsp terraform-ls tflint diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua index c023f00..844c1ca 100644 --- a/home-manager/neovim/lspconfig.lua +++ b/home-manager/neovim/lspconfig.lua @@ -50,10 +50,10 @@ lsp_status.register_progress() -- setup lua language server for init.nvim and nvim plugin development require("neodev").setup({ - override = function(root_dir, library) + override = function(root_dir, options) if require("neodev.util").has_file(root_dir, "/etc/nixos") then - library.enabled = true - library.plugins = true + options.enabled = true + options.plugins = true end end, }) @@ -63,6 +63,7 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities(lsp_status.cap local servers = { ["bashls"] = {}, ["dockerls"] = {}, + ["lua_ls"] = {}, ["pylsp"] = { pylsp = { plugins = { @@ -74,7 +75,6 @@ local servers = { }, ["pyright"] = {}, ["rnix"] = {}, - ["sumneko_lua"] = {}, ["terraformls"] = {}, ["tflint"] = {}, ["tsserver"] = {},