From 3bdb545681eb3c483e047ada21546d892628b077 Mon Sep 17 00:00:00 2001
From: Riley Apeldoorn <me@riley.lgbt>
Date: Sat, 28 May 2022 19:00:50 +0200
Subject: [PATCH] Improve sif -> thor dist build ssh config

---
 machines/sif/configuration.nix | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/machines/sif/configuration.nix b/machines/sif/configuration.nix
index b1ea1cf..ffbba39 100644
--- a/machines/sif/configuration.nix
+++ b/machines/sif/configuration.nix
@@ -59,27 +59,24 @@
 	nix = {
 		distributedBuilds = true;
 		buildMachines = [{
-			hostName = "thor";
-			systems = [
-    			"x86_64-linux"
+
+            hostName = "thor";
+            sshUser  = "riley";
+            sshKey   = "/root/.ssh/id_ed25519";
+
+            systems = [
+                "x86_64-linux"
                 "aarch64-linux"
-			];
+            ];
+
             supportedFeatures = [
                 "nixos-test"
                 "benchmark"
                 "big-parallel"
                 "kvm"
             ];
+
 		}];
 	};
 
-	programs.ssh.extraConfig = ''
-        Host thor
-            HostName thor
-            Port 22
-            User riley
-            IdentitiesOnly yes
-            IdentityFile /root/.ssh/id_ed25519
-    '';
-
 }