Simplify host imports

flake-parts/hosts.nix

@@ -9,28 +9,13 @@ let
     hostName:
     inputs.nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs self; };
-      modules =
+      modules = [
-        let
-          hostFiles =
-            "${self}/hosts/${hostName}"
-            |> lib.filesystem.listFilesRecursive
-            |> lib.filter (lib.hasSuffix ".nix");
-
-          userFiles =
-            "${self}/users"
-            |> builtins.readDir
-            |> lib.filterAttrs (_: type: type == "directory")
-            |> lib.attrNames
-            |> map (user: "${self}/users/${user}/@${hostName}/default.nix")
-            |> lib.filter (path: lib.pathExists path);
-        in
-        [
         { networking = { inherit hostName; }; }
         "${self}/hosts/common.nix"
-          "${self}/users/seb/default.nix"
+        "${self}/hosts/${hostName}"
+        "${self}/users/seb"
       ]
-        ++ hostFiles
+      ++ lib.optional (lib.pathExists "${self}/users/seb/@${hostName}") "${self}/users/seb/@${hostName}";
-        ++ userFiles;
     };
 
   mkDeployNode = hostname: {

hosts/desktop/default.nix

@@ -1,5 +1,11 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
+  imports = [
+    ./hardware.nix
+    ./disko.nix
+    inputs.disko.nixosModules.default
+  ];
+
   system.stateVersion = "23.11";
   boot.kernelPackages = pkgs.linuxPackages_latest;
 

hosts/desktop/hardware.nix

@@ -1,7 +1,4 @@
-{ inputs, ... }:
+_: {
-{
-  imports = [ inputs.disko.nixosModules.default ];
-
   nixpkgs.hostPlatform = "x86_64-linux";
 
   hardware = {

hosts/laptop/default.nix

@@ -1,5 +1,11 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
+  imports = [
+    ./hardware.nix
+    ./disko.nix
+    inputs.disko.nixosModules.default
+  ];
+
   system.stateVersion = "24.11";
   boot.kernelPackages = pkgs.linuxPackages_latest;
 

hosts/laptop/hardware.nix

@@ -1,9 +1,6 @@
 { inputs, ... }:
 {
-  imports = [
+  imports = [ inputs.nixos-hardware.nixosModules.framework-13-7040-amd ];
-    inputs.disko.nixosModules.default
-    inputs.nixos-hardware.nixosModules.framework-13-7040-amd
-  ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
 

hosts/srv-monitor/default.nix

@@ -1,5 +1,11 @@
-{ config, ... }:
+{ config, inputs, ... }:
 {
+  imports = [
+    ./hardware.nix
+    ./disko.nix
+    inputs.disko.nixosModules.default
+  ];
+
   system.stateVersion = "25.05";
 
   meta = {

hosts/srv-monitor/hardware.nix

@@ -1,9 +1,6 @@
-{ modulesPath, inputs, ... }:
+{ modulesPath, ... }:
 {
-  imports = [
+  imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
-    inputs.disko.nixosModules.default
-    "${modulesPath}/profiles/qemu-guest.nix"
-  ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
 

hosts/srv-private/default.nix

@@ -1,5 +1,11 @@
-{ config, ... }:
+{ config, inputs, ... }:
 {
+  imports = [
+    ./hardware.nix
+    ./disko.nix
+    inputs.disko.nixosModules.default
+  ];
+
   system.stateVersion = "25.05";
 
   meta = {

hosts/srv-private/hardware.nix

@@ -1,9 +1,6 @@
-{ modulesPath, inputs, ... }:
+{ modulesPath, ... }:
 {
-  imports = [
+  imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
-    inputs.disko.nixosModules.default
-    "${modulesPath}/profiles/qemu-guest.nix"
-  ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
 

hosts/srv-public/default.nix

@@ -1,5 +1,11 @@
-{ config, ... }:
+{ config, inputs, ... }:
 {
+  imports = [
+    ./hardware.nix
+    ./disko.nix
+    inputs.disko.nixosModules.default
+  ];
+
   system.stateVersion = "25.05";
 
   meta = {

hosts/srv-public/hardware.nix

@@ -1,9 +1,6 @@
-{ modulesPath, inputs, ... }:
+{ modulesPath, ... }:
 {
-  imports = [
+  imports = [ "${modulesPath}/profiles/qemu-guest.nix" ];
-    inputs.disko.nixosModules.default
-    "${modulesPath}/profiles/qemu-guest.nix"
-  ];
 
   nixpkgs.hostPlatform = "x86_64-linux";