diff --git a/.bashrc.dotfiles b/.bashrc.dotfiles
index 855797a..5b4cc27 100644
--- a/.bashrc.dotfiles
+++ b/.bashrc.dotfiles
@@ -38,3 +38,10 @@ if command -v direnv &> /dev/null ; then
     eval "$(direnv hook bash)"
     # alias tmux='direnv exec / tmux'
 fi
+
+# Set the editor
+if command -v nvim &> /dev/null; then
+    export EDITOR=nvim
+elif command -v vim &> /dev/null; then
+    export EDITOR=vim
+fi