From aadc95b5f5f172bc9cf2b46bf5e92994e52d12e3 Mon Sep 17 00:00:00 2001
From: Lin Yinfeng <lin.yinfeng@outlook.com>
Date: Tue, 13 Feb 2024 21:55:52 +0800
Subject: [PATCH] services/hydra: fix builders

---
 nixos/hosts/hil0/default.nix              | 11 -----------
 nixos/profiles/services/hydra/default.nix |  9 +++++++++
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/nixos/hosts/hil0/default.nix b/nixos/hosts/hil0/default.nix
index b2a54cd55..df51c83de 100644
--- a/nixos/hosts/hil0/default.nix
+++ b/nixos/hosts/hil0/default.nix
@@ -32,7 +32,6 @@ in {
       services.mastodon
       services.maddy
       services.well-known
-      nix.hydra-builder-server
       nix.access-tokens
     ])
     ++ [
@@ -122,16 +121,6 @@ in {
       };
     })
 
-    # hydra extra configurations
-    {
-      services.hydra.buildMachinesFiles = [
-        "/etc/nix-build-machines/hydra-builder/machines"
-      ];
-      # limit cpu usage of nix eval and builds
-      systemd.services.nix-daemon.serviceConfig.CPUWeight = "idle";
-      systemd.services.hydra-evaluator.serviceConfig.CPUWeight = "idle";
-    }
-
     # mastodon extra configurations
     {
       services.mastodon.streamingProcesses = 3; # number of cpu cores - 1
diff --git a/nixos/profiles/services/hydra/default.nix b/nixos/profiles/services/hydra/default.nix
index 71df5fea2..7fffd07db 100644
--- a/nixos/profiles/services/hydra/default.nix
+++ b/nixos/profiles/services/hydra/default.nix
@@ -52,6 +52,9 @@ in {
           </runcommand>
         '';
       };
+      services.hydra.buildMachinesFiles = [
+        "/etc/nix-build-machines/hydra-builder/machines"
+      ];
       # allow evaluator and queue-runner to access nix-access-tokens
       systemd.services.hydra-evaluator.serviceConfig.SupplementaryGroups = [config.users.groups.nix-access-tokens.name];
       systemd.services.hydra-queue-runner.serviceConfig.SupplementaryGroups = [
@@ -123,5 +126,11 @@ in {
         restartUnits = ["hydra-notify.service"];
       };
     }
+
+    # decrease cpu weight
+    {
+      systemd.services.nix-daemon.serviceConfig.CPUWeight = "idle";
+      systemd.services.hydra-evaluator.serviceConfig.CPUWeight = "idle";
+    }
   ];
 }