diff --git a/packages.csv b/packages.csv
index 3e7f2dd..4aac5b0 100644
--- a/packages.csv
+++ b/packages.csv
@@ -2,7 +2,6 @@ PAC,alsa-utils,Utilities for ALSA
 PAC,clang,C compiler
 PAC,cmake,Meta-build system
 PAC,cmus,Terminal music player
-AUR,compiledb,Utility for generating compile_commands.json from Makefile
 FUN,install_dash,
 PAC,dunst,Notification daemon
 SRC,https://github.com/augustogunsch/dmenu,Graphical dynamic menu
@@ -14,7 +13,6 @@ PAC,ffmpeg,Media library with CLI tool
 PAC,fzf,Fuzzy finder
 PAC,gcc,C compiler
 PAC,gdb,C debugger
-PAC,gvim,Text editor
 PAC,htop,System monitor
 PAC,libnotify,Implementation of the Desktop Notifications Specification
 PAC,libxinerama,X11 extension which provides support for extending a desktop across multiple displays
@@ -25,6 +23,7 @@ AUR,mmv,Batch renamer
 PAC,mpv,Media player
 PAC,mupdf,Lightweight PDF viewer
 PAC,neofetch,System info fetcher
+PAC,neovim,Text editor
 AUR,nerd-fonts-hack,Monospace font
 PAC,newsboat,RSS feed reader and manager
 PAC,noto-fonts,Collection of standard fonts from Google
diff --git a/post-install.sh b/post-install.sh
index 57c85bb..a078f4e 100755
--- a/post-install.sh
+++ b/post-install.sh
@@ -488,14 +488,14 @@ repos() {
 }
 
 # pwd must be the home dir of the user
-configure_vim_for() {
+configure_nvim_for() {
 	echo -n "Downloading vim-plug for $1..."
-	quiet sudo -u "$1" curl -sfLo .vim/autoload/plug.vim --create-dirs \
-	    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+	quiet sudo -u "$1" curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+		://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 	echo "done"
 
-	echo -n "Installing vim plugins for $1..."
-	quiet sudo -u "$1" vim -E -c PlugInstall -c qall
+	echo -n "Installing neovim plugins for $1..."
+	quiet sudo -u "$1" nvim -E -c PlugInstall -c qall
 	echo "done"
 }
 
@@ -519,12 +519,12 @@ install_dotfiles() {
 
 	qpushd "$HOME_DIR"
 	install_dotfiles_for "$INSTALL_USER"
-	configure_vim_for "$INSTALL_USER"
+	configure_nvim_for "$INSTALL_USER"
 	qpopd
 
 	qpushd "$HOME"
 	install_dotfiles_for "root"
-	configure_vim_for "root"
+	configure_nvim_for "root"
 	qpopd
 
 	change_shells