From ed5e2e13f81700e5422b590ca1a0fcb1807cdee7 Mon Sep 17 00:00:00 2001
From: ray <gitea@rayelliott.dev>
Date: Tue, 31 Mar 2020 22:28:57 +0100
Subject: [PATCH] split configuration into modules

---
 sxhkdrc                | 112 ++---------------------------------------
 sxhkdrc.bspwm          | 102 +++++++++++++++++++++++++++++++++++++
 sxhkdrc.bspwm.pamela   |  11 ++++
 sxhkdrc.bspwm.patricia |   9 ++++
 4 files changed, 125 insertions(+), 109 deletions(-)
 create mode 100644 sxhkdrc.bspwm
 create mode 100644 sxhkdrc.bspwm.pamela
 create mode 100644 sxhkdrc.bspwm.patricia

diff --git a/sxhkdrc b/sxhkdrc
index 21fc432..1b42e6f 100644
--- a/sxhkdrc
+++ b/sxhkdrc
@@ -11,8 +11,8 @@
 #	dmenu_run
 
 # make sxhkd reload its configuration files:
-#super + Escape
-#	pkill -USR1 -x sxhkd
+super + Escape
+	pkill -USR1 -x sxhkd
 
 super + p
 	dmenu_recency
@@ -34,7 +34,7 @@ super + shift + Print
 	i3-scro -d
 
 super + s
-	dmnu_ssh
+	dmenu_ssh
 
 super + e
 	dmenu_power
@@ -50,109 +50,3 @@ super + F12
 
 super + F11
 	date-show
