From 8ff521acd2c8132c62141c2990deb7406e32b335 Mon Sep 17 00:00:00 2001
From: Lyndon Sanche <lsanche@lyndeno.ca>
Date: Tue, 8 Aug 2023 12:04:08 -0600
Subject: [PATCH] XPS 9560: Remove `lib.mkDefault` on mergable options

---
 dell/xps/15-9560/default.nix    | 6 +++---
 dell/xps/15-9560/xps-common.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dell/xps/15-9560/default.nix b/dell/xps/15-9560/default.nix
index e7ec6c2..0ee38d9 100644
--- a/dell/xps/15-9560/default.nix
+++ b/dell/xps/15-9560/default.nix
@@ -15,9 +15,9 @@
 
 
  ##### bumblebee working, needs reboot to take affect and to use it run: optirun "<application>"
- services.xserver.videoDrivers = lib.mkDefault [ "intel" "nvidia" ];
- boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "bbswitch" ];
- boot.extraModulePackages = lib.mkDefault [ pkgs.linuxPackages.nvidia_x11 ];
+ services.xserver.videoDrivers = [ "intel" "nvidia" ];
+ boot.blacklistedKernelModules = [ "nouveau" "bbswitch" ];
+ boot.extraModulePackages = [ pkgs.linuxPackages.nvidia_x11 ];
  hardware.bumblebee.enable = lib.mkDefault true;
  hardware.bumblebee.pmMethod = lib.mkDefault "none";
 
diff --git a/dell/xps/15-9560/xps-common.nix b/dell/xps/15-9560/xps-common.nix
index a8361ce..b0efe45 100644
--- a/dell/xps/15-9560/xps-common.nix
+++ b/dell/xps/15-9560/xps-common.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 
 {
-  boot.kernelParams = lib.mkDefault [ "acpi_rev_override" ];
+  boot.kernelParams = [ "acpi_rev_override" ];
 
   # This will save you money and possibly your life!
   services.thermald.enable = lib.mkDefault true;