Working on reshuffling

2026-03-19 10:29:26 +00:00
parent 8bebbbe472
commit 22cd98aac3
2 changed files with 34 additions and 24 deletions
@@ -70,6 +70,7 @@ This section contains the Org blocks for tangling Nix code into the generated fo
 ** =flake.nix=
 The Nix flake definition for Droidnix.
 #+BEGIN_SRC nix :tangle flake.nix :noweb tangle :mkdirp yes :eval never-html
+# flake.nix
 {
  description = "Droidnix: A dendritic NixOS + Home Manager configuration";

@@ -101,24 +102,28 @@ The Nix flake definition for Droidnix.
    };
  };

-  outputs = inputs@{ flake-parts, nixpkgs, home-manager, stylix, ... }:
+  outputs = inputs@{ flake-parts, nixpkgs, ... }:
    flake-parts.lib.mkFlake { inherit inputs; } {
      systems = [ "x86_64-linux" ];

      flake = {
-        nixosConfigurations.traveldroid = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = { inherit inputs; };
+        nixosConfigurations.traveldroid =
+          nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            specialArgs = { inherit inputs; };

-          modules = [
-            # Host module imports all reusable modules internally
-            ./generated/hosts/traveldroid/traveldroid.nix
+            modules = [
+              # Host module now only defines configuration
+              ./generated/hosts/traveldroid/traveldroid.nix

-            # Optional host-specific things
-            ./generated/hosts/traveldroid/boot.nix
-            ./generated/hosts/traveldroid/hardware-configuration.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
+            ];
+          };
      };
    };
 }