From f85c5e87058a0d08ee704bce13d1cf5ddf30a94d Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Tue, 18 Feb 2020 09:40:28 -0600
Subject: [PATCH 1/2] Fix laptop dock script

---
 env/laptop/bin/undock   | 2 +-
 env/laptop/bin/workdock | 3 +--
 env/laptop/x/resources  | 9 +++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/env/laptop/bin/undock b/env/laptop/bin/undock
index ddd8ad7..279a81d 100755
--- a/env/laptop/bin/undock
+++ b/env/laptop/bin/undock
@@ -3,7 +3,7 @@
 resrc
 "${DOTFILES_PATH}/apps/de/x/loadresources"
 autorandr --change
-"${DOTFILES_PATH}/apps/de/bspwm/bspwmrc"
+"${DOTFILES_PATH}/apps/de/bspwm/rc"
 "${DOTFILES_PATH}/apps/de/x/loadresources"
 restartbar
 "${HOME}/.fehbg"
diff --git a/env/laptop/bin/workdock b/env/laptop/bin/workdock
index 112cfef..6d56259 100755
--- a/env/laptop/bin/workdock
+++ b/env/laptop/bin/workdock
@@ -2,8 +2,7 @@
 
 autorandr --change
 xrandr --output eDP1 --scale-from 1600x900 --filter nearest --mode 3200x1800
-"${DOTFILES_PATH}/apps/de/x/loadresources"
-xrdb -merge "$ENV_PATH/x/docked.resources"
 "${DOTFILES_PATH}/apps/de/bspwm/rc"
+xrdb -merge "$ENV_PATH/x/docked.resources"
 restartbar
 "${HOME}/.fehbg"
diff --git a/env/laptop/x/resources b/env/laptop/x/resources
index db5172a..a36eb1c 100755
--- a/env/laptop/x/resources
+++ b/env/laptop/x/resources
@@ -1,13 +1,14 @@
 #define mono_font iosevka-lyte
+#define mono_font_size 12
 #define bar_font_size 12
 #define icon_font Font Awesome 5 Free Solid
 #define icon_font_size 12
 
-*.font: xft:Iosevka Nerd Font Mono:pixelsize=12,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
-*.boldFont: xft:Iosevka Nerd Font Mono:style=bold:pixelsize=12,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
+*.font: xft:mono_font:pixelsize=mono_font_size,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
+*.boldFont: xft:mono_font:style=bold:pixelsize=mono_font_size,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
 
-URxvt.font: xft:Iosevka Nerd Font Mono:pixelsize=32,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
-URxvt.boldFont: xft:Iosevka Nerd Font Mono:style=bold:pixelsize=32,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
+# URxvt.font: xft:mono_font:pixelsize=32,xft:Noto Emoji,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
+# URxvt.boldFont: xft:mono_font:style=bold:pixelsize=32,xft:Font Awesome 5 Free:pixelsize=14,xft:FreeSans:pixelsize=14
 
 dpi: 190
 .dpi: 190

From 2348608e888060b9e4c15f9b0f41db0fd2886a5f Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Thu, 20 Feb 2020 16:56:54 -0600
Subject: [PATCH 2/2] Fix paths to include nimble bins and fix vim config

---
 apps/neovim/init.vim       | 4 ++--
 apps/shell/fish/paths.fish | 1 +
 bin/paths                  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/neovim/init.vim b/apps/neovim/init.vim
index 685036b..f6e98ba 100644
--- a/apps/neovim/init.vim
+++ b/apps/neovim/init.vim
@@ -6,8 +6,8 @@ if has('nvim')
 	let $vimdir = $XDG_CONFIG_HOME.'/nvim'
 endif
 
-if filereadable($ENV_PATH."/vim")
-	source $ENV_PATH."/vim"
+if filereadable("$ENV_PATH/vim")
+	source "$ENV_PATH/vim"
 endif
 
 call plug#begin($vimdir.'/bundle')
diff --git a/apps/shell/fish/paths.fish b/apps/shell/fish/paths.fish
index 7d659a9..982b94d 100755
--- a/apps/shell/fish/paths.fish
+++ b/apps/shell/fish/paths.fish
@@ -10,6 +10,7 @@ set -U fish_user_paths \
 	$ENV_PATH/.hidden/bin \
 	$HOME/.bin \
 	$HOME/.cargo/bin \
+	$HOME/.nimble/bin \
 	$HOME/.yarn/bin
 
 test -d $HOME/.local/bin && set -U fish_user_paths $HOME/.local/bin $fish_user_paths
diff --git a/bin/paths b/bin/paths
index e68e27c..c950a1d 100755
--- a/bin/paths
+++ b/bin/paths
@@ -7,6 +7,7 @@ PATH="$DOTFILES_PATH/bin":$PATH
 PATH="$ENV_PATH/bin":$PATH
 [ -d "$HOME/.bin" ] && PATH=$PATH:"$HOME/.bin"
 PATH=$PATH:"$HOME/.cargo/bin"
+PATH=$PATH:"$HOME/.nimble/bin"
 PATH=$PATH:"$HOME/.yarn/bin"
 PATH=$PATH:"$GOPATH/bin"
 [ -d "$HOME/.local/bin" ] && PATH=$PATH:"$HOME/.local/bin"