1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
|
From 4f492b1253fb14354068a04e6ca37889e1c6b773 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Mon, 2 Nov 2026 15:05:07 +0100
Subject: [PATCH 2/7] treewide: Use `extra_modules` to import dependency
modules
---
flake.nix | 28 ++++++++++++-------
.../tiamat/legacy-disk-module/module.nix | 4 +--
hosts/default.nix | 19 ++++++-------
modules/by-name/ag/age/module.nix | 4 +--
modules/by-name/bo/boot/module.nix | 6 ++--
modules/by-name/di/disks/module.nix | 4 +--
modules/by-name/ho/home-manager/module.nix | 4 +--
modules/by-name/im/impermanence/module.nix | 4 +--
modules/by-name/ni/nix-index/module.nix | 4 +--
modules/by-name/nv/nvim/module.nix | 4 +--
tests/default.nix | 23 ++++++---------
tests/old/by-name/nv/nvim-neorg/test.nix | 4 +--
tests/old/infrastructure/default.nix | 2 +-
13 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/flake.nix b/flake.nix
index 9e306ef7..860ce277 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,14 +24,22 @@
lib = packageSets.unstable.lib;
extra_lib = raw_sources.library.nixLib;
- extra_modules = [
- sources.agenix.nixosModules.default
- sources.turtle.nixosModules.nixos
- sources.disko.nixosModules.default
- sources.impermanence.nixosModules.impermanence
- sources.simple-nixos-mailserver.nixosModule
- sources.rocie.nixosModules.default
- ];
+ extra_modules = {
+ nixos = {
+ agenix = sources.agenix.nixosModules.default;
+ turtle = sources.turtle.nixosModules.nixos;
+ disko = sources.disko.nixosModules.default;
+ impermanence = sources.impermanence.nixosModules.impermanence;
+ simple-nixos-mailserver = sources.simple-nixos-mailserver.nixosModule;
+ rocie = sources.rocie.nixosModules.default;
+ home-manager = sources.home-manager.nixosModules.home-manager;
+ lanzaboote = sources.lanzaboote.nixosModules.lanzaboote;
+ };
+ home = {
+ nix-index-database = sources.nix-index-database.homeModules.nix-index;
+ nixvim = sources.nixvim.homeManagerModule;
+ };
+ };
module_args = {
inherit
sources
@@ -48,6 +56,7 @@
# Needs to be a special argument, because it is used for determining the `imports`
# value (via `mkByName`).
extra_lib
+ extra_modules
;
};
@@ -64,7 +73,6 @@
extra_lib
module_args
special_args
- extra_modules
system
;
inherit
@@ -78,7 +86,7 @@
deployChecks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) sources.deploy-rs.lib;
tests = lib.attrsets.filterAttrs (_: v: !(v ? meta && v.meta.broken)) (import ./tests
{
- inherit sources packageSets extra_modules module_args special_args extra_lib;
+ inherit sources packageSets module_args special_args extra_lib;
});
# myPkgsFlat =
# builtins.listToAttrs
diff --git a/hosts/by-name/tiamat/legacy-disk-module/module.nix b/hosts/by-name/tiamat/legacy-disk-module/module.nix
index 955d2026..8c49f6eb 100644
--- a/hosts/by-name/tiamat/legacy-disk-module/module.nix
+++ b/hosts/by-name/tiamat/legacy-disk-module/module.nix
@@ -11,7 +11,7 @@
config,
lib,
pkgs,
- modules,
+ extra_modules,
...
}: let
# FIXME: The iso redeploy requires a bigger efi partition <2024-05-12>
@@ -48,7 +48,7 @@ in {
};
imports = [
- modules.disko.nixosModules.default
+ extra_modules.nixos.disko
];
config = lib.mkIf cfg.enable {
diff --git a/hosts/default.nix b/hosts/default.nix
index 4a3d52fc..4f5d2982 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -2,7 +2,6 @@
self,
extra_lib,
module_args,
- extra_modules,
special_args,
nixpkgs-stable,
nixpkgs-unstable,
@@ -24,17 +23,15 @@
in
nixpkgs.lib.nixosSystem {
specialArgs = special_args;
- modules =
- extra_modules
- ++ [
- {
- _module.args = module_args;
- }
- path
+ modules = [
+ {
+ _module.args = module_args;
+ }
+ path
- ../modules
- # ../modules/common
- ];
+ ../modules
+ # ../modules/common
+ ];
};
mkDeployHost = name: path: let
host_file = builtins.fromTOML (builtins.readFile path + "/host.toml");
diff --git a/modules/by-name/ag/age/module.nix b/modules/by-name/ag/age/module.nix
index 9a498ab6..6eb0f9c4 100644
--- a/modules/by-name/ag/age/module.nix
+++ b/modules/by-name/ag/age/module.nix
@@ -1,7 +1,7 @@
{
config,
lib,
- modules,
+ extra_modules,
pkgs,
...
}: let
@@ -12,7 +12,7 @@ in {
};
imports = [
- modules.agenix.nixosModules.default
+ extra_modules.nixos.agenix
];
config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index 86ad58da..8d3cbe5f 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -11,7 +11,7 @@
config,
lib,
pkgs,
- modules,
+ extra_modules,
modulesPath,
system,
specialArgs,
@@ -94,7 +94,7 @@ in {
};
imports = [
- modules.lanzaboote.nixosModules.lanzaboote
+ extra_modules.nixos.lanzaboote
];
config = lib.mkIf cfg.enable {
@@ -130,7 +130,7 @@ in {
lanzabooteInstallHook = import "${modulesPath}/../lib/eval-config.nix" {
inherit system specialArgs;
modules = [
- modules.lanzaboote.nixosModules.lanzaboote
+ extra_modules.nixos.lanzaboote
{
# Copy the relevant config into the eval-module context.
diff --git a/modules/by-name/di/disks/module.nix b/modules/by-name/di/disks/module.nix
index ed5c939a..0a46c402 100644
--- a/modules/by-name/di/disks/module.nix
+++ b/modules/by-name/di/disks/module.nix
@@ -11,7 +11,7 @@
config,
lib,
pkgs,
- modules,
+ extra_modules,
...
}: let
cfg = config.soispha.disks;
@@ -42,7 +42,7 @@ in {
};
imports = [
- modules.disko.nixosModules.default
+ extra_modules.nixos.disko
];
config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ho/home-manager/module.nix b/modules/by-name/ho/home-manager/module.nix
index d7eccbd6..e20cfa6d 100644
--- a/modules/by-name/ho/home-manager/module.nix
+++ b/modules/by-name/ho/home-manager/module.nix
@@ -11,7 +11,7 @@
config,
lib,
system,
- modules,
+ extra_modules,
...
}: let
cfg = config.soispha.home-manager;
@@ -21,7 +21,7 @@ in {
};
imports = [
- modules.home-manager.nixosModules.home-manager
+ extra_modules.nixos.home-manager
];
# TODO: Find a way to throw this error below, when a user `enable`s a home-manager
diff --git a/modules/by-name/im/impermanence/module.nix b/modules/by-name/im/impermanence/module.nix
index 0fbd7425..0de6f3e6 100644
--- a/modules/by-name/im/impermanence/module.nix
+++ b/modules/by-name/im/impermanence/module.nix
@@ -1,7 +1,7 @@
{
config,
lib,
- modules,
+ extra_modules,
...
}: let
cfg = config.vhack.persist;
@@ -46,7 +46,7 @@ in {
};
imports = [
- modules.impermanence.nixosModules.impermanence
+ extra_modules.nixos.impermanence
];
config = lib.mkIf cfg.enable {
diff --git a/modules/by-name/ni/nix-index/module.nix b/modules/by-name/ni/nix-index/module.nix
index 72be6b52..269c6f95 100644
--- a/modules/by-name/ni/nix-index/module.nix
+++ b/modules/by-name/ni/nix-index/module.nix
@@ -10,7 +10,7 @@
{
config,
lib,
- modules,
+ extra_modules,
...
}: let
cfg = config.soispha.programs.nix-index;
@@ -27,7 +27,7 @@ in {
home-manager.users.soispha = {
imports = [
- modules.nix-index-database.homeModules.nix-index
+ extra_modules.home.nix-index-database
];
programs.nix-index = {
diff --git a/modules/by-name/nv/nvim/module.nix b/modules/by-name/nv/nvim/module.nix
index f6f9ba95..f6e2162e 100644
--- a/modules/by-name/nv/nvim/module.nix
+++ b/modules/by-name/nv/nvim/module.nix
@@ -11,7 +11,7 @@
pkgs,
lib,
config,
- modules,
+ extra_modules,
libraries,
...
}: let
@@ -51,7 +51,7 @@ in {
home-manager.users.soispha = {
imports = [
- modules.nixvim.homeModules.nixvim
+ extra_modules.home.nixvim
];
home.sessionVariables = {
diff --git a/tests/default.nix b/tests/default.nix
index 870ecfb5..6ab6b5fa 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -1,6 +1,5 @@
{
packageSets,
- extra_modules,
module_args,
special_args,
extra_lib,
@@ -86,12 +85,10 @@
];
};
name_server = {nodes, ...}: {
- imports =
- extra_modules
- ++ [
- ./common/acme/client.nix
- ./common/dns/server.nix
- ];
+ imports = [
+ ./common/acme/client.nix
+ ./common/dns/server.nix
+ ];
vhack.dns.zones = let
mkDomain = attr: let
@@ -129,14 +126,12 @@
args.nodes
(builtins.mapAttrs (_: _: {
- imports =
- extra_modules
- ++ [
- ./common/acme/client.nix
- ./common/dns/client.nix
+ imports = [
+ ./common/acme/client.nix
+ ./common/dns/client.nix
- ../modules
- ];
+ ../modules
+ ];
})
args.nodes)
];
diff --git a/tests/old/by-name/nv/nvim-neorg/test.nix b/tests/old/by-name/nv/nvim-neorg/test.nix
index 9f160df5..82cb533d 100644
--- a/tests/old/by-name/nv/nvim-neorg/test.nix
+++ b/tests/old/by-name/nv/nvim-neorg/test.nix
@@ -9,7 +9,7 @@
# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
{
mkTest,
- extraModules,
+ extra_modules,
pkgs,
...
}:
@@ -34,7 +34,7 @@ mkTest {
};
home-manager.users.soispha = {
imports = [
- extraModules.nixvim.homeManagerModule
+ extra_modules.home.nixvim
];
};
};
diff --git a/tests/old/infrastructure/default.nix b/tests/old/infrastructure/default.nix
index cd21198c..4696a99f 100644
--- a/tests/old/infrastructure/default.nix
+++ b/tests/old/infrastructure/default.nix
@@ -47,7 +47,7 @@ nixos-lib.runTest {
machine = {config, ...}: {
imports =
[
- extraModules.home-manager
+ extra_modules.home.home-manager
../../modules/by-name/us/users/module.nix
]
++ configuration.imports;
--
2.55.0
|
