Working on reshuffling

2026-03-19 11:52:14 +00:00
parent 13792d0fd1
commit 5a4a4183ba
32 changed files with 1443 additions and 13 deletions
@@ -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
+             ];
          };
       };
     };