From e9e7bfba53304bc3621abb8ae743e6b170e71fd9 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Thu, 6 Feb 2025 19:18:38 +0800 Subject: [PATCH 1/2] telescope: remove invalid option --- modules/plugins/utility/telescope/telescope.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix index cf9c5cd8..0665eb11 100644 --- a/modules/plugins/utility/telescope/telescope.nix +++ b/modules/plugins/utility/telescope/telescope.nix @@ -87,11 +87,6 @@ type = float; default = 0.55; }; - results_width = mkOption { - description = ""; - type = float; - default = 0.8; - }; }; vertical = { mirror = mkOption { From 132c3da8ece1f2518992257985a612690b2eeb90 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Thu, 6 Feb 2025 13:08:31 +0100 Subject: [PATCH 2/2] languages/nix: add nixd This adds the [nixd](https://github.com/nix-community/nixd) language server. --- docs/release-notes/rl-0.8.md | 4 ++++ modules/plugins/languages/nix.nix | 34 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 661aee1d..3a09171b 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -139,3 +139,7 @@ - Add `vim.languages.zig.dap` support through pkgs.lldb dap adapter. Code Inspiration from `vim.languages.clang.dap` implementation. + +[nezia1](https://github.com/nezia1) + +- Add support for [nixd](https://github.com/nix-community/nixd) language server. diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index 4056a415..d6ca6d32 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -59,6 +59,40 @@ } ''; }; + + nixd = { + package = pkgs.nixd; + internalFormatter = true; + lspConfig = '' + lspconfig.nixd.setup{ + capabilities = capabilities, + ${ + if cfg.format.enable + then useFormat + else noFormat + }, + cmd = ${packageToCmd cfg.lsp.package "nixd"}, + ${optionalString cfg.format.enable '' + settings = { + nixd = { + ${optionalString (cfg.format.type == "alejandra") + '' + formatting = { + command = {"${cfg.format.package}/bin/alejandra", "--quiet"}, + }, + ''} + ${optionalString (cfg.format.type == "nixfmt") + '' + formatting = { + command = {"${cfg.format.package}/bin/nixfmt"}, + }, + ''} + }, + }, + ''} + } + ''; + }; }; defaultFormat = "alejandra";