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

asdjkl

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2025-11-19 17:56:45 +01:00
parent 1c14c69963
commit d911acd86e
9 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/gpu/cuda-common.nix
View File

@@ -4,12 +4,12 @@
# https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/nvidia/prime.nix
lib.mkMerge [
(lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") {
(lib.mkIf (lib.versionOlder 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") {
(lib.mkIf (lib.versionAtLeast lib.version "24.11") {
hardware.graphics.enable = true;
hardware.graphics.enable32Bit = true;
@@ -40,8 +40,8 @@ lib.mkMerge [
];
}
/* lib.mkIf (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") { */
(lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") {
/* 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

6
hardware/gpu/intel.nix
View File

@@ -5,7 +5,7 @@ let
intel-media-driver
# not added due to collision
# https://github.com/NixOS/nixos-hardware/issues/1170
(if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11")
(if (lib.versionOlder lib.version "23.11")
then vaapiIntel
else intel-vaapi-driver)
libvdpau-va-gl
@@ -35,12 +35,12 @@ lib.mkMerge [
};
}
(lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") {
(lib.optionalAttrs (lib.versionOlder lib.version "24.11") {
hardware.opengl.driSupport = true;
hardware.opengl.enable = true;
hardware.opengl.extraPackages = extraPackages;
})
(lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor lib.version) "24.11") {
(lib.optionalAttrs (lib.versionAtLeast lib.version "24.11") {
hardware.graphics.enable = true;
hardware.graphics.extraPackages = extraPackages;
})

4
hardware/gpu/rocm.nix
View File

@@ -8,12 +8,12 @@
config = lib.mkMerge [
(lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") {
(lib.mkIf (lib.versionOlder 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") {
(lib.mkIf (lib.versionAtLeast lib.version "24.11") {
hardware.graphics.enable = true;
hardware.graphics.enable32Bit = true;
})