all the changes!

Signed-off-by: fbt <fbt@fleshless.org>

homedir/.config/bspwm/bspwmrc

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
-nullexec() {
-	"$@" &>/dev/null
-}
+nullexec() { "$@" &>/dev/null; }
 
 PATH+=":$HOME/.config/alternatives"
 PATH+=":$HOME/.config/bspwm/bin"
@@ -11,44 +9,33 @@ PATH+=":$HOME/.config/bspwm/bin"
 xsetroot -cursor_name left_ptr
 
 # Global config
-bspc config focused_sticky_border_color     "#030061"
 bspc config focused_border_color            "#67748F"
 bspc config normal_border_color             "#1f1f1f"
-bspc config urgent_border_color             "#f9f9f9"
 bspc config window_gap                      "9"
 bspc config border_width                    '2'
 bspc config split_ratio                     '0.52'
 bspc config borderless_monocle              'false'
 bspc config gapless_monocle                 'false'
-bspc config focus_by_distance               'true'
 bspc config ignore_ewmh_focus               'true'
 bspc config initial_polarity                'second_child'
-bspc config auto_cancel                     'true'
-bspc config click_to_focus                  'true'
+bspc config click_to_focus                  'button1'
 
 # Workspaces and monitors
-bspc monitor -d                             1 2 3 4 5 6 7 8 9 h
+bspc monitor -d                             1 2 3 4 5 6 7 8 9 0 q w e r t y h
 
 # Float some bastards
-bspfloat 1 &
+#bspfloat 1 &
 
 # Individual padding
 for d in 1 3; do
 	bspset -d "$d" padding 48
 done
 
-# Clear the rules before adding any
-while read -r rule _; do bspc rule -r "$rule"; done < <(bspc rule -l)
-
-# Now add the rules
-bspc rule -a 'Steam'              state=floating desktop=^8
-bspc rule -a 'Firefox:Navigator'  state=tiled desktop=^2
-bspc rule -a '*:Hearthstone.exe'  desktop=^5
-bspc rule -a '*:Arma 3'           state=fullscreen desktop=^5
-bspc rule -a '*'                  state=floating
+# Rules
+"$XDG_CONFIG_HOME/bspwm/rules"
 
 # start some services
-services=( sxhkd dunst ssh-agent )
+services=( sxhkd dunst ssh-agent ufwd{,-private,-scn,-fikus} )
 for s in "${services[@]}"; do
 	if ! service "$s" status; then
 		service "$s" start
@@ -61,6 +48,4 @@ service moltenbar restart
 nullexec browser &
 nullexec telegram &
 nullexec dropbox &
-
-terminal -e 'ssh-add-all' &
-terminal -e 'sudo wrkvpn' &
+nullexec mumble &

homedir/.config/bspwm/rules

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Clear the rules before adding any
+while read -r rule _; do bspc rule -r "$rule"; done < <(bspc rule -l)
+
+# Now add the rules
+bspc rule -a 'firefox'                  desktop=^2 state=tiled
+bspc rule -a 'steam_app_359320'         desktop=^5
+bspc rule -a 'steam_app_397540'         desktop=^5
+bspc rule -a 'Steam'                    desktop=^8
+bspc rule -a '*'                        state=floating

homedir/.config/bspwm/sxhkdrc

@@ -21,11 +21,14 @@ super + w; {0-9,h,p}
 super + w; space
 	bspc desktop -l next
 
+super + w; l; {b,n,a}
+   bspc node -l {below,normal,above}
+
 super + w; x
 	terminal
 
 super + w; b
-	bspc node -s biggest.local
+	bspc node -s biggest.local.!hidden.window
 
 super + w; Return
 	bspc node @focused:/ -R 90
@@ -33,8 +36,8 @@ super + w; Return
 super + w; w
 	ssm chameleon reload
 
-super + w; c
-	win-hd-center 1280x720
+super + w; c; {9,7,4,3,2}
+	win-hd-center {1920x1080,1280x720,768x480,480x320,400x240}
 
 # Locker
 super + l; l
@@ -43,6 +46,10 @@ super + l; l
 super + l; {u,s}
 	ssm lockd stop
 
+# Notes
+super + n; n
+	dmenu-extras note
+
 # simple hotkeys
 Print
 	snap -f
@@ -54,7 +61,7 @@ super + {r,p}
 	dmenu-extras -l 9 {run,pass}
 
 super + {j,k}
-	bspc node -f {prev,next}.local
+	bspc node -f {prev,next}.local.!hidden.window
 
 # mpd
 super + m; {a,s,n,p}
@@ -64,6 +71,16 @@ super + m; {a,s,n,p}
 super + {comma,period}
    amixer -c 0 set PCM 5%{-,+}
 
+super + s; p
+	~/bin/sndbrd -p
+
+super + s; s
+	~/bin/sndbrd
+
+# Mute mic
+super + s; m
+	pactl set-source-mute jack_in toggle
+
 # Fucking Firefox man
 control + q
    /bin/true