From 4a400dd1df703884e7eb1b7f7a8ee8409483c3e4 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Tue, 7 Aug 2018 19:22:22 -0500
Subject: [PATCH] Polybar, bspwm: De-rice

---
 .config/bspwm/bspwmrc            |  5 +++--
 .config/dtfscripts/dsk-cstm-0.rc |  3 ---
 .config/dtfscripts/wmstartup.sh  |  1 -
 .config/polybar/config           | 12 ++----------
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index f3015262..f3a57775 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -48,8 +48,9 @@ bspc config pointer_action2		resize_corner #RMB
 
 ## Looks
 # Padding
-bspc config border_width	4
-bspc config window_gap		6
+bspc config border_width		4
+bspc config window_gap			0
+bspc config single_monocle		true
 bspc config borderless_monocle		true
 bspc config gapless_monocle		true
 # Colors
diff --git a/.config/dtfscripts/dsk-cstm-0.rc b/.config/dtfscripts/dsk-cstm-0.rc
index c19136f0..b1f2bb84 100755
--- a/.config/dtfscripts/dsk-cstm-0.rc
+++ b/.config/dtfscripts/dsk-cstm-0.rc
@@ -1,7 +1,4 @@
 #!/bin/sh
-export PB_BAR_WIDTH=2548
-export PB_BAR_SECONDARY_WIDTH=1908
-
 # Primary bottom
 export PB_BAR_PRIMARY_MODULES_LEFT='cpu memory swap'
 
diff --git a/.config/dtfscripts/wmstartup.sh b/.config/dtfscripts/wmstartup.sh
index 2593f23a..0b67143e 100755
--- a/.config/dtfscripts/wmstartup.sh
+++ b/.config/dtfscripts/wmstartup.sh
@@ -24,7 +24,6 @@
 # Polybar
 unset PB_MONITOR
 unset PB_WM_RESTACK
-unset PB_BAR_WIDTH
 unset PB_BAR_PRIMARY_MODULES_LEFT PB_BAR_PRIMARY_MODULES_CENTER PB_BAR_PRIMARY_MODULES_RIGHT
 unset PB_BAR_PRIMARY_2_MODULES_LEFT PB_BAR_PRIMARY_2_MODULES_CENTER PB_BAR_PRIMARY_2_MODULES_RIGHT
 unset PB_BAR_SECONDARY_MODULES_LEFT PB_BAR_SECONDARY_MODULES_CENTER PB_BAR_SECONDARY_MODULES_RIGHT
diff --git a/.config/polybar/config b/.config/polybar/config
index c1cfd0f8..7690884e 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -56,9 +56,7 @@ font-4 = "Material Design Icons:size=11;3"
 
 [template/bar]
 # Rendering of the bar
-width = ${env:PB_BAR_WIDTH:1908}
 height = 34
-offset-x = 6
 bottom = true
 wm-restack = ${env:PB_WM_RESTACK:bspwm}
 
@@ -69,13 +67,9 @@ padding = 4
 # Tray settings
 tray-maxsize = 16
 
-# Mild ricing
+# Mild cosmetics
 background = ${res/colors.background}
 foreground = ${res/colors.foreground}
-
-border-size = 4
-border-bottom-size = 0
-border-color = ${res/colors.border}
 overline-size = 6
 underline-size = 6
 
@@ -104,7 +98,7 @@ monitor = ${env:PB_MONITOR:eDP-1}
 inherit = template/bar
 
 bottom = false
-border-bottom-size = 4
+border-bottom-size = 
 border-top-size = 0
 
 modules-left = ${env:PB_BAR_PRIMARY_2_MODULES_LEFT:bspwm}
@@ -112,7 +106,6 @@ modules-center = ${env:PB_BAR_PRIMARY_2_MODULES_CENTER:xwindow}
 modules-right = ${env:PB_BAR_PRIMARY_2_MODULES_RIGHT:fs-home | tor wlan eth}
 
 [bar/secondary]
-width = ${env:PB_BAR_SECONDARY_WIDTH:1908}
 monitor = ${env:PB_MONITOR}
 inherit = template/bar
 
@@ -121,7 +114,6 @@ modules-center = ${env:PB_BAR_SECONDARY_MODULES_CENTER: }
 modules-right = ${env:PB_BAR_SECONDARY_MODULES_RIGHT:date}
 
 [bar/secondary-2]
-width = ${env:PB_BAR_SECONDARY_WIDTH:1908}
 monitor = ${env:PB_MONITOR}
 inherit = template/bar