restructure hosts directory

hosts/cube/default.nix

@@ -1,4 +0,0 @@
-{
-  system = "x86_64-linux";
-  module = ./configuration.nix;
-}

hosts/hp/default.nix

@@ -1,4 +0,0 @@
-{
-  system = "x86_64-linux";
-  module = ./configuration.nix;
-}

hosts/nixdev/default.nix

@@ -1,4 +0,0 @@
-{
-  system = "x86_64-linux";
-  module = ./configuration.nix;
-}

hosts/slate/default.nix

@@ -1,4 +0,0 @@
-{
-  system = "x86_64-linux";
-  module = ./configuration.nix;
-}

lib/hosts.nix

@@ -1,20 +1,34 @@
 { path, nixpkgs, nixosModule }:
 let
 
-  hostMetadata = builtins.mapAttrs
+  inherit (builtins) mapAttrs attrValues attrNames readDir foldl' listToAttrs;
-    (name: _: import (path + "/${name}"))
-    (builtins.readDir path);
 
-  getHostConfig = hostName: hostMeta:
+  # grab a list of systems, with associated hostnames
-    nixpkgs.lib.nixosSystem
+  # { x86_64-linux = [ "host1" "host2" ]; }
-      {
+  sysToHosts = mapAttrs
-        inherit (hostMeta) system;
+    (system: _: attrNames (readDir "${path}/${system}"))
+    (readDir path);
+
+  # invert the attrset, from {sys=[name]} to {name=sys}
+  # { host1 = "x86_64-linux"; host2 = "x86_64-linux"; }
+  hostToSys = foldl' (a: b: a // b) { }
+    (attrValues
+      (mapAttrs
+        (system: hosts: listToAttrs (map (name: { inherit name; value = system; }) hosts))
+        sysToHosts));
+
+  # build system configurations
+  # { host1 = <nixosConfiguration>; host2 = <nixosConfiguration>; }
+  hostToConfig = mapAttrs
+    (hostName: system: nixpkgs.lib.nixosSystem {
+      inherit system;
       modules = [
         (nixosModule)
-          (hostMeta.module)
+        ("${path}/${system}/${hostName}")
         (_: { networking.hostName = hostName; })
       ];
-      };
+    })
+    hostToSys;
 
 in
-builtins.mapAttrs getHostConfig hostMetadata
+hostToConfig