Migrating over from pathogen to native, with git submodules

.gitmodules

@@ -0,0 +1,75 @@
+[submodule "vim/pack/nichus/start/vim-fugitive"]
+	path = vim/pack/nichus/start/vim-fugitive
+	url = https://github.com/tpope/vim-fugitive.git
+[submodule "vim/pack/nichus/start/tpope-vim-git"]
+	path = vim/pack/nichus/start/tpope-vim-git
+	url = https://github.com/tpope/vim-git.git
+[submodule "vim/pack/nichus/start/tpope-vim-sensible"]
+	path = vim/pack/nichus/start/tpope-vim-sensible
+	url = https://github.com/tpope/vim-sensible.git
+[submodule "vim/pack/nichus/start/rust-lang-rust.vim"]
+	path = vim/pack/nichus/start/rust-lang-rust.vim
+	url = https://github.com/rust-lang/rust.vim.git
+[submodule "vim/pack/nichus/start/pearofducks-ansible-vim"]
+	path = vim/pack/nichus/start/pearofducks-ansible-vim
+	url = https://github.com/pearofducks/ansible-vim.git
+[submodule "vim/pack/nichus/start/airblade-vim-gitgutter"]
+	path = vim/pack/nichus/start/airblade-vim-gitgutter
+	url = https://github.com/airblade/vim-gitgutter
+[submodule "vim/pack/nichus/start/bling-vim-airline"]
+	path = vim/pack/nichus/start/bling-vim-airline
+	url = https://github.com/bling/vim-airline
+[submodule "vim/pack/nichus/start/vim-airline-vim-airline-themes"]
+	path = vim/pack/nichus/start/vim-airline-vim-airline-themes
+	url = https://github.com/vim-airline/vim-airline-themes
+[submodule "vim/pack/nichus/start/pangloss-vim-javascript"]
+	path = vim/pack/nichus/start/pangloss-vim-javascript
+	url = https://github.com/pangloss/vim-javascript
+[submodule "vim/pack/nichus/start/tpope-vim-surround"]
+	path = vim/pack/nichus/start/tpope-vim-surround
+	url = https://github.com/tpope/vim-surround
+[submodule "vim/pack/nichus/start/scrooloose-syntastic"]
+	path = vim/pack/nichus/start/scrooloose-syntastic
+	url = https://github.com/scrooloose/syntastic
+[submodule "vim/pack/nichus/start/hashivim-vim-terraform"]
+	path = vim/pack/nichus/start/hashivim-vim-terraform
+	url = https://github.com/hashivim/vim-terraform.git
+[submodule "vim/pack/nichus/start/tangledhelix-vim-kickstart"]
+	path = vim/pack/nichus/start/tangledhelix-vim-kickstart
+	url = https://github.com/tangledhelix/vim-kickstart.git
+[submodule "vim/pack/nichus/start/Marfisc-vorange"]
+	path = vim/pack/nichus/start/Marfisc-vorange
+	url = https://github.com/Marfisc/vorange.git
+[submodule "vim/pack/nichus/start/sjl-badwolf"]
+	path = vim/pack/nichus/start/sjl-badwolf
+	url = https://github.com/sjl/badwolf.git
+[submodule "vim/pack/nichus/start/YorickPeterse-happy_hacking.vim"]
+	path = vim/pack/nichus/start/YorickPeterse-happy_hacking.vim
+	url = https://github.com/YorickPeterse/happy_hacking.vim.git
+[submodule "vim/pack/nichus/start/owickstrom-vim-colors-paramount"]
+	path = vim/pack/nichus/start/owickstrom-vim-colors-paramount
+	url = https://github.com/owickstrom/vim-colors-paramount.git
+[submodule "vim/pack/nichus/start/pbrisbin-vim-colors-off"]
+	path = vim/pack/nichus/start/pbrisbin-vim-colors-off
+	url = https://github.com/pbrisbin/vim-colors-off.git
+[submodule "vim/pack/nichus/start/kristijanhusak-vim-hybrid-material"]
+	path = vim/pack/nichus/start/kristijanhusak-vim-hybrid-material
+	url = https://github.com/kristijanhusak/vim-hybrid-material.git
+[submodule "vim/pack/nichus/start/dsolstad-vim-wombat256i"]
+	path = vim/pack/nichus/start/dsolstad-vim-wombat256i
+	url = https://github.com/dsolstad/vim-wombat256i.git
+[submodule "vim/pack/nichus/start/jnurmine-Zenburn"]
+	path = vim/pack/nichus/start/jnurmine-Zenburn
+	url = https://github.com/jnurmine/Zenburn.git
+[submodule "vim/pack/nichus/start/altercation-vim-colors-solarized"]
+	path = vim/pack/nichus/start/altercation-vim-colors-solarized
+	url = https://github.com/altercation/vim-colors-solarized.git
+[submodule "vim/pack/nichus/start/xero-blaquemagick.vim"]
+	path = vim/pack/nichus/start/xero-blaquemagick.vim
+	url = https://github.com/xero/blaquemagick.vim.git
+[submodule "vim/pack/nichus/start/ltlollo-diokai"]
+	path = vim/pack/nichus/start/ltlollo-diokai
+	url = https://github.com/ltlollo/diokai.git
+[submodule "vim/pack/nichus/start/sheerun-vim-wombat-scheme"]
+	path = vim/pack/nichus/start/sheerun-vim-wombat-scheme
+	url = https://github.com/sheerun/vim-wombat-scheme.git

