chore(system): update video driver syntax to match upstream
This commit is contained in:
parent
93eda2d39c
commit
8c6ece4339
|
@ -15,15 +15,12 @@ in
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
services.xserver = {
|
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||||
enable = true;
|
|
||||||
videoDrivers = [ "amdgpu" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.opengl = {
|
hardware.graphics = {
|
||||||
extraPackages = [ pkgs.amdvlk ];
|
extraPackages = [ pkgs.amdvlk ];
|
||||||
# 32-bit application compatibility
|
# 32-bit application compatibility
|
||||||
driSupport32Bit = true;
|
enable32Bit = true;
|
||||||
extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
|
extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -19,7 +19,7 @@ in
|
||||||
|
|
||||||
environment.variables.VDPAU_DRIVER = "va_gl";
|
environment.variables.VDPAU_DRIVER = "va_gl";
|
||||||
|
|
||||||
hardware.opengl.extraPackages = with pkgs; [
|
hardware.graphics.extraPackages = with pkgs; [
|
||||||
(
|
(
|
||||||
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
|
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
|
||||||
vaapiIntel
|
vaapiIntel
|
||||||
|
@ -30,7 +30,7 @@ in
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.opengl.extraPackages32 = with pkgs.driversi686Linux; [
|
hardware.graphics.extraPackages32 = with pkgs.driversi686Linux; [
|
||||||
(
|
(
|
||||||
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
|
if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then
|
||||||
vaapiIntel
|
vaapiIntel
|
||||||
|
|
Loading…
Reference in a new issue