diff --git a/zsh/.zshrc b/zsh/.zshrc
index 48ee1f9..8298418 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -70,7 +70,7 @@ ZSH_THEME="dstufft"
 # 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 zsh-autosuggestions history-substring-search docker docker-compose extract sudo colored-man-pages fzf fast-syntax-highlighting command-not-found colorize)
+plugins=(git zsh-autosuggestions history-substring-search docker docker-compose extract sudo colored-man-pages fzf fast-syntax-highlighting command-not-found colorize zoxide)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -82,11 +82,7 @@ source $ZSH/oh-my-zsh.sh
 # export LANG=en_US.UTF-8
 
 # Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='nvim'
-# fi
+export EDITOR='nvim'
 
 # Compilation flags
 # export ARCHFLAGS="-arch $(uname -m)"
@@ -102,5 +98,3 @@ source $ZSH/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
-
-eval "$(zoxide init zsh)"