treewide: move all deployment keys to flake.nix

common/base-server/default.nix

@@ -11,7 +11,6 @@ in
     time.timeZone = "Etc/UTC";
 
     # Allow remote deployment with colmena
-    deployment.targetUser = null;
     security.sudo.wheelNeedsPassword = false;
     nix.settings.trusted-users = [ "@wheel" ];
   };

flake.nix

@@ -78,6 +78,32 @@
       yevaud.imports = [ ./hosts/yevaud ];
       orm.imports = [ ./hosts/orm ];
       kalessin.imports = [ ./hosts/kalessin ];
+
+      kilgharrah.deployment = {
+        allowLocalDeployment = true;
+        targetHost = null; # disallow remote deployment
+      };
+
+      tohru.deployment = {
+        allowLocalDeployment = true;
+        targetHost = null; # disallow remote deployment
+      };
+
+      yevaud.deployment = {
+        targetHost = "yevaud.birdsong.network";
+        targetUser = null;
+      };
+
+      orm.deployment = {
+        targetHost = "orm.birdsong.network";
+        targetUser = null;
+      };
+
+      kalessin.deployment = {
+        targetHost = "kalessin.birdsong.network";
+        targetUser = null;
+        buildOnTarget = true;
+      };
     };
 
     # TODO: have this work on other systems too

hosts/kalessin/default.nix

@@ -6,10 +6,6 @@
   ];
 
   networking.hostId = "534b538e";
-  deployment = {
-    targetHost = "kalessin.birdsong.network";
-    buildOnTarget = true;
-  };
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

hosts/kilgharrah/default.nix

@@ -11,11 +11,6 @@
   nixpkgs.hostPlatform = "x86_64-linux";
   networking.hostId = "72885bb5";
 
-  deployment = {
-    allowLocalDeployment = true;
-    targetHost = null; # disallow remote deployment
-  };
-
   qenya.base-graphical.enable = true;
   qenya.base-graphical.desktop = "plasma6";
 

hosts/orm/default.nix

@@ -6,7 +6,6 @@
   ];
 
   networking.hostId = "00000000";
-  deployment.targetHost = "orm.birdsong.network";
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;

hosts/tohru/default.nix

@@ -13,11 +13,6 @@
   nixpkgs.hostPlatform = "x86_64-linux";
   networking.hostId = "31da19c1";
 
-  deployment = {
-    allowLocalDeployment = true;
-    targetHost = null; # disallow remote deployment
-  };
-
   qenya.base-graphical.enable = true;
 
   time.timeZone = "Europe/London";

hosts/yevaud/default.nix

@@ -6,7 +6,6 @@
   ];
 
   networking.hostId = "09673d65";
-  deployment.targetHost = "yevaud.birdsong.network";
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;