Working flake-based nixops config

seattle/flake.nix

@@ -4,39 +4,35 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-21.05";
 
-    fudo-home.url = "path:/state/nixos/nix-home";
+    fudo-home.url = "path:../fudo-home";
 
     fudo-secrets.url = "path:/state/secrets";
 
+    fudo-pkgs.url = "path:../fudo-pkgs";
+
     # fudo-pkgs.url = "path:/state/nixos/fudo-pkgs";
 
     fudo-nixos = {
-      url = "path:/state/nixos";
+      url = "path:../fudo-nixos";
       # Don't import it as a flake
       flake = false;
     };
   };
 
-  outputs = { self,
-              nixpkgs,
-              fudo-home,
-              fudo-nixos,
-              fudo-secrets,
-              ... }: let
-    lib = nixpkgs.lib;
-
+  outputs = { self, nixpkgs, fudo-home, fudo-nixos, fudo-pkgs, fudo-secrets, ... }: let
     domain = "sea.fudo.org";
+    site = "seattle";
 
-    build-timestamp = builtins.trace self.sourceInfo self.sourceInfo.lastModified;
+    build-timestamp = self.sourceInfo.lastModified;
 
-    hostlib = import (fudo-nixos + /lib/hosts.nix) {
-      inherit lib;
-    };
+    hostlib = import (fudo-nixos + /lib/hosts.nix) { lib = nixpkgs.lib; };
 
-    hosts = lib.filterAttrs (hostname: hostOpts:
-      hostOpts.nixos-system && hostOpts.domain == domain)
+    hosts = nixpkgs.lib.filterAttrs (hostname: hostOpts:
+      hostOpts.nixos-system && hostOpts.site == site)
       (hostlib.base-host-config (fudo-nixos + /config/hosts));
 
+    network-hosts = (import (fudo-nixos + /config/networks/${domain}.nix)).hosts;
+
     pkgs-for = system: import nixpkgs {
       inherit system;
       config = {
@@ -46,8 +42,8 @@
         ];
       };
       overlays = [
-        (import (fudo-nixos + /fudo-pkgs/overlay.nix))
-        (import (fudo-nixos + /lib/overlay.nix))
+        fudo-pkgs.overlay
+        (import (fudo-nixos + "/lib/overlay.nix"))
       ];
     };
 
@@ -61,21 +57,21 @@
         description = "Seattle NixOps network.";
         enableRollback = true;
       };
-
-      defaults._module.args = { inherit domain; };
-    } // lib.mapAttrs (hostname: hostOpts: let
-      #system = hostOpts.arch;
-      pkgs = pkgs-for hostOpts.arch;
-      lib = pkgs.lib;
-    in {
-      #inherit system;
-      modules = [
+    } // (nixpkgs.lib.mapAttrs (hostname: hostOpts: let
+      system = hostOpts.arch;
+      profile = hostOpts.profile;
+    in { config, pkgs, lib, ... }: {
+      imports = [
         fudo-home.nixosModule
         fudo-secrets.nixosModule
         (initialize-host {
-          inherit hostname pkgs lib build-timestamp fudo-secrets;
+          inherit hostname build-timestamp site domain profile config pkgs lib;
         })
       ];
-    }) hosts;
+
+      nixpkgs.pkgs = pkgs-for system;
+
+      deployment.targetHost = network-hosts.${hostname}.ipv4-address;
+    }) hosts);
   };
 }