From 5f109c6df1a65a8c1cf9e8fe800065cb42378644 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Mon, 6 Jan 2025 18:36:20 -0800
Subject: [PATCH] feat: Add ujust restore-virtual-keyboard to restore
 Maliit/Caribou on KDE/GNOME

---
 Containerfile                                       |  3 ++-
 .../usr/share/ublue-os/just/85-bazzite-image.just   | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index 6fcf81ef..ac9f97f5 100644
--- a/Containerfile
+++ b/Containerfile
@@ -957,7 +957,8 @@ RUN /usr/libexec/containerbuild/image-info && \
     sed -i 's@Exec=waydroid first-launch@Exec=/usr/bin/waydroid-launcher first-launch\nX-Steam-Library-Capsule=/usr/share/applications/Waydroid/capsule.png\nX-Steam-Library-Hero=/usr/share/applications/Waydroid/hero.png\nX-Steam-Library-Logo=/usr/share/applications/Waydroid/logo.png\nX-Steam-Library-StoreCapsule=/usr/share/applications/Waydroid/store-logo.png\nX-Steam-Controller-Template=Desktop@g' /usr/share/applications/Waydroid.desktop && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         sed -i 's/Exec=.*/Exec=systemctl start return-to-gamemode.service/' /etc/skel/Desktop/Return.desktop && \
-        rm -f /usr/share/applications/com.github.maliit.keyboard.desktop \
+        mkdir -p /usr/share/ublue-os/backup && \
+        mv /usr/share/applications/com.github.maliit.keyboard.desktop /usr/share/ublue-os/backup/com.github.maliit.keyboard.desktop \
     ; fi && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/input-remapper-gtk.desktop && \
     cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/85-bazzite-image.just b/system_files/deck/shared/usr/share/ublue-os/just/85-bazzite-image.just
index 3083ab91..03c7e483 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/85-bazzite-image.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/85-bazzite-image.just
@@ -174,6 +174,19 @@ configure-override-videos ACTION="":
       rm $HOME/.local/share/Steam/config/uioverrides/movies/deck-suspend-animation-from-throbber.webm
     fi
 
+# Restores the stock virtual keyboard under KDE & GNOME
+restore-virtual-keyboard:
+    #!/usr/bin/bash
+    IMAGE_INFO="/usr/share/ublue-os/image-info.json"
+    BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
+    if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
+      gnome-extensions disable block-caribou-36@lxylxy123456.ercli.dev
+    else
+      if [[ ! -f ~/.local/share/applications/com.github.maliit.keyboard.desktop ]]
+      mkdir -p ~/.local/share/applications/
+      cp /usr/share/ublue-os/backup/com.github.maliit.keyboard.desktop ~/.local/share/applications/com.github.maliit.keyboard.desktop
+    fi
+
 # Install hhd main branch locally until reboot, helpful for hhd testing and debugging. (rename to install-hhd-dev if we unhide)
 _hhd-dev:
     #!/usr/bin/bash