From 8d5e5959e1e432c8e36efec1a88840d214a18be0 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: treewide: Use `extra_modules` to import dependency modules

---
 hosts/by-name/tiamat/legacy-disk-module/module.nix |  4 ++--
 hosts/default.nix                                  | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'hosts')

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");
-- 
cgit v1.3.1