From d24d23748eaca6a2f0404ab4903e93a20fdab68c Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Fri, 27 Mar 2026 08:42:39 +0000
Subject: [PATCH] Regenerated

---
 Droidnix/README.org                           | 38 ++++++-------------
 Droidnix/generated/hosts/traveldroid/host.nix | 38 ++++++-------------
 2 files changed, 22 insertions(+), 54 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 4cc36dffd..e5ad9b740 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -136,25 +136,25 @@ let
   modulesPath = "${flakeRoot}/generated/modules/${hostname}";
   usersPath   = "${flakeRoot}/generated/users";
 
-  # Import raw modules (might be functions)
   hostModulesRaw = import-tree modulesPath;
   globalUsersRaw = import-tree usersPath;
 
-  # Helper to fully evaluate import-tree nodes into module sets
+  # Evaluate functions from import-tree
   evalModule = m:
     if lib.isFunction m then
       m { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; }
     else
       m;
 
-  # Evaluate all modules into sets
-  hostModules = lib.mapAttrsToList (_: mod: evalModule mod) hostModulesRaw;
-  globalUsers = lib.mapAttrsToList (_: mod: evalModule mod) globalUsersRaw;
+  hostModules = lib.mapAttrs (_: mod: evalModule mod) hostModulesRaw;
+  globalUsers = lib.mapAttrs (_: mod: evalModule mod) globalUsersRaw;
 
-  # Merge all evaluated modules
   allModules = hostModules ++ globalUsers;
 
-  # Merge all _module.args.hmUsers
+  # Flatten modules for imports
+  flattenModules = lib.flatten (lib.map (m: [ m ]) allModules);
+
+  # Merge all _module.args.hmUsers safely
   allHmUsers = lib.foldl' (acc: m:
     let
       hmUsers = if (builtins.hasAttr "_module" m) &&
@@ -167,38 +167,22 @@ let
 
 in
 {
-  #################################
-  # Core system config
-  #################################
-
   networking.hostName = hostname;
   system.stateVersion = "26.05";
 
-  #################################
-  # Imports
-  #################################
-
+  # Use flattened module list in imports
   imports =
-    [
+    flattenModules
+    ++ [
       ./boot.nix
       ./hardware-configuration.nix
       home-manager.nixosModules.home-manager
-    ]
-    ++ allModules;
-
-  #################################
-  # Home Manager integration
-  #################################
+    ];
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
-
-  # Inject the merged users directly under Home Manager
   home-manager.users = allHmUsers;
 
-  #################################
-  # Example: system packages
-  #################################
   environment.systemPackages = [
     pkgs.dconf
   ];
diff --git a/Droidnix/generated/hosts/traveldroid/host.nix b/Droidnix/generated/hosts/traveldroid/host.nix
index b5158d1f4..f7725e2b3 100644
--- a/Droidnix/generated/hosts/traveldroid/host.nix
+++ b/Droidnix/generated/hosts/traveldroid/host.nix
@@ -6,25 +6,25 @@ let
   modulesPath = "${flakeRoot}/generated/modules/${hostname}";
   usersPath   = "${flakeRoot}/generated/users";
 
-  # Import raw modules (might be functions)
   hostModulesRaw = import-tree modulesPath;
   globalUsersRaw = import-tree usersPath;
 
-  # Helper to fully evaluate import-tree nodes into module sets
+  # Evaluate functions from import-tree
   evalModule = m:
     if lib.isFunction m then
       m { lib = lib; pkgs = pkgs; config = config; flakeRoot = flakeRoot; home-manager = home-manager; }
     else
       m;
 
-  # Evaluate all modules into sets
-  hostModules = lib.mapAttrsToList (_: mod: evalModule mod) hostModulesRaw;
-  globalUsers = lib.mapAttrsToList (_: mod: evalModule mod) globalUsersRaw;
+  hostModules = lib.mapAttrs (_: mod: evalModule mod) hostModulesRaw;
+  globalUsers = lib.mapAttrs (_: mod: evalModule mod) globalUsersRaw;
 
-  # Merge all evaluated modules
   allModules = hostModules ++ globalUsers;
 
-  # Merge all _module.args.hmUsers
+  # Flatten modules for imports
+  flattenModules = lib.flatten (lib.map (m: [ m ]) allModules);
+
+  # Merge all _module.args.hmUsers safely
   allHmUsers = lib.foldl' (acc: m:
     let
       hmUsers = if (builtins.hasAttr "_module" m) &&
@@ -37,38 +37,22 @@ let
 
 in
 {
-  #################################
-  # Core system config
-  #################################
-
   networking.hostName = hostname;
   system.stateVersion = "26.05";
 
-  #################################
-  # Imports
-  #################################
-
+  # Use flattened module list in imports
   imports =
-    [
+    flattenModules
+    ++ [
       ./boot.nix
       ./hardware-configuration.nix
       home-manager.nixosModules.home-manager
-    ]
-    ++ allModules;
-
-  #################################
-  # Home Manager integration
-  #################################
+    ];
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
-
-  # Inject the merged users directly under Home Manager
   home-manager.users = allHmUsers;
 
-  #################################
-  # Example: system packages
-  #################################
   environment.systemPackages = [
     pkgs.dconf
   ];