diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/by-name/i3/i3bar-river/module.nix | 8 | ||||
| -rw-r--r-- | modules/by-name/ri/river/module.nix | 14 |
2 files changed, 18 insertions, 4 deletions
diff --git a/modules/by-name/i3/i3bar-river/module.nix b/modules/by-name/i3/i3bar-river/module.nix index 898b6c69..982ec1e3 100644 --- a/modules/by-name/i3/i3bar-river/module.nix +++ b/modules/by-name/i3/i3bar-river/module.nix @@ -115,6 +115,14 @@ in { partOf = ["graphical-session.target"]; after = ["graphical-session.target"]; requisite = ["graphical-session.target"]; + + path = [ + pkgs.bash # `sh` is needed for starting the status command + + # TODO: This should be a wrapper of the status command <2026-06-23> + pkgs.btrfs-progs # `btrfs` is needed by the storage block in the status command + ]; + serviceConfig = { ExecStart = "${lib.getExe cfg.package}"; ExecReload = "kill -SIGUSR2 $MAINPID"; diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix index 5304446d..ad17091b 100644 --- a/modules/by-name/ri/river/module.nix +++ b/modules/by-name/ri/river/module.nix @@ -239,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 @@ -256,9 +265,6 @@ in { + mkHeading "Layout Setup" '' err_fail ${riverctl} default-layout rivertile ${lib.getExe' cfg.package "rivertile"} -main-ratio 0.5 -view-padding 1 -outer-padding 0 - '' - + '' - systemctl --user start nixos-fake-graphical-session.target ''; }; }; |