From b7d8d5c78812a0a82fdfc817208e530d476d2313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Jun 2024 09:29:56 +0200
Subject: [PATCH] lenovo/yoga/7/14ARH7: remove redundant vdpau packages

amd doesn't need them and nvidia already includes them
---
 lenovo/yoga/7/14ARH7/amdgpu/default.nix | 26 +++----------------------
 lenovo/yoga/7/14ARH7/nvidia/default.nix |  4 ----
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/lenovo/yoga/7/14ARH7/amdgpu/default.nix b/lenovo/yoga/7/14ARH7/amdgpu/default.nix
index 454a914..a23307a 100644
--- a/lenovo/yoga/7/14ARH7/amdgpu/default.nix
+++ b/lenovo/yoga/7/14ARH7/amdgpu/default.nix
@@ -1,24 +1,4 @@
-# Including this file will enable the AMD-GPU driver
-
-{ lib, pkgs, ... }:
-
-let
-  inherit (lib) mkDefault;
-
-in {
-  imports = [
-    ../shared.nix
-    ../../../../../common/gpu/24.05-compat.nix
-  ];
-
-  # AMD RX680
-  services.xserver.videoDrivers = mkDefault [ "amdgpu" ];
-
-  hardware = {
-    amdgpu.loadInInitrd = true;
-    graphics.extraPackages = with pkgs; [
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-  };
+# Including this file will enable the AMD-GPU driver (in shared.nix)
+{
+  imports = [ ../shared.nix ];
 }
diff --git a/lenovo/yoga/7/14ARH7/nvidia/default.nix b/lenovo/yoga/7/14ARH7/nvidia/default.nix
index 6c97a07..9707745 100644
--- a/lenovo/yoga/7/14ARH7/nvidia/default.nix
+++ b/lenovo/yoga/7/14ARH7/nvidia/default.nix
@@ -19,10 +19,6 @@ in {
   hardware = {
     ## Enable the Nvidia card, as well as Prime and Offload:
     amdgpu.loadInInitrd = true;
-    graphics.extraPackages = with pkgs; [
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
 
     nvidia = {
       modesetting.enable = true;