initialize_environment.sh

@@ -18,8 +18,8 @@ ln -s $(pwd)/vimrc $HOME/.vimrc
 mkdir -p $HOME/.vim/autoload $HOME/.vim/bundle
 curl -LSso $HOME/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
 
-MODULES="git://github.com/tpope/vim-fugitive.git
+MODULES="https://github.com/tpope/vim-fugitive.git
-        git://github.com/tpope/vim-git.git
+        https://github.com/tpope/vim-git.git
         https://github.com/tpope/vim-sensible.git
         https://github.com/rust-lang/rust.vim.git
         https://github.com/pearofducks/ansible-vim.git
@@ -29,6 +29,8 @@ MODULES="git://github.com/tpope/vim-fugitive.git
         https://github.com/pangloss/vim-javascript
         https://github.com/tpope/vim-surround
         https://github.com/scrooloose/syntastic
+	https://github.com/hashivim/vim-terraform.git
+	https://github.com/tangledhelix/vim-kickstart.git
         https://github.com/Marfisc/vorange.git
         https://github.com/sjl/badwolf.git
         https://github.com/YorickPeterse/happy_hacking.vim.git
@@ -37,8 +39,9 @@ MODULES="git://github.com/tpope/vim-fugitive.git
         https://github.com/kristijanhusak/vim-hybrid-material.git
         https://github.com/dsolstad/vim-wombat256i.git
         https://github.com/jnurmine/Zenburn.git
-        git://github.com/altercation/vim-colors-solarized.git
+        https://github.com/altercation/vim-colors-solarized.git
         https://github.com/xero/blaquemagick.vim.git
+	https://github.com/ltlollo/diokai.git
         https://github.com/sheerun/vim-wombat-scheme.git"
 
 cd $HOME/.vim/bundle

vim-add-submodule.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$1x" -eq "x" ]; then
+  echo "specify a git repo on the command line"
+  exit 1
+fi
+repository=$(basename $(dirname $1))
+project=${$(basename $1)%.git}
+smpath="vim/pack/nichus/start/${repository}-${project}"
+git submodule add $1 $smpath
+git add .gitmodules $smpath

vim-remove-submodule.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ "$1x" -eq "x" ]; then
+  echo "specify a module directory to remove"
+  exit 1
+fi
+if [ ! -d vim/pack/nichus/start/$1 ]; then
+  echo "submodule $1 is not installed"
+  exit 1
+fi
+
+git submodule deinit vim/pack/nichus/start/$1
+git rm vim/pack/nichus/start/$1
+rm -rf .git/modules/vim/pack/nichus/start/$1
+git commit

vim-update-submodules.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+git submodule update --remote --merge
+git commit

vim/pack/nichus/start/Marfisc-vorange

@@ -0,0 +1 @@
+Subproject commit 424a9cfcc78ce73c0cc06fdcde65f558e33b48c3

vim/pack/nichus/start/YorickPeterse-happy_hacking.vim

@@ -0,0 +1 @@
+Subproject commit af4535387867df7ce6b8ca30074381697e08f639

vim/pack/nichus/start/airblade-vim-gitgutter

@@ -0,0 +1 @@
+Subproject commit 1c034be0d31168c8f4770ef7b69adb67d00d6f3d

vim/pack/nichus/start/altercation-vim-colors-solarized

