From 59bcb4c4e19bf4edfa95a14a58776a67d0171ce0 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Sun, 4 Aug 2024 12:04:22 +0300
Subject: [PATCH] lenovo/p14s/intel: init with gen3

---
 README.md                                   |  1 +
 flake.nix                                   |  1 +
 lenovo/thinkpad/p14s/intel/default.nix      |  8 ++++++++
 lenovo/thinkpad/p14s/intel/gen3/default.nix | 17 +++++++++++++++++
 4 files changed, 27 insertions(+)
 create mode 100644 lenovo/thinkpad/p14s/intel/default.nix
 create mode 100644 lenovo/thinkpad/p14s/intel/gen3/default.nix

diff --git a/README.md b/README.md
index 1992563..9df72d7 100644
--- a/README.md
+++ b/README.md
@@ -212,6 +212,7 @@ See code for all available configurations.
 | [Lenovo ThinkPad P14s AMD Gen 2](lenovo/thinkpad/p14s/amd/gen2)        | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen2>`        |
 | [Lenovo ThinkPad P14s AMD Gen 3](lenovo/thinkpad/p14s/amd/gen3)        | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen3>`        |
 | [Lenovo ThinkPad P14s AMD Gen 4](lenovo/thinkpad/p14s/amd/gen4)        | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen4>`        |
+| [Lenovo ThinkPad P14s Intel Gen 3](lenovo/thinkpad/p14s/intel/gen3)    | `<nixos-hardware/lenovo/thinkpad/p14s/intel/gen3>`      |
 | [Lenovo ThinkPad P16s AMD Gen 1](lenovo/thinkpad/p16s/amd/gen1)        | `<nixos-hardware/lenovo/thinkpad/p16s/amd/gen1>`        |
 | [Lenovo ThinkPad P1](lenovo/thinkpad/p1)                               | `<nixos-hardware/lenovo/thinkpad/p1>`                   |
 | [Lenovo ThinkPad P50](lenovo/thinkpad/p50)                             | `<nixos-hardware/lenovo/thinkpad/p50>`                  |
diff --git a/flake.nix b/flake.nix
index 0be7245..7ff974a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -151,6 +151,7 @@
       lenovo-thinkpad-p14s-amd-gen2 = import ./lenovo/thinkpad/p14s/amd/gen2;
       lenovo-thinkpad-p14s-amd-gen3 = import ./lenovo/thinkpad/p14s/amd/gen3;
       lenovo-thinkpad-p14s-amd-gen4 = import ./lenovo/thinkpad/p14s/amd/gen4;
+      lenovo-thinkpad-p14s-intel-gen3 = import ./lenovo/thinkpad/p14s/intel/gen3;
       lenovo-thinkpad-p16s-amd-gen1 = import ./lenovo/thinkpad/p16s/amd/gen1;
       lenovo-thinkpad-p50 = import ./lenovo/thinkpad/p50;
       lenovo-thinkpad-p51 = import ./lenovo/thinkpad/p51;
diff --git a/lenovo/thinkpad/p14s/intel/default.nix b/lenovo/thinkpad/p14s/intel/default.nix
new file mode 100644
index 0000000..f6eae32
--- /dev/null
+++ b/lenovo/thinkpad/p14s/intel/default.nix
@@ -0,0 +1,8 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../../common/cpu/intel
+  ];
+}
diff --git a/lenovo/thinkpad/p14s/intel/gen3/default.nix b/lenovo/thinkpad/p14s/intel/gen3/default.nix
new file mode 100644
index 0000000..4c73611
--- /dev/null
+++ b/lenovo/thinkpad/p14s/intel/gen3/default.nix
@@ -0,0 +1,17 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../.
+    ../../../../../common/gpu/nvidia/prime.nix
+  ];
+
+  hardware = {
+    intelgpu.driver = "xe";
+
+    nvidia.prime = {
+      intelBusId = "PCI:0:2:0";
+      nvidiaBusId = "PCI:3:0:0";
+    };
+  };
+}