diff --git a/fish/config.fish b/fish/config.fish
index 63d4015..7153083 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -8,14 +8,6 @@ set -gx EDITOR nvim
 set -gx LANG en_US.UTF-8
 set -gx PAGER 'less --tabs=4 --jump-target=.25 -iRFM'
 
-if command -q diff-so-fancy
-    set -gx GIT_PAGER "diff-so-fancy | $PAGER"
-end
-
-if command -q interactive-rebase-tool
-    set -gx GIT_SEQUENCE_EDITOR 'interactive-rebase-tool'
-end
-
 if status --is-interactive
     # Disable the default shell greeting
     set fish_greeting
@@ -23,6 +15,13 @@ if status --is-interactive
     # Disable the abbreviated directory format
     set fish_prompt_pwd_dir_length 0
 
+    # If installed, setup git tools
+    command -q diff-so-fancy;           and set -gx GIT_PAGER "diff-so-fancy | $PAGER"
+    command -q interactive-rebase-tool; and set -gx GIT_SEQUENCE_EDITOR interactive-rebase-tool
+
+    # If installed, setup z function
+    command -q zoxide;                  and zoxide init fish | source
+
     # Git prompt
     set -g __fish_git_prompt_showdirtystate 1
     set -g __fish_git_prompt_showstashstate 1
diff --git a/fish/fish_plugins b/fish/fish_plugins
index d7087c5..4e5857f 100644
--- a/fish/fish_plugins
+++ b/fish/fish_plugins
@@ -1,4 +1,3 @@
-jethrokuan/z
 jorgebucaran/fisher
 jorgebucaran/replay.fish
 lilyball/nix-env.fish
diff --git a/install/install-brew-packages.sh b/install/install-brew-packages.sh
index 28c0c0f..5fe58b3 100755
--- a/install/install-brew-packages.sh
+++ b/install/install-brew-packages.sh
@@ -16,7 +16,8 @@ brew install \
 	less \
 	neovim \
 	ripgrep \
-	tree
+	tree \
+	zoxide
 
 # Install optional tools (prompted by fzf)
 "$ROOTDIR/install/install-brew-extra.fish"
diff --git a/nix/packages.nix b/nix/packages.nix
index 67c9db8..5146ea0 100644
--- a/nix/packages.nix
+++ b/nix/packages.nix
@@ -15,4 +15,5 @@ with import <nixpkgs> {}; [
     nix
     ripgrep
     tree
+    zoxide
 ]