diff --git a/.zshrc b/.zshrc
index c788e32..a866ce0 100644
--- a/.zshrc
+++ b/.zshrc
@@ -105,10 +105,11 @@ zstyle ':completion:*' use-cache on
 zstyle ':completion:*' cache-path ~/.zsh/cache
 zstyle ':completion:*' menu no
 
-export EDITOR='bbedit --wait --resume'
-export GIT_EDITOR='bbedit --wait --resume'
-export TEXEDIT='bbedit --wait --resume'
-export LESSEDIT='bbedit --wait --resume'
+export EDITOR='nvim'
+export GIT_EDITOR='nvim'
+export TEXEDIT='nvim'
+export LESSEDIT='nvim'
+export VISUAL='nvim'
 
 ### ENV CONFIG
 export PATH="${HOME}/.local/bin:/opt/homebrew/bin:/opt/homebrew/sbin:${HOME}/.cargo/bin:/opt/homebrew/opt/rustup/bin:/Applications/IntelliJ IDEA.app/Contents/MacOS:/usr/local/bin:${GOROOT}/bin:$PATH"