From 7f784a59faf556f4baed00bbba890260b60ee061 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Mon, 13 Jan 2025 20:57:13 +1100
Subject: [PATCH] nixos: use ssh-ng as default distributed builds protocol

---
 modules/nixos/base/distributed-builds.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/nixos/base/distributed-builds.nix b/modules/nixos/base/distributed-builds.nix
index aa9daac..88311fc 100644
--- a/modules/nixos/base/distributed-builds.nix
+++ b/modules/nixos/base/distributed-builds.nix
@@ -14,11 +14,11 @@
     speedFactor,
     systems ? ["x86_64-linux"],
     supportedFeatures ? ["big-parallel" "kvm" "nixos-test"],
+    maxJobs,
   }: {
-    inherit speedFactor systems supportedFeatures;
+    inherit speedFactor systems supportedFeatures maxJobs;
     hostName = host;
-    maxJobs = self.nixosConfigurations.${host}.config.nix.settings.max-jobs or "auto";
-    protocol = "ssh";
+    protocol = "ssh-ng";
     sshKey = "/home/${admin.name}/.ssh/builder";
   };
 
@@ -26,10 +26,12 @@
     ooksdesk = mkBuilderMachine {
       host = "ooksdesk";
       speedFactor = 16;
+      maxJobs = 4;
     };
     ooksmedia = mkBuilderMachine {
       host = "ooksmedia";
       speedFactor = 8;
+      maxJobs = 1;
     };
   };
 in {