From f3f859d9a1fb62bfd31cb3ad3707f003b7dbc000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= Date: Tue, 6 Aug 2024 00:16:13 +0200 Subject: [PATCH] add river wm --- river/.config/river/bar | 16 ++++ river/.config/river/init | 18 ++++ river/.config/river/keymap | 163 +++++++++++++++++++++++++++++++++++++ river/.config/river/status | 52 ++++++++++++ shell/.profile | 4 +- 5 files changed, 252 insertions(+), 1 deletion(-) create mode 100755 river/.config/river/bar create mode 100755 river/.config/river/init create mode 100755 river/.config/river/keymap create mode 100755 river/.config/river/status diff --git a/river/.config/river/bar b/river/.config/river/bar new file mode 100755 index 0000000..2367c54 --- /dev/null +++ b/river/.config/river/bar @@ -0,0 +1,16 @@ +#!/usr/bin/env sh + +FIFO="$XDG_RUNTIME_DIR/sandbar" +[ -e "$FIFO" ] && rm -f "$FIFO" +mkfifo "$FIFO" + +while cat "$FIFO"; do :; done | sandbar \ + -font "FiraCode Nerd Font Ret:size=10" \ + -active-fg-color "#000000" \ + -active-bg-color "#e8c47d" \ + -inactive-fg-color "#e8c47d" \ + -inactive-bg-color "#000000" \ + -urgent-fg-color "#000000" \ + -urgent-bg-color "#cc241d" \ + -title-fg-color "#000000" \ + -title-bg-color "#e8c47d" diff --git a/river/.config/river/init b/river/.config/river/init new file mode 100755 index 0000000..e972d2a --- /dev/null +++ b/river/.config/river/init @@ -0,0 +1,18 @@ +#!/bin/sh + +"${HOME}/.config/river/keymap" + +LOCK_COMMAND='swaylock -f -c 1f7693' +RANDR_COMMAND='wlr-randr --output DP-1 --scale 2 --pos 0,0; wlr-randr --output DP-2 --scale 2 --pos 1920,0' + +riverctl spawn "${RANDR_COMMAND}" + +# Set the default layout generator to be rivertile and start it. +# River will send the process group of the init executable SIGTERM on exit. +riverctl default-layout rivertile +rivertile -view-padding 1 -outer-padding 0 & + +riverctl spawn "${HOME}/.config/river/status" +riverctl spawn "${HOME}/.config/river/bar" + +riverctl spawn "swayidle -w timeout 300 '${LOCK_COMMAND}' before-sleep '${LOCK_COMMAND}' after-resume '${RANDR_COMMAND}'" diff --git a/river/.config/river/keymap b/river/.config/river/keymap new file mode 100755 index 0000000..cc6b0eb --- /dev/null +++ b/river/.config/river/keymap @@ -0,0 +1,163 @@ +#!/bin/sh + +LOCK_COMMAND='swaylock -f -c 1f7693' + +# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc. + +# Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot) +riverctl map normal Super+Shift Return spawn alacritty + +riverctl map normal Super P spawn "wofi -S run" + +# Super+Q to close the focused view +riverctl map normal Super Q close + +# Super+Shift+E to exit river +riverctl map normal Super+Shift E exit + +# Super+J and Super+K to focus the next/previous view in the layout stack +riverctl map normal Super J focus-view next +riverctl map normal Super K focus-view previous + +# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous +# view in the layout stack +riverctl map normal Super+Shift J swap next +riverctl map normal Super+Shift K swap previous + +# Super+Period and Super+Comma to focus the next/previous output +riverctl map normal Super Period focus-output next +riverctl map normal Super Comma focus-output previous + +# Super+Shift+{Period,Comma} to send the focused view to the next/previous output +riverctl map normal Super+Shift Period send-to-output next +riverctl map normal Super+Shift Comma send-to-output previous + +# Super+Return to bump the focused view to the top of the layout stack +riverctl map normal Super Return zoom + +# Super+H and Super+L to decrease/increase the main ratio of rivertile(1) +riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05" +riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05" + +# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1) +riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1" +riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1" + +# Super+Alt+{H,J,K,L} to move views +riverctl map normal Super+Alt H move left 100 +riverctl map normal Super+Alt J move down 100 +riverctl map normal Super+Alt K move up 100 +riverctl map normal Super+Alt L move right 100 + +# Super+Alt+Control+{H,J,K,L} to snap views to screen edges +riverctl map normal Super+Alt+Control H snap left +riverctl map normal Super+Alt+Control J snap down +riverctl map normal Super+Alt+Control K snap up +riverctl map normal Super+Alt+Control L snap right + +# Super+Alt+Shift+{H,J,K,L} to resize views +riverctl map normal Super+Alt+Shift H resize horizontal -100 +riverctl map normal Super+Alt+Shift J resize vertical 100 +riverctl map normal Super+Alt+Shift K resize vertical -100 +riverctl map normal Super+Alt+Shift L resize horizontal 100 + +# Super + Left Mouse Button to move views +riverctl map-pointer normal Super BTN_LEFT move-view + +# Super + Right Mouse Button to resize views +riverctl map-pointer normal Super BTN_RIGHT resize-view + +# Super + Middle Mouse Button to toggle float +riverctl map-pointer normal Super BTN_MIDDLE toggle-float + +for i in $(seq 1 9) +do + tags=$((1 << ($i - 1))) + + # Super+[1-9] to focus tag [0-8] + riverctl map normal Super $i set-focused-tags $tags + + # Super+Shift+[1-9] to tag focused view with tag [0-8] + riverctl map normal Super+Shift $i set-view-tags $tags + + # Super+Control+[1-9] to toggle focus of tag [0-8] + riverctl map normal Super+Control $i toggle-focused-tags $tags + + # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view + riverctl map normal Super+Shift+Control $i toggle-view-tags $tags +done + +# Super+0 to focus all tags +# Super+Shift+0 to tag focused view with all tags +all_tags=$(((1 << 32) - 1)) +riverctl map normal Super 0 set-focused-tags $all_tags +riverctl map normal Super+Shift 0 set-view-tags $all_tags + +# Super+Space to toggle float +riverctl map normal Super Space toggle-float + +# Super+F to toggle fullscreen +riverctl map normal Super F toggle-fullscreen + +# Super+{Up,Right,Down,Left} to change layout orientation +riverctl map normal Super Up send-layout-cmd rivertile "main-location top" +riverctl map normal Super Right send-layout-cmd rivertile "main-location right" +riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom" +riverctl map normal Super Left send-layout-cmd rivertile "main-location left" + +# Declare a passthrough mode. This mode has only a single mapping to return to +# normal mode. This makes it useful for testing a nested wayland compositor +riverctl declare-mode passthrough + +# Super+F11 to enter passthrough mode +riverctl map normal Super F11 enter-mode passthrough + +# Super+F11 to return to normal mode +riverctl map passthrough Super F11 enter-mode normal + +# Various media key mapping examples for both normal and locked mode which do +# not have a modifier +for mode in normal locked +do + # Eject the optical drive (well if you still have one that is) + riverctl map $mode None XF86Eject spawn 'eject -T' + + # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer) + riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5' + riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5' + riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute' + + # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) + riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' + riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause' + riverctl map $mode None XF86AudioPrev spawn 'playerctl previous' + riverctl map $mode None XF86AudioNext spawn 'playerctl next' + + # Control screen backlight brightness with brightnessctl (https://github.com/Hummer12007/brightnessctl) + riverctl map $mode None XF86MonBrightnessUp spawn 'brightnessctl set +5%' + riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-' +done + +riverctl map normal Super A focus-previous-tags +riverctl map normal Super+Control+Shift L spawn "${LOCK_COMMAND}" +riverctl map normal Super+Control+Shift S spawn "systemctl suspend" + +riverctl map normal Super+Alt O spawn "${LOCK_COMMAND}" +riverctl map normal Super+Alt S spawn "systemctl suspend" + +riverctl map normal Super+Alt T spawn "${HOME}/bin/lupan-set-theme toggle" + +# Set background and border color +riverctl background-color 0x002b36 +riverctl border-color-focused 0xac7853 +riverctl border-color-unfocused 0x5387ac + +riverctl keyboard-layout -options ctrl:nocaps pl +# Set keyboard repeat rate +riverctl set-repeat 50 300 + +# Make all views with an app-id that starts with "float" and title "foo" start floating. +riverctl rule-add -app-id 'float*' -title 'foo' float + +# Make all views with app-id "bar" and any title use client-side decorations +riverctl rule-add -app-id "bar" csd diff --git a/river/.config/river/status b/river/.config/river/status new file mode 100755 index 0000000..0cdb3b3 --- /dev/null +++ b/river/.config/river/status @@ -0,0 +1,52 @@ +#!/bin/env sh + +cpu() { + cpu="$(grep -o "^[^ ]*" /proc/loadavg)" +} + +memory() { + memory="$(free -h | sed -n "2s/\([^ ]* *\)\{2\}\([^ ]*\).*/\2/p")" +} + +disk() { + disk="$(df -h | awk 'NR==2{print $4}')" +} + +datetime() { + datetime="$(date "+%F %H:%M")" +} + +bat() { + read -r bat_status "$FIFO" +} + +printf "%s" "$$" > "$XDG_RUNTIME_DIR/status_pid" +FIFO="$XDG_RUNTIME_DIR/sandbar" +[ -e "$FIFO" ] || mkfifo "$FIFO" +sec=0 + +while true; do + sleep 1 & + wait && { + [ $((sec % 15)) -eq 0 ] && memory + [ $((sec % 15)) -eq 0 ] && cpu + [ $((sec % 15)) -eq 0 ] && disk + [ $((sec % 60)) -eq 0 ] && bat + [ $((sec % 5)) -eq 0 ] && vol + [ $((sec % 5)) -eq 0 ] && datetime + + [ $((sec % 5)) -eq 0 ] && display + + sec=$((sec + 1)) + } +done diff --git a/shell/.profile b/shell/.profile index 24f21af..514d49b 100644 --- a/shell/.profile +++ b/shell/.profile @@ -29,7 +29,9 @@ export PATH # start X or Hyprland at login if [[ -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" && "$XDG_VTNR" -eq 1 ]]; then - if which Hyprland > /dev/null; then + if which river > /dev/null && [ -d ~/.config/river ]; then + exec river + elif which Hyprland > /dev/null && [ -d ~/.config/hypr ]; then exec Hyprland elif which /usr/bin/sx > /dev/null; then exec /usr/bin/sx ~/.xsession