feat(zsh): improved zoxide interactions

roles/zsh/files/zsh/nvm.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-function check_nvmrc() {
+check_nvmrc() {
   if [[ -f "$PWD"/.nvmrc ]]; then
     nvm use > /dev/null
   fi
@@ -10,8 +10,3 @@ cd() {
   builtin cd "$@"
   check_nvmrc
 }
-
-z() {
-  __zoxide_z "$@"
-  check_nvmrc
-}

roles/zsh/files/zsh/zoxide.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/env zsh
+
+_z_cd() {
+    cd "$@" || return "$?"
+
+    if [ "$_ZO_ECHO" = "1" ]; then
+        echo "$PWD"
+    fi
+}
+
+z() {
+    if [ "$#" -eq 0 ]; then
+        _z_cd ~
+    elif [ "$#" -eq 1 ] && [ "$1" = '-' ]; then
+        if [ -n "$OLDPWD" ]; then
+            _z_cd "$OLDPWD"
+        else
+            echo 'zoxide: $OLDPWD is not set'
+            return 1
+        fi
+    else
+        _zoxide_result="$(zoxide query -- "$@")" && _z_cd "$_zoxide_result"
+    fi
+    check_nvmrc
+}
+
+zi() {
+    _zoxide_result="$(zoxide query -i -- "$@")" && _z_cd "$_zoxide_result"
+}
+
+
+alias za='zoxide add'
+
+alias zq='zoxide query'
+alias zqi='zoxide query -i'
+
+alias zr='zoxide remove'
+zri() {
+    _zoxide_result="$(zoxide query -i -- "$@")" && zoxide remove "$_zoxide_result"
+}
+
+
+_zoxide_hook() {
+    zoxide add "$(pwd -L)"
+}
+
+chpwd_functions=(${chpwd_functions[@]} "_zoxide_hook")