diff --git a/home/common/files/bash/bashrc b/home/common/files/bash/bashrc
index 862f969..2b7f543 100755
--- a/home/common/files/bash/bashrc
+++ b/home/common/files/bash/bashrc
@@ -92,12 +92,10 @@ then
   PAGER=less
   LESS="-Rs"
   EXINIT="set wrapmargin=8 sh=$SHELL sw=4 report=2 tabstop=8"
-  export EXINIT EDITOR PAGER LESS
-  if [ "${EDITOR}" == "nano" ] && [ -x /etc/profiles/per-user/${USER}/bin/nvim ]
-  then
-    EDITOR=nvim
-    alias vi=nvim
-  fi
+  export EXINIT PAGER LESS
+  EDITOR=nvim
+  alias vi=nvim
+  alias vim=nvim
   export EDITOR
   unset COMPHOSTS
   export COMPHOSTS=()