From ee7ccef96ca474f4d0ddb4e97c1fede16ba9f1c3 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Tue, 24 Dec 2024 17:59:04 +0000
Subject: [PATCH] flake: switch to building on target by default

---
 flake.nix                    |  1 +
 hosts/kalessin/default.nix   |  5 +----
 hosts/kilgharrah/default.nix | 11 +++++------
 hosts/orm/default.nix        |  6 ++++++
 hosts/tohru/default.nix      |  2 +-
 hosts/yevaud/default.nix     |  6 ++++++
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 11b6748..8e857d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,6 +90,7 @@
         # disable remote deployment by default
         # (can stil build locally with nixos-rebuild)
         deployment.targetHost = lib.mkDefault null;
+        deployment.buildOnTarget = lib.mkDefault true;
 
         imports = [
           lix-module.nixosModules.default
diff --git a/hosts/kalessin/default.nix b/hosts/kalessin/default.nix
index ef0157e..a12fe97 100644
--- a/hosts/kalessin/default.nix
+++ b/hosts/kalessin/default.nix
@@ -21,10 +21,7 @@ in
 
   qenya.services.remote-builder = {
     enable = true;
-    authorizedKeys.keys = [
-      keys.machines.kilgharrah
-      keys.machines.tohru
-    ];
+    authorizedKeys.keys = [ ];
   };
 
   system.stateVersion = "23.11";
diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index 8f5ef87..63e6840 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -41,12 +41,11 @@ in
 
   qenya.services.remote-builder = {
     enable = true;
-    authorizedKeys.keys = [ keys.machines.tohru ];
-  };
-  qenya.services.distributed-builds = {
-    enable = true;
-    keyFile = "/etc/ssh/ssh_host_ed25519_key";
-    builders = [ "kalessin" ];
+    authorizedKeys.keys = [
+      keys.machines.yevaud
+      keys.machines.orm
+      keys.machines.tohru
+    ];
   };
 
   programs.steam.enable = true;
diff --git a/hosts/orm/default.nix b/hosts/orm/default.nix
index da66828..dc42041 100644
--- a/hosts/orm/default.nix
+++ b/hosts/orm/default.nix
@@ -14,6 +14,12 @@
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
+  qenya.services.distributed-builds = {
+    enable = true;
+    keyFile = "/etc/ssh/ssh_host_ed25519_key";
+    builders = [ "kilgharrah" ];
+  };
+
   randomcat.services.zfs.datasets = {
     "rpool_orm/state" = { mountpoint = "none"; };
     "rpool_orm/state/actual" = { mountpoint = "/var/lib/actual"; };
diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index 9d5702c..cebd1cb 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -49,7 +49,7 @@
   qenya.services.distributed-builds = {
     enable = true;
     keyFile = "/etc/ssh/ssh_host_ed25519_key";
-    builders = [ "kilgharrah" "kalessin" ];
+    builders = [ "kilgharrah" ];
   };
 
   programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet
diff --git a/hosts/yevaud/default.nix b/hosts/yevaud/default.nix
index 55faeb1..d17f0a3 100644
--- a/hosts/yevaud/default.nix
+++ b/hosts/yevaud/default.nix
@@ -17,6 +17,12 @@
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
+  qenya.services.distributed-builds = {
+    enable = true;
+    keyFile = "/etc/ssh/ssh_host_ed25519_key";
+    builders = [ "kilgharrah" ];
+  };
+
   randomcat.services.zfs.datasets = {
     "rpool/state" = { mountpoint = "none"; };
     "rpool/state/forgejo" = { mountpoint = "/var/lib/forgejo"; };