diff --git a/hardware/gpu/cuda.nix b/hardware/gpu/cuda.nix index e024d9b..6594ee4 100644 --- a/hardware/gpu/cuda.nix +++ b/hardware/gpu/cuda.nix @@ -37,6 +37,8 @@ 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 + 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 abd1240..5e185fe 100644 --- a/hosts/known-hosts.toml +++ b/hosts/known-hosts.toml @@ -43,6 +43,7 @@ ssh.connectTimeout = 3 ["bolle.pbsds.net"] +aliases = [ "bolle.tail9aac63.ts.net" ] buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"] buildMachine.maxJobs = 3 # 12 threads 32GB buildMachine.speedFactor = 4 # ??? @@ -62,6 +63,7 @@ ssh.proxyJump = "hildring.pvv.ntnu.no" # wakeonlan 4c:cc:6a:05:51:01 ["garp.pbsds.net"] # gtx 1080 +aliases = [ "garp.tail9aac63.ts.net" ] buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"] buildMachine.maxJobs = 2 # 8 threads 32GB buildMachine.speedFactor = 4 # i7-6700 diff --git a/todos.md b/todos.md index fc1e525..d90cfcd 100644 --- a/todos.md +++ b/todos.md @@ -3,6 +3,7 @@ * [ ] https://github.com/NixOS/nixos-hardware/tree/master/pine64/pinebook-pro * [ ] riscv # nice to have +* [ ] windows binfmtemu with wineWowPackages.wayland * [ ] nixos-generate-config instructions for new hosts * [ ] `profiles/singularity.nix` https://github.com/NixOS/nixpkgs/issues/230851 * [x] xforwarding over ssh diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index 6d1a030..794b1fb 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -105,6 +105,7 @@ manix #comma # collides with nix-index-database nix-search-cli # nix-search + devenv #cargo #cargo-update