Merge remote-tracking branch 'origin/master'

[rbdr/dotfiles] / .gitmodules

diff --git a/.gitmodules b/.gitmodules
index ab371678767850ac0ae66d86a9dfd04ddbebe511..64d438bc440d7b2252414deec28eac0303ba67f8 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,111 @@
+[submodule "prezto"]
+       path = prezto
+       url = git://github.com/rbdr/prezto.git

 [submodule "tmux-powerline"]
        path = tmux-powerline
        url = git://github.com/erikw/tmux-powerline.git
 [submodule "tmux-powerline"]
        path = tmux-powerline
        url = git://github.com/erikw/tmux-powerline.git

-
-[submodule "ctrlp"]
+[submodule "vim/bundle/ctrlp.vim"]

   path = vim/bundle/ctrlp.vim
   path = vim/bundle/ctrlp.vim

-       url = https://github.com/kien/ctrlp.vim.git
-
-[submodule "vim-json"]
+       url = git://github.com/kien/ctrlp.vim.git
+[submodule "vim/bundle/vim-json"]

   path = vim/bundle/vim-json
   path = vim/bundle/vim-json

-       url = https://github.com/elzr/vim-json.git
+       url = git://github.com/elzr/vim-json.git
+[submodule "vim/bundle/vim-easymotion"]
+       path = vim/bundle/vim-easymotion
+       url = git://github.com/Lokaltog/vim-easymotion.git
+[submodule "vim/bundle/LargeFile"]
+       path = vim/bundle/LargeFile
+       url = git://github.com/vim-scripts/LargeFile.git
+[submodule "vim/bundle/Align"]
+       path = vim/bundle/Align
+       url = https://github.com/vim-scripts/Align
+[submodule "vim/bundle/nerdcommenter"]
+       path = vim/bundle/nerdcommenter
+       url = git://github.com/scrooloose/nerdcommenter.git
+[submodule "vim/bundle/nerdtree"]
+       path = vim/bundle/nerdtree
+       url = git://github.com/scrooloose/nerdtree.git
+[submodule "vim/bundle/SearchComplete"]
+       path = vim/bundle/SearchComplete
+       url = git://github.com/vim-scripts/SearchComplete.git
+[submodule "vim/bundle/ZoomWin"]
+       path = vim/bundle/ZoomWin
+       url = git://github.com/vim-scripts/ZoomWin.git
+[submodule "vim/bundle/ag.vim"]
+       path = vim/bundle/ag.vim
+       url = git://github.com/rking/ag.vim.git
+[submodule "vim/bundle/Colour-Sampler-Pack"]
+       path = vim/bundle/Colour-Sampler-Pack
+       url = git://github.com/vim-scripts/Colour-Sampler-Pack.git
+[submodule "vim/bundle/delimitMate"]
+       path = vim/bundle/delimitMate
+       url = git://github.com/Raimondi/delimitMate.git
+[submodule "vim/bundle/vim-endwise"]
+       path = vim/bundle/vim-endwise
+       url = git://github.com/tpope/vim-endwise.git
+[submodule "vim/bundle/vim-fugitive"]
+       path = vim/bundle/vim-fugitive
+       url = git://github.com/tpope/vim-fugitive.git
+[submodule "vim/bundle/gist-vim"]
+       path = vim/bundle/gist-vim
+       url = https://github.com/mattn/gist-vim
+[submodule "vim/bundle/vim-indent-object"]
+       path = vim/bundle/vim-indent-object
+       url = git://github.com/michaeljsmith/vim-indent-object.git
+[submodule "vim/bundle/vim-rails"]
+       path = vim/bundle/vim-rails
+       url = git://github.com/tpope/vim-rails.git
+[submodule "vim/bundle/searchfold.vim"]
+       path = vim/bundle/searchfold.vim
+       url = git://github.com/vim-scripts/searchfold.vim.git
+[submodule "vim/bundle/vim-snipmate"]
+       path = vim/bundle/vim-snipmate
+       url = git://github.com/garbas/vim-snipmate.git
+[submodule "vim/bundle/tlib_vim"]
+       path = vim/bundle/tlib_vim
+       url = git://github.com/tomtom/tlib_vim.git
+[submodule "vim/bundle/vim-addon-mw-utils"]
+       path = vim/bundle/vim-addon-mw-utils
+       url = git://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule "vim/bundle/supertab"]
+       path = vim/bundle/supertab
+       url = https://github.com/ervandew/supertab
+[submodule "vim/bundle/vim-surround"]
+       path = vim/bundle/vim-surround
+       url = git://github.com/tpope/vim-surround.git
+[submodule "vim/bundle/syntastic"]
+       path = vim/bundle/syntastic
+       url = git://github.com/scrooloose/syntastic.git
+[submodule "vim/bundle/tagbar"]
+       path = vim/bundle/tagbar
+       url = git://github.com/majutsushi/tagbar.git
+[submodule "vim/bundle/taglist"]
+       path = vim/bundle/taglist
+       url = git://github.com/vim-scripts/taglist.vim.git
+[submodule "vim/bundle/vim-unimpaired"]
+       path = vim/bundle/vim-unimpaired
+       url = git://github.com/tpope/vim-unimpaired.git
+[submodule "vim/bundle/vim-misc"]
+       path = vim/bundle/vim-misc
+       url = https://github.com/xolox/vim-misc
+[submodule "vim/bundle/vim-lua-inspect"]
+       path = vim/bundle/vim-lua-inspect
+       url = https://github.com/xolox/vim-lua-inspect
+[submodule "vim/lua-inspect"]
+       path = vim/lua-inspect
+       url = git://github.com/davidm/lua-inspect.git
+[submodule "vim/bundle/mustache"]
+       path = vim/bundle/mustache
+       url = git://github.com/mustache/vim-mode.git
+[submodule "vim/bundle/api-notation.vim"]
+       path = vim/bundle/api-notation.vim
+       url = git@github.com:rbdr/api-notation.vim.git
+[submodule "vim/bundle/yajs.vim"]
+       path = vim/bundle/yajs.vim
+       url = https://github.com/othree/yajs.vim
+[submodule "vim/bundle/vim-togglelist"]
+       path = vim/bundle/vim-togglelist
+       url = https://github.com/milkypostman/vim-togglelist
+[submodule "vim/bundle/editorconfig-vim"]
+       path = vim/bundle/editorconfig-vim
+       url = https://github.com/editorconfig/editorconfig-vim.git