commit bea02a7e83c75053ab37a30efd8c6f59aaa66fbc parent 82d3db183be5ed90de006aa76665e58f061ba382 Author: jacobs-github <JacobDoesLinux@protonmail.com> Date: Thu, 20 Feb 2020 23:08:40 -0800 everything now has a help command and min arguments added a functions file for various things cleaned up EVERYTHING Diffstat:
17 files changed, 151 insertions(+), 134 deletions(-)
diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-hjkl b/bspwm/.config/bspwm/bspc-utils/bspc-hjkl @@ -1,19 +1,16 @@ #!/bin/dash -# Jacob Edwards, 2020 +# Jacob Edwards, Jan 2020 - Feb 2020 # bspwm utility to resize nodes +. "$( dirname $0 )/functions" +help "$1" '[DIRECTION] [INCREMENT]\n --left, --right, --up, --down' +need_argument "$1" - -# set increment to default if none is specified and test weather an argument was given. -if [ -z "$1" ]; then - printf 'error, no arguments `--help` for help.\n' - exit 1 -elif [ -z $2 ]; then +if [ -z "$2" ]; then inc=25 else inc="$2" fi - if [ "$1" = '--left' ]; then bspc node --resize left "-$inc" 0 bspc node east.tiled --resize left "-$inc" 0 @@ -26,12 +23,4 @@ elif [ "$1" = '--up' ]; then elif [ "$1" = '--down' ]; then bspc node --resize bottom 0 "-$inc" bspc node north.tiled --resize bottom 0 "-$inc" -elif [ "$1" = '--help' ]; then - printf 'Usage, bspc-hjkl [DIRECTION] [OPTIONAL:INCREMENT:INT]\n' - printf '\n' - printf 'Directions:\n' - printf ' --right\n' - printf ' --left\n' - printf ' --up\n' - printf ' --down\n' fi diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-inc b/bspwm/.config/bspwm/bspc-utils/bspc-inc @@ -1,17 +1,15 @@ #!/bin/dash # Jacob Edwards, 2020 # increment values in bspwm +. "$( dirname $0 )/functions" +help "$1" '[bspwm config option] [OPORATOR] [INT]' -if [ "$1" = '--help' ]; then - printf 'bspc-inc [CONFIG:OPTION] [OPORATOR] [INT]\n' -else - inital="$( bspc config "$1" )" - new="$( expr "$inital" "$2" "$3" )" +pre="$( bspc config "$1" )" +set="$( expr "$pre" "$2" "$3" )" - if [ "$new" -lt 0 ]; then - new=0 - fi - - bspc config "$1" "$new" +if [ "$set" -lt 0 ]; then + set=0 fi + +bspc config "$1" "$set" diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-inc-edges b/bspwm/.config/bspwm/bspc-utils/bspc-inc-edges @@ -0,0 +1,27 @@ +#!/bin/dash +# Jacob Edwards, Jan 2020 - Feb 2020 +# bspwm window resizing +. "$( dirname $0 )/functions" +help "$1" '[--enlarge] [--shrink]' +need_argument "$1" + +bspc query --nodes --node north > /dev/null +north=$? +bspc query --nodes --node east > /dev/null +east=$? +bspc query --nodes --node south > /dev/null +south=$? +bspc query --nodes --node west > /dev/null +west=$? + +if [ "$1" = '--enlarge' ]; then + if [ "$north" -eq '0' ]; then bspc node --resize top 0 -50 ; fi + if [ "$east" -eq '0' ]; then bspc node --resize right 50 0 ; fi + if [ "$south" -eq '0' ]; then bspc node --resize bottom 0 50 ; fi + if [ "$west" -eq '0' ]; then bspc node --resize left -50 0 ; fi +elif [ "$1" = '--shrink' ]; then + if [ "$north" -eq '0' ]; then bspc node --resize top 0 50 ; fi + if [ "$east" -eq '0' ]; then bspc node --resize right -50 0 ; fi + if [ "$south" -eq '0' ]; then bspc node --resize bottom 0 -50 ; fi + if [ "$west" -eq '0' ]; then bspc node --resize left 50 0 ; fi +fi diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-larger-smaller b/bspwm/.config/bspwm/bspc-utils/bspc-larger-smaller @@ -1,29 +0,0 @@ -#!/bin/dash -# jacob edwards -- 09/01/2020 -# bspwm window resizing - -bspc query --nodes --node north -north=$? - -bspc query --nodes --node east -east=$? - -bspc query --nodes --node south -south=$? - -bspc query --nodes --node west -west=$? - - -if [ "$1" = '--enlarge' ]; then - if [ "$north" -eq '0' ]; then bspc node --resize top 0 -50 ;fi - if [ "$east" -eq '0' ]; then bspc node --resize right 50 0 ;fi - if [ "$south" -eq '0' ]; then bspc node --resize bottom 0 50 ;fi - if [ "$west" -eq '0' ]; then bspc node --resize left -50 0 ;fi - -elif [ "$1" = '--shrink' ]; then - if [ "$north" -eq '0' ]; then bspc node --resize top 0 50 ;fi - if [ "$east" -eq '0' ]; then bspc node --resize right -50 0 ;fi - if [ "$south" -eq '0' ]; then bspc node --resize bottom 0 -50 ;fi - if [ "$west" -eq '0' ]; then bspc node --resize left 50 0 ;fi -fi diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-miniplayer b/bspwm/.config/bspwm/bspc-utils/bspc-miniplayer @@ -1,9 +1,19 @@ #!/bin/dash -# Jacob Edwards, 2020 +# Jacob Edwards, Jan 2020 - Feb 2020 # make a miniplayer +. "$( dirname $0 )/functions" +help "$1" '[DIRECTION] [DIRECTION]\n up, down, left, right' +if [ -z "$1" ]; then + snap1=down + snap2=right +else + snap1=$1 + snap2=$2 +fi + bspc node focused --state floating bspc-set-geometry 360 240 -bspc-snap --left -bspc-snap --up +bspc-snap "--$snap1" +bspc-snap "--$snap2" diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-pulse b/bspwm/.config/bspwm/bspc-utils/bspc-pulse @@ -0,0 +1,26 @@ +#!/bin/dash +# Jacob Edwards, Jan 2020 - Feb 2020 +# dump script to pulse? windows +. "$( dirname $0 )/functions" +help "$1" '[INCREMENT]' + +if [ -n "$1" ]; then + inc="$1" +else + inc=1 +fi + +# initialize variables +step=40 +mod=0 +gap="$(bspc config window_gap)" + +while [ "$mod" -lt "$step" ]; do + mod="$( expr "$mod" + "$inc" )" + bspc config window_gap "$( expr "$mod" + "$gap" )" +done + +while [ "$mod" -gt '0' ]; do + mod="$( expr "$mod" - "$inc" )" + bspc config window_gap "$( expr "$mod" + "$gap" )" +done diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-query b/bspwm/.config/bspwm/bspc-utils/bspc-query @@ -0,0 +1,9 @@ +#!/bin/dash +# Jacob Edwards, Jan 2020 - Feb 2020 +# query desktop easier +. "$( dirname $0 )/functions" +help "$1" '[QUERY]' +need_argument "$1" + +bspc query --desktop focused -T | sed 's/,/\n/g' | grep "$1" -q +exit $? diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-querydesktop b/bspwm/.config/bspwm/bspc-utils/bspc-querydesktop @@ -1,9 +0,0 @@ -#!/bin/dash -# Jacob Edwards, 2020 -# Query desktop easier - - -# I don't know hardly anything about regex yet, working on it. -# so obviously this is very flawed but works for my *perpouses* -bspc query --desktop focused -T | sed 's/,/\n/g' | grep "$1" -q -exit $? diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-set-geometry b/bspwm/.config/bspwm/bspc-utils/bspc-set-geometry @@ -1,29 +1,24 @@ #!/bin/dash -# Jacob Edwards, 10/01/2020 -# fast script to change node (window) geometry (primarily floating) in bspwm using bspc. - - -# help message -if [ "$1" = '--help' ]; then - printf 'Usage, bspc.set.geometry [X:int] [Y:int]\n' - exit 0 -fi +# Jacob Edwards, Jan 2020 - Feb 2020 +# change node geometry +. "$( dirname $0 )/functions" +help "$1" '[x] [y]' +need_argument "$2" # test wether specified geometry surpases display size -Gdisplay="$( xdotool getdisplaygeometry)" +Gdisplay="$( xdotool getdisplaygeometry )" if [ "$1" -gt "$( printf "$Gdisplay" | awk '{print $1}' )" ] || [ "$2" -gt "$( printf "$Gdisplay" | awk '{print $2}' )" ]; then - printf "Error, max geometry is $Gdisplay\n" + printf "error, max geometry is $Gdisplay\n" exit 1 fi # get node geometry -Gnode="$( xdotool getwindowgeometry "$( xdotool getactivewindow )" | tail -n 1 | awk '{print $2}' )" +Gnode="$( geometry )" Xnode="$( printf "$Gnode" | cut -d 'x' -f 1 )" Ynode="$( printf "$Gnode" | cut -d 'x' -f 2 )" - # 0 = adding, 1 = subtracting if [ "$1" -lt "$Xnode" ]; then x=true @@ -37,7 +32,6 @@ else y=false fi - # set new geometry if [ "$x" = 'true' ]; then Xdiff="$( expr \( "$Xnode" - "$1" \) / 2 )" diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-snap b/bspwm/.config/bspwm/bspc-utils/bspc-snap @@ -1,42 +1,38 @@ #!/bin/dash -# Jacob Edwards, 2020 +# Jacob Edwards, Jan 2020 - Feb 2020 # bspwm utility to snap floating windows to edges - -if [ "$1" = '--help' ]; then - printf 'takes one argument\n--left, --right, --up, --down\n' - exit 0 -fi +. "$( dirname $0 )/functions" +help "$1" '[DIRECTION]\n --left, --right, --up, --down' +need_argument "$1" -getpos(){ - window="$( xdotool getactivewindow )" - - display="$( xdotool getdisplaygeometry )" - Xdis="$( printf "$display" | awk '{print $1}' )" - Ydis="$( printf "$display" | awk '{print $2}' )" +# get geometry and position +display="$( xdotool getdisplaygeometry )" +Xdis="$( printf "$display" | awk '{print $1}' )" +Ydis="$( printf "$display" | awk '{print $2}' )" - pos="$( xdotool getwindowgeometry "$window" | head -n 2 | tail -n 1 | awk '{print $2}' )" - Xpos="$( printf "$pos" | awk -F ',' '{print $1}' )" - Ypos="$( printf "$pos" | awk -F ',' '{print $2}' )" +pos="$( position )" +Xpos="$( printf "$pos" | awk -F ',' '{print $1}' )" +Ypos="$( printf "$pos" | awk -F ',' '{print $2}' )" - geometry="$( xdotool getwindowgeometry "$window" | tail -n 1 | awk '{print $2}' )" - Xgeo="$( printf "$geometry" | awk -F 'x' '{print $1}' )" - Ygeo="$( printf "$geometry" | awk -F 'x' '{print $2}' )" -} +geometry="$( geometry )" +Xgeo="$( printf "$geometry" | awk -F 'x' '{print $1}' )" +Ygeo="$( printf "$geometry" | awk -F 'x' '{print $2}' )" -getpos +# I can not find a way to make this look good, maybe i'll make the adjust/shift a function. if [ "$1" = '--left' ]; then bspc node focused.floating --move "-$Xpos" 0 elif [ "$1" = '--right' ]; then - upleft="$( expr "$Xpos" + "$Xgeo" )" - jump="$( expr "$Xdis" - "$upleft" )" - bspc node focused.floating --move "$jump" 0 + # adjust X to be at the top right corner + shift="$( expr "$Xpos" + "$Xgeo" )" + Xpos="$( expr "$Xdis" - "$shift" )" + bspc node focused.floating --move "$Xpos" 0 elif [ "$1" = '--up' ]; then bspc node focused.floating --move 0 "-$Ypos" elif [ "$1" = '--down' ]; then - downleft="$( expr "$Ypos" + "$Ygeo" )" - jump="$( expr "$Ydis" - "$downleft" )" - bspc node focused.floating --move 0 "$jump" + # adjust Y to be at bottom left corner + shift="$( expr "$Ypos" + "$Ygeo" )" + Ypos="$( expr "$Ydis" - "$shift" )" + bspc node focused.floating --move 0 "$Ypos" fi - diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-toggle-layer b/bspwm/.config/bspwm/bspc-utils/bspc-toggle-layer @@ -1,24 +1,22 @@ #!/bin/dash -# -# Jacob Edwards, 2020 -# bspwm utility to switch floating windows -# that are above or below to the opposite +# Jacob Edwards, Jan 2020 - Feb 2020 +# bspwm utility to switch floating windows that are above or below to the opposite +. "$( dirname $0 )/functions" +help "$1" '[--above] [--below]' +need_argument "$1" if [ "$1" = '--above' ]; then bspc node --focus any.floating.below.local - if [ "$?" -eq '0' ]; then - bspc-set-geometry 1266 668 + bspc-set-geometry 1266 668 bspc node --layer above fi - elif [ "$1" = '--below' ]; then bspc node --focus any.floating.above.local - if [ "$?" -eq '0' ]; then - bspc node --layer below - bspc-set-geometry 683 384 + bspc node --layer below + bspc-set-geometry 683 384 bspc node --focus last.local.tiled fi fi diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-window-pop b/bspwm/.config/bspwm/bspc-utils/bspc-window-pop @@ -1,16 +0,0 @@ -#!/bin/dash - -gap="$(bspc config window_gap)" -inc=1 -pixel=40 -mod=0 - -while [ "$mod" -lt "$pixel" ]; do - mod="$( expr "$mod" + "$inc" )" - bspc config window_gap "$( expr "$mod" + "$gap" )" -done - -while [ "$mod" -gt '0' ]; do - mod="$( expr "$mod" - "$inc" )" - bspc config window_gap "$( expr "$mod" + "$gap" )" -done diff --git a/bspwm/.config/bspwm/bspc-utils/functions b/bspwm/.config/bspwm/bspc-utils/functions @@ -0,0 +1,24 @@ +is_floating(){ + bspc query --node focused.floating --desktops > /dev/null + printf "$?\n" +} +help(){ + if [ "$1" = '--help' ] || [ "$1" = '-h' ]; then + printf "usage; $( basename $0 ) " + printf "$2\n" + exit 0 + fi +} +need_argument(){ + if [ -z "$@" ]; then + printf 'error, not enough argunments\n' + exit 1 + fi +} +position(){ + xdotool getwindowgeometry "$( xdotool getactivewindow )" | tail -n 2 | head -n 1 | awk '{print $2}' +} + +geometry(){ + xdotool getwindowgeometry "$( xdotool getactivewindow )" | tail -n 1 | awk '{print $2}' +} diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-subscribe-desktop b/bspwm/.config/bspwm/bspc-utils/trash/bspc-subscribe-desktop diff --git a/bspwm/.config/bspwm/bspc-utils/bspwm-query b/bspwm/.config/bspwm/bspc-utils/trash/bspwm-query diff --git a/bspwm/.config/bspwm/bspc-utils/conky-bspwm b/bspwm/.config/bspwm/bspc-utils/trash/conky-bspwm diff --git a/bspwm/.config/bspwm/bspc-utils/bspc-hide-others b/bspwm/.config/bspwm/bspc-utils/unpolished/bspc-hide-others