more rearchitecting folders

hosts/default.nix

@@ -1,6 +1,6 @@
 # Return a list of all hosts
 
 {
-  darwinConfigurations = import ./nix-darwin;
-  nixosConfigurations = import ./nixos;
+  darwin-hosts = import ./aarch64-darwin;
+  linux-hosts = import ./x86_64-linux // import ./aarch64-linux;
 }

hosts/x86_64-linux/default.nix

@@ -0,0 +1,20 @@
+# Return a list of all NixOS hosts
+
+{ nixpkgs, ... }:
+
+let
+  inherit (nixpkgs) lib;
+in
+
+lib.pipe (lib.filesystem.listFilesRecursive ./.) [
+  # Get only files ending in default.nix
+  (builtins.filter (name: lib.hasSuffix "default.nix" name))
+  # Import each host function
+  map
+  (file: {
+    name = builtins.baseNameOf (builtins.dirOf file);
+    value = import file;
+  })
+  # Convert to an attrset of hostname -> host function
+  (builtins.listToAttrs)
+]