From 9f6d0fbaf88f1f2a4936f4f449f82edd8a8a3f8f Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Wed, 18 Sep 2024 03:06:48 +0100
Subject: [PATCH] treewide: move all deployment keys to flake.nix

---
 common/base-server/default.nix |  1 -
 flake.nix                      | 26 ++++++++++++++++++++++++++
 hosts/kalessin/default.nix     |  4 ----
 hosts/kilgharrah/default.nix   |  5 -----
 hosts/orm/default.nix          |  1 -
 hosts/tohru/default.nix        |  5 -----
 hosts/yevaud/default.nix       |  1 -
 7 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/common/base-server/default.nix b/common/base-server/default.nix
index 47a82fa..c074c3c 100644
--- a/common/base-server/default.nix
+++ b/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" ];
   };
diff --git a/flake.nix b/flake.nix
index b1a2ac9..0a20e84 100644
--- a/flake.nix
+++ b/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
diff --git a/hosts/kalessin/default.nix b/hosts/kalessin/default.nix
index e3c08a6..d1a568b 100644
--- a/hosts/kalessin/default.nix
+++ b/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;
diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index 4418b4a..0ebc881 100644
--- a/hosts/kilgharrah/default.nix
+++ b/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";
 
diff --git a/hosts/orm/default.nix b/hosts/orm/default.nix
index 4b6e346..3753fcc 100644
--- a/hosts/orm/default.nix
+++ b/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;
diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index 53fb544..a071c2b 100644
--- a/hosts/tohru/default.nix
+++ b/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";
diff --git a/hosts/yevaud/default.nix b/hosts/yevaud/default.nix
index 18f868a..eebd456 100644
--- a/hosts/yevaud/default.nix
+++ b/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;