From 8bb54852371a858bbc969456acb9bdcd15899abc Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Tue, 23 Oct 2018 14:59:04 -0500
Subject: [PATCH] Setup FA5 and change some icons

---
 de/bar/bar.bash       |  6 +++---
 de/bar/polybar-config | 20 ++++++++++----------
 de/bspwm_config       |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/de/bar/bar.bash b/de/bar/bar.bash
index 1f737fa..f61575b 100755
--- a/de/bar/bar.bash
+++ b/de/bar/bar.bash
@@ -9,7 +9,7 @@ export BAR_SIDE_MARGIN=200
 MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1)
 
 export BAR_FONT="${BAR_FONT:-$(xrdb -query | sed -ne      's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1)}"
-export BAR_ICON_FONT="${BAR_ICON_FONT:-"FontAwesome"}"
+export BAR_ICON_FONT="${BAR_ICON_FONT:-"Font Awesome 5 Free"}"
 export BAR_FONT_SIZE="${BAR_FONT_SIZE:-$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1)}"
 export BAR_ICON_FONT_SIZE="${BAR_ICON_FONT_SIZE:-$((BAR_FONT_SIZE))}"
 
@@ -29,8 +29,8 @@ if [ -f "$HOME/.env_bar" ]; then
 fi
 
 export BAR_FONT_DECLARATION="${BAR_FONT}:pixelsize=${BAR_FONT_SIZE};1"
-export BAR_ICON_FONT_DECLARATION="${BAR_ICON_FONT}:pixelsize=${BAR_ICON_FONT_SIZE};1"
-export BAR_ICON_FONT_2_DECLARATION="${BAR_ICON_FONT_2}:pixelsize=${BAR_ICON_FONT_SIZE};1"
+export BAR_ICON_FONT_DECLARATION="${BAR_ICON_FONT}:style=Solid:pixelsize=${BAR_ICON_FONT_SIZE};1"
+export BAR_ICON_FONT_2_DECLARATION="${BAR_ICON_FONT_2}:style=Regular:pixelsize=${BAR_ICON_FONT_SIZE};1"
 
 export BAR_WIDTH=$((MONITOR_WIDTH - GAP - GAP - BAR_SIDE_MARGIN - BAR_SIDE_MARGIN))
 export POS_X=$((GAP + BAR_SIDE_MARGIN))
diff --git a/de/bar/polybar-config b/de/bar/polybar-config
index 4ee159a..eebef2a 100644
--- a/de/bar/polybar-config
+++ b/de/bar/polybar-config
@@ -49,7 +49,7 @@ dpi = ${xrdb:dpi:92}
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-line-size = 3
+line-size = 0
 line-color = ${colors.foreground}
 
 border-size = 0
@@ -59,7 +59,7 @@ padding-left = 0
 padding-right = 2
 
 module-margin-left = 1
-module-margin-right = 2
+module-margin-right = 1
 
 font-0 = ${env:BAR_FONT_DECLARATION}
 font-1 = ${env:BAR_ICON_FONT_DECLARATION}
@@ -95,7 +95,7 @@ mount-0 = ${env:BAR_FS_VOLUME}
 format = <label-mounted>
 label-mounted = %used%
 label-mounted-foreground = ${colors.filesystem}
-format-mounted-prefix = " "
+format-mounted-prefix = " "
 format-mounted-prefix-foreground = ${colors.icon}
 
 ; ########################### ;
@@ -105,13 +105,13 @@ format-mounted-prefix-foreground = ${colors.icon}
 [module/bspwm]
 ws-icon-0 = dev;
 ws-icon-1 = web;
-ws-icon-2 = gfx;
+ws-icon-2 = gfx;
 ws-icon-3 = env;
-ws-icon-4 = play;
-ws-icon-5 = out;
-ws-icon-6 = misc;
-ws-icon-7 = chat;
-ws-icon-8 = mon;
+ws-icon-4 = play;
+ws-icon-5 = chat;
+ws-icon-6 = out;
+ws-icon-7 = mon;
+ws-icon-8 = misc;
 ws-icon-9 = util;
 ws-icon-default = ♟
 
@@ -202,7 +202,7 @@ label-foreground = ${colors.cpu}
 [module/memory]
 type = internal/memory
 interval = 2
-format-prefix = " "
+format-prefix = " "
 format-prefix-foreground = ${colors.icon}
 label = %gb_free%
 label-foreground = ${colors.memory}
diff --git a/de/bspwm_config b/de/bspwm_config
index 9fd6b58..52a0d69 100755
--- a/de/bspwm_config
+++ b/de/bspwm_config
@@ -2,7 +2,7 @@
 
 BORDER_WIDTH=5 # change in bspwmrc
 export WINDOW_GAP=25
-DESKTOPS=(dev web gfx env play out misc chat mon util)
+DESKTOPS=(dev web gfx env play chat misc mon out util)
 
 BSPWM_MONITORS=$(bspc query -M | tac)
 MONITOR_COUNT=$(echo "${BSPWM_MONITORS}" | wc -w | awk '{ printf $1 }')