summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
-rw-r--r--.config/sway/config6
-rwxr-xr-x[-rw-r--r--].config/sway/xdpw9
2 files changed, 7 insertions, 8 deletions
diff --git a/.config/sway/config b/.config/sway/config
index 4a550f4..1e25051 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -252,9 +252,9 @@ bar {
status_command exec ~/.local/bin/any_position_wrapper.sh
}
-# Prepare for xdg-desktop-portal-wlr
-exec ~/.config/sway/xdpw
-
# Load machine specific configuration
include ~/.config/sway/`hostname`
+# Prepare for xdg-desktop-portal-wlr
+exec ~/.config/sway/xdpw
+
diff --git a/.config/sway/xdpw b/.config/sway/xdpw
index 05ce594..72449c7 100644..100755
--- a/.config/sway/xdpw
+++ b/.config/sway/xdpw
@@ -1,8 +1,7 @@
-#!/bin/sh
-# Import the WAYLAND_DISPLAY env var from sway into the systemd user session.
-dbus-update-activation-environment --systemd \
- XDG_SESSION_TYPE=wayland DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+# sway does not set XDG_CURRENT_DESKTOP in the systemd user environment
+# therfore xdg-desktop-portal makes the wrong choice for desktop witht this fix
+
+dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-# Stop any services that are running, so that they receive the new env var when they restart.
systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
systemctl --user start wireplumber