Skip to content

Commit 2a052f5

Browse files
horriblenamehorriblename
committed
languages: allow listOf format.type
1 parent 8fe7bae commit 2a052f5

File tree

22 files changed

+265
-357
lines changed

22 files changed

+265
-357
lines changed

‎modules/plugins/languages/bash.nix‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
inherit (lib.options) mkOption mkEnableOption;
99
inherit (lib.meta) getExe;
1010
inherit (lib.modules) mkIf mkMerge;
11-
inherit (lib.types) enum package bool;
11+
inherit (lib.types) enum bool;
1212
inherit (lib.generators) mkLuaInline;
1313
inherit (lib.nvim.types) diagnostics mkGrammarOption singleOrListOf;
1414
inherit (lib.nvim.attrsets) mapListToAttrs;
@@ -30,10 +30,10 @@
3030
};
3131
};
3232

33-
defaultFormat = "shfmt";
33+
defaultFormat = ["shfmt"];
3434
formats = {
3535
shfmt = {
36-
package = pkgs.shfmt;
36+
command = getExe pkgs.shfmt;
3737
};
3838
};
3939

@@ -68,16 +68,10 @@ in {
6868
description = "Enable Bash formatting";
6969
};
7070
type = mkOption {
71-
type = enum (attrNames formats);
71+
type = singleOrListOf (enum (attrNames formats));
7272
default = defaultFormat;
7373
description = "Bash formatter to use";
7474
};
75-
76-
package = mkOption {
77-
type = package;
78-
default = formats.${cfg.format.type}.package;
79-
description = "Bash formatter package";
80-
};
8175
};
8276

8377
extraDiagnostics = {
@@ -108,10 +102,13 @@ in {
108102
(mkIf cfg.format.enable {
109103
vim.formatter.conform-nvim = {
110104
enable = true;
111-
setupOpts.formatters_by_ft.sh = [cfg.format.type];
112-
setupOpts.formatters.${cfg.format.type} = {
113-
command = getExe cfg.format.package;
114-
};
105+
setupOpts.formatters_by_ft.sh = cfg.format.type;
106+
setupOpts.formatters =
107+
mapListToAttrs (name: {
108+
inherit name;
109+
value = formats.${name};
110+
})
111+
cfg.format.type;
115112
};
116113
})
117114

‎modules/plugins/languages/clojure.nix‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
inherit (lib.options) mkEnableOption mkOption;
99
inherit (lib.modules) mkIf mkMerge;
1010
inherit (lib.meta) getExe;
11-
inherit (lib.lists) isList;
12-
inherit (lib.types) enum either listOf package str;
11+
inherit (lib.types) enum listOf;
1312
inherit (lib.nvim.types) mkGrammarOption;
14-
inherit (lib.nvim.lua) expToLua;
1513
inherit (lib.nvim.attrsets) mapListToAttrs;
1614

1715
cfg = config.vim.languages.clojure;

‎modules/plugins/languages/css.nix‎

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
inherit (lib.options) mkEnableOption mkOption;
99
inherit (lib.meta) getExe;
1010
inherit (lib.modules) mkIf mkMerge;
11-
inherit (lib.types) enum package;
11+
inherit (lib.types) enum;
1212
inherit (lib.nvim.types) mkGrammarOption singleOrListOf;
1313
inherit (lib.nvim.attrsets) mapListToAttrs;
1414

@@ -30,34 +30,18 @@
3030
};
3131
};
3232

33-
defaultFormat = "prettier";
33+
defaultFormat = ["prettier"];
3434
formats = {
3535
prettier = {
36-
package = pkgs.prettier;
36+
command = getExe pkgs.prettier;
3737
};
3838

3939
prettierd = {
40-
package = pkgs.prettierd;
41-
nullConfig = ''
42-
table.insert(
43-
ls_sources,
44-
null_ls.builtins.formatting.prettier.with({
45-
command = "${cfg.format.package}/bin/prettierd",
46-
})
47-
)
48-
'';
40+
command = getExe pkgs.prettierd;
4941
};
5042

5143
biome = {
52-
package = pkgs.biome;
53-
nullConfig = ''
54-
table.insert(
55-
ls_sources,
56-
null_ls.builtins.formatting.biome.with({
57-
command = "${cfg.format.package}/bin/biome",
58-
})
59-
)
60-
'';
44+
command = getExe pkgs.biome;
6145
};
6246
};
6347
in {
@@ -85,15 +69,9 @@ in {
8569

8670
type = mkOption {
8771
description = "CSS formatter to use";
88-
type = enum (attrNames formats);
72+
type = singleOrListOf (enum (attrNames formats));
8973
default = defaultFormat;
9074
};
91-
92-
package = mkOption {
93-
description = "CSS formatter package";
94-
type = package;
95-
default = formats.${cfg.format.type}.package;
96-
};
9775
};
9876
};
9977

