modules/nix-config: proper ssh-ng

This commit is contained in:
Max Headroom 2022-09-25 13:45:50 +02:00
parent 9428dcf6b1
commit 7e9d8685a8

View file

@ -1,10 +1,11 @@
{ pkgs, lib, config, inputs, ... }@args: { pkgs, lib, config, inputs, ... }:
let let
builder = { builder = {
systems = [ "x86_64-linux" "i686-linux" ]; systems = [ "x86_64-linux" "i686-linux" ];
speedFactor = 4; speedFactor = 4;
supportedFeatures = [ "benchmark" "nixos-test" ]; supportedFeatures = [ "benchmark" "nixos-test" ];
sshKey = config.age.secrets.nixBuilderKey.path; sshKey = config.age.secrets.nixBuilderKey.path;
protocol = "ssh-ng";
}; };
bigBuilder = builder // { bigBuilder = builder // {
speedFactor = 16; speedFactor = 16;
@ -59,18 +60,18 @@ in {
buildMachines = [ buildMachines = [
(bigBuilder // { (bigBuilder // {
sshUser = "ssh-ng://nixbuilder"; sshUser = "nixbuilder";
hostName = "animus.com"; hostName = "animus.com";
maxJobs = 4; maxJobs = 4;
}) })
(builder // { (builder // {
sshUser = "ssh-ng://nix"; sshUser = "nix";
hostName = "prophet.node.privatevoid.net"; hostName = "prophet.node.privatevoid.net";
systems = [ "aarch64-linux" ]; systems = [ "aarch64-linux" ];
}) })
] ++ ] ++
(lib.optional (config.networking.hostName != "TITAN") (bigBuilder // { (lib.optional (config.networking.hostName != "TITAN") (bigBuilder // {
sshUser = "ssh-ng://nix"; sshUser = "nix";
hostName = "titan.hypr"; hostName = "titan.hypr";
speedFactor = 12; speedFactor = 12;
maxJobs = 12; maxJobs = 12;