diff --git a/.password-store b/.password-store
index e06f7f4..711e129 160000
--- a/.password-store
+++ b/.password-store
@@ -1 +1 @@
-Subproject commit e06f7f4d24c6aca829c5e886342504ee4eb24ee2
+Subproject commit 711e1298a66769671af42afd71860bfc9ee03cd2
diff --git a/.ssh/known_hosts b/.ssh/known_hosts
index e40c79b..94c3d41 100644
--- a/.ssh/known_hosts
+++ b/.ssh/known_hosts
@@ -8,3 +8,4 @@ aur.archlinux.org,95.216.144.15 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAy
 2a01:4f9:c010:50::1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLMiLrP8pVi5BFX2i3vepSUnpedeiewE5XptnUnau+ZoeUOPkpoCgZZuYfpaIQfhhJJI5qgnjJmr4hyJbe/zxow=
 140.82.121.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
 140.82.121.4 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+10.2.34.5 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIODBbJvBzvkTjqdOmd6kjj9N+q/AMzVYj8b5uGHFl89T
diff --git a/.xinitrc b/.xinitrc
index 48c80b8..e8b7663 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -4,6 +4,7 @@ usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 env=$HOME/.zshenv
+bspwm_files=$HOME/.local/share/bspwm
 
 if [ -f $sysresources ]; then
     xrdb -merge $sysresources
@@ -21,10 +22,6 @@ if [ -f $usermodmap ]; then
     xmodmap $usermodmap
 fi
 
-if [ -x "$env" ]; then
-    . "$env"
-fi
-
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
   [ -x "$f" ] && . "$f"
@@ -41,9 +38,9 @@ xsetroot -cursor_name left_ptr
 
 export _JAVA_AWT_WM_NONPARENTING=1
 
-if [ -n $BSPWM_FILES ]; then
-    mkdir -p $BSPWM_FILES
-    exec bspwm >$BSPWM_FILES/output.log 2>$BSPWM_FILES/error.log
+if [ -n $bspwm_files ]; then
+    mkdir -p $bspwm_files
+    exec bspwm >$bspwm_files/output.log 2>$bspwm_files/error.log
 else
     exec bspwm
 fi
diff --git a/.zshenv b/.zshenv
index ee613be..8c83780 100755
--- a/.zshenv
+++ b/.zshenv
@@ -50,8 +50,6 @@ export XDG_CONFIG_HOME="$HOME/.config"
 
 export WINIT_X11_SCALE_FACTOR=1
 
-export BSPWM_FILES="$HOME/.local/share/bspwm"
-
 if [[ -f $HOME/.zsh_alias ]]; then
     source $HOME/.zsh_alias
 fi