diff --git a/flake.lock b/flake.lock index a033ed3..f4dbcd2 100644 --- a/flake.lock +++ b/flake.lock @@ -108,11 +108,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695541019, - "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=", + "lastModified": 1695887975, + "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296", + "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", "type": "github" }, "original": { @@ -123,11 +123,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695559356, - "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -203,11 +203,11 @@ }, "unstable": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7f49335..fe8ec38 100644 --- a/flake.nix +++ b/flake.nix @@ -140,8 +140,9 @@ nord = mkConfig "nord" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel-cpu-only common-cpu-intel-sandy-bridge common-gpu-amd common-hidpi ]); sopp = mkConfig "sopp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia-nonprime ]); #garp = mkConfig "garp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia-nonprime ]); + #garp = mkConfig "garp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia ]); garp = mkConfig "garp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]); - #gomperud smattkuken skrytebiffen skalkesnerken + #gomperud smattkuken skrytebiffen skalkesnerken balleby brumlebasse }; homeConfigurations = forAllSystems ({ pkgs, flakes, ... }: let diff --git a/hosts/garp/default.nix b/hosts/garp/default.nix index 34f1bda..db297b0 100644 --- a/hosts/garp/default.nix +++ b/hosts/garp/default.nix @@ -43,14 +43,15 @@ #../../profiles/desktop/sound/pulseaudio.nix ../../profiles/desktop/sound/pipewire.nix + ../../profiles/domeneshop-dyndns # TODO: secrets ]; + services.domeneshop-updater.targets = [ "garp.pbsds.net" ]; - networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery + #networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery # Networking networking.networkmanager.enable = true; - # Installed system packages environment.systemPackages = with pkgs; [ cage diff --git a/profiles/remote-builders/default.nix b/profiles/remote-builders/default.nix index 8cfd2ce..344e741 100644 --- a/profiles/remote-builders/default.nix +++ b/profiles/remote-builders/default.nix @@ -25,6 +25,21 @@ let 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 = "garp.pbsds.net"; # TODO: port 23 + sshUser = "pbsds"; + maxJobs = 3; # 8 cores + #maxJobs = 1; # at least for big-parallel + speedFactor = 3; + supportedFeatures = [ "kvm" "big-parallel" "nixos-test" ]; + #mandatoryFeatures = [ ]; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx"; + proxy.user = "pederbs"; + proxy.host = "isvegg.pvv.ntnu.no"; + 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"; # TODO: port 23 @@ -52,7 +67,7 @@ let proxy.host = "isvegg.pvv.ntnu.no"; 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 = "sopp.pbsds.net"; @@ -65,7 +80,7 @@ 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"; @@ -87,6 +102,7 @@ let speedFactor = 0; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; } + /**/ { systems = ["x86_64-linux"]; hostName = "eirin.pvv.ntnu.no";