From bfa96143a1f5ea3cddae44b01abb2884f8e7b9f4 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 30 Oct 2020 17:24:53 -0700
Subject: [PATCH] Fix package loading on Windows

---
 .gitmodules                          | 6 +++---
 .vim/pack/plugins/start/vim-fugitive | 1 +
 .vim/pack/plugins/start/vim-pathogen | 1 -
 .vimrc                               | 2 --
 link.bat                             | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)
 create mode 160000 .vim/pack/plugins/start/vim-fugitive
 delete mode 160000 .vim/pack/plugins/start/vim-pathogen

diff --git a/.gitmodules b/.gitmodules
index 262c44a..19217b7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule ".vim/bundle/vim-pathogen"]
-	path = .vim/pack/plugins/start/vim-pathogen
-	url = https://github.com/tpope/vim-pathogen.git
 [submodule ".vim/bundle/vim-argwrap"]
 	path = .vim/pack/plugins/start/vim-argwrap
 	url = https://github.com/FooSoft/vim-argwrap.git
@@ -118,3 +115,6 @@
 [submodule ".vim/bundle/vim-solarized8"]
 	path = .vim/pack/plugins/start/vim-solarized8
 	url = https://github.com/lifepillar/vim-solarized8.git
+[submodule ".vim/pack/plugins/start/vim-fugitive"]
+	path = .vim/pack/plugins/start/vim-fugitive
+	url = https://github.com/tpope/vim-fugitive.git
diff --git a/.vim/pack/plugins/start/vim-fugitive b/.vim/pack/plugins/start/vim-fugitive
new file mode 160000
index 0000000..1a77f1c
--- /dev/null
+++ b/.vim/pack/plugins/start/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit 1a77f1c00e12e8460f39098ec3289c5433d32512
diff --git a/.vim/pack/plugins/start/vim-pathogen b/.vim/pack/plugins/start/vim-pathogen
deleted file mode 160000
index c6bc424..0000000
--- a/.vim/pack/plugins/start/vim-pathogen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6bc42404597c718e4a032a98e21e63321cbb05a
diff --git a/.vimrc b/.vimrc
index 34f9ef4..4e9b9b7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,3 @@
-set runtimepath+=~/.vim
-
 runtime plugins.vim
 runtime options.vim
 runtime keymaps.vim
diff --git a/link.bat b/link.bat
index e5a6155..4e5aaeb 100644
--- a/link.bat
+++ b/link.bat
@@ -1,4 +1,4 @@
 @echo off
 
 mklink "%USERPROFILE%\_vimrc" "%CD%\.vimrc"
-mklink /J "%USERPROFILE%\.vim" "%CD%\.vim"
+mklink /J "%USERPROFILE%\vimfiles" "%CD%\.vim"