From 902c6e11275017dd500d7fdbf1d521f14e2019c2 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 4 May 2025 16:26:41 -0400
Subject: [PATCH] Switch to quark's buildMachine config being entirely in nix
 rather than in root's ssh config.

---
 nix/configuration/roles/distributed_build/default.nix | 5 +++--
 nix/configuration/roles/ssh/files/ssh_config_root     | 7 -------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/nix/configuration/roles/distributed_build/default.nix b/nix/configuration/roles/distributed_build/default.nix
index f97b34e..61914b1 100644
--- a/nix/configuration/roles/distributed_build/default.nix
+++ b/nix/configuration/roles/distributed_build/default.nix
@@ -77,8 +77,9 @@ in
             {
               hostName = "quark";
               sshUser = "nixworker";
-              # sshKey = "";
-              # publicHostKey = "";
+              sshKey = "/persist/manual/ssh/root/keys/id_ed25519";
+              # From: base64 -w0 /persist/ssh/ssh_host_ed25519_key.pub
+              publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUx0alplYlVYTkRkU3Y1enVGbjM3eFNMZUN3S2hPKzFMdWovM2FYNFJRTEEgcm9vdEBxdWFyawo=";
               systems = [
                 "x86_64-linux"
                 # "aarch64-linux"
diff --git a/nix/configuration/roles/ssh/files/ssh_config_root b/nix/configuration/roles/ssh/files/ssh_config_root
index d5f3f8e..0d340b3 100644
--- a/nix/configuration/roles/ssh/files/ssh_config_root
+++ b/nix/configuration/roles/ssh/files/ssh_config_root
@@ -5,12 +5,5 @@ Host hydra
   IdentitiesOnly yes
   IdentityFile /persist/manual/ssh/root/keys/id_ed25519
 
-Host quark
-  HostName quark
-  Port 22
-  User nixworker
-  IdentitiesOnly yes
-  IdentityFile /persist/manual/ssh/root/keys/id_ed25519
-
 Host *
   Compression yes