Merge remote-tracking branch 'refs/remotes/origin/wayland' into wayland

This commit is contained in:
Andrew Scott 2023-12-27 00:14:10 -05:00
commit 6f3b0f6c1e
Signed by: a
GPG key ID: 7CD5A5977E4931C1
3 changed files with 7 additions and 2 deletions

View file

@ -75,4 +75,4 @@ export XAUTHORITY="${XDG_RUNTIME_DIR}/Xauthority"
[[ -f ~/.bashrc ]] && . ~/.bashrc [[ -f ~/.bashrc ]] && . ~/.bashrc
# start river # start river
[[ -z "${DISPLAY}" && "${XDG_VTNR}" -eq 1 ]] && exec dbus-run-session river [[ -z $DISPLAY && $(tty) = "/dev/tty1" ]] && exec dbus-run-session river

View file

@ -12,7 +12,7 @@
} }
{ {
"label" : "logout", "label" : "logout",
"action" : "loginctl terminate-user $USER", "action" : "${HOME}/.local/bin/river-logout",
"text" : "Logout", "text" : "Logout",
"keybind" : "e" "keybind" : "e"
} }

View file

@ -0,0 +1,5 @@
#!/bin/bash
RIVER=`ps -C river | awk '/river/'`
[[ $RIVER != "" ]] && riverctl spawn 'reset' && riverctl exit || echo "River is not running."