dotfiles/commonfunc

@@ -139,15 +139,6 @@ EOF
     fi
 }
 
-# zoxide z functions, since my default zoxide init will overwrite the cd command
-z () {
-	__zoxide_z "$@"
-}
-
-zi () {
-	__zoxide_zi "$@"
-}
-
 {%@@ if distro == 'macos' @@%}
 #######################################
 # Shows a netstat -tulpn styled output on mac.

dotfiles/zshrc

@@ -72,9 +72,6 @@ COMPLETION_WAITING_DOTS="true"
 # Would you like to use another custom folder than $ZSH/custom?
 # ZSH_CUSTOM=/path/to/new-custom-folder
 
-# set zoxide command to cd
-ZOXIDE_CMD_OVERRIDE="cd"
-
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
@@ -106,7 +103,6 @@ plugins=(
   themes
   uv
   vscode
-  zoxide
   zsh-navigation-tools
   zsh-ssh
 {%@@ if distro == 'macos' @@%}  # Mac specifics
@@ -214,3 +210,5 @@ autoload -Uz compinit
 zstyle ':completion:*' menu select
 fpath+=~/.zfunc
 {%@@ endif @@%}
+
+[[ $(command -v zoxide) ]] && eval "$(zoxide init zsh)"