zephyrus/ga402x: switch to amd gpu module

This commit is contained in:
Jörg Thalheim 2024-06-26 08:55:30 +02:00 committed by mergify[bot]
parent 5fe1583567
commit a5abf3379d

View file

@ -1,17 +1,15 @@
{ config, { config,
lib, lib,
pkgs,
... ...
}: }:
let let
inherit (lib) mkDefault mkEnableOption mkIf mkMerge; inherit (lib) mkEnableOption mkIf mkMerge;
cfg = config.hardware.asus.zephyrus.ga402x; cfg = config.hardware.asus.zephyrus.ga402x;
in { in {
imports = [ imports = [
../shared.nix ../shared.nix
../../../../common/gpu/24.05-compat.nix
]; ];
options.hardware.asus.zephyrus.ga402x.amdgpu = { options.hardware.asus.zephyrus.ga402x.amdgpu = {
@ -21,19 +19,6 @@ in {
}; };
config = mkMerge [ config = mkMerge [
{
# AMD RX680
services.xserver.videoDrivers = mkDefault [ "amdgpu" ];
hardware = {
amdgpu.loadInInitrd = true;
graphics.extraPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
];
};
}
(mkIf cfg.amdgpu.recovery.enable { (mkIf cfg.amdgpu.recovery.enable {
# Hopefully fixes for where the kernel sometimes hangs when suspending or hibernating # Hopefully fixes for where the kernel sometimes hangs when suspending or hibernating
# (Though, I'm very suspicious of the Mediatek Wifi...) # (Though, I'm very suspicious of the Mediatek Wifi...)