Added deployment-config.nix for import

common/deployment-config.nix

@@ -0,0 +1,31 @@
+{ build-timestamp, networks, pkgs-for }:
+
+hostname:  hostOpts:
+
+{ config, lib, ... }:
+
+with lib;
+{
+  config = {
+    instance = {
+      inherit build-timestamp;
+    };
+
+    nixpkgs.pkgs = pkgs-for hostOpts.arch;
+
+    deployment = let
+      domain = hostOpts.domain;
+      host-ip = networks.${domain}.hosts.${hostname}.ipv4-address;
+      fs-keys = config.fudo.secrets.files.host-filesystem-keys;
+      keys = if (hasAttr hostname fs-keys) then
+        mapAttrs (secret: secret-file: {
+          keyFile = secret-file;
+          user = "root";
+          permissions = "0400";
+        }) fs-keys.${hostname} else {};
+    in {
+      inherit keys;
+      targetHost = host-ip;
+    };
+  };
+}

common/deployment.nix

@@ -1,22 +1,18 @@
-{ hostnames, description, ... }:
+{ deployment-hosts, description, ... }:
 
-{ self, nixpkgs, fudo-home, fudo-nixos, fudo-pkgs, fudo-secrets, ... }:
+{ self, nixpkgs, fudo-nixos, fudo-secrets, ... }:
 with nixpkgs.lib;
 let
 
   build-timestamp = self.sourceInfo.lastModified;
 
-  helpers = import ./helpers.nix { lib = nixpkgs.lib; };
+  # helpers = import ./helpers.nix { lib = nixpkgs.lib; };
 
-  networks = with nixpkgs.lib; let
-    network-files = helpers.nix-files (fudo-nixos + /config/networks);
-    networks = map helpers.strip-ext network-files;
-  in genAttrs networks
-    (network: import (fudo-nixos + /config/networks/${network}.nix));
+  # syslib = import (fudo-nixos + /lib/system.nix) { lib = nixpkgs.lib; };
 
-  hosts = with nixpkgs.lib; let
-  in genAttrs hostnames
-    (hostname: import (fudo-nixos + /config/hosts/${host}.nix));
+  # networks = syslib.networks (fudo-nixos + /config/networks);
+
+  # deployment-hosts = getAttrs hostnames fudo-nixos.fudoHosts;
 
   pkgs-for = system: import nixpkgs {
     inherit system;
@@ -32,38 +28,22 @@ let
     };
   };
 
+  host-config = let
+    networks = fudo-nixos.fudoNetworks;
+  in import ./deployment-config.nix {
+    inherit build-timestamp networks pkgs-for;
+  };
+
 in {
-  nixopsConfigurations.default = {
-    inherit nixpkgs;
+  inherit nixpkgs;
 
-    network = {
-      inherit description;
-      enableRollback = true;
-    };
-  } // (genAttrs hostnames (hostname: let
-    host-cfg = hosts.${hostname}
-    pkgs = pkgs-for host-cfg.arch;
-    domain = host-cfg.domain;
-    network-hosts = config.fudo.networks.${network}.hosts;
-    host-filesystem-keys = config.fudo.secrets.files.host-filesystem-keys;
-  in {config, ... }: {
-    nixpkgs.pkgs = pkgs;
-
-    imports = [
-      fudo-home.nixModule
-      fudo-secrets.nixModule
-      fudo-nixos.nixosConfigurations.${hostname}
-    ];
-
-    deployment = {
-      targetHost = network-hosts.${hostname}.ipv4-address;
-
-      keys = mkIf (hasAttr hostname host-filesystem-keys)
-        (mapAttrs (secret: secret-file: {
-          keyFile = secret-file;
-          user = "root";
-          permissions = "0400";
-        }) host-filesystem-keys.${hostname});
-    };
-  }));
-}
+  network = {
+    inherit description;
+    enableRollback = true;
+  };
+} // mapAttrs (hostname: hostOpts: {
+  imports = [
+    (host-config hostname hostOpts)
+    fudo-nixos.nixosConfigurations.${hostname}
+  ];
+}) deployment-hosts