fix: Check for Ally & Framegame everywhere Deck is currently checked for

feat: Enable TDP control on non-deck hardware covered by steam-patch.

Author: KyleGospo

system_files/desktop/shared/usr/bin/bazzite-hardware-setup

@@ -19,7 +19,6 @@ KNOWN_IMAGE_FLAVOR=$(cat $KNOWN_IMAGE_FLAVOR_FILE)
 # GLOBAL
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 GPU_ID=$(lspci -k | grep -A 3 -E "(VGA|3D)")
-PRODUCT_NAME="$(cat /sys/devices/virtual/dmi/id/product_name)"
 KARGS=$(rpm-ostree kargs)
 NEEDED_KARGS=""
 echo "Current kargs: $KARGS"
@@ -139,23 +138,21 @@ if [[ -f $HWS_VER_FILE && $HWS_VER = $HWS_VER_RAN ]]; then
   fi
 fi
 
-if [[ $IMAGE_NAME =~ "deck"  ]]; then
+if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then
   if [[ ":Jupiter:" =~ ":$SYS_ID:" ]]; then
     # Future updates to Deck on Jupiter here
+    echo "Jupiter hardware detected, skipping further setup..."
   else
     echo "Generic device detected. Performing setup..."
-    if [[ \
-        ":AYA NEO:AYANEO:AIR Plus:" =~ ":$PRODUCT_NAME:" || \
-        "ONEXPLAYER" =~ "$PRODUCT_NAME" || \
-        "AOKZOE" =~ "$PRODUCT_NAME" || \
-        ":G1619-01:G1621-02:MicroPC:" =~ ":$SYS_ID:" \
-       ]]; then
-      echo "HandyGCCS supported handheld detected, enabling handycon & steam-patch."
-      systemctl enable --now handycon.service
-      systemctl enable --now --global steam-patch.service
-    elif [[ ":ROG Ally RC71L_RC71L:" =~ ":$SYS_ID:" ]]
-      echo "ROG Ally detected. Enabling steam-patch."
+    if [[ ":ROG Ally RC71L_RC71L:AYA NEO:AYANEO:AIR Plus:ONEXPLAYER:AOKZOE:G1619-01:G1621-02:MicroPC:G1619-01:G1621-02:MicroPC:AYA NEO:AYANEO:AIR Plus:AOKZOE:ONEXPLAYER:" =~ ":$SYS_ID:" ]]; then
+      echo "HandyGCCS supported handheld detected, enabling handycon & steam-patch..."
+      if [[ ":ROG Ally RC71L_RC71L:" =~ ":$SYS_ID:" ]]
+        echo "ROG Ally detected, skipping handycon".
+      else
+        systemctl enable --now handycon.service
+      fi
       systemctl enable --now --global steam-patch.service
+      sed -i 's/ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE=0/ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE=1/g' /etc/default/steam-hardware-control
     fi
     systemctl disable --now jupiter-fan-control.service
     systemctl disable --now vpower.service

system_files/desktop/shared/usr/bin/bazzite-user-setup

@@ -15,15 +15,14 @@ IMAGE_INFO="/usr/share/ublue-os/image-info.json"
 IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO)
 BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
-PRODUCT_NAME="$(cat /sys/devices/virtual/dmi/id/product_name)"
 
 if [[ $BASE_IMAGE_NAME =~ "kinoite"  ]]; then
   echo 'Running setup for Kinoite'
 
   echo 'Enabling System76-Scheduler KWin script'
   kwriteconfig5 --file kwinrc --group Plugins --key kwin-system76-scheduler-integrationEnabled true
 
-  if [[ $IMAGE_NAME =~ "deck" ]]; then
+  if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then
     echo 'Running setup for Kinoite on Steam Deck'
 
     echo 'Creating Desktop shortcuts'
@@ -69,7 +68,7 @@ else
     ln -s /usr/share/ublue-os/bazzite/themes/vgui2.json $HOME/.config/presets/user/vgui2.json
   fi
 
-  if [[ $IMAGE_NAME =~ "deck" ]]; then
+  if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then
     echo 'Running setup for Silverblue on Steam Deck'
 
     echo 'Enabling Bazzite tofu menu fork'
@@ -112,14 +111,8 @@ else
 fi
 
 # Steam Patch setup
-if [[ $IMAGE_NAME =~ "deck" ]]; then
-  if [[ \
-      ":ROG Ally RC71L_RC71L:" =~ ":$SYS_ID:" || \
-      ":AYA NEO:AYANEO:AIR Plus:" =~ ":$PRODUCT_NAME:" || \
-      "ONEXPLAYER" =~ "$PRODUCT_NAME" || \
-      "AOKZOE" =~ "$PRODUCT_NAME" || \
-      ":G1619-01:G1621-02:MicroPC:" =~ ":$SYS_ID:" \
-     ]]; then
+if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" ]]; then
+  if [[ ":ROG Ally RC71L_RC71L:AYA NEO:AYANEO:AIR Plus:ONEXPLAYER:AOKZOE:G1619-01:G1621-02:MicroPC:G1619-01:G1621-02:MicroPC:AYA NEO:AYANEO:AIR Plus:AOKZOE:ONEXPLAYER:" =~ ":$SYS_ID:" ]]; then
       mkdir -p "$HOME/.steam/steam/"
       touch "$HOME/.steam/steam/.cef-enable-remote-debugging"
   fi