17 files changed, 51 insertions, 60 deletions
diff --git a/.gitmodules b/.gitmodules
index 2225436..88c5bd8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,45 @@
 [submodule "shell/_oh-my-zsh"]
 	path = shell/_oh-my-zsh
 	url = https://github.com/robbyrussell/oh-my-zsh.git
+[submodule "shell/_vim/bundle/vim-pathogen"]
+	path = shell/_vim/bundle/vim-pathogen
+	url = https://github.com/tpope/vim-pathogen.git
+[submodule "shell/_vim/bundle/vim-reload"]
+	path = shell/_vim/bundle/vim-reload
+	url = https://github.com/xolox/vim-reload.git
+[submodule "shell/_vim/bundle/vim-misc"]
+	path = shell/_vim/bundle/vim-misc
+	url = https://github.com/xolox/vim-misc.git
+[submodule "shell/_vim/bundle/unite.vim"]
+	path = shell/_vim/bundle/unite.vim
+	url = https://github.com/Shougo/unite.vim.git
+[submodule "shell/_vim/bundle/vim-airline"]
+	path = shell/_vim/bundle/vim-airline
+	url = https://github.com/bling/vim-airline.git
+[submodule "shell/_vim/bundle/syntastic"]
+	path = shell/_vim/bundle/syntastic
+	url = https://github.com/scrooloose/syntastic.git
+[submodule "shell/_vim/bundle/nerdcommenter"]
+	path = shell/_vim/bundle/nerdcommenter
+	url = https://github.com/scrooloose/nerdcommenter.git
+[submodule "shell/_vim/bundle/vim-surround"]
+	path = shell/_vim/bundle/vim-surround
+	url = https://github.com/tpope/vim-surround.git
+[submodule "shell/_vim/bundle/jedi-vim"]
+	path = shell/_vim/bundle/jedi-vim
+	url = https://github.com/davidhalter/jedi-vim.git
+[submodule "shell/_vim/bundle/rust.vim"]
+	path = shell/_vim/bundle/rust.vim
+	url = https://github.com/wting/rust.vim.git
+[submodule "shell/_vim/bundle/vim-ledger"]
+	path = shell/_vim/bundle/vim-ledger
+	url = https://github.com/ledger/vim-ledger.git
+[submodule "shell/_vim/bundle/vim-easy-align"]
+	path = shell/_vim/bundle/vim-easy-align
+	url = https://github.com/junegunn/vim-easy-align.git
+[submodule "shell/_vim/bundle/LargeFile"]
+	path = shell/_vim/bundle/LargeFile
+	url = https://github.com/vim-scripts/LargeFile.git
+[submodule "shell/_vim/bundle/vim-distinguished"]
+	path = shell/_vim/bundle/vim-distinguished
+	url = https://github.com/Lokaltog/vim-distinguished.git
diff --git a/install.sh b/install.sh
index a52e49f..f550747 100755
--- a/install.sh
+++ b/install.sh
@@ -12,6 +12,7 @@ ln -sfT "$dotfiles/shell/themes" "$HOME/.oh-my-zsh/custom/themes"
 
 # [vim]
 ln -sf "$dotfiles/shell/_vimrc" "$HOME/.vimrc"
+ln -sfT "$dotfiles/shell/_vim" "$HOME/.vim"
 
 # [git]
 ln -sf "$dotfiles/shell/_gitconfig" "$HOME/.gitconfig"
