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

languages: allow listOf format.type

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

30
modules/plugins/languages/json.nix
View file

@ -8,7 +8,7 @@
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.meta) getExe' getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum package;
inherit (lib.types) enum;
inherit (lib.nvim.types) mkGrammarOption singleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
@ -24,15 +24,12 @@
};
};
defaultFormat = "jsonfmt";
defaultFormat = ["jsonfmt"];
formats = {
jsonfmt = {
package = pkgs.writeShellApplication {
name = "jsonfmt";
runtimeInputs = [pkgs.jsonfmt];
text = "jsonfmt -w -";
};
command = getExe pkgs.jsonfmt;
args = ["-w" "-"];
};
};
in {
@ -60,15 +57,9 @@ in {
type = mkOption {
description = "JSON formatter to use";
type = enum (attrNames formats);
type = singleOrListOf (enum (attrNames formats));
default = defaultFormat;
};
package = mkOption {
description = "JSON formatter package";
type = package;
default = formats.${cfg.format.type}.package;
};
};
};
@ -90,10 +81,13 @@ in {
(mkIf cfg.format.enable {
vim.formatter.conform-nvim = {
enable = true;
setupOpts.formatters_by_ft.json = [cfg.format.type];
setupOpts.formatters.${cfg.format.type} = {
command = getExe cfg.format.package;
};
setupOpts.formatters_by_ft.json = cfg.format.type;
setupOpts.formatters =
mapListToAttrs (name: {
inherit name;
value = formats.${name};
})
cfg.format.type;
};
})
]);