Switch over to native Vim package management.

.gitmodules

@@ -1,39 +1,39 @@
 [submodule "bundle/vim-pathogen"]
-	path = bundle/vim-pathogen
+	path = pack/bundle/start/vim-pathogen
 	url = https://github.com/tpope/vim-pathogen.git
 [submodule "bundle/vim-fugitive"]
-	path = bundle/vim-fugitive
+	path = pack/bundle/start/vim-fugitive
 	url = https://github.com/tpope/vim-fugitive.git
 [submodule "bundle/tlib_vim"]
-	path = bundle/tlib_vim
+	path = pack/bundle/start/tlib_vim
 	url = https://github.com/tomtom/tlib_vim.git
 [submodule "bundle/vim-addon-mw-utils"]
-	path = bundle/vim-addon-mw-utils
+	path = pack/bundle/start/vim-addon-mw-utils
 	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
 [submodule "bundle/vim-snipmate"]
-	path = bundle/vim-snipmate
+	path = pack/bundle/start/vim-snipmate
 	url = https://github.com/garbas/vim-snipmate.git
 [submodule "bundle/vim-snippets"]
-	path = bundle/vim-snippets
+	path = pack/bundle/start/vim-snippets
 	url = https://github.com/honza/vim-snippets.git
 [submodule "bundle/tabular"]
-	path = bundle/tabular
+	path = pack/bundle/start/tabular
 	url = https://github.com/godlygeek/tabular.git
 [submodule "bundle/vim-puppet"]
-	path = bundle/vim-puppet
+	path = pack/bundle/start/vim-puppet
 	url = https://github.com/rodjek/vim-puppet.git
 [submodule "bundle/vim-vagrant"]
-	path = bundle/vim-vagrant
+	path = pack/bundle/start/vim-vagrant
 	url = https://github.com/hashivim/vim-vagrant.git
 [submodule "bundle/vim-terraform"]
-	path = bundle/vim-terraform
+	path = pack/bundle/start/vim-terraform
 	url = https://github.com/hashivim/vim-terraform.git
 [submodule "bundle/epp-syntax-vim"]
-	path = bundle/epp-syntax-vim
+	path = pack/bundle/start/epp-syntax-vim
 	url = https://github.com/farkasmate/epp-syntax-vim.git
 [submodule "bundle/ale"]
-	path = bundle/ale
+	path = pack/bundle/start/ale
 	url = https://github.com/dense-analysis/ale.git
 [submodule "bundle/vim-commentary"]
-	path = bundle/vim-commentary
+	path = pack/bundle/start/vim-commentary
 	url = https://github.com/tpope/vim-commentary.git

.vimrc

@@ -98,10 +98,6 @@ endif
 " Shift+mouse in xterm reverts to normal xterm behavior.
 set mouse+=a
 
-" Enable pathogen
-runtime bundle/vim-pathogen/autoload/pathogen.vim
-execute pathogen#infect()
-
 " Status bar stuff.
 set showcmd
 set laststatus=2

install.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# Create symlinks to this directory for vim and neovim
+
+set -e
+
+link() {
+    src=$1
+    tgt=$2
+
+    if [ -L "$tgt" -a "$( readlink "$tgt" )" = "$src" ] ; then
+        return
+    fi
+
+    if [ ! -e "$tgt" ] ; then
+        ln -sfv "$src" "$tgt"
+    elif [ -L "$tgt" ] ; then
+        rm -fv "$tgt"
+        ln -sfv "$src" "$tgt"
+    else
+        echo "Skipping existing directory $tgt"
+    fi
+}
+
+reldir="$( dirname "$0" )"
+
+if [ -z "$dir" ] ; then
+    reldir='.'
+fi
+
+dir="$( realpath "$reldir" )"
+
+# Configure vim
+link "$dir"/.vimrc ~/.vimrc
+link "$dir"/.gvimrc ~/.gvimrc
+
+# Configure neovim
+mkdir -pv ~/.config ~/.local/share/nvim
+
+for target in ~/.config/nvim ~/.local/share/nvim/site ; do
+    link "$dir" "$target"
+done