From be33295d69d8864d58df99e5c5602ebff5bf5dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sun, 20 Oct 2024 09:30:47 +0200
Subject: [PATCH] gpu/intel/tiger-lake: simplify conditionals

---
 common/gpu/intel/tiger-lake/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/gpu/intel/tiger-lake/default.nix b/common/gpu/intel/tiger-lake/default.nix
index f641ad3..3621a4a 100644
--- a/common/gpu/intel/tiger-lake/default.nix
+++ b/common/gpu/intel/tiger-lake/default.nix
@@ -1,13 +1,9 @@
 { config, lib, ... }:
 {
   imports = [ ../. ];
-  config = lib.mkMerge [
-    (lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8") {
-      hardware.intelgpu.driver = "xe";
-    })
-    (lib.mkIf (config.hardware.intelgpu.driver == "i915") {
-      boot.kernelParams = [ "i915.enable_guc=3" ];
-    })
-    { hardware.intelgpu.vaapiDriver = "intel-media-driver"; }
-  ];
+  config = {
+    hardware.intelgpu.driver = lib.mkIf (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.8") "xe";
+    boot.kernelParams = lib.mkIf (config.hardware.intelgpu.driver == "i915") [ "i915.enable_guc=3" ];
+    hardware.intelgpu.vaapiDriver = "intel-media-driver";
+  };
 }