From e45b2241fabcb0fd7c85b7c6d2be29ef51627191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 17 Jun 2024 10:01:08 +0200 Subject: [PATCH] feat: update nixd config --- .nixd.json | 9 -------- flake.nix | 1 + .../nvim/plugins/lua/nvim-lspconfig.lua | 22 ++++++++++++++++++- 3 files changed, 22 insertions(+), 10 deletions(-) delete mode 100644 .nixd.json diff --git a/.nixd.json b/.nixd.json deleted file mode 100644 index 31ab0e5..0000000 --- a/.nixd.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "options": { - "enable": true, - "target": { - "args": [], - "installable": ".#nixosConfigurations.nixos-desktop.options" - } - } -} diff --git a/flake.nix b/flake.nix index 37e227d..f5fa4f3 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,7 @@ outputs = inputs@{ self, flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { + debug = true; # NOTE: for nixd imports = [ inputs.pre-commit-hooks.flakeModule inputs.devshell.flakeModule diff --git a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua index d618a7f..1c6dcbe 100644 --- a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua +++ b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua @@ -124,7 +124,6 @@ local servers = { "gleam", "gopls", "nil_ls", - "nixd", "pylsp", "ruff_lsp", "templ", @@ -134,6 +133,27 @@ for _, lsp in ipairs(servers) do lspconfig_setup(lsp, {}) end +lspconfig_setup("nixd", { + settings = { + nixd = { + nixpkgs = { + expr = "import { }", + }, + options = { + nixos = { + expr = '(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.nixos-desktop.options', + }, + ["flake-parts"] = { + expr = '(builtins.getFlake ("git+file://" + toString ./.)).debug.options', + }, + ["flake-parts2"] = { + expr = '(builtins.getFlake ("git+file://" + toString ./.)).currentSystem.options', + }, + }, + }, + }, +}) + -- Add templ filetype vim.filetype.add({ extension = { templ = "templ" } })