diff --git a/shell/_vim/bundle/LargeFile b/shell/_vim/bundle/LargeFile
new file mode 160000
+Subproject 3941a37b2b0288524300348a39521a46539bf9f
diff --git a/shell/_vim/bundle/jedi-vim b/shell/_vim/bundle/jedi-vim
new file mode 160000
+Subproject bcf24529faa5979e0d67b62673429f9978c2357
diff --git a/shell/_vim/bundle/nerdcommenter b/shell/_vim/bundle/nerdcommenter
new file mode 160000
+Subproject 5cc672a4f2adb734ac671499476034f0cd1d3d7
diff --git a/shell/_vim/bundle/rust.vim b/shell/_vim/bundle/rust.vim
new file mode 160000
+Subproject 2450ecf3091cc7c2711ca9f00eae8e3bedd0437
diff --git a/shell/_vim/bundle/syntastic b/shell/_vim/bundle/syntastic
new file mode 160000
+Subproject be111259ec4428ea10dbb02b54127cf348f1760
diff --git a/shell/_vim/bundle/unite.vim b/shell/_vim/bundle/unite.vim
new file mode 160000
+Subproject 385a52a842a2b7c7dc89f6a22ddd76e67ae32c0
diff --git a/shell/_vim/bundle/vim-airline b/shell/_vim/bundle/vim-airline
new file mode 160000
+Subproject cdc6d98a09db60d3dda58815616f78338cbdaa9
diff --git a/shell/_vim/bundle/vim-distinguished b/shell/_vim/bundle/vim-distinguished
new file mode 160000
+Subproject 62b360dc81355b53d124cd06218a9ba2496563f
diff --git a/shell/_vim/bundle/vim-easy-align b/shell/_vim/bundle/vim-easy-align
new file mode 160000
+Subproject 1206c65dcb87488900b5ac193965268f0ce2c57
diff --git a/shell/_vim/bundle/vim-ledger b/shell/_vim/bundle/vim-ledger
new file mode 160000
+Subproject 97fa935d8f644c69506ad69cc3db84d9ac328f3
diff --git a/shell/_vim/bundle/vim-misc b/shell/_vim/bundle/vim-misc
new file mode 160000
+Subproject 3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0
diff --git a/shell/_vim/bundle/vim-pathogen b/shell/_vim/bundle/vim-pathogen
new file mode 160000
+Subproject b9fb0dfd811004010f5f6903edef42d6004ebea
diff --git a/shell/_vim/bundle/vim-reload b/shell/_vim/bundle/vim-reload
new file mode 160000
+Subproject 0a601a668727f5b675cb1ddc19f6861f3f7ab9e
diff --git a/shell/_vim/bundle/vim-surround b/shell/_vim/bundle/vim-surround
new file mode 160000
+Subproject 2d05440ad23f97a7874ebd9b5de3a0e65d25d85
diff --git a/shell/_vimrc b/shell/_vimrc
index a36493c..f91c575 100644
--- a/shell/_vimrc
+++ b/shell/_vimrc
@@ -4,69 +4,17 @@
 " May install in the future:
 " Git wrapper, similar to magit: 'https://github.com/tpope/vim-fugitive'
 " https://github.com/tony/vim-config
-
+" Plugins for review:
+"   'msanders/snipmate.vim'
+"   'godlygeek/tabular'
+"   'plasticboy/vim-markdown'
+
+runtime bundle/vim-pathogen/autoload/pathogen.vim
+execute pathogen#infect()
+set nocompatible " Be iMproved
 let mapleader="," " set leader early as otherwise it wouldn't work
-
-" ----- NeoBundle -----
-" Note: Skip initialization for vim-tiny or vim-small.
-if 0 | endif
-
-let first_run=0
-if !filereadable(expand('~/.vim/bundle/neobundle.vim/README.md'))
-	let first_run=1
-	silent !git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim
-endif
-
-if has('vim_starting')
-	if &compatible
-		set nocompatible " Be iMproved
-	endif
-
-	set runtimepath+=~/.vim/bundle/neobundle.vim/
-endif
-
-call neobundle#begin(expand('~/.vim/bundle/'))
-
-NeoBundleFetch 'Shougo/neobundle.vim'
-
-NeoBundle 'Shougo/vimproc.vim', {
-\ 'build' : {
-\     'windows' : 'tools\\update-dll-mingw',
-\     'cygwin' : 'make -f make_cygwin.mak',
-\     'mac' : 'make -f make_mac.mak',
-\     'linux' : 'make',
-\     'unix' : 'gmake',
-\    },
-\ }
-NeoBundle 'Lokaltog/vim-distinguished'
-NeoBundle 'xolox/vim-reload'
-NeoBundle 'xolox/vim-misc'
-NeoBundle 'Shougo/unite.vim'
-NeoBundle 'bling/vim-airline'
-NeoBundle 'scrooloose/syntastic'
-NeoBundle 'scrooloose/nerdcommenter'
-NeoBundle 'tpope/vim-surround'
-NeoBundle 'davidhalter/jedi-vim'
-NeoBundle 'wting/rust.vim'
-NeoBundle 'ledger/vim-ledger'
-NeoBundle 'junegunn/vim-easy-align'
-"NeoBundle 'msanders/snipmate.vim'
-"NeoBundle 'godlygeek/tabular'
-"NeoBundle 'plasticboy/vim-markdown'
-
-" Disable plugins for very large files
-NeoBundleLazy 'vim-scripts/LargeFile'
-
-call neobundle#end()
-
 filetype plugin indent on
 
-if first_run
-	NeoBundleInstall
-else
-	NeoBundleCheck
-endif
-
 " ----- general settings -----
 set encoding=utf-8
 set ff=unix