Working on reshuffling

Droidnix/README.org

@@ -112,19 +112,19 @@ The Nix flake definition for Droidnix.
 
            specialArgs = { inherit inputs; };
 
-           modules = [
-             ./generated/system/mysystem.nix # <-- Must be first, offers the mysystem module
-           ]
-           ++ builtins.attrValues (inputs.import-tree ./generated/modules)
-           ++
-           [
-             ./generated/hosts/traveldroid/traveldroid.nix
-             ./generated/hosts/traveldroid/boot.nix
-             ./generated/hosts/traveldroid/hardware-configuration.nix
-             # External modules
-             inputs.stylix.nixosModules.default
-             inputs.home-manager.nixosModules.home-manager
-           ];
+           modules =
+             [
+               ./generated/system/mysystem.nix
+             ]
+             ++ (inputs.import-tree ./generated/modules).imports
+             ++ [
+               ./generated/hosts/traveldroid/traveldroid.nix
+               ./generated/hosts/traveldroid/boot.nix
+               ./generated/hosts/traveldroid/hardware-configuration.nix
+
+               inputs.stylix.nixosModules.default
+               inputs.home-manager.nixosModules.home-manager
+             ];
           };
        };
      };

Droidnix/find_lists.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# Find all nix files under generated/modules
+echo "Scanning generated/modules for modules returning lists..."
+
+for f in $(find generated/modules -name '*.nix'); do
+    # Look for lines where config or modules is assigned to a list
+    if rg -q '^\s*(config|modules)\s*=\s*\[' "$f"; then
+        echo "⚠️  Possible nested list in: $f"
+        rg '^\s*(config|modules)\s*=\s*\[' "$f"
+        echo ""
+    fi
+done
+
+echo "Scan complete."

Droidnix/flake.nix

@@ -40,19 +40,19 @@
 
            specialArgs = { inherit inputs; };
 
-           modules = [
-             ./generated/system/mysystem.nix # <-- Must be first, offers the mysystem module
-           ]
-           ++ builtins.attrValues (inputs.import-tree ./generated/modules)
-           ++
-           [
-             ./generated/hosts/traveldroid/traveldroid.nix
-             ./generated/hosts/traveldroid/boot.nix
-             ./generated/hosts/traveldroid/hardware-configuration.nix
-             # External modules
-             inputs.stylix.nixosModules.default
-             inputs.home-manager.nixosModules.home-manager
-           ];
+           modules =
+             [
+               ./generated/system/mysystem.nix
+             ]
+             ++ (inputs.import-tree ./generated/modules).imports
+             ++ [
+               ./generated/hosts/traveldroid/traveldroid.nix
+               ./generated/hosts/traveldroid/boot.nix
+               ./generated/hosts/traveldroid/hardware-configuration.nix
+
+               inputs.stylix.nixosModules.default
+               inputs.home-manager.nixosModules.home-manager
+             ];
           };
        };
      };