diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 815306fda..a21fbc682 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -4,7 +4,7 @@ source $ZDOTDIR/configs/setup
 source $ZDOTDIR/configs/widgets
 source $ZDOTDIR/configs/bindings
 source $ZDOTDIR/configs/aliases
-source $ZDOTDIR/configs/host-setup
+[ -r $ZDOTDIR/configs/host-setup ] && source $ZDOTDIR/configs/host-setup
 
 source $ZDOTDIR/plugins/fzf/bindings.zsh
 source $ZDOTDIR/plugins/autopyenv/autopyenv.zsh
diff --git a/.local/bin/remaps b/.local/bin/remaps
index 7c721ec5a..dd8120614 100755
--- a/.local/bin/remaps
+++ b/.local/bin/remaps
@@ -12,6 +12,10 @@ setmap() {
             "󰌌 Keymap set" "Layout: $(xkbcomp :0 - | grep -oP "(?<=pc[_+])([^_+]+)(?=[_+])" | tr "(" " " | head -c -2)"
 	fi
 	echo "$1" >"$statefile"
+    xset r rate 300 50
+    xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock
+    killall xcape 2>/dev/null
+    xcape -e 'Super_L=Escape'
 }
 
 rotatemap() {
@@ -35,7 +39,6 @@ rotatemap() {
 	setmap "$first"
 }
 
-DISPLAY=:0
 
 notify=true
 while getopts dq flag; do
@@ -51,10 +54,5 @@ done
 
 rotatemap
 
-xset r rate 300 50
-xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock
-killall xcape 2>/dev/null
-xcape -e 'Super_L=Escape'
-
 # sleep 0.03
 # [ "$1" != "-n" ] && pkill -RTMIN+15 dwmblocks