diff --git a/config/nvim/lua/core/plugin_config/lsp_config.lua b/config/nvim/lua/core/plugin_config/lsp_config.lua index 308857e7..c4a1bf25 100644 --- a/config/nvim/lua/core/plugin_config/lsp_config.lua +++ b/config/nvim/lua/core/plugin_config/lsp_config.lua @@ -29,23 +29,9 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities() mason_null_ls.setup() -- funny lsp config stuff -require('lspconfig').nil_ls.setup({ +require('lspconfig').nixd.setup({ on_attach = on_attach, capabilities = capabilities, - settings = { - ['nil'] = { - testSetting = 42, - formatting = { - command = { "nixpkgs-fmt" }, - }, - nix = { - binary = { "nix" }, - maxMemoryMB = { "1024" }, - autoEvalInputs = { true }, - nixpkgsInputName = { "nixpkgs" }, - }, - }, - }, }) diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix index 181c1187..1efc57b4 100644 --- a/hosts/sakotop/configuration.nix +++ b/hosts/sakotop/configuration.nix @@ -58,8 +58,8 @@ nvim.enable = true; vscode.enable = true; }; - nixd.enable = false; - nil.enable = true; + nixd.enable = true; + nil.enable = false; cc.enable = true; javascript.enable = true; python.enable = true;