diff --git a/zsh/.zsh/exports.zsh b/zsh/.zsh/exports.zsh
index fcffa90..d8ae5fb 100644
--- a/zsh/.zsh/exports.zsh
+++ b/zsh/.zsh/exports.zsh
@@ -15,7 +15,8 @@ export XDG_DATA_HOME="$HOME/.local/share"
 export GREP_COLOR='3;33'
 
 # VIM everything
-export EDITOR='nvim'
+export EDITOR="emacsclient -t"
+export VISUAL="emacsclient -c -a emacs"
 
 # Fix gnupg
 export GPG_TTY=$(tty)