diff --git a/.environment.d/neovim.env b/.environment.d/neovim.env
new file mode 100644
index 0000000..8148f24
--- /dev/null
+++ b/.environment.d/neovim.env
@@ -0,0 +1,6 @@
+# Set neovim as default editor if it is installed
+
+if command -v nvim >/dev/null 2>&1; then
+  export EDITOR=nvim
+fi
+