Migrating over from pathogen to native, with git submodules

This commit is contained in:
2017-03-28 10:48:25 -06:00
parent 75ca5375e5
commit 5e829dd680
32 changed files with 139 additions and 6 deletions

75
.gitmodules vendored Normal file
View File

@ -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

View File

@ -29,5 +29,5 @@ Module 12: Diag
Course Review:
Mod 1 -
Mod 1 -
joanna@splunk.com

View File

@ -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
git://github.com/tpope/vim-git.git
MODULES="https://github.com/tpope/vim-fugitive.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

11
vim-add-submodule.sh Normal file
View File

@ -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

15
vim-remove-submodule.sh Normal file
View File

@ -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

4
vim-update-submodules.sh Normal file
View File

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

4
vimrc
View File

@ -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