This commit is contained in:
Peder Bergebakken Sundt 2025-01-21 23:42:55 +01:00
parent e364359bdb
commit 5da6e6502c
3 changed files with 5 additions and 2 deletions

View File

@ -247,6 +247,7 @@
]); ]);
})) }))
]; ];
nix-system-features = cfg.nix.settings.system-features;
bootloader = if cfg.boot.loader.grub.enable then "grub" bootloader = if cfg.boot.loader.grub.enable then "grub"
else if cfg.boot.loader.systemd-boot.enable then "systemd-boot" else if cfg.boot.loader.systemd-boot.enable then "systemd-boot"
else null; else null;
@ -279,10 +280,12 @@
#rb = ./profiles/known-hosts.nix; # TODO #rb = ./profiles/known-hosts.nix; # TODO
nixld = ./profiles/nix-ld.nix; nixld = ./profiles/nix-ld.nix;
dns64 = { config, ... }: { dns64 = { config, ... }: {
/*
networking.nameservers = [ "2001:700:1:11::2:51" ]; # dns64.uninett.no networking.nameservers = [ "2001:700:1:11::2:51" ]; # dns64.uninett.no
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.networkmanager.insertNameservers = config.networking.nameservers; # https://github.com/NixOS/nixpkgs/issues/61230 networking.networkmanager.insertNameservers = config.networking.nameservers; # https://github.com/NixOS/nixpkgs/issues/61230
networking.resolvconf.enable = false; networking.resolvconf.enable = false;
*/
}; };
in builtins.mapAttrs (hostname: curried: curried hostname) { in builtins.mapAttrs (hostname: curried: curried hostname) {
#hostname "domain" "system" inputs "state" [ modules ... ] #hostname "domain" "system" inputs "state" [ modules ... ]

View File

@ -37,7 +37,7 @@ lib.mkMerge [
(lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { (lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") {
programs.nix-required-mounts.enable = true; programs.nix-required-mounts.enable = true;
programs.nix-required-mounts.presets.nvidia-gpu.enable = true; programs.nix-required-mounts.presets.nvidia-gpu.enable = true;
# adding "cuda", "opengl" and "nvidia-gpu" overrides the implicit defaults # adding "cuda", "opengl" and "nvidia-gpu" ^ overrides the implicit defaults
nix.settings.system-features = lib.mkIf (config.nixpkgs.system == "x86_64-linux") ["kvm" "nixos-test"]; nix.settings.system-features = lib.mkIf (config.nixpkgs.system == "x86_64-linux") ["kvm" "nixos-test"];
}) })
{ {

View File

@ -194,7 +194,7 @@ ssh.userPrivateKey = "/run/secrets/nix-community-builders-ssh-key"
["aarch64-build-box.nix-community.org"] # https://nix-community.org/community-builder/ ["aarch64-build-box.nix-community.org"] # https://nix-community.org/community-builder/
buildMachine.systems = [ "aarch64-linux" ] buildMachine.systems = [ "aarch64-linux" ]
buildMachine.maxJobs = 4 # 80 threads 256GB buildMachine.maxJobs = 4 # 80 threads 128GB
buildMachine.speedFactor = 4 # Neoverse-N1 buildMachine.speedFactor = 4 # Neoverse-N1
buildMachine.supportedFeatures = [ "big-parallel", "kvm", "nixos-test" ] buildMachine.supportedFeatures = [ "big-parallel", "kvm", "nixos-test" ]
ssh.connectTimeout = 10 ssh.connectTimeout = 10