diff options
Diffstat (limited to 'river')
| -rwxr-xr-x | river/init | 17 | ||||
| -rwxr-xr-x | river/theme_helper | 8 |
2 files changed, 19 insertions, 6 deletions
@@ -1,6 +1,10 @@ #!/bin/sh +export XDG_CURRENT_DESKTOP=river +RIVERWM_BASE="${RIVERWM_BASE:-$HOME/.local/opt/river}" XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export SSH_ASKPASS="${XDG_CONFIG_HOME}/river/bemenu_askpass_helper" +export SSH_ASKPASS_REQUIRE=force bmenu_helper="$XDG_CONFIG_HOME/river/bemenu_helper" # This is the example configuration file for river. # @@ -186,7 +190,7 @@ riverctl map normal Super+Shift Minus spawn "${XDG_CONFIG_HOME}/river/padding_he riverctl map normal Super+Control L spawn swaylock riverctl map normal Super D spawn "$bmenu_helper "bemenu-run -riverctl map normal Super B spawn 'pkill -SIGUSR1 waybar' +riverctl map normal Super B spawn "sh -c 'if pgrep waybar; then pkill waybar ; else waybar & fi'" riverctl focus-follows-cursor normal riverctl map normal Super+Shift P spawn 'grim /tmp/screenshot_$(date +%s).png' @@ -214,11 +218,20 @@ if ! pgrep swaybg >/dev/null 2>&1 ; then echo "" # swaybg -i .wallpaper.jpg & fi - +# # If Chromium dialogs aren't working these are suspect dbus-update-activation-environment --systemd WAYLAND_DISPLAY "XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP" systemctl --user restart xdg-desktop-portal +# So.... if we've compiled the portal by hand we're going to now run it +if [ -d "$RIVERWM_BASE" ] ; then + _portal="$RIVERWM_BASE/libexec/xdg-desktop-portal" + [ -x "$_portal" ] && sh -c "$_portal"' --replace' & + + _portal="$RIVERWM_BASE/libexec/xdg-desktop-portal-wlr" + [ -x "$_portal" ] && sh -c "$_portal"' --replace' & +fi + # I hate calling this directly but the systemd unit is bugged on arch at # least, running it by hand appears to work just fine _gtk_portal=/usr/lib/xdg-desktop-portal-gtk diff --git a/river/theme_helper b/river/theme_helper index 398910d..5de2830 100755 --- a/river/theme_helper +++ b/river/theme_helper @@ -1,11 +1,11 @@ #!/bin/sh set -ex -exec >/tmp/theme.log 2>&1 +# exec >/tmp/theme.log 2>&1 XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" conf="$XDG_CONFIG_HOME/river/theme_conf" gnomeSet() { - gsettings set org.gnome.desktop.interface color-scheme "$1" + gsettings set org.gnome.desktop.interface color-scheme "$1" || echo "color-scheme failed" } bgcolor_dark=0x282828 @@ -24,14 +24,14 @@ case $mode in mode=dark gnomeSet 'prefer-dark' # Because GTK is an absolute disaster... - gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark + gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark || echo "gtk-theme failed..." pkill -SIGUSR1 foot riverctl background-color "$bgcolor_dark" ;; dark) mode=light gnomeSet 'prefer-light' - gsettings set org.gnome.desktop.interface gtk-theme Adwaita + gsettings set org.gnome.desktop.interface gtk-theme Adwaita || echo "gtk-theme failed..." pkill -SIGUSR2 foot riverctl background-color "$bgcolor_light" ;; |