replace pathogen with vundle

12 files changed, 21 insertions, 30 deletions

diff --git a/.gitignore b/.gitignore
index 4d01141..8367412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-vim/.netrwhist
-vim/doc/tags
+vim/
 dotfiles-backup
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index fadcd43..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,24 +0,0 @@
-[submodule "vim/bundle/pathogen"]
-	path = vim/bundle/pathogen
-	url = https://github.com/tpope/vim-pathogen.git
-[submodule "vim/bundle/nerdtree"]
-	path = vim/bundle/nerdtree
-	url = https://github.com/scrooloose/nerdtree.git
-[submodule "vim/bundle/coffee-script"]
-	path = vim/bundle/coffee-script
-	url = https://github.com/kchmck/vim-coffee-script.git
-[submodule "vim/bundle/solarized"]
-	path = vim/bundle/solarized
-	url = https://github.com/altercation/vim-colors-solarized.git
-[submodule "vim/bundle/bufexplorer"]
-	path = vim/bundle/bufexplorer
-	url = https://github.com/vim-scripts/bufexplorer.zip.git
-[submodule "vim/bundle/ctrlp"]
-	path = vim/bundle/ctrlp
-	url = https://github.com/kien/ctrlp.vim.git
-[submodule "vim/bundle/powerline"]
-	path = vim/bundle/powerline
-	url = https://github.com/Lokaltog/vim-powerline.git
-[submodule "vim/bundle/gitgutter"]
-	path = vim/bundle/gitgutter
-	url = git://github.com/airblade/vim-gitgutter.git
diff --git a/deploy.sh b/deploy.sh
index b66b0d6..d85d7bf 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -14,6 +14,11 @@ do
     ln -sf `pwd`/${f} ~/.${f}
 done
 
+if [ ! -d ~/.vim/bundle/vundle ]; then
+    git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
+fi
+vim +BundleInstall +qall
+
 if [ ! -e ~/.zshrc-local ]; then
     cp zshrc-local ~/.zshrc-local
 fi
diff --git a/vim/bundle/bufexplorer b/vim/bundle/bufexplorer
deleted file mode 160000
-Subproject 8c75e65b647238febd0257658b150f717a13635
diff --git a/vim/bundle/coffee-script b/vim/bundle/coffee-script
deleted file mode 160000
-Subproject ae7ebc39cbf7f29a1034ba3dbe7e947d7dda3bf
diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp
deleted file mode 160000
-Subproject 2927ce4eabbe03a3fb008b0bfbe0fb02dcaf55b
diff --git a/vim/bundle/gitgutter b/vim/bundle/gitgutter
deleted file mode 160000
-Subproject 24efce03cc12dd30f63048627981ab911e551dd
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
deleted file mode 160000
-Subproject 153041ac939502746e5a24468910eb7214a3f59
diff --git a/vim/bundle/pathogen b/vim/bundle/pathogen
deleted file mode 160000
-Subproject ab64b4ddd0c184a528780b498a0b0a5b40248f7
diff --git a/vim/bundle/powerline b/vim/bundle/powerline
deleted file mode 160000
-Subproject 4df0cdc009e590c1d6ec32a2a3c12ff8deeb6f2
diff --git a/vim/bundle/solarized b/vim/bundle/solarized
deleted file mode 160000
-Subproject 528a59f26d12278698bb946f8fb82a63711eec2
diff --git a/vimrc b/vimrc
index b8f323a..8195ee6 100644
--- a/vimrc
+++ b/vimrc
@@ -1,10 +1,21 @@
 "
-" register pathogen
+" vundle
 "
 
-runtime bundle/pathogen/autoload/pathogen.vim
-call pathogen#infect()
-call pathogen#helptags()
+set nocompatible
+filetype off
+
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
+Bundle 'gmarik/vundle'
+
+Bundle 'scrooloose/nerdtree'
+Bundle 'altercation/vim-colors-solarized'
+Bundle 'vim-scripts/bufexplorer.zip'
+Bundle 'kien/ctrlp.vim'
+Bundle 'Lokaltog/vim-powerline'
+Bundle 'airblade/vim-gitgutter'
 
 "
 " behavior