Merge pull request #293 from ublue-os/bazzite-autologin

feat(deck): Only autologin to gamescope after Steam has updated

Containerfile

@@ -387,7 +387,7 @@ RUN rm /usr/share/applications/wine*.desktop && \
         systemctl disable gdm.service && \
         systemctl enable sddm.service \
     ; fi && \
-    systemctl enable desktop-autologin.service && \
+    systemctl enable bazzite-autologin.service && \
     systemctl enable jupiter-fan-control.service && \
     systemctl enable btrfs-dedup@run-media-mmcblk0p1.timer && \
     systemctl enable vpower.service && \

system_files/deck/shared/usr/bin/bazzite-autologin

@@ -7,9 +7,17 @@ USER=$(id -nu 1000)
 
 # SteamOS SDDM config
 SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
+DESKTOP_AUTOLOGIN="/etc/bazzite/desktop_autologin"
 
-# Configure SDDM autologin
-if [[ ${BASE_IMAGE_NAME} =~ "kinoite" ]]; then
+# Configure autologin if Steam has been updated
+if [[ ! -f $DESKTOP_AUTOLOGIN && -f /var/home/$USER/.local/share/Steam/ubuntu12_32/steamui.so ]]; then
+  AUTOLOGIN_CONF='/etc/sddm.conf.d/zz-steamos-autologin.conf'
+  # Avoid autologin conflict
+  if [[ -f ${AUTOLOGIN_CONF} ]]; then
+    rm -f ${AUTOLOGIN_CONF}
+  fi
+  sed -i 's/.*Session=.*/Session=gamescope-session.desktop/g' ${SDDM_CONF}
+elif [[ ${BASE_IMAGE_NAME} =~ "kinoite" ]]; then
   if ${DESKTOP_WAYLAND}; then
     sed -i 's/.*Session=.*/Session=plasma.desktop/g' ${SDDM_CONF}
   else

system_files/deck/shared/usr/bin/gamescope-autologin

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-USER=$(id -nu 1000)
-
-# SteamOS SDDM config
-SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
-AUTOLOGIN_CONF='/etc/sddm.conf.d/zz-steamos-autologin.conf'
-
-# Avoid autologin conflict
-if [[ -f ${AUTOLOGIN_CONF} ]]; then
-  rm -f ${AUTOLOGIN_CONF}
-fi
-
-# Configure autologin
-sed -i 's/.*Session=.*/Session=gamescope-session.desktop/g' ${SDDM_CONF}
-sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}

system_files/deck/shared/usr/etc/polkit-1/rules.d/bazzite-autologin.rules

@@ -0,0 +1,8 @@
+polkit.addRule(function(action, subject) {
+    if (subject.isInGroup("wheel") &&
+        action.id == "org.freedesktop.systemd1.manage-units" &&
+        action.lookup("unit") == "bazzite-autologin.service")
+    {
+        return polkit.Result.YES;
+    }
+})

system_files/deck/shared/usr/lib/systemd/system/bazzite-autologin.service

@@ -1,10 +1,10 @@
 [Unit]
-Description=Enables autologin to desktop
+Description=Enables Bazzite autologin
 Before=display-manager.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/desktop-autologin
+ExecStart=/usr/bin/bazzite-autologin
 
 [Install]
 WantedBy=multi-user.target

system_files/deck/shared/usr/lib/systemd/system/gamescope-autologin.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Enables autologin to gamescope-session
-Before=display-manager.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/gamescope-autologin
-
-[Install]
-WantedBy=multi-user.target

system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml

@@ -53,11 +53,6 @@ screens:
           default: false
           packages:
           - Retrieve EmuDeck: just --unstable get-emudeck
-        Gamescope Autologin:
-          description: Autologin to Gamescope Session
-          default: true
-          packages:
-          - Enable Gamescope Autologin: just --unstable enable-gamescope-autologin
         Greenlight:
           description: A utility for xCloud and xHome streaming
           default: false

system_files/deck/shared/usr/share/ublue-os/just/custom.just

@@ -32,15 +32,15 @@ setup-firefox-vaapi-nvidia:
         --env=MOZ_ENABLE_WAYLAND=1 \
         org.mozilla.firefox
 
-# Enable autologin to gamescope session
-enable-gamescope-autologin:
-  systemctl disable --now desktop-autologin
-  systemctl enable --now gamescope-autologin
-
-# Enable autologin to desktop
-enable-desktop-autologin:
-  systemctl disable --now gamescope-autologin
-  systemctl enable --now desktop-autologin
+# Toggle between desktop/gamescope autologin
+toggle-autologin:
+  #!/usr/bin/env bash
+  DESKTOP_AUTOLOGIN="/etc/bazzite/desktop_autologin"
+  if [[ -f $DESKTOP_AUTOLOGIN ]]; then
+    sudo rm -f $DESKTOP_AUTOLOGIN
+  else
+    sudo touch $DESKTOP_AUTOLOGIN
+  fi
 
 # Launch Waydroid configuration helper
 configure-waydroid: