diff --git a/base/.config/profile/env.d/base.env b/base/.config/profile/env.d/base.env
index 7b6c505..48cc8a0 100644
--- a/base/.config/profile/env.d/base.env
+++ b/base/.config/profile/env.d/base.env
@@ -1,6 +1,5 @@
 #shellcheck disable=SC2034
 BROWSER=firefox
-EDITOR=vim
 HISTCONTROL=ignoredups:erasedups:ignorespace
 HISTFILESIZE=
 HISTSIZE=
diff --git a/base/.config/profile/profile.d/base.sh b/base/.config/profile/profile.d/base.sh
index 842e4ba..963494c 100644
--- a/base/.config/profile/profile.d/base.sh
+++ b/base/.config/profile/profile.d/base.sh
@@ -2,6 +2,12 @@
 
 alias slugify="sed -e 's/[^[:alnum:]]/-/g' | tr -s '-' | tr A-Z a-z"
 
+if type nvim >/dev/null 2>/dev/null ; then
+    export EDITOR=nvim
+else
+    export EDITOR=vim
+fi
+
 source_env_file () {
     if [ ! -f "${1}" ]; then
         return