diff options
Diffstat (limited to 'modules/by-name/ri/river')
| -rw-r--r-- | modules/by-name/ri/river/module.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix index bc747c9d..ad17091b 100644 --- a/modules/by-name/ri/river/module.nix +++ b/modules/by-name/ri/river/module.nix @@ -166,7 +166,9 @@ in { }; autoStart = lib.mkOption { - type = lib.types.listOf lib.types.package; + type = + lib.types.listOf (lib.types.either lib.types.package (lib.types.listOf + lib.types.str)); description = "List of programs to be started at river start"; example = '' [ @@ -237,13 +239,22 @@ in { # ${text} ${other_stuff} ''; + + sessionVars = + builtins.concatStringsSep " " (builtins.attrNames + config.home-manager.users.soispha.home.sessionVariables); in builtins.readFile ./init_base.sh + # bash mkHeading "Environment variables" '' - err_fail ${riverctl} spawn "${lib.getExe' pkgs.dbus "dbus-update-activation-environment"} --verbose --systemd SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION=river XDG_CURRENT_DESKTOP=river" 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 ${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 '' + mkHeading "Key Mappings" keymappings + mkHeading "Rules" ruleSetup |