diff --git a/shell/aliases.sh b/shell/aliases.sh
index 63784ef..1534ac7 100755
--- a/shell/aliases.sh
+++ b/shell/aliases.sh
@@ -12,8 +12,14 @@ alias :qa="exit"
 alias :q!="exit"
 alias :qw="exit"
 
-alias vim="vim -p"
-alias vi="vim -p"
+if [ -n "$(type nvim 2>/dev/null)" ]; then
+  alias vimdiff='nvim -d'
+  alias vim="nvim -p"
+  alias vi="nvim -p"
+else
+  alias vim="vim -p"
+  alias vi="vim -p"
+fi
 
 alias yt-dlp='yt-dlp -o "%(title)s.%(ext)s"'
 alias yt-audio='yt-dlp -o "%(title)s.%(ext)s" --extract-audio'
diff --git a/shell/vars.sh b/shell/vars.sh
index 8c6116e..9e82738 100755
--- a/shell/vars.sh
+++ b/shell/vars.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-export EDITOR=vim
-export VISUAL=vim
+export EDITOR=nvim
+export VISUAL=nvim
 export BROWSER=firefox