fix(HandyGCCS): Enable globally (#400)

* fix(HandyGCCS): Enable globally * feat: Enable handycon in bazzite-hardware-setup for any device on a deck image that isn't Jupiter. --------- Co-authored-by: Kyle Gospodnetich <me@kylegospodneti.ch>
ublue-os · Oct 3, 2023 · 17a7611 · 17a7611
1 parent 0ea324d
commit 17a7611
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/Containerfile b/Containerfile
@@ -448,7 +448,6 @@ RUN /tmp/image-info.sh && \
         systemctl enable sddm.service \
     ; fi && \
     systemctl enable bazzite-autologin.service && \
-    systemctl enable handycon.service && \
     systemctl enable jupiter-fan-control.service && \
     systemctl enable btrfs-dedup@run-media-mmcblk0p1.timer && \
     systemctl enable vpower.service && \
@@ -457,6 +456,7 @@ RUN /tmp/image-info.sh && \
     systemctl --global enable sdgyrodsu.service && \
     systemctl disable input-remapper.service && \
     systemctl disable ublue-update.timer && \
+    systemctl disable handycon.service && \
     rm -f /usr/etc/sddm.conf && \
     rm -f /usr/etc/default/bazzite && \
     rm -rf \

diff --git a/system_files/deck/shared/usr/bin/bazzite-autologin b/system_files/deck/shared/usr/bin/bazzite-autologin
@@ -26,13 +26,11 @@ elif [[ ${BASE_IMAGE_NAME} =~ "kinoite" ]]; then
   else
     sed -i 's/.*Session=.*/Session=plasmax11.desktop/g' ${SDDM_CONF}
   fi
-  systemctl stop handycon.service
 elif [[ ${BASE_IMAGE_NAME} =~ "silverblue" ]]; then
   if ${DESKTOP_WAYLAND}; then
     sed -i 's/.*Session=.*/Session=gnome-wayland.desktop/g' ${SDDM_CONF}
   else
     sed -i 's/.*Session=.*/Session=gnome-xorg.desktop/g' ${SDDM_CONF}
   fi
-  systemctl stop handycon.service
 fi
 sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}
diff --git a/system_files/deck/shared/usr/bin/steamos-session-select b/system_files/deck/shared/usr/bin/steamos-session-select
@@ -123,12 +123,6 @@ fi
   echo "Session=$session_launcher"
 } > "$CONF_FILE"
 
-if [[ $session_launcher = "gamescope-session.desktop" ]]; then
-  systemctl start handycon.service
-else
-  systemctl stop handycon.service
-fi
-
 echo "Updated system autologin session to $session_launcher"
 systemctl reset-failed sddm
 systemctl restart sddm

diff --git 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=3
+HWS_VER=4
 HWS_VER_FILE="/etc/bazzite/hws_version"
 HWS_VER_RAN=$(cat $HWS_VER_FILE)
 
@@ -144,6 +144,7 @@ if [[ $IMAGE_NAME =~ "deck"  ]]; then
   else
     echo "Generic device detected. Performing setup..."
 
+    systemctl enable --now handycon.service
     systemctl disable --now jupiter-fan-control.service
     systemctl disable --now vpower.service
     systemctl disable --now jupiter-biosupdate.service