From 7f6ac346f467b83bf02f1b3a02d5a40ca57f5887 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 15 Nov 2024 04:50:41 +0100 Subject: [PATCH] things --- base.nix | 2 +- hardware/gpu/cuda.nix | 8 +++++--- users/pbsds/home/default.nix | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/base.nix b/base.nix index da339f8..ee0058c 100644 --- a/base.nix +++ b/base.nix @@ -72,7 +72,7 @@ nix.settings.experimental-features = [ "nix-command" "flakes" - "pipe-operator" + /* "pipe-operator" # not supported on lix 2.91 */ ]; #nix.settings.allowed-users = [ "@builders" ]; # TODO: this nix.settings.allowed-users = [ "root" "pbsds" "@wheel" ]; # default is [ "*" ] diff --git a/hardware/gpu/cuda.nix b/hardware/gpu/cuda.nix index f7e8cf3..e024d9b 100644 --- a/hardware/gpu/cuda.nix +++ b/hardware/gpu/cuda.nix @@ -5,15 +5,17 @@ lib.mkMerge [ # TODO: should we move it from flake.nix to here? # https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/nvidia/default.nix # https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/nvidia/prime.nix - - hardware.opengl.enable = true; } (lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") { + hardware.opengl.enable = true; hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = true; }) (lib.mkIf (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { - hardware.nvidia.open = true; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; + + # hardware.nvidia.open = if lib.versionOlder config.hardware.nvidia.package.version "560" then false else null; }) { diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index c1ba2ce..ded376f 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -107,6 +107,7 @@ nix-search-cli # nix-search #cargo + #cargo-update #cargo-edit #nim