Improvements to builders, config for zsh

Justfile

@@ -72,3 +72,9 @@ host-age-key:
 [doc("Render the GitHub workflow files")]
 render-workflows:
     nix run .#render-workflows
+
+[doc("Restarts the `linux-builder` QEMU VM")]
+restart-linux-builder:
+    sudo launchctl unload -w /Library/LaunchDaemons/org.nixos.linux-builder.plist
+    sudo launchctl load -w /Library/LaunchDaemons/org.nixos.linux-builder.plist
+    sudo launchctl kickstart -kp system/org.nixos.linux-builder

hosts/eMac/configuration.nix

@@ -13,7 +13,8 @@
     ++ [
       profiles.users.ethan
       profiles.builders.builder
-      profiles.builders.darwin-linux
+      profiles.builders.fabricator
+      profiles.builders.linux-builder
     ];
 
   tilde.host.directory = "/Users/ethan/Workspace/tilde";
@@ -45,6 +46,7 @@
       "Paprika Recipe Manager 3" = 1303222628;
       "Reeder 5" = 1529448980;
       "Tailscale" = 1475387142;
+      "Brother iPrint&Scan" = 1193539993;
     };
   };
 

modules/profiles/home/direnv.nix

@@ -1,8 +1,18 @@
-{ pkgs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
   programs.direnv = {
     enable = true;
     nix-direnv.enable = true;
   };
 
   home.packages = with pkgs; [ nix-direnv ];
+
+  programs.zsh.initContent = lib.mkAfter ''
+    eval "$(${lib.getExe config.programs.direnv.package} hook zsh)"
+  '';
 }

modules/profiles/home/zsh.nix

@@ -0,0 +1 @@
+{ programs.zsh.enable = true; }

modules/profiles/system/builders/builder.nix

@@ -5,9 +5,13 @@
     buildMachines = [
       {
         hostName = "builder";
-        system = "x86_64-linux";
         protocol = "ssh-ng";
-        maxJobs = 16;
+        systems = [
+          "x86_64-linux"
+          "aarch64-linux"
+          "i686-linux"
+        ];
+        maxJobs = 32;
         speedFactor = 1;
         supportedFeatures = [
           "nixos-test"

modules/profiles/system/builders/fabricator.nix

@@ -0,0 +1,28 @@
+{
+  imports = [ ./common.nix ];
+
+  nix = {
+    buildMachines = [
+      {
+        hostName = "fabricator";
+        protocol = "ssh-ng";
+        systems = [ "x86_64-linux" ];
+        maxJobs = 32;
+        speedFactor = 1;
+        supportedFeatures = [
+          "nixos-test"
+          "benchmark"
+          "big-parallel"
+          "kvm"
+        ];
+        mandatoryFeatures = [ ];
+        sshUser = "builder";
+        sshKey = "/Users/ethan/Workspace/e10/keys/builder_rsa";
+      }
+    ];
+
+    settings = {
+      builders-use-substitutes = true;
+    };
+  };
+}

modules/profiles/system/builders/linux-builder.nix

@@ -0,0 +1,11 @@
+{
+  nix.linux-builder = {
+    enable = true;
+
+    # NOTE: If building this configuration from scratch (i.e., brand new system), comment out this configuration
+    # first, otherwise we can't build the builder itself
+    config = {
+      services.qemuGuest.enable = true;
+    };
+  };
+}

modules/suites/home.nix

@@ -27,6 +27,7 @@ with profiles;
     tools.darwin
     xdg
     zed-editor
+    zsh
   ];
 
   development = [