~dwm -> bspwm

dwm was giving me some issues, and it just wasn't fun to use anymore. So
I switched to bspwm, which should have basically everything I need.

4 files changed, 59 insertions, 14 deletions

diff --git a/BSPWM/.config/bspwm/bspwmrc b/BSPWM/.config/bspwm/bspwmrc
new file mode 100755
index 0000000..68887e5
--- /dev/null
+++ b/BSPWM/.config/bspwm/bspwmrc
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+bspc monitor -d Development Browser Media
+
+bspc config border_width         2
+bspc config window_gap          12
+
+bspc config split_ratio          0.52
+bspc config borderless_monocle   true
+bspc config gapless_monocle      true
+
+bspc rule -a Gimp desktop='^8' state=floating follow=on
+bspc rule -a Chromium desktop='^2'
+bspc rule -a mplayer2 state=floating
+bspc rule -a Kupfer.py focus=on
+bspc rule -a Screenkey manage=off
+
+bspwm
diff --git a/Polybar/.config/polybar/config b/Polybar/.config/polybar/config
index d272b75..a162acf 100644
--- a/Polybar/.config/polybar/config
+++ b/Polybar/.config/polybar/config
@@ -1,7 +1,7 @@
 [bar/custom-bar]
 width = 100%
 height = 27
-modules-left = i3
+modules-left = bspwm
 modules-right = filesystem pulseaudio battery date
 tray-position = right
 separator = "        Δ        "
@@ -12,8 +12,15 @@ font-0 = IBM Plex Sans:size=12
 [module/i3]
 type = internal/i3
 format = <label-state> <label-mode>
-index-sort = true
-wrapping-scroll = false
+pin-workspaces = false
+
+[module/bspwm]
+type = internal/bspwm
+format = <label-state> <label-mode>
+label-monitor = %name%   
+enable-click = true
+pin-workspaces = true
+label-focused-foreground = #91cbff
 
 [module/pulseaudio]
 type = internal/pulseaudio
diff --git a/SXHkD/.config/sxhkd/sxhkdrc b/SXHkD/.config/sxhkd/sxhkdrc
index 1609463..daad941 100644
--- a/SXHkD/.config/sxhkd/sxhkdrc
+++ b/SXHkD/.config/sxhkd/sxhkdrc
@@ -1,3 +1,28 @@
+# BSPWM
+super + {_, shift + } {h,j,k,l}
+  bspc node -{f,s} {west, south, north, east}
+
+super + Escape
+  killall xinit
+
+super + {_,shift + } q
+  bspc node -{c,k}
+
+super + c
+  bspc node -s biggest
+
+super + shift + {t,f}
+  bspc node -t {tiled,floating}
+
+super + f
+  bspc node -t ~fullscreen
+
+super + {_,shift + }{1,2,3}
+	bspc {desktop -f,node -d} {Development,Browser,Media}
+
+hyper + {_,shift + }{1,2,3}
+	bspc {desktop -f,node -d} {Development,Browser,Media}
+
 # Launchers
 {super + Return, hyper + a}
   alacritty
diff --git a/XServer/.xinitrc b/XServer/.xinitrc
index 81c3c79..d0a905a 100644
--- a/XServer/.xinitrc
+++ b/XServer/.xinitrc
@@ -6,14 +6,9 @@ systemctl start --user emacs &
 $(xss-lock --transfer-sleep-lock -- lock) &
 feh --randomize --bg-scale $HOME/Pictures/Backgrounds &
 
-while true; do
-    killall picom;
-    killall mpd;
-    killall sxhkd;
-    killall dwmblocks;
-    picom &
-    mpd &
-    sxhkd &
-    dwmblocks &
-    ssh-agent dwm || break
-done
+picom &
+mpd &
+sxhkd &
+
+$HOME/.config/bspwm/bspwmrc &
+polybar custom-bar &