Skip to content

Commit

Permalink
fix(HandyGCCS): Enable globally (#400)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
EyeCantCU and KyleGospo committed Oct 3, 2023
1 parent 0ea324d commit 17a7611
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Containerfile
Expand Up @@ -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 && \
Expand All @@ -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 \
Expand Down
2 changes: 0 additions & 2 deletions system_files/deck/shared/usr/bin/bazzite-autologin
Expand Up @@ -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}
6 changes: 0 additions & 6 deletions system_files/deck/shared/usr/bin/steamos-session-select
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion system_files/desktop/shared/usr/bin/bazzite-hardware-setup
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 17a7611

Please sign in to comment.