-
-# bspwm hotkeys
-#
-
-# quit/restart bspwm
-super + shift + {q,r}
-	bspc {quit,wm -r}
-
-# close and kill
-super + {_,shift + }w
-	bspc node -{c,k}
-
-# alternate between the tiled and monocle layout
-super + m
-	bspc desktop -l next
-
-# send the newest marked node to the newest preselected node
-super + y
-	bspc node newest.marked.local -n newest.!automatic.local
-
-# swap the current node and the biggest node
-super + g
-	bspc node -s biggest
-
-#
-# state/flags
-#
-
-# set the window state
-super + {t,shift + t,s,f}
-	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
-
-# set the node flags
-super + ctrl + {m,x,y,z}
-	bspc node -g {marked,locked,sticky,private}
-
-#
-# focus/swap
-#
-
-# focus the node in the given direction
-super + {_,shift + }{h,j,k,l}
-	bspc node -{f,s} {west,south,north,east}
-
-# focus the node for the given path jump
-super + {p,b,comma,period}
-	bspc node -f @{parent,brother,first,second}
-
-# focus the next/previous node in the current desktop
-super + {_,shift + }c
-	bspc node -f {next,prev}.local
-
-# focus the next/previous desktop in the current monitor
-super + bracket{left,right}
-	bspc desktop -f {prev,next}.local
-
-# focus the last node/desktop
-super + {grave,Tab}
-	bspc {node,desktop} -f last
-
-# focus the older or newer node in the focus history
-super + {o,i}
-	bspc wm -h off; \
-	bspc node {older,newer} -f; \
-	bspc wm -h on
-
-# focus or send to the given desktop
-super + {_,shift + }{1-9,0}
-	bspc {desktop -f,node -d} '^{1-9,10}'
-
-#
-# preselect
-#
-
-# preselect the direction
-super + ctrl + {h,j,k,l}
-	bspc node -p {west,south,north,east}
-
-# preselect the ratio
-super + ctrl + {1-9}
-	bspc node -o 0.{1-9}
-
-# cancel the preselection for the focused node
-super + ctrl + space
-	bspc node -p cancel
-
-# cancel the preselection for the focused desktop
-super + ctrl + shift + space
-	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
-
-#
-# move/resize
-#
-
-# expand a window by moving one of its side outward
-super + alt + {h,j,k,l}
-	bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
-
-# contract a window by moving one of its side inward
-super + alt + shift + {h,j,k,l}
-	bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
-
-# move a floating window
-super + {Left,Down,Up,Right}
-	bspc node -v {-20 0,0 20,0 -20,20 0}
-
diff --git a/sxhkdrc.bspwm b/sxhkdrc.bspwm
new file mode 100644
index 0000000..43456cc
--- /dev/null
+++ b/sxhkdrc.bspwm
@@ -0,0 +1,102 @@
+# #
+# bspwm hotkeys
+#
+
+# quit/restart bspwm
+super + shift + {q,r}
+	bspc {quit,wm -r}
+
+# close and kill
+super + {_,ctrl + }q
+	bspc node -{c,k}
+shift
+# alternate between the tiled and monocle layout
+super + m
+	bspc desktop -l next
+
+# send the newest marked node to the newest preselected node
+super + y
+	bspc node newest.marked.local -n newest.!automatic.local
+
+# swap the current node and the biggest node
+super + g
+	bspc node -s biggest
+
+#
+# state/flags
+#
+
+# set the window state
+super + {t,shift + t,s,f}
+	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
+
+# set the node flags
+super + ctrl + {m,x,y,z}
+	bspc node -g {marked,locked,sticky,private}
+
+#
+# focus/swap
+#
+
+# focus the node in the given direction
+super + {_,shift + }{h,j,k,l}
+	bspc node -{f,s} {west,south,north,east}
+
+# focus the node for the given path jump
+super + {p,b,comma,period}
+	bspc node -f @{parent,brother,first,second}
+
+# focus the next/previous node in the current desktop
+super + {_,shift + }c
+	bspc node -f {next,prev}.local
+
+# focus the next/previous desktop in the current monitor
+super + bracket{left,right}
+	bspc desktop -f {prev,next}.local
+
+# focus the last node/desktop
+super + {grave,Tab}
+	bspc {node,desktop} -f last
+
+# focus the older or newer node in the focus history
+super + {o,i}
+	bspc wm -h off; \
+	bspc node {older,newer} -f; \
+	bspc wm -h on
+
+#
+# preselect
+#
+
+# preselect the direction
+super + ctrl + {h,j,k,l}
+	bspc node -p {west,south,north,east}
+
+# preselect the ratio
+super + ctrl + {1-9}
+	bspc node -o 0.{1-9}
+
+# cancel the preselection for the focused node
+super + ctrl + space
+	bspc node -p cancel
+
+# cancel the preselection for the focused desktop
+super + ctrl + shift + space
+	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
+
+#
+# move/resize
+#
+
+# expand a window by moving one of its side outward
+super + alt + {h,j,k,l}
+	bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
+
+# contract a window by moving one of its side inward
+super + alt + shift + {h,j,k,l}
+	bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
+
+# move a floating window
+super + {Left,Down,Up,Right}
+	bspc node -v {-20 0,0 20,0 -20,20 0}
+
diff --git a/sxhkdrc.bspwm.pamela b/sxhkdrc.bspwm.pamela
new file mode 100644
index 0000000..0b439a5
--- /dev/null
+++ b/sxhkdrc.bspwm.pamela
@@ -0,0 +1,11 @@
+#
+# pamela specific hotkeys
+#
+
+# focus or send to the given desktop
+super + {_,shift + }{1-4}
+	bspc {desktop -f,node -d} '^{1-4}'
+super + {_,shift + }{5,6,7}
+	bspc {desktop -f,node -d} '^{10, 11, 12}'
+super + {_,shift + }{8,9,0}
+	bspc {desktop -f,node -d} '^{16,17,18}'
diff --git a/sxhkdrc.bspwm.patricia b/sxhkdrc.bspwm.patricia
new file mode 100644
index 0000000..016a7f3
--- /dev/null
+++ b/sxhkdrc.bspwm.patricia
@@ -0,0 +1,9 @@
+#
+# patricia specific hotkeys
+#
+
+# focus or send to the given desktop
+super + {_,shift + }{1-7}
+	bspc {desktop -f,node -d} '^{1-7}'
+super + {_,shift + }{8,9,0}
+	bspc {desktop -f,node -d} '^{11,12,13}'