diff --git a/nvim/config/lua/lsp-config.lua b/nvim/config/lua/lsp-config.lua index 395b80a..4ebf876 100644 --- a/nvim/config/lua/lsp-config.lua +++ b/nvim/config/lua/lsp-config.lua @@ -115,6 +115,14 @@ nvim_lsp.svelte.setup { cmd = {nix_vars.sveltels, "--stdio"} } +-- Lua LSP Configuration +nvim_lsp.lua_ls.setup { + on_attach = on_attach_no_formatting, + flags = lsp_flags, + capabilities = capabilities, + cmd = {nix_vars.luals} +} + -- Go LSP Configuration nvim_lsp.gopls.setup { on_attach = function(client, bufnr) @@ -160,8 +168,9 @@ has_eslint_in_parents = function(fname) root_file = nvim_lsp.util.insert_package_json(eslintFiles, 'eslintConfig', fname) return nvim_lsp.util.root_pattern(unpack(root_file))(fname) +end -end, null_ls.setup({ +null_ls.setup({ sources = { -- Prettier Formatting null_ls.builtins.formatting.prettier.with({ diff --git a/nvim/default.nix b/nvim/default.nix index d12f3ae..099c66e 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -112,6 +112,7 @@ in golangci-lint golangci-lint-langserver gopls + lua-language-server nodePackages.eslint nodePackages.eslint_d nodePackages.pyright @@ -146,6 +147,7 @@ in "nvim/lua/nix-vars.lua".text = '' local nix_vars = { gopls = "${pkgs.gopls}/bin/gopls", + luals = "${pkgs.lua-language-server}/bin/lua-language-server", sveltels = "${pkgs.nodePackages.svelte-language-server}/bin/svelteserver", tsls = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", golintls = "${pkgs.golangci-lint-langserver}/bin/golangci-lint-langserver",