From 7d57b6acd5a1d12a6e7da1becc25d5341534aa41 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 5 Jun 2026 12:35:17 +0900
Subject: [PATCH] common/nix: remove builders `bob`, add `wenche` and
 `gluttony`

---
 hosts/common/nix-builders/bob.nix      | 37 --------------------------
 hosts/common/nix-builders/gluttony.nix | 24 +++++++++++++++++
 hosts/common/nix-builders/wenche.nix   | 24 +++++++++++++++++
 hosts/common/nix.nix                   |  3 ++-
 4 files changed, 50 insertions(+), 38 deletions(-)
 delete mode 100644 hosts/common/nix-builders/bob.nix
 create mode 100644 hosts/common/nix-builders/gluttony.nix
 create mode 100644 hosts/common/nix-builders/wenche.nix

diff --git a/hosts/common/nix-builders/bob.nix b/hosts/common/nix-builders/bob.nix
deleted file mode 100644
index 7b1285e..0000000
--- a/hosts/common/nix-builders/bob.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, ... }:
-{
-  sops.secrets."ssh/nix-builders/bob/key" = { sopsFile = ./../../../secrets/common.yaml; };
-
-  nix.buildMachines = [{
-    hostName = "nix-builder-bob";
-    system = "x86_64-linux";
-    speedFactor = 5;
-    maxJobs = 24;
-    supportedFeatures = [
-      "nixos-test"
-      "benchmark"
-      "big-paralell"
-    ];
-    mandatoryFeatures = [ ];
-    sshUser = "oysteikt";
-    sshKey = config.sops.secrets."ssh/nix-builders/bob/key".path;
-  }];
-
-  programs.ssh = {
-    extraConfig = ''
-      Host nix-builder-bob
-        HostName bob.pvv.ntnu.no
-        ProxyJump nix-builder-isvegg
-        User oysteikt
-        IdentityFile ${config.sops.secrets."ssh/nix-builders/bob/key".path}
-    '';
-
-    knownHosts.bob = {
-      hostNames = [
-        "bob.pvv.ntnu.no"
-        "bob.pvv.org"
-      ];
-      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGJSgh20qDIYEXiK4MUZhc879dJIyH0K/s0RZ+9wFI0F";
-    };
-  };
-}
diff --git a/hosts/common/nix-builders/gluttony.nix b/hosts/common/nix-builders/gluttony.nix
new file mode 100644
index 0000000..9036bef
--- /dev/null
+++ b/hosts/common/nix-builders/gluttony.nix
@@ -0,0 +1,24 @@
+{ config, ... }:
+{
+  # sops.secrets."ssh/nix-builders/gluttony/key" = { sopsFile = ./../../../secrets/common.yaml; };
+
+  nix.buildMachines = [{
+    hostName = "nix-builder-gluttony";
+    system = "x86_64-linux";
+    speedFactor = 1;
+    maxJobs = 8;
+    supportedFeatures = [ ];
+    mandatoryFeatures = [ ];
+    sshUser = "oysteikt";
+    sshKey = "/home/h7x4/.ssh/id_rsa";
+    # sshKey = config.sops.secrets."ssh/nix-builders/gluttony/key".path;
+  }];
+
+  programs.ssh.extraConfig = ''
+    Host nix-builder-gluttony
+      HostName 129.241.100.118
+      ProxyJump microbel.pvv.ntnu.no
+      User oysteikt
+      IdentityFile "/home/h7x4/.ssh/id_rsa"
+  '';
+}
diff --git a/hosts/common/nix-builders/wenche.nix b/hosts/common/nix-builders/wenche.nix
new file mode 100644
index 0000000..77bdb20
--- /dev/null
+++ b/hosts/common/nix-builders/wenche.nix
@@ -0,0 +1,24 @@
+{ config, ... }:
+{
+  # sops.secrets."ssh/nix-builders/wenche/key" = { sopsFile = ./../../../secrets/common.yaml; };
+
+  nix.buildMachines = [{
+    hostName = "nix-builder-wenche";
+    system = "x86_64-linux";
+    speedFactor = 1;
+    maxJobs = 8;
+    supportedFeatures = [ ];
+    mandatoryFeatures = [ ];
+    sshUser = "oysteikt";
+    sshKey = "/home/h7x4/.ssh/id_rsa";
+    # sshKey = config.sops.secrets."ssh/nix-builders/wenche/key".path;
+  }];
+
+  programs.ssh.extraConfig = ''
+    Host nix-builder-wenche
+      HostName wenche.pvv.ntnu.no
+      ProxyJump microbel.pvv.ntnu.no
+      User oysteikt
+      IdentityFile "/home/h7x4/.ssh/id_rsa"
+  '';
+}
diff --git a/hosts/common/nix.nix b/hosts/common/nix.nix
index 24f1535..264e217 100644
--- a/hosts/common/nix.nix
+++ b/hosts/common/nix.nix
@@ -1,8 +1,9 @@
 { config, lib, unstable-pkgs, ... }:
 {
   imports = [
-    ./nix-builders/bob.nix
     ./nix-builders/isvegg.nix
+    ./nix-builders/wenche.nix
+    ./nix-builders/gluttony.nix
     ./nix-builders/tsuki.nix
   ];