From c3ce63099f3af5dbd923c78c30af26fe4c01c001 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Wed, 3 May 2017 13:31:10 -0500
Subject: [PATCH 1/2] Fix some bar bugs

---
 de/bar/bar.bash       |  1 +
 de/bar/polybar-config | 28 +++++++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/de/bar/bar.bash b/de/bar/bar.bash
index ef116e9..539456b 100755
--- a/de/bar/bar.bash
+++ b/de/bar/bar.bash
@@ -40,6 +40,7 @@ if [ $BAR_ON_TOP -eq 1 ]; then
 	bspc config -m ${BAR_MONITOR} top_padding "$EHEIGHT"
 	bspc config -m ${BAR_MONITOR} bottom_padding "0"
 else
+	export BAR_BOTTOM="true"
 	export POS_Y=$GAP
 	bspc config -m ${BAR_MONITOR} top_padding "0"
 	bspc config -m ${BAR_MONITOR} bottom_padding "$EHEIGHT"
diff --git a/de/bar/polybar-config b/de/bar/polybar-config
index f5c5948..a8a71e2 100644
--- a/de/bar/polybar-config
+++ b/de/bar/polybar-config
@@ -42,9 +42,7 @@ module-margin-left = 1
 module-margin-right = 2
 
 font-0 = ${env:BAR_FONT_DECLARATION}
-font-1 = xos4 Terminess Powerline:size=24:antialias=false;0
-font-2 = siji:pixelsize=24;1
-font-3 = ${env:BAR_ICON_FONT_DECLARATION}
+font-1 = ${env:BAR_ICON_FONT_DECLARATION}
 
 modules-left = bspwm
 modules-center =
@@ -111,10 +109,10 @@ ws-icon-8 = mon;
 ws-icon-9 = util;
 ws-icon-default = ♟
 
-label-focused-font = 4
-label-occupied-font = 4
-label-urgent-font = 4
-label-empty-font = 4
+label-focused-font = 2
+label-occupied-font = 2
+label-urgent-font = 2
+label-empty-font = 2
 
 ; misc icon: 
 
@@ -161,12 +159,12 @@ label = 
 bar-width = 5
 bar-indicator = |
 bar-indicator-foreground = #fff
-bar-indicator-font = 2
+bar-indicator-font = 0
 bar-fill = ─
-bar-fill-font = 2
+bar-fill-font = 0
 bar-fill-foreground = ${xrdb:color3}
 bar-empty = ─
-bar-empty-font = 2
+bar-empty-font = 0
 bar-empty-foreground = ${xrdb:color3}
 
 [module/backlight-acpi]
@@ -268,11 +266,11 @@ bar-volume-foreground-5 = ${xrdb:color3}
 bar-volume-foreground-6 = ${xrdb:color3}
 bar-volume-gradient = false
 bar-volume-indicator = |
-bar-volume-indicator-font = 2
-bar-volume-fill = ─
-bar-volume-fill-font = 2
-bar-volume-empty = ─
-bar-volume-empty-font = 2
+bar-volume-indicator-font = 0
+bar-volume-fill = -
+bar-volume-fill-font = 0
+bar-volume-empty = -
+bar-volume-empty-font = 0
 bar-volume-empty-foreground = ${colors.foreground-alt}
 
 [module/battery]

From 1fe37ad51f19bd1a77b2fe0725eb7da011e20e5c Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Wed, 3 May 2017 13:43:14 -0500
Subject: [PATCH 2/2] Fix default Xresources

---
 de/xresources | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/de/xresources b/de/xresources
index b9473ce..8a96ce0 100755
--- a/de/xresources
+++ b/de/xresources
@@ -1,21 +1,35 @@
+# Some of my favorite font setups...
+# *font: xft:Monaco for Powerline-9
+# *faceName: xft:Monaco for Powerline-9
+# *boldFont: xft:Monaco for Powerline-9
+# *letterSpace: -1
+
+# *font: xft:artwiz lemon-8
+# *faceName: xft:artwiz lemon-8
+# *boldFont: xft:artwiz lemon-8
+# *letterSpace: 0
+
+# *font: xft:xos4 Terminess Powerline-8
+# *faceName: xft:xos4 Terminess Powerline-8
+# *boldFont: xft:xos4 Terminess Powerline-8
+# *letterSpace: 0
+
+# Set fonts in "$HOME/.Xresources.env"
 *font: xft:xos4 Terminus-14,xft:FreeSans-14
 *faceName: xft:xos4 Terminus-14,xft:FreeSans-14
 *boldFont: xft:xos4 Terminus-14,xft:FreeSans-14
 *letterSpace: 0
+
+# rxvt-unicode configuration
+*termName: rxvt-unicode
 *scrollBar: false
 *cursorUnderline: true
 *cursorBlink: true
-*termName: rxvt-unicode
 *intensityStyles: true
 *utf8: 1
 *scaleHeight: 1
-
 *depth: 32
-
 URxvt.internalBorder: 24
-
-Xcursor.theme: human
-
 URxvt.perl-ext-common: default,matcher,keyboard-select,resize-font
 URxvt.keysym.M-Escape: perl:keyboard-select:activate
 URxvt.resize-font.smaller: C-Down
@@ -23,3 +37,7 @@ URxvt.resize-font.bigger: C-Up
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.matcher.button: 1
 URxvt*iso14755: False
+
+# Other Xorg configuration
+Xcursor.theme: human
+