Skip to content

feat: launch cosmic-session alongside regolith in regolith-session-wayland #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: launch cosmic-session alongside regolith in regolith-session-wayland #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions usr/bin/regolith-session-wayland
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,26 @@
set -Eeu -o pipefail
source /usr/lib/regolith/regolith-session-common.sh

# Try COSMIC session first
if command -v cosmic-session >/dev/null 2>&1; then
export XDG_CURRENT_DESKTOP="Regolith:COSMIC"
export XDG_SESSION_TYPE="wayland"

resolve_default_config_file

if [[ -z "${DBUS_SESSION_BUS_ADDRESS}" ]]; then
exec /usr/bin/dbus-run-session -- cosmic-session sway -c "$SWAY_CONFIG_FILE"
else
exec cosmic-session sway -c "$SWAY_CONFIG_FILE"
fi
fi

# Check if NOTIFY_SOCKET is available. This is used as a
# test to see if the session uses systemd
if [ -z "${NOTIFY_SOCKET-}" ]; then
# Start trawl daemon manually
trawld&

# Register with gnome-session so that it does not kill the whole session thinking it is dead.
if [ -n "${DESKTOP_AUTOSTART_ID-}" ]; then
dbus-send --print-reply --session --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:Regolith-Wayland" "string:$DESKTOP_AUTOSTART_ID"
fi

# Export environmentt from Environment.d
while read -r l; do
eval export $l
Expand Down Expand Up @@ -46,16 +55,28 @@ if [ ! -e "$UPDATE_FLAG_DIR" ]; then
fi

# Set XDG_CURRENT_DESKTOP
export XDG_CURRENT_DESKTOP="Regolith-Wayland:GNOME:sway"
if command -v cosmic-session >/dev/null 2>&1; then
export XDG_CURRENT_DESKTOP="Regolith:COSMIC"
else
export XDG_CURRENT_DESKTOP="Regolith-Wayland:GNOME:sway"
fi

# Start sway-regolith
unsupported_gpu=$(trawlcat regolith.sway.unsupported_gpu false)
echo "Regolith is launching Sway with $SWAY_CONFIG_FILE"

if [[ "${unsupported_gpu,,}" == "true" ]]; then
sway -c "$SWAY_CONFIG_FILE" --unsupported-gpu
if [[ -z "${DBUS_SESSION_BUS_ADDRESS}" ]]; then
exec /usr/bin/dbus-run-session -- cosmic-session sway -c "$SWAY_CONFIG_FILE" --unsupported-gpu
else
sway -c "$SWAY_CONFIG_FILE" --unsupported-gpu
fi
else
sway -c "$SWAY_CONFIG_FILE"
if [[ -z "${DBUS_SESSION_BUS_ADDRESS}" ]]; then
exec /usr/bin/dbus-run-session -- cosmic-session sway -c "$SWAY_CONFIG_FILE"
else
sway -c "$SWAY_CONFIG_FILE"
fi
fi

# Run user's post logout script if script. Post logout means that the wayland session has been terminated.
Expand Down