Merge pull request #136 from ublue-os/fix-gnome-wayland

fix: Correct the name of GNOME's Wayland session

system_files/deck/shared/usr/bin/steamos-session-select

@@ -4,6 +4,7 @@ set -e
 
 die() { echo >&2 "!! $*"; exit 1; }
 
+source /etc/default/bazzite
 source /etc/default/desktop-wayland
 
 # File this script will modify, in addition to (potentially) the per-user sentinel file
@@ -55,22 +56,45 @@ if [[ -z $SENTINEL_CREATED ]]; then
     cat "$SENTINEL_FILE"
   )
 
+  if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
+    # clear steam game desktop shortcut clutter
+    DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share}
+    grep --files-with-matches "Exec=steam steam://rungameid/" ${DATA_HOME}/applications/* | tr '\n' '\0' | xargs -0 -I {} rm {} || true
+  fi
+
   # If we were executed as a session user and then re-execute as root below, we don't want to set root's sentinel too
   export SENTINEL_CREATED=1
 fi
 
+# We use "plasma" as "desktop" to hook up to SteamOS's scripts
 case "$session" in
   plasma-wayland-persistent)
-    session_launcher="plasma.desktop"
+    if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
+      session_launcher="plasma.desktop"
+    elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
+      session_launcher="gnome-wayland.desktop"
+    fi
   ;;
   plasma-x11-persistent)
-    session_launcher="plasmax11.desktop"
+    if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
+      session_launcher="plasmax11.desktop"
+    elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
+      session_launcher="gnome-xorg.desktop"
+    fi
   ;;
-  plasma)
-    if ${DESKTOP_WAYLAND}; then
-      session_launcher="plasma-steamos-wayland-oneshot.desktop"
-    else
-      session_launcher="plasma-steamos-oneshot.desktop"
+  desktop|plasma)
+    if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
+      if ${DESKTOP_WAYLAND}; then
+        session_launcher="plasma-steamos-wayland-oneshot.desktop"
+      else
+        session_launcher="plasma-steamos-oneshot.desktop"
+      fi
+    elif [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
+      if ${DESKTOP_WAYLAND}; then
+        session_launcher="gnome-wayland-oneshot.desktop"
+      else
+        session_launcher="gnome-xorg-oneshot.desktop"
+      fi
     fi
     create_sentinel=1
   ;;

system_files/deck/silverblue/usr/bin/gnome-autologin

@@ -13,7 +13,7 @@ fi
 
 # Configure autologin
 if ${DESKTOP_WAYLAND}; then
-  sed -i 's/.*Session=.*/Session=gnome-session.desktop/g' ${SDDM_CONF}
+  sed -i 's/.*Session=.*/Session=gnome-wayland.desktop/g' ${SDDM_CONF}
 else
   sed -i 's/.*Session=.*/Session=gnome-xorg.desktop/g' ${SDDM_CONF}
 fi

system_files/deck/silverblue/usr/bin/steamos-session-select

@@ -1,108 +0,0 @@
-#!/usr/bin/bash
-
-set -e
-
-die() { echo >&2 "!! $*"; exit 1; }
-
-source /etc/default/desktop-wayland
-
-# File this script will modify, in addition to (potentially) the per-user sentinel file
-CONF_FILE="/etc/sddm.conf.d/zz-steamos-autologin.conf"
-
-SENTINEL_FILE="steamos-session-select"
-
-# For sanity this shipped file must be present, to ensure we're still on a normal-looking steamos setup.
-CHECK_FILE="/etc/sddm.conf.d/steamos.conf"
-
-session="${1:-gamescope}"
-if ${DESKTOP_WAYLAND}; then
-  session_type="wayland"
-else
-  session_type="x11"
-fi
-
-session_launcher="gamescope-session"
-create_sentinel=""
-
-if [[ "$2" == "--sentinel-created" ]]; then
-  SENTINEL_CREATED=1
-  if ${DESKTOP_WAYLAND}; then
-    session_type="wayland"
-  else
-    session_type="x11"
-  fi
-fi
-
-# Update config sentinel
-if [[ -z $SENTINEL_CREATED ]]; then
-  [[ $EUID == 0 ]] && die "Running $0 as root is not allowed"
-
-  [[ -n ${HOME+x} ]] || die "No \$HOME variable"
-  config_dir="${XDG_CONF_DIR:-"$HOME/.config"}"
-  session_type=$(
-    cd "$HOME"
-    mkdir -p "$config_dir"
-    cd "$config_dir"
-    if [[ -f "steamos-session-type" ]]; then
-      cp steamos-session-type "$SENTINEL_FILE"
-    else
-      if ${DESKTOP_WAYLAND}; then
-        echo "wayland" > "$SENTINEL_FILE"
-      else
-        echo "x11" > "$SENTINEL_FILE"
-      fi
-    fi
-    cat "$SENTINEL_FILE"
-  )
-
-  # clear steam game desktop shortcut clutter
-  DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share}
-  grep --files-with-matches "Exec=steam steam://rungameid/" ${DATA_HOME}/applications/* | tr '\n' '\0' | xargs -0 -I {} rm {} || true
-
-  # If we were executed as a session user and then re-execute as root below, we don't want to set root's sentinel too
-  export SENTINEL_CREATED=1
-fi
-
-# We use "plasma" as "desktop" to hook up to SteamOS's scripts
-case "$session" in
-  plasma-wayland-persistent)
-    session_launcher="gnome-session"
-  ;;
-  plasma-x11-persistent)
-    session_launcher="gnome-xorg"
-  ;;
-  desktop|plasma)
-    if ${DESKTOP_WAYLAND}; then
-      session_launcher="gnome-session-oneshot"
-    else
-      session_launcher="gnome-xorg-oneshot"
-    fi
-    create_sentinel=1
-  ;;
-  gamescope)
-    session_launcher="gamescope-session"
-    create_sentinel=1
-  ;;
-  *)
-    echo >&2 "!! Unrecognized session '$session'"
-    exit 1
-  ;;
-esac
-
-echo "Updated user selected session to $session_launcher"
-
-# Become root
-if [[ $EUID != 0 ]]; then
-  exec pkexec "$(realpath $0)" "$session" --sentinel-created
-  exit 1
-fi
-
-{
-  echo "[Autologin]"
-  echo "Session=$session_launcher"
-} > "$CONF_FILE"
-
-echo "Updated system autologin session to $session_launcher"
-systemctl reset-failed sddm
-systemctl restart sddm
-echo "Restarted SDDM"

system_files/desktop/silverblue/usr/bin/gnome-autologin

@@ -11,7 +11,7 @@ GDM_CONF='/etc/gdm/custom.conf'
 sed -i 's/.*AutomaticLoginEnable=.*/AutomaticLoginEnable=true/g' ${GDM_CONF}
 sed -i 's/.*AutomaticLogin=.*/AutomaticLogin='${USER}'/g' ${GDM_CONF}
 if ${DESKTOP_WAYLAND}; then
-  sed -i 's/.*DefaultSession=.*/DefaultSession=gnome-session/g' ${GDM_CONF}
+  sed -i 's/.*DefaultSession=.*/DefaultSession=gnome-wayland/g' ${GDM_CONF}
 else
   sed -i 's/.*DefaultSession=.*/DefaultSession=gnome-xorg/g' ${GDM_CONF}
 fi