Auto import all hosts

flake.nix

@@ -57,7 +57,7 @@
       systems = [ "x86_64-linux" ];
 
       imports = [
-        ./flake/nixosConfigurations.nix
+        ./flake/hosts.nix
         ./flake/devShells.nix
         ./flake/formatter.nix
       ];

flake/hosts.nix

@@ -0,0 +1,25 @@
+{
+  self,
+  inputs,
+  lib,
+  ...
+}:
+let
+  subdirsOf =
+    dir: builtins.attrNames (lib.filterAttrs (_: v: v == "directory") (builtins.readDir dir));
+in
+{
+  flake.nixosConfigurations = lib.genAttrs (subdirsOf "${self}/hosts") (
+    name:
+    inputs.nixpkgs.lib.nixosSystem {
+      specialArgs = {
+        inherit self inputs;
+      };
+      modules = [
+        "${self}/hosts/${name}"
+        "${self}/users/seb/@${name}"
+        { networking.hostName = name; }
+      ];
+    }
+  );
+}

flake/nixosConfigurations.nix

@@ -1,30 +0,0 @@
-{
-  nixpkgs,
-  self,
-  inputs,
-  ...
-}:
-{
-  flake = {
-    nixosConfigurations = {
-      north = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = {
-          inherit self inputs;
-        };
-        modules = [
-          "${self}/hosts/north"
-          "${self}/users/seb/@north"
-        ];
-      };
-      inspiron = inputs.nixpkgs.lib.nixosSystem {
-        specialArgs = {
-          inherit self inputs;
-        };
-        modules = [
-          "${self}/hosts/inspiron"
-          "${self}/users/seb/@inspiron"
-        ];
-      };
-    };
-  };
-}

hosts/inspiron/default.nix

@@ -5,7 +5,6 @@
     ./hardware.nix
   ];
 
-  networking.hostName = "inspiron";
   system.stateVersion = "23.11";
   boot.kernelPackages = pkgs.linuxPackages_latest;
 

hosts/north/default.nix

@@ -5,7 +5,6 @@
     ./hardware.nix
   ];
 
-  networking.hostName = "north";
   system.stateVersion = "23.11";
   boot.kernelPackages = pkgs.linuxPackages_6_8;