From 36c71b875383d285ac6a9f3d3babc60f94c92e65 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Sun, 6 Aug 2023 11:01:04 +0300 Subject: [PATCH] lets try this again --- config/nvim/lua/core/plugin_config/lsp_config.lua | 10 +--------- hosts/sakotop/configuration.nix | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/config/nvim/lua/core/plugin_config/lsp_config.lua b/config/nvim/lua/core/plugin_config/lsp_config.lua index 49a1ed6c..7ce57453 100644 --- a/config/nvim/lua/core/plugin_config/lsp_config.lua +++ b/config/nvim/lua/core/plugin_config/lsp_config.lua @@ -30,17 +30,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" }, - }, - }, - }, }) diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix index 5f74dbbe..f4cb9a07 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;