Sigh. Still trying.

common/deployment.nix

@@ -1,19 +1,7 @@
-{ deployment-hosts, description, ... }:
+lib: build-timestamp: hostname: hostOpts:
 
-{ self, nixpkgs, fudo-nixos, fudo-secrets, ... }:
-with nixpkgs.lib;
+with lib;
 let
-
-  build-timestamp = self.sourceInfo.lastModified;
-
-  # helpers = import ./helpers.nix { lib = nixpkgs.lib; };
-
-  # syslib = import (fudo-nixos + /lib/system.nix) { lib = nixpkgs.lib; };
-
-  # networks = syslib.networks (fudo-nixos + /config/networks);
-
-  # deployment-hosts = getAttrs hostnames fudo-nixos.fudoHosts;
-
   pkgs-for = system: import nixpkgs {
     inherit system;
     config = {
@@ -28,22 +16,22 @@ let
     };
   };
 
-  host-config = let
-    networks = fudo-nixos.fudoNetworks;
-  in import ./deployment-config.nix {
-    inherit build-timestamp networks pkgs-for;
-  };
+in fudo-nixos.nixosConfigurations.${hostname} {
 
-in {
-  inherit nixpkgs;
+} // mapAttrs (hostname: hostOpts: let
+  pkgs = pkgs-for hostOpts.arch;
+  host-ip = networks.${hostOpts.domain}.hosts.${hostname}.ipv4-address;
+in fudo-nixos.nixosConfigurations.${hostname} // {
 
-  network = {
-    inherit description;
-    enableRollback = true;
+  config = {
+    nixpkgs.pkgs = pkgs;
+
+    imports = [
+      (host-config hostname)
+    ];
+
+    instance = { inherit hostname; };
+
+    deployment.targetHost = host-ip;
   };
-} // mapAttrs (hostname: hostOpts: {
-  imports = [
-    (host-config hostname hostOpts)
-    fudo-nixos.nixosConfigurations.${hostname}
-  ];
 }) deployment-hosts