From f84ec770ae64100ec2d98e07b615b8ac04e7387e Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 24 Feb 2023 11:18:01 -0600 Subject: add basic river scratchpads --- river/sp/river_sp | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ river/sp/sp_a | 3 +++ river/sp/sp_b | 3 +++ river/sp/sp_c | 3 +++ river/sp/sp_d | 3 +++ river/sp/sp_f | 3 +++ river/sp/sp_g | 3 +++ river/sp/sp_q | 3 +++ river/sp/sp_s | 3 +++ river/sp/sp_v | 3 +++ river/sp/sp_x | 3 +++ river/sp/sp_z | 3 +++ 12 files changed, 103 insertions(+) create mode 100755 river/sp/river_sp create mode 100755 river/sp/sp_a create mode 100755 river/sp/sp_b create mode 100755 river/sp/sp_c create mode 100755 river/sp/sp_d create mode 100755 river/sp/sp_f create mode 100755 river/sp/sp_g create mode 100755 river/sp/sp_q create mode 100755 river/sp/sp_s create mode 100755 river/sp/sp_v create mode 100755 river/sp/sp_x create mode 100755 river/sp/sp_z (limited to 'river/sp') diff --git a/river/sp/river_sp b/river/sp/river_sp new file mode 100755 index 0000000..e354cc9 --- /dev/null +++ b/river/sp/river_sp @@ -0,0 +1,70 @@ +#!/bin/sh + +#{{{ binpath +BINPATH="${XDG_CONFIG_HOME:-$HOME/.config}/river/sp" +#}}} + +#{{{ spawnwindow +spawnwindow () { + case "$1" in + 1) pgrep -x sp_z || ${BINPATH}/sp_z ;; + 2) pgrep -x sp_x || ${BINPATH}/sp_x ;; + 3) pgrep -x sp_c || ${BINPATH}/sp_c ;; + 4) pgrep -x sp_v || ${BINPATH}/sp_v ;; + 5) pgrep -x sp_b || ${BINPATH}/sp_b ;; + 6) pgrep -x sp_a || ${BINPATH}/sp_a ;; + 7) pgrep -x sp_s || ${BINPATH}/sp_s ;; + 8) pgrep -x sp_d || ${BINPATH}/sp_d ;; + 9) pgrep -x sp_f || ${BINPATH}/sp_f ;; + 10) pgrep -x sp_g || ${BINPATH}/sp_g ;; + 11) pgrep -x sp_q || ${BINPATH}/sp_q ;; + *) printf "Unknown scratchpad $1!\n" ; exit 1 ;; + esac +} +#}}} + +#{{{ getopts +while getopts "n:s:" o; do case "${o}" in + n) + case "$OPTARG" in + z|1) ARG=1 ;; + x|2) ARG=2 ;; + c|3) ARG=3 ;; + v|4) ARG=4 ;; + b|5) ARG=5 ;; + a|6) ARG=6 ;; + s|7) ARG=7 ;; + d|8) ARG=8 ;; + f|9) ARG=9 ;; + g|10) ARG=10 ;; + q|11) ARG=11 ;; + *) printf "Unknown scratchpad $1!\n" ; exit 1 ;; + esac + if pgrep -x "sp_$OPTARG"; then + riverctl toggle-focused-tags $((1 << ($ARG + 9))) + else + riverctl toggle-focused-tags $(( 1 << ($ARG + 9))) + riverctl spawn-tagmask $(( 1 << ($ARG + 9))) + spawnwindow "$ARG" + riverctl spawn-tagmask $(( (1 << 9) - 1)) + fi + ;; + s) + case "$OPTARG" in + z|1) ARG=1 ;; + x|2) ARG=2 ;; + c|3) ARG=3 ;; + v|4) ARG=4 ;; + b|5) ARG=5 ;; + a|6) ARG=6 ;; + s|7) ARG=7 ;; + d|8) ARG=8 ;; + f|9) ARG=9 ;; + g|10) ARG=10 ;; + q|11) ARG=11 ;; + *) printf "Unknown scratchpad $1!\n" ; exit 1 ;; + esac + riverctl toggle-focused-tags $((1 << ($ARG + 9))) + ;; +esac done +#}}} diff --git a/river/sp/sp_a b/river/sp/sp_a new file mode 100755 index 0000000..d76f78e --- /dev/null +++ b/river/sp/sp_a @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "spmutt" neomutt diff --git a/river/sp/sp_b b/river/sp/sp_b new file mode 100755 index 0000000..208cf4c --- /dev/null +++ b/river/sp/sp_b @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "spncmp" ncmpcpp diff --git a/river/sp/sp_c b/river/sp/sp_c new file mode 100755 index 0000000..0201227 --- /dev/null +++ b/river/sp/sp_c @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "sppmxr" pulsemixer diff --git a/river/sp/sp_d b/river/sp/sp_d new file mode 100755 index 0000000..1545c87 --- /dev/null +++ b/river/sp/sp_d @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "spirss" irssi diff --git a/river/sp/sp_f b/river/sp/sp_f new file mode 100755 index 0000000..f2468ea --- /dev/null +++ b/river/sp/sp_f @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "sptodo" todo diff --git a/river/sp/sp_g b/river/sp/sp_g new file mode 100755 index 0000000..7b3a393 --- /dev/null +++ b/river/sp/sp_g @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "sptrmc" tremc diff --git a/river/sp/sp_q b/river/sp/sp_q new file mode 100755 index 0000000..9202782 --- /dev/null +++ b/river/sp/sp_q @@ -0,0 +1,3 @@ +#!/bin/sh + +qpwgraph diff --git a/river/sp/sp_s b/river/sp/sp_s new file mode 100755 index 0000000..288373c --- /dev/null +++ b/river/sp/sp_s @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "spprof" profanity diff --git a/river/sp/sp_v b/river/sp/sp_v new file mode 100755 index 0000000..009e18d --- /dev/null +++ b/river/sp/sp_v @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "spblue" bluetoothctl diff --git a/river/sp/sp_x b/river/sp/sp_x new file mode 100755 index 0000000..ef07b51 --- /dev/null +++ b/river/sp/sp_x @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "spterm" diff --git a/river/sp/sp_z b/river/sp/sp_z new file mode 100755 index 0000000..c6414ed --- /dev/null +++ b/river/sp/sp_z @@ -0,0 +1,3 @@ +#!/bin/sh + +foot -a "sphtop" htop -- cgit v1.2.3 From b14a3e0bd1e9fc36ca9b8cb2945edf1f254cc091 Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 24 Feb 2023 11:28:01 -0600 Subject: simplify river_sp command --- river/init | 22 +++++++++---------- river/sp/river_sp | 65 ++++++++++++++++++++----------------------------------- 2 files changed, 34 insertions(+), 53 deletions(-) (limited to 'river/sp') diff --git a/river/init b/river/init index ebd3224..d5f609c 100755 --- a/river/init +++ b/river/init @@ -106,17 +106,17 @@ riverctl map normal $mod1+Shift 0 set-view-tags $all_tags # scratchpad tags BINPATH="${XDG_CONFIG_HOME:-$HOME/.config}/river/sp" -riverctl map normal $mod1+Control z spawn "$BINPATH/river_sp -n z" -riverctl map normal $mod1+Control x spawn "$BINPATH/river_sp -n x" -riverctl map normal $mod1+Control c spawn "$BINPATH/river_sp -n c" -riverctl map normal $mod1+Control v spawn "$BINPATH/river_sp -n v" -riverctl map normal $mod1+Control b spawn "$BINPATH/river_sp -n b" -riverctl map normal $mod1+Control a spawn "$BINPATH/river_sp -n a" -riverctl map normal $mod1+Control s spawn "$BINPATH/river_sp -n s" -riverctl map normal $mod1+Control d spawn "$BINPATH/river_sp -n d" -riverctl map normal $mod1+Control f spawn "$BINPATH/river_sp -n f" -riverctl map normal $mod1+Control g spawn "$BINPATH/river_sp -n g" -riverctl map normal $mod1+Control q spawn "$BINPATH/river_sp -n q" +riverctl map normal $mod1+Control z spawn "$BINPATH/river_sp z" +riverctl map normal $mod1+Control x spawn "$BINPATH/river_sp x" +riverctl map normal $mod1+Control c spawn "$BINPATH/river_sp c" +riverctl map normal $mod1+Control v spawn "$BINPATH/river_sp v" +riverctl map normal $mod1+Control b spawn "$BINPATH/river_sp b" +riverctl map normal $mod1+Control a spawn "$BINPATH/river_sp a" +riverctl map normal $mod1+Control s spawn "$BINPATH/river_sp s" +riverctl map normal $mod1+Control d spawn "$BINPATH/river_sp d" +riverctl map normal $mod1+Control f spawn "$BINPATH/river_sp f" +riverctl map normal $mod1+Control g spawn "$BINPATH/river_sp g" +riverctl map normal $mod1+Control q spawn "$BINPATH/river_sp q" # $mod1+Space to toggle float riverctl map normal $mod1+Control Space toggle-float diff --git a/river/sp/river_sp b/river/sp/river_sp index e354cc9..2203e40 100755 --- a/river/sp/river_sp +++ b/river/sp/river_sp @@ -24,47 +24,28 @@ spawnwindow () { #}}} #{{{ getopts -while getopts "n:s:" o; do case "${o}" in - n) - case "$OPTARG" in - z|1) ARG=1 ;; - x|2) ARG=2 ;; - c|3) ARG=3 ;; - v|4) ARG=4 ;; - b|5) ARG=5 ;; - a|6) ARG=6 ;; - s|7) ARG=7 ;; - d|8) ARG=8 ;; - f|9) ARG=9 ;; - g|10) ARG=10 ;; - q|11) ARG=11 ;; - *) printf "Unknown scratchpad $1!\n" ; exit 1 ;; - esac - if pgrep -x "sp_$OPTARG"; then - riverctl toggle-focused-tags $((1 << ($ARG + 9))) - else - riverctl toggle-focused-tags $(( 1 << ($ARG + 9))) - riverctl spawn-tagmask $(( 1 << ($ARG + 9))) - spawnwindow "$ARG" - riverctl spawn-tagmask $(( (1 << 9) - 1)) - fi - ;; - s) - case "$OPTARG" in - z|1) ARG=1 ;; - x|2) ARG=2 ;; - c|3) ARG=3 ;; - v|4) ARG=4 ;; - b|5) ARG=5 ;; - a|6) ARG=6 ;; - s|7) ARG=7 ;; - d|8) ARG=8 ;; - f|9) ARG=9 ;; - g|10) ARG=10 ;; - q|11) ARG=11 ;; - *) printf "Unknown scratchpad $1!\n" ; exit 1 ;; - esac +for i in "$@"; do + case "$i" in + z|1) ARG=1 ;; + x|2) ARG=2 ;; + c|3) ARG=3 ;; + v|4) ARG=4 ;; + b|5) ARG=5 ;; + a|6) ARG=6 ;; + s|7) ARG=7 ;; + d|8) ARG=8 ;; + f|9) ARG=9 ;; + g|10) ARG=10 ;; + q|11) ARG=11 ;; + *) printf "Unknown scratchpad $i!\n" ; exit 1 ;; + esac + if pgrep -x "sp_$OPTARG"; then riverctl toggle-focused-tags $((1 << ($ARG + 9))) - ;; -esac done + else + riverctl toggle-focused-tags $(( 1 << ($ARG + 9))) + riverctl spawn-tagmask $(( 1 << ($ARG + 9))) + spawnwindow "$ARG" + riverctl spawn-tagmask $(( (1 << 9) - 1)) + fi +done #}}} -- cgit v1.2.3 From b9429bab03c5a9b9b867259322f77a6bec0d3eeb Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 24 Feb 2023 11:35:00 -0600 Subject: update river_sp --- river/sp/river_sp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'river/sp') diff --git a/river/sp/river_sp b/river/sp/river_sp index 2203e40..9b1e1ad 100755 --- a/river/sp/river_sp +++ b/river/sp/river_sp @@ -26,20 +26,20 @@ spawnwindow () { #{{{ getopts for i in "$@"; do case "$i" in - z|1) ARG=1 ;; - x|2) ARG=2 ;; - c|3) ARG=3 ;; - v|4) ARG=4 ;; - b|5) ARG=5 ;; - a|6) ARG=6 ;; - s|7) ARG=7 ;; - d|8) ARG=8 ;; - f|9) ARG=9 ;; - g|10) ARG=10 ;; - q|11) ARG=11 ;; + z) ARG=1 ;; + x) ARG=2 ;; + c) ARG=3 ;; + v) ARG=4 ;; + b) ARG=5 ;; + a) ARG=6 ;; + s) ARG=7 ;; + d) ARG=8 ;; + f) ARG=9 ;; + g) ARG=10 ;; + q) ARG=11 ;; *) printf "Unknown scratchpad $i!\n" ; exit 1 ;; esac - if pgrep -x "sp_$OPTARG"; then + if pgrep -x "sp_$i"; then riverctl toggle-focused-tags $((1 << ($ARG + 9))) else riverctl toggle-focused-tags $(( 1 << ($ARG + 9))) -- cgit v1.2.3