From 7f4055435bd8c68a808cbf864364fa84443fc94a Mon Sep 17 00:00:00 2001 From: stupidcomputer Date: Mon, 4 Nov 2024 01:26:35 -0600 Subject: [PATCH] merge the phone sxhkdrc with the regular one --- .config/sxhkd/mouse | 7 +++++++ .config/sxhkd/phone | 21 -------------------- .config/sxhkd/phonemouse | 43 ---------------------------------------- .config/sxhkd/sxhkdrc | 41 +++++++++++++++++++++++++++++++++++--- builds/utils/disp | 6 +----- 5 files changed, 46 insertions(+), 72 deletions(-) delete mode 100644 .config/sxhkd/phone delete mode 100644 .config/sxhkd/phonemouse diff --git a/.config/sxhkd/mouse b/.config/sxhkd/mouse index 0304776..5b5dd55 100644 --- a/.config/sxhkd/mouse +++ b/.config/sxhkd/mouse @@ -2,6 +2,13 @@ Escape mode sxhkdrc +w + mode sxhkdrc + +# send the escape key +] + xdotool key Escape + # move left {ctrl +,shift +,_} h xdotool mousemove_relative -- {-5,-50,-20} 0 diff --git a/.config/sxhkd/phone b/.config/sxhkd/phone deleted file mode 100644 index 511b1b9..0000000 --- a/.config/sxhkd/phone +++ /dev/null @@ -1,21 +0,0 @@ -# essentially the same thing as sxhkdrc, but super is replaced with ctrl + b and all shortcuts are chorded -ctrl + b; c - st - -ctrl + b; Return - st - -ctrl + b; q - bspc node -c - -ctrl + b; {_,shift + } {1-9,0} - bspc {desktop -f,node -d} '{1-9,10}' - -ctrl + b; {_,ctrl +,shift + }{h,j,k,l} - bspc node -{f,p,s} {west,south,north,east} - -ctrl + b; d - tmenu_run - -ctrl + b; m - mode phonemouse diff --git a/.config/sxhkd/phonemouse b/.config/sxhkd/phonemouse deleted file mode 100644 index 3215f79..0000000 --- a/.config/sxhkd/phonemouse +++ /dev/null @@ -1,43 +0,0 @@ -# exit mouse mode -w - mode phone - -# move left -{ctrl +,shift +,_} h - xdotool mousemove_relative -- {-5,-50,-20} 0 - -# move down -{ctrl +,shift +,_} j - xdotool mousemove_relative -- 0 {5,50,20} - -# move up -{ctrl +,shift +,_} k - xdotool mousemove_relative -- 0 {-5,-50,-20} - -# move right -{ctrl +,shift +,_} l - xdotool mousemove_relative -- {5,50,20} 0 - -# left, middle, right click -{ctrl +,_} {a,s,d} - xdotool {mousedown,click} {1,2,3} - -# let go of clicked button -q - xdotool mouseup 1; xdotool mouseup 2; xdotool mouseup 3 - -# move the mouse to the top of the window -g ; g - mousehelper top - -# ditto for bottom -G - mousehelper bottom - -# ditto for left -0 - mousehelper left - -# ditto for right -dollar - mousehelper right diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index b313893..49b8a4d 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -2,15 +2,29 @@ super + Return st +ctrl + b; c + st + +ctrl + b; Return + st + # spawn the launcher super + d tmenu_run +ctrl + b; d + tmenu_run + # kill sxhkd with USR1 and restart bspwm super + r pkill -USR1 -x sxhkd; \ bspc wm -r +ctrl + b; r + pkill -USR1 -x sxhkd; \ + bspc wm -r + +# show nws radar super + {_,shift + }n nws {local,national} @@ -18,14 +32,23 @@ super + {_,shift + }n super + m mode mouse +ctrl + b; m + mode mouse + # kill the current node super + q bspc node -c +ctrl + b; q + bspc node -c + # kill bspwm super + e bspc quit 0 +ctrl + b; e + bspc quit 0 + # systemctl suspend super + shift + e systemctl suspend @@ -34,14 +57,16 @@ super + shift + e super + z passmenu -# start a browser -super + b - chromium +ctrl + b; z + passmenu # manipulate a node super + {_,ctrl +,shift + }{h,j,k,l} bspc node -{f,p,s} {west,south,north,east} +ctrl + b; {_,ctrl +,shift + }{h,j,k,l} + bspc node -{f,p,s} {west,south,north,east} + # change to or move a node to a desktop super + {_,shift + } {1-9,0} bspc {desktop -f,node -d} '0{1-9,0}' @@ -49,13 +74,23 @@ super + {_,shift + } {1-9,0} super + space; {_,shift + } {1-9,0} bspc {desktop -f,node -d} '1{1-9,0}' +ctrl + b; {_,shift + } {1-9,0} + bspc {desktop -f,node -d} '0{1-9,0}' + # change a node to tiling, floating, or fullscreen super + {t,f,s} bspc node -t {tiled,floating,fullscreen} +ctrl + b; {t,f,s} + bspc node -t {tiled,floating,fullscreen} + # x230t specific -- activate the tablet menu XF86RotateWindows tabletmenu shift + Insert special_ins + +# phone specific -- send the escape key since we can't use it +super + b; [ + xdotool key Escape diff --git a/builds/utils/disp b/builds/utils/disp index 7b3a8a3..a12db55 100755 --- a/builds/utils/disp +++ b/builds/utils/disp @@ -173,12 +173,8 @@ case "$(hostname)" in phone pair & disown ;; "localhost") # phone in termux - pkill sxhkd - cd ~ - sxhkd -c ~/.config/sxhkd/phone & disown - cd - xrandr --output VNC-0 --mode 1920x1080 - bspc monitor VNC-0 -d 1 2 3 4 5 6 7 8 9 # the phone uses different desktop descriptors + bspc monitor VNC-0 -d 01 02 03 04 05 06 07 08 09 feh --bg-fill ~/.local/share/pape.jpg bspc config top_padding 0 bspc config bottom_padding 100