From d60a63cdb43be80df05b3257797f5438a1586b9b Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Fri, 10 May 2024 18:16:29 +0200 Subject: [PATCH] fix: properly import environment for dwl and qtile --- home/modules/profiles/desktop/dwl/default.nix | 6 ++---- home/modules/profiles/desktop/qtile/config/autostart.sh | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home/modules/profiles/desktop/dwl/default.nix b/home/modules/profiles/desktop/dwl/default.nix index 112f0eb..f8ff5bc 100644 --- a/home/modules/profiles/desktop/dwl/default.nix +++ b/home/modules/profiles/desktop/dwl/default.nix @@ -39,11 +39,9 @@ in { }; home.file.".sessions/start-dwl".source = pkgs.writeShellScript "start-dwl" '' - export XDG_CURRENT_DESKTOP="wlroots" - export GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland + export XDG_CURRENT_DESKTOP=wlroots XDG_BACKEND=wayland QT_QPA_PLATFORM=wayland MOZ_ENABLE_WAYLAND=1 _JAVA_AWT_WM_NONREPARENTING=1 dwl -s "${pkgs.writeShellScript "dwl-internal" '' - dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP DISPLAY - systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP DISPLAY + dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP DISPLAY systemctl start --user wlr-session.target ''}" & pid=$! diff --git a/home/modules/profiles/desktop/qtile/config/autostart.sh b/home/modules/profiles/desktop/qtile/config/autostart.sh index 3e30038..e3e33fb 100644 --- a/home/modules/profiles/desktop/qtile/config/autostart.sh +++ b/home/modules/profiles/desktop/qtile/config/autostart.sh @@ -1,5 +1,7 @@ #!/usr/bin/env sh +dbus-update-activation-environment --systemd DISPLAY XDG_CURRENT_DESKTOP + # systemctl start --user wm-services.target systemctl start --user xorg-wm-services.target -- 2.48.1