From 9ec3f96131f0256d671b2287ccd1dd3b13104fb3 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 8 Dec 2019 19:27:59 -0500
Subject: [PATCH] Minor refactors & cleanup

---
 config/sxhkd/sxhkdrc            | 10 +++++-----
 config/vim/result               |  1 -
 config/zsh/.zshenv              |  5 ++---
 config/zsh/.zshrc               |  9 ++++-----
 themes/glimpse/rofi/config.rasi |  4 ----
 5 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 120000 config/vim/result

diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 4422f8e0..c109c309 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -12,10 +12,10 @@ super + apostrophe
 
 # focus/swap the node in the given direction
 super + {_,ctrl +}{h,j,k,l}
-	bspc-focus {_,-m }{west,south,north,east}
+	~/.config/bspwm/bin/bspc-focus {_,-m }{west,south,north,east}
 
 super + shift + {_,ctrl +}{h,j,k,l}
-	bspc-swap {_,-m }{west,south,north,east}
+	~/.config/bspwm/bin/bspc-swap {_,-m }{west,south,north,east}
 
 super + {_,shift +}{1-9,0}
 	bspc {desktop -f,node -d} {1-9,10}
@@ -30,13 +30,13 @@ super + shift + grave
 	emacsclient -e '(open-scratch-frame)'
 
 super + space
-	rofi-appmenu
+	~/.config/rofi/bin/rofi-appmenu
 
 super + Tab
-	rofi-windowmenu
+	~/.config/rofi/bin/rofi-windowmenu
 
 super + backslash
-	rofi-passmenu
+	~/.config/rofi/bin/rofi-passmenu
 
 super + Escape
 	pkill -USR1 -x sxhkd
diff --git a/config/vim/result b/config/vim/result
deleted file mode 120000
index bd6e9900..00000000
--- a/config/vim/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/ghzvhpik58grxkspwqnz2zr1hyfndr51-nixos-system-shiro-19.03.172927.30a82bba734
\ No newline at end of file
diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv
index e7b3361f..2c5acda7 100644
--- a/config/zsh/.zshenv
+++ b/config/zsh/.zshenv
@@ -6,6 +6,5 @@ for file in $XDG_CONFIG_HOME/zsh/rc.d/env.*.zsh(N); do
   source $file
 done
 
-if [[ -f ~/.config/zsh/env ]]; then
-  source ~/.config/zsh/env
-fi
+# If you have host-local configuration, this is where you'd put it
+[ -f ~/.config/zsh/env ] && source ~/.config/zsh/env
diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index af4f7a71..2d1f14a9 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -25,11 +25,6 @@ for file in $XDG_CONFIG_HOME/zsh/rc.d/aliases.*.zsh(N); do
   source $file
 done
 
-if [[ -f ~/.config/zsh/rc ]]; then
-  source ~/.config/zsh/rc
-fi
-
-
 ##
 function _cache {
   command -v "$1" >/dev/null || return 1
@@ -58,3 +53,7 @@ _cache direnv hook zsh
 ##
 autoload -Uz compinit && compinit -u -d $ZSH_CACHE/zcompdump
 autopair-init
+
+
+# If you have host-local configuration, this is where you'd put it
+[ -f ~/.config/zsh/rc ] && source ~/.config/zsh/rc
diff --git a/themes/glimpse/rofi/config.rasi b/themes/glimpse/rofi/config.rasi
index 0c26bc3b..2941b86c 100644
--- a/themes/glimpse/rofi/config.rasi
+++ b/themes/glimpse/rofi/config.rasi
@@ -5,10 +5,6 @@ configuration {
   hide-scrollbar:   true;
   disable-history:  false;
   monitor:          -4;
-  /*
-  modi:             "drun";
-  display-drun:     "apps";
-  */
   columns:          2;
 }