pederbs/config
2
2
Fork 0
Code Issues Pull Requests Releases Activity

disable nix-required-mounts on remote builders

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2026-06-29 15:13:48 +02:00
parent ee03c10ce6
commit 6716f07adf
11 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/gpu/cuda-common.nix
+5 -7
View File
@@ -77,13 +77,11 @@ lib.mkMerge [
};
}
/* lib.mkIf (lib.versionAtLeast lib.version "24.11") { */
(lib.optionalAttrs (lib.versionAtLeast lib.version "24.11") {
programs.nix-required-mounts.enable = true;
programs.nix-required-mounts.presets.nvidia-gpu.enable = true;
# adding "cuda", "opengl" and "nvidia-gpu" ^ overrides the implicit defaults
nix.settings.system-features = lib.mkIf (pkgs.stdenv.hostPlatform.system == "x86_64-linux") ["kvm" "nixos-test"];
})
{
# # blocked by https://github.com/NixOS/nix/issues/9272
# programs.nix-required-mounts.enable = true;
# programs.nix-required-mounts.presets.nvidia-gpu.enable = true;
}
{
# https://wiki.nixos.org/wiki/Nvidia
hosts/nixos/bjarte/configuration.nix
+1
View File
@@ -30,6 +30,7 @@
../../../profiles/nix-ld.nix
../../../profiles/sshd/ts-only.nix
../../../profiles/ccache
#../../../profiles/no-suspend.nix
../../../profiles/earlyoom.nix
../../../profiles/oci/podman.nix
hosts/nixos/bolle/configuration.nix
+1
View File
@@ -17,6 +17,7 @@
../../../hardware/gpu/intel.nix
../../../profiles/sshd
# ../../../profiles/ccache # https://github.com/NixOS/nix/issues/9272
../../../profiles/nix-cgroups.nix
../../../users/pbsds
hosts/nixos/eple/configuration.nix
+1
View File
@@ -20,6 +20,7 @@
../../../hardware/gpu/rocm.nix
../../../profiles/sshd
# ../../../profiles/ccache # https://github.com/NixOS/nix/issues/9272
../../../profiles/nix-cgroups.nix
../../../users/pbsds
hosts/nixos/garp/configuration.nix
+1
View File
@@ -31,6 +31,7 @@
../../../profiles/nix-ld.nix
../../../profiles/sshd
# ../../../profiles/ccache # https://github.com/NixOS/nix/issues/9272
../../../profiles/nix-cgroups.nix
#../../../profiles/no-suspend.nix
# ../../../profiles/oci/podman.nix
hosts/nixos/nord/configuration.nix
+1
View File
@@ -57,6 +57,7 @@
../../../profiles/nix-ld.nix
../../../profiles/sshd
../../../profiles/ccache
../../../profiles/earlyoom.nix
#../../../profiles/oci/podman.nix
../../../profiles/oci/docker.nix
hosts/nixos/sopp/configuration.nix
+1
View File
@@ -56,6 +56,7 @@
../../../profiles/nix-ld.nix
../../../profiles/sshd
../../../profiles/ccache
../../../profiles/earlyoom.nix
../../../profiles/no-suspend.nix
#../../../profiles/oci/podman.nix
profiles/base/default.nix
+4 -1
View File
@@ -11,7 +11,6 @@
./locale-no.nix
./upgrade-diff.nix
./vm-variant.nix
./ccache
./../mounts/common-nfs.nix
# ./profiles/mounts/common-zfs.nix
];
@@ -20,6 +19,10 @@
(import ./../../overlays/wl-clipboard-timeout.nix)
];
# reaffirm these defaults in case we add mroe via 'programs.nix-required-mounts'
# adding "cuda" or "ccache" overrides the implicit defaults
nix.settings.system-features = lib.mkIf (pkgs.stdenv.hostPlatform.system == "x86_64-linux") ["kvm" "nixos-test"];
# TODO: selectively whitelist
nixpkgs.config.allowUnfree = true;
# nixpkgs.config.allowAliases = false;
profiles/base/ccache/default.nix → profiles/ccache/default.nix
View File
profiles/base/ccache/server.nix → profiles/ccache/server.nix
View File
profiles/known-hosts/hosts.toml
+10 -5
View File
@@ -54,7 +54,8 @@ aliases = [ "bolle.pbsds.net" ]
buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"]
buildMachine.maxJobs = 3 # 12 threads 32GB
buildMachine.speedFactor = 4 # ???
buildMachine.supportedFeatures = ["kvm", "nixos-test" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache
# buildMachine.supportedFeatures = ["kvm", "nixos-test" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache
buildMachine.supportedFeatures = ["kvm", "nixos-test" ] # https://github.com/NixOS/nix/issues/9272
buildMachine.protocol = "ssh-ng"
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeOB/57N1fQPVorIUlkkJZaQduBo+4+km2Qbj4ebd/k"
# ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
@@ -66,7 +67,8 @@ aliases = [ "eple.pbsds.net" ]
buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"]
buildMachine.maxJobs = 3 # 12 threads 32GB
buildMachine.speedFactor = 3 # i7-5820K
buildMachine.supportedFeatures = ["kvm", "nixos-test", "ccache" ]
# buildMachine.supportedFeatures = ["kvm", "nixos-test", "ccache" ]
buildMachine.supportedFeatures = ["kvm", "nixos-test" ] # https://github.com/NixOS/nix/issues/9272
buildMachine.protocol = "ssh-ng"
# useAsSubstituter = true
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH03MEINNnjBvtmvN2QsCDCLkvF9ow5FQJp9uiyQ1Iwi"
@@ -80,7 +82,8 @@ aliases = [ "garp.pbsds.net" ]
buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"]
# buildMachine.maxJobs = 2 # 8 threads 64GB
buildMachine.speedFactor = 4 # i7-6700
buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache
# buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda" ] #, "ccache" ] # no ccache because we have yet to setup distributed ccache
buildMachine.supportedFeatures = ["kvm", "nixos-test" ] # https://github.com/NixOS/nix/issues/9272
buildMachine.protocol = "ssh-ng"
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx"
# ssh.proxyJump = "login.stud.ntnu.no" # login.pvv.ntnu.no
@@ -100,7 +103,8 @@ ssh.userPublicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7fYndgIXJM+tLSfkbprW
aliases = [ "sopp.tail9aac63.ts.net" ] # "sopp.pbsds.net",
# buildMachine.maxJobs = 2 # 8 threads 32GB
buildMachine.speedFactor = 2 # i7-4790K
buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda", "ccache" ]
# buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda", "ccache" ]
buildMachine.supportedFeatures = ["kvm", "nixos-test" ] # https://github.com/NixOS/nix/issues/9272
# useAsSubstituter = true
remoteStoreSpecialization = true
# ssh.listenPort = 26
@@ -114,7 +118,8 @@ ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6eTQkxO/1XflHpGf3478+
aliases = [ "nord.tail9aac63.ts.net" ] # "nord.pbsds.net",
# buildMachine.maxJobs = 1 # 4 threads 32GB
buildMachine.speedFactor = 1 # i5-2500
buildMachine.supportedFeatures = ["kvm", "nixos-test", "ccache" ]
# buildMachine.supportedFeatures = ["kvm", "nixos-test", "ccache" ]
buildMachine.supportedFeatures = ["kvm", "nixos-test" ] # https://github.com/NixOS/nix/issues/9272
# useAsSubstituter = true
# ssh.listenPort = 24
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBSdIUtUfAxnVbPDmDDFdP2S3Wd3+CC8IfZAANJ76oh"