Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

modules/profiles/base.nix

@@ -161,7 +161,7 @@ in
     # nix
     (nom-system-command "nixos-boot" "sudo nixos-rebuild boot --flake ~/.dotfiles")
     (nom-system-command "nixos-switch" "sudo nixos-rebuild switch --flake ~/.dotfiles")
-    comma
+    (nom-system-command "nixos-test" "sudo nixos-rebuild test --flake ~/.dotfiles")
     manix
     nix-index
     nix-output-monitor

modules/profiles/personal.nix

@@ -69,5 +69,24 @@ in
           };
         };
       };
+      nix.buildMachines = [{
+        hostName = "builder";
+        systems = [ "aarch64-linux" "x86_64-linux" ];
+        protocol = "ssh-ng";
+        maxJobs = 1;
+        speedFactor = 1;
+        supportedFeatures = [ "nixos-test" "benchmark" "kvm" ];
+        mandatoryFeatures = [ ];
+      }];
+      nix.distributedBuilds = true;
+      # optional, useful when the builder has a faster internet connection than yours
+      nix.extraOptions = ''
+        builders-use-substitutes = true
+      '';
+      age.secrets."ssh-builder" = {
+        file = ../../secrets/ssh-builder.age;
+        owner = "0";
+        path = "/root/.ssh/config";
+      };
     };
 }