From 3e2ea8a49d4d76276b0f4e2041df8ca5c0771371 Mon Sep 17 00:00:00 2001
From: bashfulrobot <dustin@bashfulrobot.com>
Date: Mon, 4 Mar 2024 14:16:13 -0800
Subject: [PATCH] feat: Add support for Dell XPS 15-9530 with NVIDIA graphics

- Added `default.nix` file for Dell XPS 15-9530 configuration
- Imported necessary files for CPU, laptop, SSD, and fingerprint
- Enabled thermald service
- Configured iwlwifi module with power saving option
- Removed commented out code for `disable_11ax` option
- Added `default.nix` file for NVIDIA configuration in Dell XPS 15-9530
- Imported `default.nix` file from parent directory and NVIDIA prime configuration file
- Configured `hardware.nvidia.prime` with Bus IDs of Intel and NVIDIA GPUs

[dell/xps/15-9530/default.nix]
- Add a new file `dell/xps/15-9530/default.nix`
- Import the following files: `../../../common/cpu/intel`, `../../../common/pc/laptop`, `../../../common/pc/laptop/ssd`, and `./fingerprint`
- Enable thermald service
- Add configuration for iwlwifi module with `options iwlwifi power_save=1`
- Remove commented out code for `disable_11ax` option
[dell/xps/15-9530/nvidia/default.nix]
- Added a new file `default.nix` in the directory `dell/xps/15-9530/nvidia/`
- The file `default.nix` includes two imports: `../default.nix` and `../../../../common/gpu/nvidia/prime.nix`
- Added a configuration for `hardware.nvidia.prime` which includes the Bus IDs of the Intel and NVIDIA GPUs.

Co-authored-by: Felix Svensson <klowdo.fs@gmail.com>
---
 dell/xps/15-9530/default.nix        | 29 +++++++++++++++++++++++++++++
 dell/xps/15-9530/nvidia/default.nix | 15 +++++++++++++++
 flake.nix                           |  2 ++
 3 files changed, 46 insertions(+)
 create mode 100644 dell/xps/15-9530/default.nix
 create mode 100644 dell/xps/15-9530/nvidia/default.nix

diff --git a/dell/xps/15-9530/default.nix b/dell/xps/15-9530/default.nix
new file mode 100644
index 00000000..95df2da6
--- /dev/null
+++ b/dell/xps/15-9530/default.nix
@@ -0,0 +1,29 @@
+{ lib, ... }:
+{
+  imports = [
+    ../../../common/cpu/intel
+    ../../../common/pc/laptop
+    ../../../common/pc/laptop/ssd
+  ];
+
+  # This will save you money and possibly your life!
+  services.thermald.enable = lib.mkDefault true;
+
+  # 9530 wifi is:
+  # > lspci | grep i Network
+  # - 00:14.3 Network controller: Intel Corporation Raptor Lake PCH CNVi WiFi (rev 01)
+  # > sudo lspci -vv -s 00:14.3
+  # 00:14.3 Network controller: Intel Corporation Raptor Lake PCH CNVi WiFi (rev 01)
+	# Subsystem: Intel Corporation Wi-Fi 6E AX211 160MHz
+  #
+  # WiFi speed is slow and crashes by default (https://bugzilla.kernel.org/show_bug.cgi?id=213381)
+  # disable_11ax - required until ax driver support is fixed
+  # power_save - works well on this card
+  # boot.extraModprobeConfig = ''
+  #   options iwlwifi power_save=1 disable_11ax=1
+  # '';
+
+  boot.extraModprobeConfig = ''
+    options iwlwifi power_save=1
+  '';
+}
diff --git a/dell/xps/15-9530/nvidia/default.nix b/dell/xps/15-9530/nvidia/default.nix
new file mode 100644
index 00000000..257462a4
--- /dev/null
+++ b/dell/xps/15-9530/nvidia/default.nix
@@ -0,0 +1,15 @@
+{ lib, ... }:
+{
+  imports = [
+    ../default.nix
+    ../../../../common/gpu/nvidia/prime.nix
+  ];
+
+  hardware.nvidia.prime = {
+    # Bus ID of the Intel GPU.
+    intelBusId = lib.mkDefault "PCI:0:2:0";
+
+    # Bus ID of the NVIDIA GPU.
+    nvidiaBusId = lib.mkDefault "PCI:1:0:0";
+  };
+}
diff --git a/flake.nix b/flake.nix
index 3e9110d6..17a36e63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,6 +98,8 @@
         dell-xps-15-9510-nvidia = import ./dell/xps/15-9510/nvidia;
         dell-xps-15-9520 = import ./dell/xps/15-9520;
         dell-xps-15-9520-nvidia = import ./dell/xps/15-9520/nvidia;
+        dell-xps-15-9530 = import ./dell/xps/15-9530;
+        dell-xps-15-9530-nvidia = import ./dell/xps/15-9530/nvidia;
         dell-xps-15-9550 = import ./dell/xps/15-9550;
         dell-xps-15-9550-nvidia = import ./dell/xps/15-9550/nvidia;
         dell-xps-15-9560 = import ./dell/xps/15-9560;