@@ -0,0 +1 @@
+Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21

vim/pack/nichus/start/bling-vim-airline

@@ -0,0 +1 @@
+Subproject commit 396b49be4c886c96e949d535b638cc5a79440148

vim/pack/nichus/start/dsolstad-vim-wombat256i

@@ -0,0 +1 @@
+Subproject commit f99475e4031139cb681d8e73eb274f2d01940ae6

vim/pack/nichus/start/hashivim-vim-terraform

@@ -0,0 +1 @@
+Subproject commit c9a168018de054bcdb6379a3217b880f20012eb1

vim/pack/nichus/start/jnurmine-Zenburn

@@ -0,0 +1 @@
+Subproject commit f7847fb1531b91e2b4bb4aed5db3146f07765179

vim/pack/nichus/start/kristijanhusak-vim-hybrid-material

@@ -0,0 +1 @@
+Subproject commit 6da8b8524013873fe1125d8410eee9dd00da8281

vim/pack/nichus/start/ltlollo-diokai

@@ -0,0 +1 @@
+Subproject commit d5bd6df81c9f99cf1045154002fcd72edfcf7871

vim/pack/nichus/start/owickstrom-vim-colors-paramount

@@ -0,0 +1 @@
+Subproject commit 3e4db0e62aaca536d8e995df70893f2c427346a6

vim/pack/nichus/start/pangloss-vim-javascript

@@ -0,0 +1 @@
+Subproject commit a24f345f47703d957742275d0525e83b68e83b40

vim/pack/nichus/start/pbrisbin-vim-colors-off

@@ -0,0 +1 @@
+Subproject commit 6a2b13690017be37caa5acb05fd90e70da2ecac0

vim/pack/nichus/start/pearofducks-ansible-vim

@@ -0,0 +1 @@
+Subproject commit 8540ad7ff0f8da2b31b5c55e6ae52ad87221e918

vim/pack/nichus/start/rust-lang-rust.vim

@@ -0,0 +1 @@
+Subproject commit 732b5fcb3652f81726d5f0f5b97c9027c01f057a

vim/pack/nichus/start/scrooloose-syntastic

@@ -0,0 +1 @@
+Subproject commit d7338f8a635514270b441e381164ec477a2e0cfd

vim/pack/nichus/start/sheerun-vim-wombat-scheme

@@ -0,0 +1 @@
+Subproject commit 8bddabafb47dc84870cc20ffe887326883190997

vim/pack/nichus/start/sjl-badwolf

@@ -0,0 +1 @@
+Subproject commit 834fbe93d1648894124fea1b281c2649c3df587d

vim/pack/nichus/start/tangledhelix-vim-kickstart

@@ -0,0 +1 @@
+Subproject commit 0ef49ac5afd4aca5b0f9f8533e557ec9d603f283

vim/pack/nichus/start/tpope-vim-git

@@ -0,0 +1 @@
+Subproject commit a08ca046128988beb3461d44de91524350be7678

vim/pack/nichus/start/tpope-vim-sensible

@@ -0,0 +1 @@
+Subproject commit 4b7535921819a5b2e39be68f81109ea684232503

vim/pack/nichus/start/tpope-vim-surround

@@ -0,0 +1 @@
+Subproject commit e49d6c2459e0f5569ff2d533b4df995dd7f98313

vim/pack/nichus/start/vim-airline-vim-airline-themes

@@ -0,0 +1 @@
+Subproject commit 66c2839bb1126c71a0a2d1da9804161ccd3b78b6

vim/pack/nichus/start/vim-fugitive

@@ -0,0 +1 @@
+Subproject commit 87c1bda4d5573185a1f79c42a919c4b62bc34c42

vim/pack/nichus/start/xero-blaquemagick.vim

@@ -0,0 +1 @@
+Subproject commit a535351f25bd4d0dfac7be710468c4ee0e8a874e

vimrc

@@ -1,4 +1,4 @@
-execute pathogen#infect()
+"execute pathogen#infect()
 
 " Pathogen modules used:
 " * git://github.com/tpope/vim-fugitive.git
@@ -51,7 +51,7 @@ set cursorline
 
 "set background=dark
 "let g:badwolf_darkgutter=1
-colorscheme vorange
+colorscheme happy_hacking
 
 let g:airline_powerline_fonts = 1
 "let g:airline#extensions#whitespace#mixed_indent_algo = 1