From 1043ee60423714601590d88267dac73851e7690a Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Sun, 18 Mar 2018 12:51:03 -0500
Subject: [PATCH] Fix bashrc not loading NICE_HOME properly

---
 apps/neovim/init.vim  | 2 ++
 de/bar/bar.bash       | 2 ++
 de/bar/polybar-config | 3 ++-
 shell/bashrc          | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim
index e8219cd..054dc70 100644
--- a/apps/neovim/init.vim
+++ b/apps/neovim/init.vim
@@ -172,6 +172,7 @@ Plug 'hail2u/vim-css3-syntax', {'for': ['styl', 'stylus', 'css', 'vue']}
 Plug 'kchmck/vim-coffee-script', {'for': ['coffee', 'coffeescript', 'vue']}
 Plug 'posva/vim-vue', {'for': ['vue']}
 Plug 'elixir-lang/vim-elixir', {'for': ['elixir', 'eelixir']}
+Plug 'elixir-lang/', {'for': ['elixir', 'eelixir']}
 Plug 'mattn/emmet-vim', {'for': ['html']}
 Plug 'wavded/vim-stylus', {'for': ['styl', 'stylus', 'vue']}
 Plug 'quabug/vim-gdscript', {'for': ['gd', 'gdscript']}
@@ -179,6 +180,7 @@ Plug 'rust-lang/rust.vim', {'for': ['rs', 'rust']}
 Plug 'mustache/vim-mustache-handlebars', {'for': ['html.handlebars', 'handlebars', 'hbs']}
 Plug 'plasticboy/vim-markdown', {'for': ['md', 'markdown', 'vimwiki']}
 Plug 'lifepillar/pgsql.vim', {'for': ['psql', 'sql']}
+Plug 'cespare/vim-toml', {'for': ['toml']}
 Plug 'vim-scripts/utl.vim'
 let g:utl_cfg_hdl_scm_http_system = "silent !$BROWSER '%u#%f' &"
 
diff --git a/de/bar/bar.bash b/de/bar/bar.bash
index 23ccb31..6c61a35 100755
--- a/de/bar/bar.bash
+++ b/de/bar/bar.bash
@@ -8,6 +8,7 @@ export BAR_SIDE_MARGIN=200
 MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1)
 export BAR_FONT=$(xrdb -query | sed -ne      's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1)
 export BAR_ICON_FONT="Font Awesome 5 Free"
+export BAR_ICON_FONT_2="Font Awesome 5 Brands"
 export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1)
 export BAR_ICON_FONT_SIZE=$((BAR_FONT_SIZE))
 
@@ -28,6 +29,7 @@ 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_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 6f7f038..75cb685 100644
--- a/de/bar/polybar-config
+++ b/de/bar/polybar-config
@@ -44,6 +44,7 @@ module-margin-right = 2
 
 font-0 = ${env:BAR_FONT_DECLARATION}
 font-1 = ${env:BAR_ICON_FONT_DECLARATION}
+font-2 = ${env:BAR_ICON_FONT_2_DECLARATION}
 
 modules-left = bspwm
 modules-center =
@@ -178,7 +179,7 @@ card = intel_backlight
 [module/cpu]
 type = internal/cpu
 interval = 2
-format-prefix = "- "
+format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 ; format-underline = #f90000
 label = %percentage%%
diff --git a/shell/bashrc b/shell/bashrc
index 9e74a1f..79ab713 100644
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -9,7 +9,7 @@ export XDG_CONFIG_HOME="$HOME/.config"
 export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
 export NICE_HOME="$HOME"
 
-[[ $(basename "${HOME}") -eq "usr" ]] && export NICE_HOME="$HOME/.."
+[[ $(basename "${HOME}") = "usr" ]] && export NICE_HOME="$HOME/.."
 
 # TODO: nice home on a per-device basis