From 5da6e6502cd0bca6b9ea137d6374f3e9cec0c8bd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 21 Jan 2025 23:42:55 +0100 Subject: [PATCH] asd --- flake.nix | 3 +++ hardware/gpu/cuda.nix | 2 +- hosts/known-hosts.toml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 2f25204..65b9443 100644 --- a/flake.nix +++ b/flake.nix @@ -247,6 +247,7 @@ ]); })) ]; + nix-system-features = cfg.nix.settings.system-features; bootloader = if cfg.boot.loader.grub.enable then "grub" else if cfg.boot.loader.systemd-boot.enable then "systemd-boot" else null; @@ -279,10 +280,12 @@ #rb = ./profiles/known-hosts.nix; # TODO nixld = ./profiles/nix-ld.nix; dns64 = { config, ... }: { + /* networking.nameservers = [ "2001:700:1:11::2:51" ]; # dns64.uninett.no networking.networkmanager.enable = true; networking.networkmanager.insertNameservers = config.networking.nameservers; # https://github.com/NixOS/nixpkgs/issues/61230 networking.resolvconf.enable = false; + */ }; in builtins.mapAttrs (hostname: curried: curried hostname) { #hostname "domain" "system" inputs "state" [ modules ... ] diff --git a/hardware/gpu/cuda.nix b/hardware/gpu/cuda.nix index 6594ee4..93472f4 100644 --- a/hardware/gpu/cuda.nix +++ b/hardware/gpu/cuda.nix @@ -37,7 +37,7 @@ lib.mkMerge [ (lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor 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 + # 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"]; }) { diff --git a/hosts/known-hosts.toml b/hosts/known-hosts.toml index c814652..d1f9081 100644 --- a/hosts/known-hosts.toml +++ b/hosts/known-hosts.toml @@ -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/ buildMachine.systems = [ "aarch64-linux" ] -buildMachine.maxJobs = 4 # 80 threads 256GB +buildMachine.maxJobs = 4 # 80 threads 128GB buildMachine.speedFactor = 4 # Neoverse-N1 buildMachine.supportedFeatures = [ "big-parallel", "kvm", "nixos-test" ] ssh.connectTimeout = 10