Commit Diff


commit - 270fac6658346cde50b2983eb1c8bfe8e0789b58
commit + 2e021eb19d3949779d43b2d3b3d49ea91e9afcce
blob - b83e2f51da9044a7c82ac9551160ca9fde92242e
blob + 389372b056dfc0c58760bda708e49c8b5598be2e
--- hosts/impish/overlays/bin/wagu
+++ hosts/impish/overlays/bin/wagu
@@ -1,5 +1,5 @@
 #!/bin/sh
-export XDG_CURRENT_DESKTOP=sway
+export XDG_CURRENT_DESKTOP=river
 export XDG_SESSION_TYPE=wayland
 export MOZ_ENABLE_WAYLAND=1
 export GDK_BACKEND='wayland,x11'
@@ -13,5 +13,5 @@ export ELECTRON_OZONE_PLATFORM_HINT=auto
 
 keychain --eval --ssh-agent-socket "$XDG_RUNTIME_DIR/ssh-agent.socket"
 
-WM=${WM:-volare}
+WM=${WM:-river}
 exec dbus-run-session -- "$WM" 2>&1 | vlogger -t "$WM"
blob - 57270b5fd82430588d0bfbe7e6039f3a8e8cb440
blob + 3c431b71bfced664cb5efe09be8451386587abf2
--- hosts/impish/overlays/config/river/init
+++ hosts/impish/overlays/config/river/init
@@ -16,6 +16,9 @@ riverctl border-color-focused "0x2fafff"
 riverctl border-color-unfocused "0x646464"
 riverctl border-width 1
 
+riverctl border-color-focused-inactive "0x353535"
+riverctl border-color-unfocused "0x222222"
+
 riverctl set-repeat 50 300
 
 riverctl default-layout rivertile
@@ -26,6 +29,11 @@ riverctl input "pointer-1189-32769-BenQ_ZOWIE_BenQ_ZOW
 riverctl input "pointer-1133-45108-Logitech_MX_Master_3S" pointer-accel 0.0
 riverctl input "pointer-1133-16500-Logitech_G305" pointer-accel 0.0
 
+riverctl input "*" touchpad tap disable
+riverctl input "*" touchpad drag disable
+riverctl input "*" touchpad click_method none
+riverctl input "*" touchpad scroll_method two_finger
+
 riverctl attach-mode top
 riverctl focus-follows-cursor normal
 
@@ -84,7 +92,7 @@ riverctl map normal $mod d send-layout-cmd rivertile "
 
 riverctl map normal $mod+Shift Space toggle-float
 
-riverctl map normal $mod+Shift f toggle-fullscreen
+riverctl map normal $mod q toggle-fullscreen
 riverctl map normal $alt+Shift f toggle-fullscreen
 
 riverctl map normal $mod Space spawn "fnottctl dismiss"
@@ -128,3 +136,5 @@ riverctl map normal $mod Tab focus-previous-tags
 riverctl map normal $mod+Shift Tab send-to-previous-tags
 
 "$HOME/.nix-profile/bin/shepherd" &
+
+font Ttyp0 OTB 10
blob - 855cd909727f4ccb7574dacd77600e1946b1858a
blob + 707ebb0ccf1c11b1ad9e83b9f922cbab6e022d45
Binary files hosts/impish/overlays/config/shell/rc/imp and hosts/impish/overlays/config/shell/rc/imp differ
blob - /dev/null
blob + 839a8bd694af5e09d983e163447106d1b998470d (mode 644)
--- /dev/null
+++ modules/mixins/dotfiles/bin/tmux-status-right
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+out=
+
+playing=$(mpd_now_playing 2>/dev/null | sed 's/#/##/g')
+[ -n "$playing" ] && out="${out}${playing} · "
+
+plants_out=$(plants 2>/dev/null | sed 's/#/##/g')
+[ -n "$plants_out" ] && out="${out}${plants_out} · "
+
+volume_status=$(wpctl get-volume @DEFAULT_AUDIO_SINK@ 2>/dev/null)
+case "$volume_status" in
+*MUTED*) out="${out}vol muted · " ;;
+*[0-9]*)
+	pct=$(printf '%s' "$volume_status" | awk '{printf "%d", $2 * 100}')
+	out="${out}vol ${pct}% · "
+	;;
+*) out="${out}vol ?% · " ;;
+esac
+
+if wlr-randr 2>/dev/null | sed -n '/^eDP-1 /,/^[^[:space:]]/p' | grep -q '^  Enabled: yes$'; then
+	bri=$(brightnessctl 2>/dev/null | sed -En 's/.*\(([0-9]+)%\).*/\1/p')
+	out="${out}bri ${bri:-?}% · "
+fi
+
+battery=$(cat /sys/class/power_supply/BAT*/capacity 2>/dev/null | head -1)
+out="${out}bat ${battery:-?}% · "
+
+out="${out}#[fg=#16181d,bg=#f5a03c] $(date '+%Y-%m-%d %H:%M') "
+
+printf '%s' "$out"
blob - f2b6a1eaf19e390f4036a0e19ac8c891d15fb618
blob + 5f8cf6f3e7088324b91f4d0d47d8c0868a0ad177
--- modules/mixins/dotfiles/home/tmux.conf
+++ modules/mixins/dotfiles/home/tmux.conf
@@ -20,9 +20,11 @@ set -g status-interval 30
 
 set -g status on
 set -g status-left ''
-set -g status-right ''
+set -g status-right-length 120
+set -g status-right '#(~/bin/tmux-status-right)'
 
 set-option -g status-style "fg=#ebe9e7,bg=default"
+set-option -g status-right-style "fg=#a3a3a3,bg=default"
 
 set-window-option -g window-status-style "fg=#a3a3a3,bg=default"
 set-window-option -g window-status-current-style "fg=#16181d,bg=#f5a03c"