From a5abf3379dc986f6952cc8c6999ddc1bf9d0ee13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 26 Jun 2024 08:55:30 +0200 Subject: [PATCH] zephyrus/ga402x: switch to amd gpu module --- asus/zephyrus/ga402x/amdgpu/default.nix | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/asus/zephyrus/ga402x/amdgpu/default.nix b/asus/zephyrus/ga402x/amdgpu/default.nix index b1791d7..2610db8 100644 --- a/asus/zephyrus/ga402x/amdgpu/default.nix +++ b/asus/zephyrus/ga402x/amdgpu/default.nix @@ -1,17 +1,15 @@ { config, lib, - pkgs, ... }: let - inherit (lib) mkDefault mkEnableOption mkIf mkMerge; + inherit (lib) mkEnableOption mkIf mkMerge; cfg = config.hardware.asus.zephyrus.ga402x; in { imports = [ ../shared.nix - ../../../../common/gpu/24.05-compat.nix ]; options.hardware.asus.zephyrus.ga402x.amdgpu = { @@ -21,19 +19,6 @@ in { }; 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 { # Hopefully fixes for where the kernel sometimes hangs when suspending or hibernating # (Though, I'm very suspicious of the Mediatek Wifi...)