@@ -115,10 +93,13 @@ in {
11593
(mkIf cfg.format.enable {
11694
vim.formatter.conform-nvim = {
11795
enable = true;
118-
setupOpts.formatters_by_ft.css = [cfg.format.type];
119-
setupOpts.formatters.${cfg.format.type} = {
120-
command = getExe cfg.format.package;
121-
};
96+
setupOpts.formatters_by_ft.css = cfg.format.type;
97+
setupOpts.formatters =
98+
mapListToAttrs (name: {
99+
inherit name;
100+
value = formats.${name};
101+
})
102+
cfg.format.type;
122103
};
123104
})
124105
]);

‎modules/plugins/languages/elixir.nix‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
inherit (lib.options) mkEnableOption mkOption;
99
inherit (lib.modules) mkIf mkMerge;
1010
inherit (lib.meta) getExe;
11-
inherit (lib.types) enum package;
11+
inherit (lib.types) enum;
1212
inherit (lib.generators) mkLuaInline;
1313
inherit (lib.nvim.types) mkGrammarOption singleOrListOf;
1414
inherit (lib.nvim.dag) entryAnywhere;
@@ -40,13 +40,10 @@
4040
};
4141
};
4242

43-
defaultFormat = "mix";
43+
defaultFormat = ["mix"];
4444
formats = {
4545
mix = {
46-
package = pkgs.elixir;
47-
config = {
48-
command = "${cfg.format.package}/bin/mix";
49-
};
46+
command = "${pkgs.elixir}/bin/mix";
5047
};
5148
};
5249
in {
@@ -73,16 +70,10 @@ in {
7370
enable = mkEnableOption "Elixir formatting" // {default = config.vim.languages.enableFormat;};
7471

7572
type = mkOption {
76-
type = enum (attrNames formats);
73+
type = singleOrListOf (enum (attrNames formats));
7774
default = defaultFormat;
7875
description = "Elixir formatter to use";
7976
};
80-
81-
package = mkOption {
82-
type = package;
83-
default = formats.${cfg.format.type}.package;
84-
description = "Elixir formatter package";
85-
};
8677
};
8778

8879
elixir-tools = {
@@ -112,9 +103,13 @@ in {
112103
(mkIf cfg.format.enable {
113104
vim.formatter.conform-nvim = {
114105
enable = true;
115-
setupOpts.formatters_by_ft.elixir = [cfg.format.type];
116-
setupOpts.formatters.${cfg.format.type} =
117-
formats.${cfg.format.type}.config;
106+
setupOpts.formatters_by_ft.elixir = cfg.format.type;
107+
setupOpts.formatters =
108+
mapListToAttrs (name: {
109+
inherit name;
110+
value = formats.${name};
111+
})
112+
cfg.format.type;
118113
};
119114
})
120115

‎modules/plugins/languages/fsharp.nix‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}: let
77
inherit (builtins) attrNames;
88
inherit (lib.options) mkEnableOption mkOption;
9-
inherit (lib.types) package enum;
9+
inherit (lib.types) enum;
1010
inherit (lib.meta) getExe;
1111
inherit (lib.modules) mkIf mkMerge;
1212
inherit (lib.generators) mkLuaInline;
@@ -51,10 +51,10 @@
5151
};
5252
};
5353

54-
defaultFormat = "fantomas";
54+
defaultFormat = ["fantomas"];
5555
formats = {
5656
fantomas = {
57-
package = pkgs.fantomas;
57+
command = getExe pkgs.fantomas;
5858
};
5959
};
6060

@@ -81,16 +81,10 @@ in {
8181
enable = mkEnableOption "F# formatting" // {default = config.vim.languages.enableFormat;};
8282

8383
type = mkOption {
84-
type = enum (attrNames formats);
84+
type = singleOrListOf (enum (attrNames formats));
8585
default = defaultFormat;
8686
description = "F# formatter to use";
8787
};
88-
89-
package = mkOption {
90-
type = package;
91-
default = formats.${cfg.format.type}.package;
92-
description = "F# formatter package";
93-
};
9488
};
9589
};
9690
};
@@ -113,10 +107,13 @@ in {
113107
(mkIf cfg.format.enable {
114108
vim.formatter.conform-nvim = {
115109
enable = true;
116-
setupOpts.formatters_by_ft.fsharp = [cfg.format.type];
117-
setupOpts.formatters.${cfg.format.type} = {
118-
command = getExe cfg.format.package;
119-
};
110+
setupOpts.formatters_by_ft.fsharp = cfg.format.type;
111+
setupOpts.formatters =
112+
mapListToAttrs (name: {
113+
inherit name;
114+
value = formats.${name};
115+
})
116+
cfg.format.type;
120117
};
121118
})
122119
]);

