From c80b2cb76e0a14a0e7b9e899a3d392bfee03066b Mon Sep 17 00:00:00 2001
From: Sravan Balaji <balajsra@umich.edu>
Date: Tue, 1 Oct 2024 23:44:49 -0400
Subject: [PATCH] Fix xdg-desktop-portal / dbus issues

- Added some systemd and dbus environment commands to winitrc
- Running dwl via `dbus-run-session` instead of exec
- Waybar works on startup now
- KDE wallet works as well
---
 README.org      | 4 +++-
 dwl/.config/dwl | 2 +-
 dwl/.winitrc    | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index e1a1049..20e2c94 100644
--- a/README.org
+++ b/README.org
@@ -9042,7 +9042,9 @@ export XDG_CURRENT_DESKTOP=wlroots    # Set XDG current desktop
 #+BEGIN_SRC shell :shebang #!/usr/bin/env bash :tangle dwl/.winitrc
 $HOME/.scripts/wayland-startup.sh --kill-startup
 
-exec dwl -s 'sleep 5 && $HOME/.scripts/wayland-startup.sh --startup'
+systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+dbus-run-session dwl -s '$HOME/.scripts/wayland-startup.sh --startup'
 #+END_SRC
 
 *** Wayland Startup
diff --git a/dwl/.config/dwl b/dwl/.config/dwl
index cfd3455..528d962 160000
--- a/dwl/.config/dwl
+++ b/dwl/.config/dwl
@@ -1 +1 @@
-Subproject commit cfd345571f486f89524fd2f8d6798458f2044690
+Subproject commit 528d96221a1c41fb640505a4f0d0cc3a5353142a
diff --git a/dwl/.winitrc b/dwl/.winitrc
index 6dee8ae..cc43180 100755
--- a/dwl/.winitrc
+++ b/dwl/.winitrc
@@ -11,4 +11,6 @@ export XDG_CURRENT_DESKTOP=wlroots    # Set XDG current desktop
 
 $HOME/.scripts/wayland-startup.sh --kill-startup
 
-exec dwl -s 'sleep 5 && $HOME/.scripts/wayland-startup.sh --startup'
+systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+dbus-run-session dwl -s '$HOME/.scripts/wayland-startup.sh --startup'