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

---
 flake.nix | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'flake.nix')

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