diff --git a/neovim/init.vim b/neovim/init.vim
index 78b849d..3636db7 100644
--- a/neovim/init.vim
+++ b/neovim/init.vim
@@ -6,7 +6,6 @@ let &shell = '/bin/sh'
 let g:python3_host_prog = expand('~/.virtualenvs/neovim3/bin/python')
 let g:python_host_prog  = expand('~/.virtualenvs/neovim2/bin/python')
 
-set runtimepath+=~/.config/nvim/autoload
 call plug#begin('~/.local/share/nvim/plugged')
 if filereadable(expand("~/.config/nvim/os-plugins.vim"))
     source ~/.config/nvim/os-plugins.vim
diff --git a/neovim/pluginstall.vim b/neovim/pluginstall.vim
deleted file mode 100644
index 4ef5e3b..0000000
--- a/neovim/pluginstall.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-:PlugInstall
-:xa
diff --git a/neovim/postinstall b/neovim/postinstall
index 1afc175..1c53504 100755
--- a/neovim/postinstall
+++ b/neovim/postinstall
@@ -4,6 +4,5 @@ set -euo pipefail
 
 CURDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# I wish I could use `--headless` here to avoid screen flashing, but this
-# doesn't seem to work if I set that.
-nvim -s "${CURDIR}/pluginstall.vim"
+# https://github.com/junegunn/vim-plug/wiki/tips#install-plugins-on-the-command-line
+nvim -es -u ~/.config/nvim/init.vim -i NONE -c "PlugInstall" -c "qa"