diff --git a/crates/20-vim/crate.arch.sh b/crates/20-vim/crate.arch.sh
index e114bc1..3d97b3c 100644
--- a/crates/20-vim/crate.arch.sh
+++ b/crates/20-vim/crate.arch.sh
@@ -1,5 +1,5 @@
 super_apply() {
-    pacman -S --needed --noconfirm vim
+    pacman -S --needed --noconfirm neovim
 }
 
 super_undo() {
diff --git a/crates/20-vim/crate.debian.sh b/crates/20-vim/crate.debian.sh
index ba156fd..a6d8e34 100644
--- a/crates/20-vim/crate.debian.sh
+++ b/crates/20-vim/crate.debian.sh
@@ -1,5 +1,5 @@
 super_apply() {
-    apt install -y vim
+    apt install -y neovim
 }
 
 super_undo() {
diff --git a/crates/20-vim/crate.sh b/crates/20-vim/crate.sh
index 2b465b1..b3b82e0 100644
--- a/crates/20-vim/crate.sh
+++ b/crates/20-vim/crate.sh
@@ -4,11 +4,12 @@ describe="Install vim and it's stuff"
 scripts="@distro @self"
 
 apply() {
-    [ -e "$HOME/.nvimrc" ] || ln files/.nvimrc $HOME/.nvimrc
+    [ -d "$HOME/.config/nvim" ] || mkdir -p "$HOME/.config/nvim"
+    [ -e "$HOME/.config/nvim/init.vim" ] || ln files/init.vim $HOME/.config/nvim/init.vim
     [ -e "$HOME/.ideavimrc" ] || ln files/.ideavimrc $HOME/.ideavimrc
 }
 
 undo() {
-    unlink $HOME/.nvimrc
+    unlink $HOME/.config/nvim/init.vim
     unlink $HOME/.ideavimrc
 }
\ No newline at end of file
diff --git a/crates/20-vim/crate.void.sh b/crates/20-vim/crate.void.sh
index 8fab1a3..1b3e1e8 100644
--- a/crates/20-vim/crate.void.sh
+++ b/crates/20-vim/crate.void.sh
@@ -1,5 +1,5 @@
 super_apply() {
-    xbps-install -y vim
+    xbps-install -y neovim
 }
 
 super_undo() {
diff --git a/crates/20-vim/files/.nvimrc b/crates/20-vim/files/init.vim
similarity index 100%
rename from crates/20-vim/files/.nvimrc
rename to crates/20-vim/files/init.vim