diff --git a/.local/share/applications/nvim.desktop b/.local/share/applications/nvim.desktop
new file mode 100644
index 0000000..53108bb
--- /dev/null
+++ b/.local/share/applications/nvim.desktop
@@ -0,0 +1,22 @@
+# To update:
+# ```
+# curl -LO https://github.com/neovim/neovim/releases/download/nightly/nvim.appimage \
+#      --output-dir $HOME/bin &&
+# chmod u+x $HOME/bin/nvim.appimage
+# ```
+#
+[Desktop Entry]
+Name=Neovim ($HOME/bin)
+GenericName=Text Editor
+TryExec=/home/michel/bin/nvim.appimage
+Exec=/home/michel/bin/nvim.appimage %F
+Terminal=true
+Type=Application
+Keywords=Text;editor;
+Icon=nvim
+Categories=Utility;TextEditor;
+StartupNotify=false
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+
+#
+# See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
diff --git a/.local/share/applications/nvim.png b/.local/share/applications/nvim.png
new file mode 100644
index 0000000..5d6cee3
Binary files /dev/null and b/.local/share/applications/nvim.png differ
diff --git a/.zshrc b/.zshrc
index 9209721..93334d8 100644
--- a/.zshrc
+++ b/.zshrc
@@ -166,12 +166,18 @@ alias ls='exa --icons --no-permissions --no-user'
 alias make='colormake-short'
 
 # Neovim — nvim
+if (( ${+commands[nvim.appimage]} )); then
+  alias vi='nvim.appimage'
+else
+  alias vi='nvim'
+fi
+
 local nvim_python=($HOME/.config/nvim/.direnv/python-3*(om))
 nvim_python=$nvim_python[1]
 
 # Use `export NVIM=$(nvr --serverlist | fzf)` to choose existing instance
 alias nvr="${nvim_python}/bin/nvr"
-alias vi='nvim'
+
 
 # Debian Specific:
 # sudo dpkg-divert --divert /usr/bin/fd --rename /usr/bin/fdfind
@@ -241,7 +247,7 @@ fi
 ###
 
 export BROWSER=firefox
-export EDITOR=nvim
+export EDITOR=vi
 
 # -i Searches ignore case
 # -F Automatically exit if the entire file can be displayed