Skip to content

Set XDG_CURRENT_DESKTOP for new units started by user service manager #90

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: master
Choose a base branch
from
Open

Set XDG_CURRENT_DESKTOP for new units started by user service manager #90

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
16 changes: 16 additions & 0 deletions startlxqtwayland.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ done

export XDG_CURRENT_DESKTOP="LXQt:$COMPOSITOR:wlroots"

# set environment variables for new units started by user service manager
if command -v systemctl >/dev/null; then
systemctl --user import-environment XDG_CURRENT_DESKTOP
fi

valid_layouts=$(grep -A98 '! layout' /usr/share/X11/xkb/rules/base.lst | awk '{print $1}' | grep -v '!')
trylayout=$(echo $LANG | cut -c 1,2)

Expand All @@ -91,6 +96,11 @@ if [ -z "$COMPOSITOR" ]; then
COMPOSITOR=labwc
export XDG_CURRENT_DESKTOP="LXQt:wlroots"

# set environment variables for new units started by user service manager
if command -v systemctl >/dev/null; then
systemctl --user import-environment XDG_CURRENT_DESKTOP
fi

# enable cursor on VM (systemd only)
if type systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt --quiet; then
export WLR_NO_HARDWARE_CURSORS=1
Expand Down Expand Up @@ -125,6 +135,12 @@ elif [ "$COMPOSITOR" = "kwin_wayland" ]; then
# Style KDE's QML apps like systemsettings
export QT_QUICK_CONTROLS_STYLE=org.kde.desktop
export XDG_CURRENT_DESKTOP="LXQt:$COMPOSITOR"

# set environment variables for new units started by user service manager
if command -v systemctl >/dev/null; then
systemctl --user import-environment XDG_CURRENT_DESKTOP
fi

if echo "$valid_layouts" | grep -q "$trylayout"; then
kxkbrc=$XDG_CONFIG_HOME/kxkbrc
layout="LayoutList=$trylayout"
Expand Down