This commit is contained in:
Peder Bergebakken Sundt 2023-03-04 01:33:23 +01:00
parent a484bed0e5
commit 9166792bb3
3 changed files with 59 additions and 44 deletions

View File

@ -31,6 +31,7 @@
]; ];
# run/build weird binaries # run/build weird binaries
# TODO: somehow make sure this is in sync with remote-builders
boot.binfmt.emulatedSystems = [ boot.binfmt.emulatedSystems = [
"wasm32-wasi" "wasm32-wasi"
"wasm64-wasi" "wasm64-wasi"

View File

@ -87,6 +87,7 @@
]; ];
# run/build weird binaries # run/build weird binaries
# TODO: somehow make sure this is in sync with remote-builders
boot.binfmt.emulatedSystems = [ boot.binfmt.emulatedSystems = [
"wasm32-wasi" "wasm32-wasi"
"wasm64-wasi" "wasm64-wasi"

View File

@ -6,10 +6,12 @@ let
# - "benchmark" - has "equal" performance # - "benchmark" - has "equal" performance
# - "big-parallel" - is beefy, for stuff like llvm # - "big-parallel" - is beefy, for stuff like llvm
# find 'publicKey' with `ssh-keyscan`
remotes = [ remotes = [
/** / /**/
{ {
systems = [ "x86_64-linux" ]; systems = [ "x86_64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ];
hostName = "bolle.pbsds.net"; hostName = "bolle.pbsds.net";
sshUser = "pbsds"; sshUser = "pbsds";
maxJobs = 16; maxJobs = 16;
@ -17,12 +19,24 @@ let
speedFactor = 2; speedFactor = 2;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ]; supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
#mandatoryFeatures = [ ]; #mandatoryFeatures = [ ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBHdkKmRB0WjD3L+k8GNTVJDLpOUqLBMW17ld/Jzapo6"; publicKey = "bolle.pbsds.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeOB/57N1fQPVorIUlkkJZaQduBo+4+km2Qbj4ebd/k";
proxy.user="pederbs"; proxy.user = "pederbs";
proxy.host="isvegg.pvv.ntnu.no"; proxy.host = "isvegg.pvv.ntnu.no";
proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU=";
} }
/**/ /**/
{
systems = [ "x86_64-linux" "wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ];
hostName = "noximilien.pbsds.net";
sshUser = "pbsds";
maxJobs = 4;
#maxJobs = 1; # at least for big-parallel
speedFactor = 1;
supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ];
#mandatoryFeatures = [ ];
publicKey = "noximilien.pbsds.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ3QhTGS03Sqm6OeCEz5AIGqJnBttKaBqMgNXp3Md7t4";
}
/**/
{ {
systems = ["x86_64-linux"]; systems = ["x86_64-linux"];
hostName = "rocm.pbsds.net"; hostName = "rocm.pbsds.net";
@ -34,8 +48,8 @@ let
supportedFeatures = [ "kvm" "big-parallel" ]; supportedFeatures = [ "kvm" "big-parallel" ];
#mandatoryFeatures = [ ]; #mandatoryFeatures = [ ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDuWdqEQ5mmVjuKi6f/Q2PFxuqB3URpgTHid06Vw7we"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDuWdqEQ5mmVjuKi6f/Q2PFxuqB3URpgTHid06Vw7we";
proxy.user="pederbs"; proxy.user = "pederbs";
proxy.host="isvegg.pvv.ntnu.no"; proxy.host = "isvegg.pvv.ntnu.no";
proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU=";
} }
/**/ /**/
@ -73,8 +87,10 @@ let
}@args: }@args:
let let
buildMachine = lib.filterAttrs (key: _: !builtins.elem key ["publicKey" "proxy"]) args; # this should have syntactic sugar: ...@buildMachine buildMachine = lib.filterAttrs (key: _: !builtins.elem key ["publicKey" "proxy"]) args; # this should have syntactic sugar: ...@buildMachine
in { filter = lib.mkIf (buildMachine.hostName != config.networking.fqdn);
in filter {
nix.buildMachines = [ buildMachine ]; nix.buildMachines = [ buildMachine ];
#TODO: users.users.root.openssh.authorizedKeys.keys
programs.ssh.knownHosts.${buildMachine.hostName}.publicKey = publicKey; 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 # the timeout is great to have when a remote is unresponsive, as nix currently does not give a shit
programs.ssh.extraConfig = '' programs.ssh.extraConfig = ''
@ -95,10 +111,7 @@ in {
# https://github.com/NixOS/nix/issues/2457 # https://github.com/NixOS/nix/issues/2457
# useful when the builder has a faster internet connection than i do # useful when the builder has a faster internet connection than i do
nix.extraOptions = '' nix.settings.builders-use-substitutes = true;
builders-use-substitutes = true
'';
# TODO: can i make ^ non-string?
# TIL: this can be a list of configurations and lambdas, not just file paths # TIL: this can be a list of configurations and lambdas, not just file paths
imports = builtins.map mkRemoteConfig remotes; imports = builtins.map mkRemoteConfig remotes;