diff options
Diffstat (limited to '')
| -rwxr-xr-x | hm/soispha/wms/river/init | 5 | ||||
| -rw-r--r-- | sys/svcs/xdg/default.nix | 20 |
2 files changed, 17 insertions, 8 deletions
diff --git a/hm/soispha/wms/river/init b/hm/soispha/wms/river/init index 1fd52eee..f2fe3eb6 100755 --- a/hm/soispha/wms/river/init +++ b/hm/soispha/wms/river/init @@ -1,4 +1,4 @@ -#!/usr/bin/env dash +#!/usr/bin/env bash # shellcheck source=/dev/null SHELL_LIBRARY_VERSION="1.7.0" . %SHELL_LIBRARY_PATH @@ -19,6 +19,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" err_fail export XDG_CURRENT_DESKTOP=river +err_fail ENV_VARS="XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river" #}}} # Setup of mappings {{{ @@ -72,7 +73,7 @@ err_fail alacritty & # Setup of layout [acts as exec!] {{{ err_fail riverctl default-layout rivertile -err_fail 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 diff --git a/sys/svcs/xdg/default.nix b/sys/svcs/xdg/default.nix index 1fe60c43..4f6db4a1 100644 --- a/sys/svcs/xdg/default.nix +++ b/sys/svcs/xdg/default.nix @@ -3,12 +3,20 @@ xdg = { portal = { enable = true; - # TODO: only enable the below, when on river (or wlr based compositor) - wlr.enable = true; - extraPortals = [ - # NOTE: The next entry is supposedly needed for gtk based apps <2023-08-31> - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-wlr + config = { + common = { + # NOTE: The next entry is supposedly needed for gtk based apps <2023-08-31> + default = ["gtk"]; + }; + + # TODO: Also activate, when on another wlr-based compositor <2023-11-25> + river = { + default = ["wlr"]; + }; + }; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + xdg-desktop-portal-wlr ]; }; }; |