From 9768da9f909197046c120dc25171dae7dbe2f01c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 21 Nov 2023 00:39:09 +0100 Subject: [PATCH] eple ssh --- hosts/eple/default.nix | 20 +++++--------------- profiles/remote-builders/default.nix | 13 +++++++++++++ users/pbsds/home/profiles/ssh.nix | 1 + 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/hosts/eple/default.nix b/hosts/eple/default.nix index 09dab63..79409dd 100644 --- a/hosts/eple/default.nix +++ b/hosts/eple/default.nix @@ -29,23 +29,13 @@ # Networking networking.networkmanager.enable = true; - /** / - #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - #networking.iwd.enable = true - networking.interfaces.eno1.ipv4.addresses = [ - { address = "129.241.105.252"; prefixLength = 23; } - ]; - networking.defaultGateway.address = "192.241.104.1"; - networking.defaultGateway.interface = "eno1"; networking.nameservers = [ - "129.241.0.200" - "129.241.0.201" - #"2001:700:300::200" - #"2001:700:300::201" - "8.8.8.8" - "1.1.1.1" + "2001:700:1:11::2:51" # dns64.uninett.no + #"129.241.0.200" + #"129.241.0.201" + "2001:700:300::200" + "2001:700:300::201" ]; - /**/ # Installed system packages environment.systemPackages = with pkgs; [ diff --git a/profiles/remote-builders/default.nix b/profiles/remote-builders/default.nix index 812882c..e9e2d18 100644 --- a/profiles/remote-builders/default.nix +++ b/profiles/remote-builders/default.nix @@ -32,6 +32,19 @@ let inherit (proxyjump-ntnu) proxy; } /**/ + { + systems = [ "x86_64-linux" ]; #"wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ]; + hostName = "eple.pbsds.net"; + sshUser = "pbsds"; + maxJobs = 4; # 12 cores + #maxJobs = 1; # at least for big-parallel + speedFactor = 3; + supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ]; + #mandatoryFeatures = [ ]; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH03MEINNnjBvtmvN2QsCDCLkvF9ow5FQJp9uiyQ1Iwi"; + inherit (proxyjump-ntnu) proxy; + } + /**/ { systems = [ "x86_64-linux" ]; #"wasm32-wasi" "wasm64-wasi" "x86_64-windows" "aarch64-linux" "riscv64-linux" ]; hostName = "garp.pbsds.net"; # TODO: port 23 diff --git a/users/pbsds/home/profiles/ssh.nix b/users/pbsds/home/profiles/ssh.nix index 6bb9556..1617621 100644 --- a/users/pbsds/home/profiles/ssh.nix +++ b/users/pbsds/home/profiles/ssh.nix @@ -33,6 +33,7 @@ # me "garp.pbsds.net".proxyJump = "microbel.pvv.ntnu.no"; + "eple.pbsds.net".proxyJump = "microbel.pvv.ntnu.no"; "bolle.pbsds.net".proxyJump = "microbel.pvv.ntnu.no"; "knut.pbsds.net".port = 23; "nord.pbsds.net".port = 24;