From e203cc258ee79e3973e60418793a3ab0b2a1783f Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <git@cy.md>
Date: Sat, 28 Sep 2024 16:36:13 +0000
Subject: [PATCH] thinkpad/x1-extreme/gen3: add module

---
 README.md                                   |  1 +
 flake.nix                                   |  1 +
 lenovo/thinkpad/x1-extreme/gen3/default.nix | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 lenovo/thinkpad/x1-extreme/gen3/default.nix

diff --git a/README.md b/README.md
index bfeb291aa..d6330abb6 100644
--- a/README.md
+++ b/README.md
@@ -259,6 +259,7 @@ See code for all available configurations.
 | [Lenovo ThinkPad X1 (11th Gen)](lenovo/thinkpad/x1/11th-gen)           | `<nixos-hardware/lenovo/thinkpad/x1/11th-gen>`          |
 | [Lenovo ThinkPad X1 (12th Gen)](lenovo/thinkpad/x1/12th-gen)           | `<nixos-hardware/lenovo/thinkpad/x1/12th-gen>`          |
 | [Lenovo ThinkPad X1 Extreme Gen 2](lenovo/thinkpad/x1-extreme/gen2)    | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen2>`      |
+| [Lenovo ThinkPad X1 Extreme Gen 3](lenovo/thinkpad/x1-extreme/gen3)    | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen3>`      |
 | [Lenovo ThinkPad X1 Extreme Gen 4](lenovo/thinkpad/x1-extreme/gen4)    | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen4>`      |
 | [Lenovo ThinkPad X1 Nano Gen 1](lenovo/thinkpad/x1-nano/gen1)          | `<nixos-hardware/lenovo/thinkpad/x1-nano/gen1>`         |
 | [Lenovo ThinkPad X13 Yoga](lenovo/thinkpad/x13/yoga)                   | `<nixos-hardware/lenovo/thinkpad/x13/yoga>`             |
diff --git a/flake.nix b/flake.nix
index ea375a520..7bc4fb7e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -204,6 +204,7 @@
         lenovo-thinkpad-x1-12th-gen = import ./lenovo/thinkpad/x1/12th-gen;
         lenovo-thinkpad-x1-extreme = import ./lenovo/thinkpad/x1-extreme;
         lenovo-thinkpad-x1-extreme-gen2 = import ./lenovo/thinkpad/x1-extreme/gen2;
+        lenovo-thinkpad-x1-extreme-gen3 = import ./lenovo/thinkpad/x1-extreme/gen3;
         lenovo-thinkpad-x1-extreme-gen4 = import ./lenovo/thinkpad/x1-extreme/gen4;
         lenovo-thinkpad-x1-nano = import ./lenovo/thinkpad/x1-nano;
         lenovo-thinkpad-x1-nano-gen1 = import ./lenovo/thinkpad/x1-nano/gen1;
diff --git a/lenovo/thinkpad/x1-extreme/gen3/default.nix b/lenovo/thinkpad/x1-extreme/gen3/default.nix
new file mode 100644
index 000000000..49eaf2e3a
--- /dev/null
+++ b/lenovo/thinkpad/x1-extreme/gen3/default.nix
@@ -0,0 +1,19 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ../.
+  ];
+
+  # New ThinkPads have a different TrackPoint manufacturer/name.
+  hardware.trackpoint.device = "TPPS/2 Elan TrackPoint";
+
+  # Fix clickpad (clicking by depressing the touchpad).
+  boot.kernelParams = [ "psmouse.synaptics_intertouch=0" ];
+
+  # Set the right DPI. xdpyinfo says the screen is 677x423 mm but
+  # it actually is 344×215 mm.
+  services.xserver.monitorSection = lib.mkDefault ''
+    DisplaySize 344 215
+  '';
+}