From f16e0cd51c8bb6df7bfc5b7bbec3b36ed59020ae Mon Sep 17 00:00:00 2001
From: Johannes Arnold <jarnold@b1-systems.de>
Date: Sat, 19 Apr 2025 12:15:00 +0200
Subject: [PATCH] Add yt6801 driver for TUXEDO InfinityBook Pro 14 - Gen9 -
 INTEL

---
 flake.nix                                             |  2 +-
 tuxedo/infinitybook/gen9-intel/default.nix            | 11 +++++++++++
 tuxedo/infinitybook/pro14/gen9-intel/default.nix      |  6 ------
 .../infinitybook/pro14/{gen9-intel => gen9}/README.md |  0
 tuxedo/infinitybook/pro14/gen9/default.nix            |  9 +++++++++
 tuxedo/infinitybook/pro14/gen9/intel/default.nix      |  6 ++++++
 6 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 tuxedo/infinitybook/gen9-intel/default.nix
 delete mode 100644 tuxedo/infinitybook/pro14/gen9-intel/default.nix
 rename tuxedo/infinitybook/pro14/{gen9-intel => gen9}/README.md (100%)
 create mode 100644 tuxedo/infinitybook/pro14/gen9/default.nix
 create mode 100644 tuxedo/infinitybook/pro14/gen9/intel/default.nix

diff --git a/flake.nix b/flake.nix
index fc673574..fc84741f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -334,7 +334,7 @@
         tuxedo-aura-15-gen1 = import ./tuxedo/aura/15/gen1;
         tuxedo-infinitybook-v4 = import ./tuxedo/infinitybook/v4;
         tuxedo-infinitybook-pro14-gen7 = import ./tuxedo/infinitybook/pro14/gen7;
-        tuxedo-infinitybook-pro14-gen9-intel = import ./tuxedo/infinitybook/pro14/gen9-intel;
+        tuxedo-infinitybook-pro14-gen9-intel = import ./tuxedo/infinitybook/pro14/gen9/intel;
         tuxedo-pulse-14-gen3 = import ./tuxedo/pulse/14/gen3;
         tuxedo-pulse-15-gen2 = import ./tuxedo/pulse/15/gen2;
         xiaomi-redmibook-16-pro-2024 = import ./xiaomi/redmibook/16-pro-2024;
diff --git a/tuxedo/infinitybook/gen9-intel/default.nix b/tuxedo/infinitybook/gen9-intel/default.nix
new file mode 100644
index 00000000..3f0b97a2
--- /dev/null
+++ b/tuxedo/infinitybook/gen9-intel/default.nix
@@ -0,0 +1,11 @@
+{
+  warnings = [
+    ''
+      DEPRECATED: The <nixos-hardware/tuxedo/infinitybook/pro14/gen9-intel> module has been renamed to <nixos-hardware/tuxedo/infinitybook/pro14/gen9/intel>
+
+      The gen9-intel module will be removed in a future release.
+    ''
+  ];
+
+  imports = [ ../pro14/gen9/intel ];
+}
diff --git a/tuxedo/infinitybook/pro14/gen9-intel/default.nix b/tuxedo/infinitybook/pro14/gen9-intel/default.nix
deleted file mode 100644
index 4b6ee893..00000000
--- a/tuxedo/infinitybook/pro14/gen9-intel/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ../../.
-    ../../../../common/cpu/intel
-  ];
-}
diff --git a/tuxedo/infinitybook/pro14/gen9-intel/README.md b/tuxedo/infinitybook/pro14/gen9/README.md
similarity index 100%
rename from tuxedo/infinitybook/pro14/gen9-intel/README.md
rename to tuxedo/infinitybook/pro14/gen9/README.md
diff --git a/tuxedo/infinitybook/pro14/gen9/default.nix b/tuxedo/infinitybook/pro14/gen9/default.nix
new file mode 100644
index 00000000..7662c658
--- /dev/null
+++ b/tuxedo/infinitybook/pro14/gen9/default.nix
@@ -0,0 +1,9 @@
+{ lib, config, ... }: {
+  imports = [
+    ../../.
+  ];
+
+  # Add Motorcomm YT6801 Driver if available
+  boot.extraModulePackages = with config.boot; lib.lists.optional
+  ( kernelPackages ? yt6801 ) kernelPackages.yt6801;
+}
diff --git a/tuxedo/infinitybook/pro14/gen9/intel/default.nix b/tuxedo/infinitybook/pro14/gen9/intel/default.nix
new file mode 100644
index 00000000..80d5c29c
--- /dev/null
+++ b/tuxedo/infinitybook/pro14/gen9/intel/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../.
+    ../../../../../common/cpu/intel
+  ];
+}