From 7bae0f5aa0198e8513404287d3b0c980a6e13994 Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Fri, 17 Feb 2023 12:29:47 +0100
Subject: [PATCH] add DISPLAY variables to systemd session

---
 home/desktop-river/init.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/home/desktop-river/init.nix b/home/desktop-river/init.nix
index b513535..7ca5803 100644
--- a/home/desktop-river/init.nix
+++ b/home/desktop-river/init.nix
@@ -179,8 +179,6 @@ in {
       # Set app-ids and titles of views which should use client side decorations
       ${riverctl} csd-filter-add app-id "gedit"
 
-      ${riverctl} spawn "${dbus-update-activation-environment} --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river"
-      ${riverctl} spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river"
       ${configure-gtk}/bin/configure-gtk
 
       trackball_names="pointer-21298-5120-Clearly_Superior_Technologies._CST_Laser_Trackball 21298:5120:Clearly_Superior_Technologies._CST_Laser_Trackball"
@@ -191,6 +189,9 @@ in {
 
       ${config.xdg.configHome}/river/init-kile
 
+      export XDG_CURRENT_DESKTOP=river
+      ${dbus-update-activation-environment} --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+      systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
       systemctl --user start river-session.target
     '';
   };