diff options
| -rw-r--r-- | hm/soispha/wms/river/default.nix | 3 | ||||
| -rwxr-xr-x | hm/soispha/wms/river/init | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hm/soispha/wms/river/default.nix b/hm/soispha/wms/river/default.nix index 30b3b016..9965f5a8 100644 --- a/hm/soispha/wms/river/default.nix +++ b/hm/soispha/wms/river/default.nix @@ -35,9 +35,10 @@ err_fail gammastep & '' else builtins.throw "Host not covered in river screen setup"; + env_vars = "XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river"; init_scr = pkgs.substituteAll { src = ./init; - inherit mappings screen_setup; + inherit mappings screen_setup env_vars; }; in { xdg.configFile."river/init".source = diff --git a/hm/soispha/wms/river/init b/hm/soispha/wms/river/init index 778837cc..a77f0dde 100755 --- a/hm/soispha/wms/river/init +++ b/hm/soispha/wms/river/init @@ -18,8 +18,7 @@ exec 2>> "$HOME"/river_log #Setup of environment variables {{{ err_fail riverctl spawn "exec dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION=river XDG_CURRENT_DESKTOP=river" -export XDG_CURRENT_DESKTOP=river -ENV_VARS="XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river" +export @env_vars@ #}}} # Setup of mappings {{{ @@ -73,7 +72,7 @@ err_fail alacritty & # Setup of layout [acts as exec!] {{{ err_fail riverctl default-layout rivertile -$ENV_VARS rivertile -main-ratio 0.5 -view-padding 1 -outer-padding 0 +@env_vars@ rivertile -main-ratio 0.5 -view-padding 1 -outer-padding 0 #riverctl default-layout luatile #river-luatile |