Changes over time...

common/deployment.nix

@@ -1,39 +1,37 @@
 { inputs, deployment-hosts, description, enable-rollback ? true, ... }:
-with inputs.nixpkgs.lib; let
+with inputs.nixpkgs.lib;
+let
   network-config = {
     nixpkgs = inputs.nixpkgs;
     network = {
       inherit description;
       enableRollback = enable-rollback;
 
-      storage.legacy = {
-        databasefile = "~/.nixops/deployments.nixops";
-      };
+      storage.legacy = { databasefile = "~/.nixops/deployments.nixops"; };
     };
   };
 
-  host-config = hostname: inputs.fudo-nixos.nixopsHostConfigurations.${hostname};
+  host-config = hostname:
+    inputs.fudo-nixos.nixopsHostConfigurations.${hostname};
 
-  host-ip = hostname: domain: let
-    zone-hosts = inputs.fudo-entities.entities.zones.${domain}.hosts;
-  in zone-hosts.${hostname}.ipv4-address;
+  host-ip = hostname: domain:
+    let zone-hosts = inputs.fudo-entities.entities.zones.${domain}.hosts;
+    in zone-hosts.${hostname}.ipv4-address;
 
-  host-uber-secrets = hostname: { config, ... }: let
-    uber-secrets = config.fudo.secrets.files.host-filesystem-keys;
-  in {
-    config.deployment.keys = mkIf (hasAttr hostname uber-secrets)
-      (mapAttrs (secret: secret-file: {
-        keyFile = secret-file;
-        user = "root";
-        permissions = "0400";
-      }) uber-secrets.${hostname});
-  };
+  host-uber-secrets = hostname:
+    { config, ... }:
+    let uber-secrets = config.fudo.secrets.files.host-filesystem-keys;
+    in {
+      config.deployment.keys = mkIf (hasAttr hostname uber-secrets) (mapAttrs
+        (secret: secret-file: {
+          keyFile = secret-file;
+          user = "root";
+          permissions = "0400";
+        }) uber-secrets.${hostname});
+    };
 
 in network-config // (mapAttrs (hostname: hostOpts: {
-  imports = [
-    (host-config hostname)
-    (host-uber-secrets hostname)
-  ];
+  imports = [ (host-config hostname) (host-uber-secrets hostname) ];
 
   deployment.targetHost = host-ip hostname hostOpts.domain;
 }) deployment-hosts)

deployments/fudo/flake.nix

@@ -2,7 +2,7 @@
   description = "Fudo NixOps network.";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-22.11";
+    nixpkgs.url = "nixpkgs/nixos-23.11";
 
     fudo-secrets.url = "path:/secrets";
 
@@ -12,7 +12,7 @@
     };
 
     fudo-entities = {
-      url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git";
+      url = "git+https://fudo.dev/nix/entities.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -28,7 +28,8 @@
       nixopsConfigurations.default = let
         description = "Fudo NixOps Network";
 
-        fudo-site = site: site == "nuttyclub" || site == "worldstream";
+        fudo-site = site:
+          site == "nuttyclub" || site == "worldstream" || site == "portage";
 
         deployment-hosts = filterAttrs (hostname: hostOpts:
           hostOpts.nixos-system && (fudo-site hostOpts.site))

deployments/informis/flake.nix

@@ -2,7 +2,7 @@
   description = "Informis NixOps network.";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-22.11";
+    nixpkgs.url = "nixpkgs/nixos-23.11";
 
     fudo-nixos = {
       url = "path:/state/deploy/config";
@@ -10,7 +10,7 @@
     };
 
     fudo-entities = {
-      url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git";
+      url = "git+https://fudo.dev/nix/entities.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

deployments/seattle/flake.nix

@@ -2,7 +2,7 @@
   description = "Seattle Fudo NixOps network.";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-22.11";
+    nixpkgs.url = "nixpkgs/nixos-23.11";
 
     fudo-secrets.url = "path:/secrets";
 
@@ -13,7 +13,7 @@
     };
 
     fudo-entities = {
-      url = "git+ssh://fudo_git@git.fudo.org:2222/fudo-nix/entities.git";
+      url = "git+https://fudo.dev/nix/entities.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };