diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nixos/traits/24.05-compat.nix | 5 | ||||
| -rw-r--r-- | modules/nixos/traits/default.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/traits/nvidia.nix | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/modules/nixos/traits/24.05-compat.nix b/modules/nixos/traits/24.05-compat.nix new file mode 100644 index 0000000..26dcbca --- /dev/null +++ b/modules/nixos/traits/24.05-compat.nix @@ -0,0 +1,5 @@ +{lib, ...}: { + imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [ + (lib.mkAliasOptionModule ["hardware" "graphics" "extraPackages"] ["hardware" "opengl" "extraPackages"]) + ]; +} diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix index 7f03a58..88a0b8c 100644 --- a/modules/nixos/traits/default.nix +++ b/modules/nixos/traits/default.nix @@ -1,5 +1,7 @@ { imports = [ + ./24.05-compat.nix # TODO: remove when 24.11 is stable + ./auto-upgrade.nix ./containers.nix ./home-manager.nix diff --git a/modules/nixos/traits/nvidia.nix b/modules/nixos/traits/nvidia.nix index f7fe543..303d902 100644 --- a/modules/nixos/traits/nvidia.nix +++ b/modules/nixos/traits/nvidia.nix @@ -19,7 +19,7 @@ in { services.xserver.videoDrivers = ["nvidia"]; hardware = { - opengl.extraPackages = [pkgs.vaapiVdpau]; + graphics.extraPackages = [pkgs.vaapiVdpau]; nvidia = { package = lib.mkDefault config.boot.kernelPackages.nvidiaPackages.latest; modesetting.enable = true; @@ -39,7 +39,7 @@ in { MESA_VK_VERSION_OVERRIDE = "1.3"; }; - hardware.opengl.extraPackages = lib.mkForce []; + hardware.graphics.extraPackages = lib.mkForce []; services.xserver.videoDrivers = lib.mkForce ["modesetting"]; |