export CLICOLOR=1
export LSCOLORS=ExfxcxdxbxagadbHbHEHEH
export LS_COLORS='di=01;34;49:ln=35;49:so=32;49:pi=33;49:ex=31;49:bd=30;46:cd=30;43:su=31;01;47:sg=31;01;47:tw=01;34;01;47:ow=01;34;01;47'
export EDITOR="$(command -v nvim || command -v vim)"
if [ -z "$JAVA_HOME" ] && command -v /usr/libexec/java_home &> /dev/null; then
  export JAVA_HOME="$(/usr/libexec/java_home 2>/dev/null)"
fi
command -v lesspipe.sh &> /dev/null && export LESSOPEN="| lesspipe.sh %s"
[[ -z "$LANG" ]] && export LANG=en_US.UTF-8
export LESS="-i -M -S -R"
export PAGER="$(command -vp less)"
export VISUAL="$EDITOR"

type fd &> /dev/null && export FZF_DEFAULT_COMMAND='fd --type f'

export PATH="$PATH:$HOME/bin"

export CLICOLOR=1
export LSCOLORS=ExfxcxdxbxagadbHbHEHEH
export LS_COLORS='di=01;34;49:ln=35;49:so=32;49:pi=33;49:ex=31;49:bd=30;46:cd=30;43:su=31;01;47:sg=31;01;47:tw=01;34;01;47:ow=01;34;01;47'
export EDITOR=vim
if [ -z "$JAVA_HOME" ] && command -v /usr/libexec/java_home &> /dev/null; then
  export JAVA_HOME="$(/usr/libexec/java_home 2>/dev/null)"
fi
command -v lesspipe.sh &> /dev/null && export LESSOPEN="| lesspipe.sh %s"
[[ -z "$LANG" ]] && export LANG=en_US.UTF-8
export LESS="-i -M -S -R"
export PAGER="$(command -vp less)"
export VISUAL=vim

type fd &> /dev/null && export FZF_DEFAULT_COMMAND='fd --type f'

export PATH="$PATH:$HOME/bin"

--- 
+++ 
@@ -1,7 +1,7 @@
 export CLICOLOR=1
 export LSCOLORS=ExfxcxdxbxagadbHbHEHEH
 export LS_COLORS='di=01;34;49:ln=35;49:so=32;49:pi=33;49:ex=31;49:bd=30;46:cd=30;43:su=31;01;47:sg=31;01;47:tw=01;34;01;47:ow=01;34;01;47'
-export EDITOR=vim
+export EDITOR="$(command -v nvim || command -v vim)"
 if [ -z "$JAVA_HOME" ] && command -v /usr/libexec/java_home &> /dev/null; then
   export JAVA_HOME="$(/usr/libexec/java_home 2>/dev/null)"
 fi
@@ -9,7 +9,7 @@
 [[ -z "$LANG" ]] && export LANG=en_US.UTF-8
 export LESS="-i -M -S -R"
 export PAGER="$(command -vp less)"
-export VISUAL=vim
+export VISUAL="$EDITOR"
 
 type fd &> /dev/null && export FZF_DEFAULT_COMMAND='fd --type f'
 
shell: Use nvim as EDITOR/VISUAL, if available
