diff --git a/profiles/remote-builders/default.nix b/profiles/remote-builders/default.nix index e9e2d18..741cded 100644 --- a/profiles/remote-builders/default.nix +++ b/profiles/remote-builders/default.nix @@ -9,12 +9,12 @@ let # find 'publicKey' with `ssh-keyscan` proxyjump-ntnu = { proxy.user = "pederbs"; - #proxy.host = "isvegg.pvv.ntnu.no"; - #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # isvegg + proxy.host = "isvegg.pvv.ntnu.no"; + proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # isvegg #proxy.host = "hildring.pvv.ntnu.no"; #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # hildring - proxy.host = "microbel.pvv.ntnu.no"; - proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="; # microbel + #proxy.host = "microbel.pvv.ntnu.no"; + #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="; # microbel }; remotes = [ @@ -51,7 +51,7 @@ let sshUser = "pbsds"; maxJobs = 3; # 8 cores #maxJobs = 1; # at least for big-parallel - speedFactor = 3; + speedFactor = 2; supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ]; #mandatoryFeatures = [ ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx"; @@ -96,13 +96,13 @@ let #mandatoryFeatures = [ ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDYB9H1pHB1vTBiGhO/GCQjn70BtVdQuJyXx38zN2CDj"; } - /** / + /**/ { systems = [ "x86_64-linux" ]; #"wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ]; hostName = "nord.pbsds.net"; sshPort = 24; sshUser = "pbsds"; - maxJobs = 2; # 4 cores + maxJobs = 1; # 4 cores #maxJobs = 1; # at least for big-parallel speedFactor = 1; supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ]; @@ -118,7 +118,7 @@ let speedFactor = 0; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; } - /**/ + /** / { systems = ["x86_64-linux"]; hostName = "eirin.pvv.ntnu.no"; @@ -149,6 +149,7 @@ let filter = lib.mkIf (buildMachine.hostName != config.networking.fqdn); in filter { nix.buildMachines = [ buildMachine ]; + #nix.buildMachines = [ (buildMachine // { protocol = "ssh-ng"; } ) ]; #TODO: users.users.root.openssh.authorizedKeys.keys programs.ssh.knownHosts.${buildMachine.hostName}.publicKey = publicKey; # the timeout is great to have when a remote is unresponsive, as nix currently does not give a shit