20 files changed, 53 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index af2af57..a0e76af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/bundle
-/themes
 .netrwhist
-/pack
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d0f92df
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,51 @@
+[submodule "pack/plugins/start/vim-go"]
+	path = pack/plugins/start/vim-go
+	url = https://github.com/fatih/vim-go.git
+[submodule "pack/plugins/start/ag.vim"]
+	path = pack/plugins/start/ag.vim
+	url = https://github.com/rking/ag.vim.git
+[submodule "pack/plugins/start/ctrlp.vim"]
+	path = pack/plugins/start/ctrlp.vim
+	url = https://github.com/ctrlpvim/ctrlp.vim
+[submodule "pack/plugins/start/emmet-vim"]
+	path = pack/plugins/start/emmet-vim
+	url = https://github.com/mattn/emmet-vim.git
+[submodule "pack/plugins/start/gundo"]
+	path = pack/plugins/start/gundo
+	url = https://github.com/sjl/gundo.vim
+[submodule "pack/plugins/start/nerdtree"]
+	path = pack/plugins/start/nerdtree
+	url = https://github.com/scrooloose/nerdtree
+[submodule "pack/plugins/start/vim-airline"]
+	path = pack/plugins/start/vim-airline
+	url = https://github.com/vim-airline/vim-airline.git
+[submodule "pack/plugins/start/vim-airline-themes"]
+	path = pack/plugins/start/vim-airline-themes
+	url = https://github.com/vim-airline/vim-airline-themes/
+[submodule "pack/plugins/start/dracula"]
+	path = pack/plugins/start/dracula
+	url = https://github.com/dracula/vim.git
+[submodule "pack/plugins/start/l9"]
+	path = pack/plugins/start/l9
+	url = https://git.riedstra.us/vim/vim-l9.git
+[submodule "pack/plugins/start/vim-autocomplpop"]
+	path = pack/plugins/start/vim-autocomplpop
+	url = https://git.riedstra.us/vim/vim-autocomplpop.git
+[submodule "pack/themes/start/mitch"]
+	path = pack/themes/start/mitch
+	url = https://git.riedstra.us/vim/mitch.git
+[submodule "pack/themes/start/solarized"]
+	path = pack/themes/start/solarized
+	url = https://github.com/altercation/vim-colors-solarized
+[submodule "pack/themes/start/orbital"]
+	path = pack/themes/start/orbital
+	url = https://github.com/fcpg/vim-orbital
+[submodule "pack/themes/start/monotone"]
+	path = pack/themes/start/monotone
+	url = https://github.com/Lokaltog/vim-monotone
+[submodule "pack/themes/start/gruvbox"]
+	path = pack/themes/start/gruvbox
+	url = https://github.com/morhetz/gruvbox
+[submodule "pack/themes/start/base16-black-metal"]
+	path = pack/themes/start/base16-black-metal
+	url = https://github.com/metalelf0/base16-black-metal-scheme.git
diff --git a/pack/plugins/start/ag.vim b/pack/plugins/start/ag.vim
new file mode 160000
+Subproject 4a0dd6e190f446e5a016b44fdaa2feafc582918
diff --git a/pack/plugins/start/ctrlp.vim b/pack/plugins/start/ctrlp.vim
new file mode 160000
+Subproject 44c8e24956d7dcfee3ee6083a0573fed31d136e
diff --git a/pack/plugins/start/dracula b/pack/plugins/start/dracula
new file mode 160000
+Subproject c8c0a9325407c487fd702eca39d987d67123c98
diff --git a/pack/plugins/start/emmet-vim b/pack/plugins/start/emmet-vim
new file mode 160000
+Subproject 5f559fae12a8babf414376906197dbd751e1138
diff --git a/pack/plugins/start/gundo b/pack/plugins/start/gundo
new file mode 160000
+Subproject 46c443ee9d5854320eb965a1fdee781ba83a070
diff --git a/pack/plugins/start/l9 b/pack/plugins/start/l9
new file mode 160000
+Subproject 9546445035be84b7f7ff280282e2eef9923a390
diff --git a/pack/plugins/start/nerdtree b/pack/plugins/start/nerdtree
new file mode 160000
+Subproject fec3e57ad23e4c268d07181d6afb858925b647a
diff --git a/pack/plugins/start/vim-airline b/pack/plugins/start/vim-airline
new file mode 160000
+Subproject f2241b61b2aded65d76a59be400b2cc6c3efa4d
diff --git a/pack/plugins/start/vim-airline-themes b/pack/plugins/start/vim-airline-themes
new file mode 160000
+Subproject 650701f08fa49abca607f5a69ddf0a8157bcd8c
diff --git a/pack/plugins/start/vim-autocomplpop b/pack/plugins/start/vim-autocomplpop
new file mode 160000
+Subproject e4b418d53018dab2c6a7ea2bf6bebd43727705c
diff --git a/pack/plugins/start/vim-go b/pack/plugins/start/vim-go
new file mode 160000
+Subproject dfa71c91286d796c3f775efe3c8c79728938241
diff --git a/pack/themes/start/base16-black-metal b/pack/themes/start/base16-black-metal
new file mode 160000
+Subproject cdfb3d2f3020648338253587917244eff403478
diff --git a/pack/themes/start/gruvbox b/pack/themes/start/gruvbox
new file mode 160000
+Subproject cb4e7a5643f7d2dd40e694bcbd28c4b89b185e8
diff --git a/pack/themes/start/mitch b/pack/themes/start/mitch
new file mode 160000
+Subproject 217beabd4f442b3dde578f220ea6f40f3648f3e
diff --git a/pack/themes/start/monotone b/pack/themes/start/monotone
new file mode 160000
+Subproject af7e02b0c71a61e8237c3c8cffbfaa18e0b07d5
diff --git a/pack/themes/start/orbital b/pack/themes/start/orbital
new file mode 160000
+Subproject 39ba0c7e995185ff262bb88b5af71394bafd508
diff --git a/pack/themes/start/solarized b/pack/themes/start/solarized
new file mode 160000
+Subproject 528a59f26d12278698bb946f8fb82a63711eec2
diff --git a/setup.sh b/setup.sh
index 2cced41..4d554a0 100755
--- a/setup.sh
+++ b/setup.sh
@@ -3,18 +3,8 @@
 WD="$(pwd)"
 
 clone() {
-	printf "Working dir: %s
-" $DIR
-	if [ -d "$DIR/.git" ] ; then
-		cd $DIR
-		git pull --ff-only origin master
-	elif ! [ -d "$DIR/.git" ] ; then
-		mkdir -p "$DIR"
-		cd "$DIR"
-		git clone --depth=1 "$URL" . ||
-			git clone "$URL" .
-	fi
-	cd $WD
+	printf "Working dir: %s\n" "$DIR"
+	git submodule add "$URL" "$DIR"
 	printf ""
 }
 DIR="pack/plugins/start/vim-go"