diff --git a/.zshrc b/.zshrc
index b9059e2..68060db 100644
--- a/.zshrc
+++ b/.zshrc
@@ -100,10 +100,32 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # set by `omz`
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git docker node zsh-autosuggestions zsh-syntax-highlighting sudo gitfast history-substring-search docker-compose terraform)
+plugins=(
+    alias-finder
+    aliases
+    docker
+    docker-compose
+    git
+    gitfast
+    history-substring-search
+    jj
+    ng
+    node
+    npm
+    nvm
+    sudo
+    uv
+    zsh-autosuggestions
+    zsh-syntax-highlighting
+)
 
 source $ZSH/oh-my-zsh.sh
 
+zstyle ':omz:plugins:alias-finder' autoload yes # disabled by default
+zstyle ':omz:plugins:alias-finder' longer yes # disabled by default
+zstyle ':omz:plugins:alias-finder' exact yes # disabled by default
+zstyle ':omz:plugins:alias-finder' cheaper yes # disabled by default
+
 # User configuration
 
 # export MANPATH="/usr/local/man:$MANPATH"
@@ -141,14 +163,8 @@ fi
 # Set GPG TTY
 export GPG_TTY=$TTY
 
-eval "$(uv generate-shell-completion zsh)"
-eval "$(uvx --generate-shell-completion zsh)"
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 . "$HOME/.local/bin/env"
 
 autoload -U +X bashcompinit && bashcompinit
-complete -o nospace -C /usr/bin/terraform terraform
+