summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake.nix28
-rw-r--r--hosts/by-name/tiamat/legacy-disk-module/module.nix4
-rw-r--r--hosts/default.nix19
-rw-r--r--modules/by-name/ag/age/module.nix4
-rw-r--r--modules/by-name/bo/boot/module.nix6
-rw-r--r--modules/by-name/di/disks/module.nix4
-rw-r--r--modules/by-name/ho/home-manager/module.nix4
-rw-r--r--modules/by-name/im/impermanence/module.nix4
-rw-r--r--modules/by-name/ni/nix-index/module.nix4
-rw-r--r--modules/by-name/nv/nvim/module.nix4
-rw-r--r--tests/old/by-name/nv/nvim-neorg/test.nix4
-rw-r--r--tests/old/infrastructure/default.nix2
12 files changed, 46 insertions, 41 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/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;
generated by cgit v1.3.1 (git 2.54.0) at 2026-11-07 19:04:05 +0000