From 16838c8633d0dcb73295eabd5b7065251919231e Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 17 Jun 2024 04:56:53 +0200
Subject: [PATCH] feat: Remove decky hhd plugin, replaced by built in hhd
 overlay (#1238)

* feat: remove deprecated decky-hhd-plugin
it has been replaced by hhd overlay ages ago.

* fix: move _hhd-dev ujust to deck image
---
 .../usr/share/ublue-os/just/85-bazzite-image.just  |  7 +++++++
 .../shared/usr/share/ublue-os/just/80-bazzite.just | 14 +-------------
 .../usr/share/ublue-os/just/82-bazzite-apps.just   |  7 -------
 3 files changed, 8 insertions(+), 20 deletions(-)

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 65f1f1b0..f1472942 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
@@ -128,6 +128,13 @@ restore-input-remapper:
     cp /usr/share/applications/input-remapper-gtk.desktop ~/.local/share/applications/input-remapper-gtk.desktop && \
     sed -i '/NoDisplay=true/d' ~/.local/share/applications/input-remapper-gtk.desktop
 
+# 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
+    source /usr/lib/ujust/ujust.sh
+    echo "Installing ${b}Handheld Daemon${n} locally until next reboot."
+    curl -L https://raw.githubusercontent.com/hhd-dev/hhd/master/local_hhd.sh | bash
+
 _toggle-autologin:
     #!/usr/bin/bash
     DESKTOP_AUTOLOGIN="/etc/bazzite/desktop_autologin"
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
index ef6f0062..c76556ed 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
@@ -155,7 +155,6 @@ setup-decky ACTION="":
       echo "  <option>: Specify the quick option to skip the prompt"
       echo "  Use 'install' to select Install Decky"
       echo "  Use 'simpledeckytdp' to select Get SimpleDeckyTDP"
-      echo "  Use 'hhd-decky' to select Get HHD-decky"
       exit 0
     elif [ "$OPTION" == "" ]; then
       echo "${bold}Setup Decky Loader${normal}"
@@ -165,8 +164,7 @@ setup-decky ACTION="":
       OPTION=$(
         Choose \
         "Install Decky" \
-        "Get $(Urllink "https://github.com/aarron-lee/SimpleDeckyTDP" SimpleDeckyTDP)${n}" \
-        "Get $(Urllink "https://github.com/hhd-dev/hhd-decky" HHD-Decky)${n}"
+        "Get $(Urllink "https://github.com/aarron-lee/SimpleDeckyTDP" SimpleDeckyTDP)${n}"
         )
     fi
     if [[ "${OPTION,,}" =~ install ]]; then
@@ -184,16 +182,6 @@ setup-decky ACTION="":
       else
         echo 'Please install Decky Loader by running "ujust setup-decky install" first.'
       fi
-    elif [[ "${OPTION,,}" =~ hhd-decky ]]; then
-      if [[ -d $HOME/homebrew/plugins ]]; then
-        sudo rm -rf $HOME/homebrew/plugins/hhd-decky
-        curl -L $(curl -s https://api.github.com/repos/hhd-dev/hhd-decky/releases/latest | grep "browser_download_url" | cut -d '"' -f 4) -o /tmp/hhd-decky.tar.gz
-        sudo tar -xzf /tmp/hhd-decky.tar.gz -C $HOME/homebrew/plugins
-        rm /tmp/hhd-decky.tar.gz
-        echo 'Installed.'
-      else
-        echo 'Please install Decky Loader by running "ujust setup-decky install" first.'
-      fi
     fi
 
 # Ptyxis terminal transparency
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
index 32eecfb4..caea22b2 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
@@ -157,13 +157,6 @@ install-opentabletdriver:
     systemctl enable --user --now arch-opentabletdriver.service && \
     distrobox enter -n arch -- bash -c 'distrobox-export --app otd-gui'
 
-# 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
-    source /usr/lib/ujust/ujust.sh
-    echo "Installing ${b}Handheld Daemon${n} locally until next reboot."
-    curl -L https://raw.githubusercontent.com/hhd-dev/hhd/master/local_hhd.sh | bash
-
 # Create fedora distrobox if it doesn't exist
 [private]
 distrobox-check-fedora: