Working on reshuffling

2026-03-19 10:21:31 +00:00
parent f2c30e2a8c
commit 078bc06375
4 changed files with 214 additions and 216 deletions
@@ -1,60 +1,46 @@
-{ inputs, config, ... }:
+{ inputs, ... }:

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

-    modules =
-      [
-        inputs.home-manager.nixosModules.home-manager
-        inputs.stylix.nixosModules.stylix
-      ] ++
-      (builtins.attrValues config.flake.nixosModules) ++
-      [
-        ./hardware-configuration.nix
+  # Optional: pass inputs to modules
+  specialArgs = { inherit inputs; };

-        ({ ... }: {
-          networking.hostName = "traveldroid";
-          system.stateVersion = "25.11";
+  modules = [
+    inputs.home-manager.nixosModules.home-manager
+  ]
+  ++ builtins.attrValues (import-tree ./generated/modules)
+  ++ [
+    ./hardware-configuration.nix

-          boot = {
-	    loader = {
-              grub = {
-                enable = true;
-                efiSupport = true;
-                device = "nodev";
-                useOSProber = true;
-              };
+    # Host-specific hardware and system settings
+    ({ config, lib, ... }: {
+      networking.hostName = "traveldroid";
+      system.stateVersion = "25.11";

-              efi.canTouchEfiVariables = true;
-            };
+      boot.loader.grub = {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+        useOSProber = true;
+      };
+      boot.efi.canTouchEfiVariables = true;

-	    # initrd.systemd.tpm2.enable = false;
-	    kernelParams = [
-              "systemd.mask=dev-tpm0.device"
-              "systemd.mask=dev-tpmrm0.device"
-	    ];
-	  };
-
-	  # systemd.tpm2.enable = false;
-
-	  # Enable various user-defined modules
-	  mySystem = {
-        # Turn on the core system
-        system.core.enable = true;
-
-	    # Hardware-specific modules
-	    hardware.nvidia.enable = false;
-
-	    # Define Environment
-	    desktop = {
-	      hyprland.enable = true;
-	      noctalia.enable = true;
-	      stylix.enable = true;
-	    };
-	  };
-        })
+      boot.kernelParams = [
+        "systemd.mask=dev-tpm0.device"
+        "systemd.mask=dev-tpmrm0.device"
      ];
-  };
+
+      # User-defined features
+      mySystem.system.core.enable = true;
+
+      # Desktop environment features
+      desktop.hyprland.enable = true;
+      desktop.noctalia.enable = true;
+      desktop.stylix.enable = true;
+
+      # Hardware overrides (host-specific)
+      hardware.nvidia.enable = false;
+    })
+  ];
 }