From 6403af95fbf305c686ef9683123385737752f4e0 Mon Sep 17 00:00:00 2001
From: Justin Waymire <justin@waymirenet.com>
Date: Sat, 7 Feb 2026 12:42:32 -0600
Subject: [PATCH] lenovo/thinkpad/p16s: add Intel Gen 3 support

Tested on ThinkPad P16s Gen 3 (21KS0025US):
- Intel Core Ultra 7 155H (Meteor Lake)
- Intel Arc Graphics (iGPU)
- NVIDIA RTX 500 Ada Generation (dGPU)
- Goodix fingerprint reader (27c6:6594)
---
 flake.nix                                   |  1 +
 lenovo/thinkpad/p16s/intel/gen3/default.nix | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 lenovo/thinkpad/p16s/intel/gen3/default.nix

diff --git a/flake.nix b/flake.nix
index eade087..e188754 100644
--- a/flake.nix
+++ b/flake.nix
@@ -265,6 +265,7 @@
           lenovo-thinkpad-p16s-amd-gen2 = import ./lenovo/thinkpad/p16s/amd/gen2;
           lenovo-thinkpad-p16s-amd-gen4 = import ./lenovo/thinkpad/p16s/amd/gen4;
           lenovo-thinkpad-p16s-intel-gen2 = import ./lenovo/thinkpad/p16s/intel/gen2;
+          lenovo-thinkpad-p16s-intel-gen3 = import ./lenovo/thinkpad/p16s/intel/gen3;
           lenovo-thinkpad-p43s = import ./lenovo/thinkpad/p43s;
           lenovo-thinkpad-p50 = import ./lenovo/thinkpad/p50;
           lenovo-thinkpad-p51 = import ./lenovo/thinkpad/p51;
diff --git a/lenovo/thinkpad/p16s/intel/gen3/default.nix b/lenovo/thinkpad/p16s/intel/gen3/default.nix
new file mode 100644
index 0000000..e92d1f4
--- /dev/null
+++ b/lenovo/thinkpad/p16s/intel/gen3/default.nix
@@ -0,0 +1,16 @@
+{ lib, ... }:
+{
+  imports = [
+    ../.
+    ../../../../../common/cpu/intel/meteor-lake
+    ../../../../../common/gpu/nvidia/ada-lovelace
+    ../../../../../common/gpu/nvidia/prime.nix
+  ];
+
+  # NVIDIA PRIME hybrid graphics
+  # Use `nvidia-offload <command>` to run on discrete GPU
+  hardware.nvidia.prime = {
+    intelBusId = lib.mkDefault "PCI:0:2:0";
+    nvidiaBusId = lib.mkDefault "PCI:1:0:0";
+  };
+}