From 3a9577cdfc1422ee8be44b755de272a52c7421bf Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sun, 8 Oct 2023 19:14:09 -0700
Subject: [PATCH] feat: Enable Steam Patch for any hardware other than Steam
 Deck, fixes resolution issue that requires desktop gamers to select "Native"
 for every title in gamemode.

---
 Containerfile                                             | 2 --
 .../desktop/shared/usr/bin/bazzite-hardware-setup         | 6 +++---
 system_files/desktop/shared/usr/bin/bazzite-user-setup    | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Containerfile b/Containerfile
index 4d57334c..3e884338 100644
--- a/Containerfile
+++ b/Containerfile
@@ -57,8 +57,6 @@ RUN rpm-ostree override remove \
 # Install new packages
 RUN rpm-ostree install \
     ublue-update \
-    libei \
-    libei.i686 \
     discover-overlay \
     python3-pip \
     libadwaita \
diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
index 98dc5f81..37b8742f 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
@@ -6,7 +6,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
 BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
 
 # SCRIPT VERSION
-HWS_VER=7
+HWS_VER=8
 HWS_VER_FILE="/etc/bazzite/hws_version"
 HWS_VER_RAN=$(cat $HWS_VER_FILE)
 
@@ -25,7 +25,7 @@ echo "Current kargs: $KARGS"
 mkdir -p /etc/bazzite
 
 # KERNEL ARGUMENTS
-if [[ ":Jupiter:" =~ ":$SYS_ID:"  ]]; then
+if [[ ":Jupiter:" =~ ":$SYS_ID:" ]]; then
   echo "Checking for needed karg changes (Jupiter)"
 
   if [[ ! $KARGS =~ "amd_pstate" ]]; then
@@ -150,7 +150,7 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegam
   else
     echo "Generic device detected. Performing setup..."
     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 & TDP for steam-patch..."
+      echo "HandyGCCS supported handheld detected, enabling handycon & TDP control..."
       systemctl enable --now handycon.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
diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 3d4d774d..11b2fabd 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # SCRIPT VERSION
-USER_SETUP_VER=4
+USER_SETUP_VER=5
 USER_SETUP_VER_FILE="$HOME/.bazzite-configured"
 USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE)
 
@@ -111,9 +111,9 @@ else
 fi
 
 # Steam Patch setup
-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
-      pkexec /usr/bin/bazzite-enable-steam-patch "$USER"
+if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then
+  if [[ ! ":Jupiter:" =~ ":$SYS_ID:" ]]; then
+    pkexec /usr/bin/bazzite-enable-steam-patch "$USER"
   fi
 fi