Working on reshuffling

Droidnix/README.org

@@ -113,15 +113,10 @@ The Nix flake definition for Droidnix.
             specialArgs = { inherit inputs; };
 
             modules = [
-              # Host module now only defines configuration
               ./generated/hosts/traveldroid/traveldroid.nix
-
-              # Optional host-specific boot/hardware overrides
               ./generated/hosts/traveldroid/boot.nix
               ./generated/hosts/traveldroid/hardware-configuration.nix
-
-              # External modules like stylix can also be added here if needed
-              # stylix.nixosModules.default
+              stylix.nixosModules.default
             ];
           };
       };
@@ -369,20 +364,17 @@ in
 
 ** =generated/hosts/traveldroid/boot.nix=
 #+BEGIN_SRC nix :tangle generated/hosts/traveldroid/boot.nix :noweb tangle :mkdirp yes :eval never-html
-# ./generated/hosts/traveldroid/traveldroid.nix
-{ inputs, config, pkgs, lib, ... }:
+{ inputs, config, lib, pkgs, ... }:
 
 let
-  # Import all reusable modules under ./generated/modules via the flake input
-  modulesFromTree = builtins.attrValues (inputs.import-tree { path = ./generated/modules; });
+  # Import all reusable modules via the flake input
+  modulesFromTree = builtins.attrValues (inputs.import-tree { path = ../modules; });
 in
 {
   # Host-specific imports
   imports = [
     inputs.home-manager.nixosModules.home-manager
-  ] ++ modulesFromTree ++ [
-    ./hardware-configuration.nix
-  ];
+  ] ++ modulesFromTree;
 
   # Host-specific configuration
   networking.hostName = "traveldroid";

Droidnix/flake.nix

@@ -41,15 +41,10 @@
             specialArgs = { inherit inputs; };
 
             modules = [
-              # Host module now only defines configuration
               ./generated/hosts/traveldroid/traveldroid.nix
-
-              # Optional host-specific boot/hardware overrides
               ./generated/hosts/traveldroid/boot.nix
               ./generated/hosts/traveldroid/hardware-configuration.nix
-
-              # External modules like stylix can also be added here if needed
-              # stylix.nixosModules.default
+              stylix.nixosModules.default
             ];
           };
       };

Droidnix/generated/hosts/traveldroid/boot.nix

@@ -1,17 +1,14 @@
-# ./generated/hosts/traveldroid/traveldroid.nix
-{ inputs, config, pkgs, lib, ... }:
+{ inputs, config, lib, pkgs, ... }:
 
 let
-  # Import all reusable modules under ./generated/modules via the flake input
-  modulesFromTree = builtins.attrValues (inputs.import-tree { path = ./generated/modules; });
+  # Import all reusable modules via the flake input
+  modulesFromTree = builtins.attrValues (inputs.import-tree { path = ../modules; });
 in
 {
   # Host-specific imports
   imports = [
     inputs.home-manager.nixosModules.home-manager
-  ] ++ modulesFromTree ++ [
-    ./hardware-configuration.nix
-  ];
+  ] ++ modulesFromTree;
 
   # Host-specific configuration
   networking.hostName = "traveldroid";