From d22dfcbec2bfa1326ce5c3fe93de8029e58217f4 Mon Sep 17 00:00:00 2001
From: Hector Martin <marcan@marcan.st>
Date: Oct 10 2023 16:14:04 +0000
Subject: Add workaround for KDE bug #475435 (wrong keyboard model)


Signed-off-by: Hector Martin <marcan@marcan.st>

---

diff --git a/calamares-firstboot-config.spec b/calamares-firstboot-config.spec
index 58573ef..d767fb2 100644
--- a/calamares-firstboot-config.spec
+++ b/calamares-firstboot-config.spec
@@ -1,5 +1,5 @@
 Name:           calamares-firstboot-config
-Version:        20231008
+Version:        20231010
 Release:        1%{?dist}
 Summary:        Fedora Asahi Calamares firstboot configs
 
@@ -53,6 +53,9 @@ cp -a calamares/* %{buildroot}%{_datadir}/calamares-asahi/
 %{_datadir}/calamares-asahi/
 
 %changelog
+* Tue Oct 10 2023 Hector Martin <marcan@marcan.st> - 20231010-1
+- Add workaround for KDE bug #475435
+
 * Tue Oct 08 2023 Hector Martin <marcan@marcan.st> - 20231008-1
 - Fix HiDPI detection (wildcard DRM device ID)
 
diff --git a/setup.sh b/setup.sh
index a963b0e..85adf3e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -200,4 +200,18 @@ sleep 0.3
 calamares -c /usr/share/calamares-asahi &
 
 # Disable the setup wizard if it completes successfully
-wait $! && systemctl disable calamares-firstboot.service 
+if wait $!; then
+    # Work around https://bugs.kde.org/show_bug.cgi?id=475435
+    xkbmodel="$(localectl status | grep "X11 Model" | cut -d: -f2 | sed 's/^ //')"
+    userhome="$(ls -d /home/* | head -1)"
+    if [ -n "$xkbmodel" ] && [ -e "$userhome" ]; then
+        uidgid="$(stat -c %u:%g "$userhome")"
+        mkdir -p "$userhome/.config"
+        cat > "$userhome/.config/kxkbrc" <<EOF
+[Layout]
+Model=$xkbmodel
+EOF
+        chown "$uidgid" "$userhome/.config" "$userhome/.config/kxkbrc"
+    fi
+    systemctl disable calamares-firstboot.service
+fi