From 15426b39d8de959769a494f8d38597cbd3198c14 Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Sat, 9 Nov 2024 23:59:34 -0500
Subject: [PATCH 1/2] chore(hwe): 09-hwe-additions.sh

Re-add old surface modules-load file.
---
 build_files/base/09-hwe-additions.sh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/build_files/base/09-hwe-additions.sh b/build_files/base/09-hwe-additions.sh
index 3bbd4e1e774..5db452fed79 100755
--- a/build_files/base/09-hwe-additions.sh
+++ b/build_files/base/09-hwe-additions.sh
@@ -38,3 +38,30 @@ SURFACE_PACKAGES=(
 rpm-ostree install \
     "${ASUS_PACKAGES[@]}" \
     "${SURFACE_PACKAGES[@]}"
+
+tee /etc/modules-load.d/ublue-surface.conf << EOF
+# Add modules necessary for Disk Encryption via keyboard
+surface_aggregator
+surface_aggregator_registry
+surface_aggregator_hub
+surface_hid_core
+8250_dw
+
+# Surface Laptop 3/Surface Book 3 and later
+surface_hid
+surface_kbd
+
+# Only on AMD models
+pinctrl_amd
+
+# Only on Intel models
+intel_lpss
+intel_lpss_pci
+
+# For Surface Laptop 3/Surface Book 3
+pinctrl_icelake
+
+# For Surface Laptop 4/Surface Laptop Studio
+pinctrl_tigerlake
+EOF
+

From 71fcd008647d8c4a94c8b7110a08c1f6dae9254a Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Sun, 10 Nov 2024 00:20:33 -0500
Subject: [PATCH 2/2] place under /usr/lib

---
 build_files/base/09-hwe-additions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_files/base/09-hwe-additions.sh b/build_files/base/09-hwe-additions.sh
index 5db452fed79..7553206132b 100755
--- a/build_files/base/09-hwe-additions.sh
+++ b/build_files/base/09-hwe-additions.sh
@@ -39,7 +39,7 @@ rpm-ostree install \
     "${ASUS_PACKAGES[@]}" \
     "${SURFACE_PACKAGES[@]}"
 
-tee /etc/modules-load.d/ublue-surface.conf << EOF
+tee /usr/lib/modules-load.d/ublue-surface.conf << EOF
 # Add modules necessary for Disk Encryption via keyboard
 surface_aggregator
 surface_aggregator_registry