diff --git a/bash/usr-local-bin/.gitignore b/bash/usr-local-bin/.gitignore
index 3a06c3d..5f9ee34 100644
--- a/bash/usr-local-bin/.gitignore
+++ b/bash/usr-local-bin/.gitignore
@@ -8,3 +8,4 @@ joplin
 ff
 chrome
 iwd-wifi.bash
+vim
diff --git a/bash/usr-local-bin/nvim b/bash/usr-local-bin/nvim
index f12e50a..1b1b83e 100755
--- a/bash/usr-local-bin/nvim
+++ b/bash/usr-local-bin/nvim
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # In case we are on SteamOS?
-#set -x
+set -x
 # The usual system-wide installation
 if [ -f /usr/bin/nvim ]; then
 	/usr/bin/nvim "$@"
@@ -10,9 +10,22 @@ elif [ -f /var/lib/flatpak/exports/bin/io.neovim.nvim ]; then
 # User-specific flatpak
 elif [ -f ~/.local/share/flatpak/exports/bin/io.neovim.nvim ]; then
 	flatpak run --user io.neovim.nvim "$@"
+	# Snap
+elif [ -f /snap/bin/nvim ]; then
+	snap run nvim "$@"
+# Fallback to vim, because this script breaks my alias/function
+elif [ -f /usr/bin/vim ]; then
+	/usr/bin/vim "$@"
+elif [ -f /var/lib/flatpak/exports/bin/org.vim.Vim ]; then
+	flatpak run org.vim.Vim "$@"
+elif [ -f ~/.local/share/flatpak/exports/bin/org.vim.Vim ]; then
+	flatpak run --user org.vim.Vim "$@"
+# Fallback to Vi is acceptable.
+elif [ -f /usr/bin/vi ]; then
+	/usr/bin/vi "$@"
 # If not found.
 else
-	printf "nvim doesn't seem to be installed :("
+	printf "Neither nvim or vim found :("
 	exit
 fi
 #set +x
diff --git a/bash/usr-local-bin/vim b/bash/usr-local-bin/vim
new file mode 120000
index 0000000..44e0dfc
--- /dev/null
+++ b/bash/usr-local-bin/vim
@@ -0,0 +1 @@
+nvim
\ No newline at end of file