From 18e9f9753e9ae261bcc7d3abe15745686991fd30 Mon Sep 17 00:00:00 2001
From: Matthieu <matthieu.cx@gmail.com>
Date: Thu, 20 Feb 2025 22:07:31 +0000
Subject: [PATCH] dell-xps-15-9570: fix imports, refactor (closer to recent
 profiles and more explicit) (#1331)

---
 dell/xps/15-9570/default.nix        |  7 +------
 dell/xps/15-9570/intel/default.nix  |  6 +++---
 dell/xps/15-9570/nvidia/default.nix |  5 +----
 dell/xps/15-9570/shared.nix         | 20 ++++++++++++++++++++
 dell/xps/15-9570/xps-common.nix     | 10 ----------
 5 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 dell/xps/15-9570/shared.nix
 delete mode 100644 dell/xps/15-9570/xps-common.nix

diff --git a/dell/xps/15-9570/default.nix b/dell/xps/15-9570/default.nix
index 91fd0244..51787a4b 100644
--- a/dell/xps/15-9570/default.nix
+++ b/dell/xps/15-9570/default.nix
@@ -1,11 +1,6 @@
 { lib, ... }:
 {
   imports = [
-    ../../../common/cpu/intel/kaby-lake
-    ../../../common/pc/laptop
-    ./xps-common.nix
+    ./shared.nix
   ];
-
-  # Includes the Wi-Fi and Bluetooth firmware
-  hardware.enableRedistributableFirmware = lib.mkDefault true;
 }
diff --git a/dell/xps/15-9570/intel/default.nix b/dell/xps/15-9570/intel/default.nix
index c4d51ea6..ff92dd76 100644
--- a/dell/xps/15-9570/intel/default.nix
+++ b/dell/xps/15-9570/intel/default.nix
@@ -1,8 +1,8 @@
 {
   imports = [
-    ../../../../common/cpu/intel
-    ../../../../common/pc/laptop
     ../../../../common/gpu/nvidia/disable.nix
-    ../xps-common.nix
+    ../shared.nix
   ];
+
+  # Disables the Nvidia GPU, better for battery life
 }
diff --git a/dell/xps/15-9570/nvidia/default.nix b/dell/xps/15-9570/nvidia/default.nix
index 430e0e90..7cbb908a 100644
--- a/dell/xps/15-9570/nvidia/default.nix
+++ b/dell/xps/15-9570/nvidia/default.nix
@@ -1,12 +1,9 @@
 { ... }:
-
 {
   imports = [
-    ../../../../common/cpu/intel
     ../../../../common/gpu/nvidia/prime.nix
     ../../../../common/gpu/nvidia/pascal
-    ../../../../common/pc/laptop
-    ../xps-common.nix
+    ../shared.nix
   ];
 
 
diff --git a/dell/xps/15-9570/shared.nix b/dell/xps/15-9570/shared.nix
new file mode 100644
index 00000000..06701e75
--- /dev/null
+++ b/dell/xps/15-9570/shared.nix
@@ -0,0 +1,20 @@
+{ lib, ... }:
+{
+
+  imports = [ 
+    ../../../common/cpu/intel/coffee-lake
+    ../../../common/pc/laptop
+  ];
+
+  # Solution to rcu_sched freezing
+  boot.kernelParams = [ "acpi_rev_override" ];
+
+  # This will save you money and possibly your life!
+  # https://github.com/NixOS/nixos-hardware/pull/127
+  services.thermald.enable = lib.mkDefault true;
+
+  hardware.graphics = {
+    enable = lib.mkDefault true;
+    enable32Bit = lib.mkDefault true;
+  };
+}
diff --git a/dell/xps/15-9570/xps-common.nix b/dell/xps/15-9570/xps-common.nix
deleted file mode 100644
index 39151e96..00000000
--- a/dell/xps/15-9570/xps-common.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, ... }:
-
-{
-  # Solution to rcu_sched freezing
-  boot.kernelParams = [ "acpi_rev_override" ];
-  boot.kernelModules = [ "kvm-intel" ];
-
-  # This will save you money and possibly your life!
-  services.thermald.enable = lib.mkDefault true;
-}