diff --git a/deploy.sh b/deploy.sh
index e462623..f79a171 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -143,6 +143,7 @@ echo "
 [ -d ~/.config/emacs-config/doom ] || git clone https://github.com/hlissner/doom-emacs ~/.config/emacs-config/doom
 [ -d ~/.config/tmux/plugins/tpm ] || git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm
 [ -d ~/.config/ranger/plugins/ranger_devicons ] || git clone https://github.com/FollieHiyuki/ranger_devicons ~/.config/ranger/plugins/ranger_devicons
+[ -d ~/.config/ranger/plugins/ranger-zoxide ] || git clone https://github.com/jchook/ranger-zoxide ~/.config/ranger/plugins/ranger-zoxide
 
 echo "
 ~~~ Post deployment ~~~
diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated
index dc331cd..08446e7 100644
--- a/home/.bashrc-bloated
+++ b/home/.bashrc-bloated
@@ -629,11 +629,6 @@ fi
 # zoxide
 if command -v zoxide >/dev/null; then
   eval "$(zoxide init bash)"
-  if command -v ranger >/dev/null; then
-    if [ ! -f "$HOME/.config/ranger/plugins/ranger_zoxide.py" ]; then
-      curl -fLo $HOME/.config/ranger/plugins/ranger_zoxide.py https://github.com/ajeetdsouza/zoxide/raw/main/contrib/ranger.py
-    fi
-  fi
 fi
 
 # autostart gpg-agent at login
diff --git a/home/.config/fish/conf.d/env.fish b/home/.config/fish/conf.d/env.fish
index d24d509..e82dfd5 100644
--- a/home/.config/fish/conf.d/env.fish
+++ b/home/.config/fish/conf.d/env.fish
@@ -19,7 +19,9 @@ set -gx XDG_CONFIG_HOME $HOME/.config
 set -gx XDG_CACHE_HOME $HOME/.cache
 set -gx XDG_DATA_HOME $HOME/.local/share
 set -gx XDG_DATA_DIRS $HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share
-set -gx XDG_RUNTIME_DIR /tmp/fish.$USER
+if not command -v loginctl >/dev/null
+  set -gx XDG_RUNTIME_DIR /tmp/fish.$USER
+end
 # alternate paths
 set -gx LESSHISTFILE -
 set -gx MOST_INITFILE $XDG_CONFIG_HOME/mostrc
diff --git a/home/.config/fish/conf.d/evaluate.fish b/home/.config/fish/conf.d/evaluate.fish
index 437701b..31d80e7 100644
--- a/home/.config/fish/conf.d/evaluate.fish
+++ b/home/.config/fish/conf.d/evaluate.fish
@@ -80,9 +80,4 @@ fzf_key_bindings
 # zoxide
 if command -v zoxide >/dev/null
   zoxide init fish | source
-  if command -v ranger >/dev/null
-    if not test -f "$HOME/.config/ranger/plugins/ranger_zoxide.py"
-      curl -fLo $HOME/.config/ranger/plugins/ranger_zoxide.py https://github.com/ajeetdsouza/zoxide/raw/main/contrib/ranger.py
-    end
-  end
 end
diff --git a/home/.config/zsh/.zshrc b/home/.config/zsh/.zshrc
index a6999f2..6cfb043 100644
--- a/home/.config/zsh/.zshrc
+++ b/home/.config/zsh/.zshrc
@@ -43,11 +43,6 @@ fi
 # zoxide
 if command -v zoxide >/dev/null; then
   eval "$(zoxide init zsh)"
-  if command -v ranger >/dev/null; then
-    if [ ! -f "$HOME/.config/ranger/plugins/ranger_zoxide.py" ]; then
-      curl -fLo $HOME/.config/ranger/plugins/ranger_zoxide.py https://github.com/ajeetdsouza/zoxide/raw/main/contrib/ranger.py
-    fi
-  fi
 fi
 
 # poetry