mac

georgewhewell · Sep 9, 2024 · 838e554 · 838e554
1 parent f61fcbb
commit 838e554
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/home/development.nix b/home/development.nix
@@ -2,10 +2,6 @@
 
 {
 
-  imports = [
-    ./zed.nix
-  ];
-
   programs.direnv = {
     enable = true;
     enableZshIntegration = true;

diff --git a/machines/darwin-aarch64/darwin-configuration.nix b/machines/darwin-aarch64/darwin-configuration.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./system.nix
+    ../../services/buildfarm-executor.nix
   ];
 
   nixpkgs.config.allowUnfree = true;

diff --git a/profiles/home.nix b/profiles/home.nix
@@ -9,9 +9,7 @@
       https://cache.nixos.org
     ];
     trusted-public-keys = [
-      "hydra.satanic.link-1:dqovbpJdboPkY2O2D4UAh4IgEReKf608IJ7aLl6CAoM="
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%"
     ];
   };
 

diff --git a/services/buildfarm-executor.nix b/services/buildfarm-executor.nix
@@ -7,19 +7,6 @@
       builders-use-substitutes = true
     '';
     buildMachines = [
-      {
-        hostName = "trex.satanic.link";
-        sshUser = "grw";
-        protocol = "ssh-ng";
-        maxJobs = 16;
-        speedFactor = 128;
-        supportedFeatures = [ "kvm" "nixos-test" "big-parallel" ];
-        systems = [
-          "x86_64-linux"
-          "i686-linux"
-          #  "aarch64-linux"
-        ];
-      }
       {
         hostName = "rock-5b.satanic.link";
         sshUser = "root";
@@ -28,13 +15,18 @@
         supportedFeatures = [ "kvm" "nixos-test" "big-parallel" ];
         systems = [ "aarch64-linux" ];
       }
+    ] ++ lib.optionals (config.networking.hostName != "trex") [
       {
-        hostName = "air.satanic.link";
+        hostName = "trex.satanic.link";
         sshUser = "grw";
-        speedFactor = 4;
-        maxJobs = 2;
+        protocol = "ssh-ng";
+        maxJobs = 16;
+        speedFactor = 128;
         supportedFeatures = [ "kvm" "nixos-test" "big-parallel" ];
-        systems = [ "aarch64-linux" ];
+        systems = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       }
     ];
   };