From d3964de65c70de9f2c452fdec7f57abb2587945e Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 15 Nov 2018 16:10:45 -0600
Subject: [PATCH] DSK, Polybar: Trim down the startup script, make i3 the
 default restack

---
 .config/dsk/run/polybar | 21 +++++++++------------
 .config/polybar/config  |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.config/dsk/run/polybar b/.config/dsk/run/polybar
index e130e2e7..e40cf295 100755
--- a/.config/dsk/run/polybar
+++ b/.config/dsk/run/polybar
@@ -1,18 +1,14 @@
 #! /usr/bin/env bash
 # Make sure we have our xrdb stuff going
-if $(which xrdbupdate) > /dev/null 2>&1; then
+if which xrdbupdate > /dev/null 2>&1; then
 	xrdbupdate > /dev/null 2>&1
 fi
-# Set some variables, if necessary
-if [[ "$PB_BAR_BORDER_SIZE" == "" ]] && pgrep -U "$UID" bspwm > /dev/null 2>&1; then
-	if ! [[ "$BSPWM_WINDOW_GAP" == "" ]]; then
-		echo "Inferring bar size from BSPWM_WINDOW_GAP"
-		export PB_BAR_BORDER_SIZE="$BSPWM_WINDOW_GAP"
-	fi
-fi
-if pgrep -U "$UID" i3 > /dev/null 2>&1; then
-	export PB_WM_RESTACK="i3"
+
+# Restack compatibility
+if pgrep -U "$UID" bspwm > /dev/null 2>&1; then
+	export PB_WM_RESTACK="bspwm"
 fi
+
 # Spawn bars on the primary monitor
 export PB_MONITOR=$(xrandr -q | awk '/primary/{print $1}')
 polybar -r primary &
@@ -20,7 +16,7 @@ polybar -r primary-2 &
 
 # Spawn more for each secondary
 export secondary_monitors=$(xrandr -q | grep ' connected' | grep -v 'primary' | awk '{print $1}')
-if [[ "$secondary_monitors" == "" ]]; then
+if [ "$secondary_monitors" == "" ]; then
 	return 0
 fi
 for monitor in $secondary_monitors; do
@@ -28,5 +24,6 @@ for monitor in $secondary_monitors; do
 	polybar -r secondary &
 	polybar -r secondary-2 &
 done
-return 0
+
+# And wait
 wait
diff --git a/.config/polybar/config b/.config/polybar/config
index 1861b3da..a1914b40 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -55,7 +55,7 @@ font-4 = "Material Design Icons:size=11;3"
 [template/bar]
 # General ordering
 bottom = true
-wm-restack = ${env:PB_WM_RESTACK:bspwm}
+wm-restack = ${env:PB_WM_RESTACK:i3}
 offset-y = 2
 
 # Tray settings