NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-09 06:55:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

languages: allow listOf format.type

Browse source
This commit is contained in:
Ching Pei Yang 2025-08-23 16:04:51 +02:00
commit 60004b0da2
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
24 changed files with 314 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@
inherit (lib.meta) getExe;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum package;
inherit (lib.types) enum;
inherit (lib.nvim.types) mkGrammarOption diagnostics singleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
@ -49,14 +49,14 @@
};
};
defaultFormat = "alejandra";
defaultFormat = ["alejandra"];
formats = {
alejandra = {
package = pkgs.alejandra;
command = getExe pkgs.alejandra;
};
nixfmt = {
package = pkgs.nixfmt-rfc-style;
command = getExe pkgs.nixfmt-rfc-style;
};
};
@ -109,15 +109,9 @@ in {
type = mkOption {
description = "Nix formatter to use";
type = enum (attrNames formats);
type = singleOrListOf (enum (attrNames formats));
default = defaultFormat;
};
package = mkOption {
description = "Nix formatter package";
type = package;
default = formats.${cfg.format.type}.package;
};
};
extraDiagnostics = {
@ -161,9 +155,14 @@ in {
(mkIf (cfg.format.enable && !cfg.lsp.enable) {
vim.formatter.conform-nvim = {
enable = true;
setupOpts.formatters_by_ft.nix = [cfg.format.type];
setupOpts.formatters.${cfg.format.type} = {
command = getExe cfg.format.package;
setupOpts = {
formatters_by_ft.nix = cfg.format.type;
formatters =
mapListToAttrs (name: {
inherit name;
value = formats.${name};
})
cfg.format.type;
};
};
})