From 080a734228929a7f46da184f719e32131a8158db Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Tue, 23 Jun 2026 03:01:52 +0200 Subject: modules/river: Import all the sessionVariables Otherwise things like `MPD_HOST` are not accessible --- modules/by-name/ri/river/module.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix index 8410df12..ad17091b 100644 --- a/modules/by-name/ri/river/module.nix +++ b/modules/by-name/ri/river/module.nix @@ -239,6 +239,10 @@ in { # ${text} ${other_stuff} ''; + + sessionVars = + builtins.concatStringsSep " " (builtins.attrNames + config.home-manager.users.soispha.home.sessionVariables); in builtins.readFile ./init_base.sh + @@ -246,8 +250,9 @@ in { mkHeading "Environment variables" '' export XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river; - err_fail ${riverctl} spawn "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --verbose --systemd SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION XDG_CURRENT_DESKTOP" - err_fail ${riverctl} spawn "systemctl --user import-environment SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION XDG_CURRENT_DESKTOP" + err_fail ${riverctl} spawn "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --verbose --systemd SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION XDG_CURRENT_DESKTOP ${sessionVars}" + err_fail ${riverctl} spawn "systemctl --user import-environment SEATD_SOCK + DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION XDG_CURRENT_DESKTOP ${sessionVars}" err_fail systemctl --user start nixos-fake-graphical-session.target '' -- cgit v1.3.1