NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-10-03 15:33:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

nix: fix nixd option

Browse source
This commit is contained in:
Ching Pei Yang 2025-09-15 18:44:30 +02:00
commit 96e1004e55
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
1 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/plugins/languages/nix.nix
View file

@ -60,7 +60,17 @@
'';
};
nixd = {
nixd = let
settings.nixd = {
inherit (cfg.lsp) options;
formatting.command =
if !cfg.format.enable
then null
else if cfg.format.type == "alejandra"
then ["${cfg.format.package}/bin/alejandra" "--quiet"]
else ["${cfg.format.package}/bin/nixfmt"];
};
in {
package = pkgs.nixd;
internalFormatter = true;
lspConfig = ''
@ -72,25 +82,7 @@
else noFormat
},
cmd = ${packageToCmd cfg.lsp.package "nixd"},
options = ${toLuaObject cfg.lsp.options},
${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"},
},
''}
},
},
''}
settings = ${toLuaObject settings},
}
'';
};