Merge branch 'master' of github.com:lytedev/dotfiles

de/bar/bar.bash

@@ -17,18 +17,19 @@ export POS_X=$((GAP + BAR_SIDE_MARGIN))
 export BAR_FONT_DECLARATION="${BAR_FONT}:pixelsize=${BAR_FONT_SIZE};1"
 
 EHEIGHT=$((BAR_HEIGHT + GAP))
+echo $EHEIGHT
 
 export BAR_BOTTOM="true"
 export POS_Y=0
 if [ $BAR_ON_TOP -eq 1 ]; then
 	export BAR_BOTTOM="false"
 	export POS_Y=$GAP
-	bspc config -m ${BAR_MONITOR} top_padding "$EHEIGHT"
+	bspc config -m ${BAR_MONITOR} top_padding "-$GAP"
 	bspc config -m ${BAR_MONITOR} bottom_padding "0"
 else
 	export POS_Y=$GAP
 	bspc config -m ${BAR_MONITOR} top_padding "0"
-	bspc config -m ${BAR_MONITOR} bottom_padding "$EHEIGHT"
+	bspc config -m ${BAR_MONITOR} bottom_padding "-$GAP"
 fi
 
 # bspc

de/bar/polybar-config

@@ -362,5 +362,5 @@ screenchange-reload = true
 ;compositing-border = over
 
 [global/wm]
-margin-top = 25
-margin-bottom = 25
+margin-top = ${env:WINDOW_GAP}
+margin-bottom = ${env:WINDOW_GAP}

de/bspwm_config

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 BORDER_WIDTH=0 # change in bspwmrc
-WINDOW_GAP=25
+export WINDOW_GAP=25
 DESKTOPS=(dev web misc env play out main srv daem util)
 
 BSPWM_MONITORS=$(bspc query -M | tac)