‎modules/plugins/languages/go.nix‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,16 @@
5959
};
6060
};
6161

62-
defaultFormat = "gofmt";
62+
defaultFormat = ["gofmt"];
6363
formats = {
6464
gofmt = {
65-
package = pkgs.go;
66-
config.command = "${cfg.format.package}/bin/gofmt";
65+
command = "${pkgs.go}/bin/gofmt";
6766
};
6867
gofumpt = {
69-
package = pkgs.gofumpt;
70-
config.command = getExe cfg.format.package;
68+
command = getExe pkgs.gofumpt;
7169
};
7270
golines = {
73-
package = pkgs.golines;
74-
config.command = "${cfg.format.package}/bin/golines";
71+
command = "${pkgs.golines}/bin/golines";
7572
};
7673
};
7774

@@ -113,15 +110,9 @@ in {
113110

114111
type = mkOption {
115112
description = "Go formatter to use";
116-
type = enum (attrNames formats);
113+
type = singleOrListOf (enum (attrNames formats));
117114
default = defaultFormat;
118115
};
119-
120-
package = mkOption {
121-
description = "Go formatter package";
122-
type = package;
123-
default = formats.${cfg.format.type}.package;
124-
};
125116
};
126117

127118
dap = {
@@ -163,8 +154,13 @@ in {
163154
(mkIf cfg.format.enable {
164155
vim.formatter.conform-nvim = {
165156
enable = true;
166-
setupOpts.formatters_by_ft.go = [cfg.format.type];
167-
setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
157+
setupOpts.formatters_by_ft.go = cfg.format.type;
158+
setupOpts.formatters =
159+
mapListToAttrs (name: {
160+
inherit name;
161+
value = formats.${name};
162+
})
163+
cfg.format.type;
168164
};
169165
})
170166

‎modules/plugins/languages/hcl.nix‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
inherit (lib.options) mkEnableOption mkOption;
99
inherit (lib.meta) getExe;
1010
inherit (lib.modules) mkIf mkMerge;
11-
inherit (lib.types) package bool enum listOf;
12-
inherit (lib.nvim.types) mkGrammarOption;
11+
inherit (lib.types) bool enum listOf;
12+
inherit (lib.nvim.types) mkGrammarOption singleOrListOf;
1313
inherit (lib.nvim.attrsets) mapListToAttrs;
1414

1515
cfg = config.vim.languages.hcl;
@@ -24,10 +24,10 @@
2424
};
2525
};
2626

27-
defaultFormat = "hclfmt";
27+
defaultFormat = ["hclfmt"];
2828
formats = {
2929
hclfmt = {
30-
package = pkgs.hclfmt;
30+
command = getExe pkgs.hclfmt;
3131
};
3232
};
3333
in {
@@ -55,15 +55,10 @@ in {
5555
description = "Enable HCL formatting";
5656
};
5757
type = mkOption {
58-
type = enum (attrNames formats);
58+
type = singleOrListOf (enum (attrNames formats));
5959
default = defaultFormat;
6060
description = "HCL formatter to use";
6161
};
62-
package = mkOption {
63-
type = package;
64-
default = formats.${cfg.format.type}.package;
65-
description = "HCL formatter package";
66-
};
6762
};
6863
};
6964

@@ -103,10 +98,13 @@ in {
10398
(mkIf cfg.format.enable {
10499
vim.formatter.conform-nvim = {
105100
enable = true;
106-
setupOpts.formatters_by_ft.hcl = [cfg.format.type];
107-
setupOpts.formatters.${cfg.format.type} = {
108-
command = getExe cfg.format.package;
109-
};
101+
setupOpts.formatters_by_ft.hcl = cfg.format.type;
102+
setupOpts.formatters =
103+
mapListToAttrs (name: {
104+
inherit name;
105+
value = formats.${name};
106+
})
107+
cfg.format.type;
110108
};
111109
})
112110
]);

0 commit comments

Comments
 (0)