updated git config, readme and added all submodules for vim

12 years ago · f602c23180
parent e566b9ec52
commit f602c23180
42 changed files with 231 additions and 4 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,117 @@
 [submodule "vim/bundle/mw-utils"]
 	path = vim/bundle/mw-utils
 	url = git://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule "vim/bundle/tlib"]
+	path = vim/bundle/tlib
+	url = git://github.com/tomtom/tlib_vim.git
+[submodule "vim/bundle/matchit"]
+	path = vim/bundle/matchit
+	url = git://github.com/edsono/vim-matchit.git
+[submodule "vim/bundle/snipmate"]
+	path = vim/bundle/snipmate
+	url = git://github.com/garbas/vim-snipmate.git
+[submodule "vim/bundle/ack"]
+	path = vim/bundle/ack
+	url = git://github.com/mileszs/ack.vim.git
+[submodule "vim/bundle/fugitive"]
+	path = vim/bundle/fugitive
+	url = git://github.com/tpope/vim-fugitive.git
+[submodule "vim/bundle/html5"]
+	path = vim/bundle/html5
+	url = git://github.com/othree/html5.vim.git
+[submodule "vim/bundle/markdown"]
+	path = vim/bundle/markdown
+	url = git://github.com/tpope/vim-markdown.git
+[submodule "vim/bundle/surround"]
+	path = vim/bundle/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/tabular"]
+	path = vim/bundle/tabular
+	url = git://github.com/godlygeek/tabular.git
+[submodule "vim/bundle/unimpaired"]
+	path = vim/bundle/unimpaired
+	url = git://github.com/tpope/vim-unimpaired.git
+[submodule "vim/bundle/zoomwin"]
+	path = vim/bundle/zoomwin
+	url = git://github.com/vim-scripts/ZoomWin.git
+[submodule "vim/bundle/tcomment"]
+	path = vim/bundle/tcomment
+	url = git://github.com/tomtom/tcomment_vim.git
+[submodule "vim/bundle/ragtag"]
+	path = vim/bundle/ragtag
+	url = git://github.com/tpope/vim-ragtag.git
+[submodule "vim/bundle/gist"]
+	path = vim/bundle/gist
+	url = git://github.com/mattn/gist-vim.git
+[submodule "vim/bundle/easymotion"]
+	path = vim/bundle/easymotion
+	url = git://github.com/Lokaltog/vim-easymotion.git
+[submodule "vim/bundle/yankring"]
+	path = vim/bundle/yankring
+	url = git://github.com/vim-scripts/YankRing.vim.git
+[submodule "vim/bundle/repeat"]
+	path = vim/bundle/repeat
+	url = git://github.com/tpope/vim-repeat.git
+[submodule "vim/bundle/sparkup"]
+	path = vim/bundle/sparkup
+	url = git://github.com/kogakure/vim-sparkup.git
+[submodule "vim/bundle/jellybeans"]
+	path = vim/bundle/jellybeans
+	url = git://github.com/nanotech/jellybeans.vim.git
+[submodule "vim/bundle/browser-refresh"]
+	path = vim/bundle/browser-refresh
+	url = git://github.com/mkitt/browser-refresh.vim.git
+[submodule "vim/bundle/typoscript"]
+	path = vim/bundle/typoscript
+	url = git://github.com/nebelschwade/typoscript-vim.git
+[submodule "vim/bundle/statusline"]
+	path = vim/bundle/statusline
+	url = git://github.com/nebelschwade/statusline-vim.git
+[submodule "vim/bundle/snipmate-snippets"]
+	path = vim/bundle/snipmate-snippets
+	url = git://github.com/nebelschwade/snipmate-snippets.git
+[submodule "vim/bundle/php-indent"]
+	path = vim/bundle/php-indent
+	url = git://github.com/2072/PHP-Indenting-for-VIm.git
+[submodule "vim/bundle/indent-guides"]
+	path = vim/bundle/indent-guides
+	url = git://github.com/nathanaelkane/vim-indent-guides.git
+[submodule "vim/bundle/nerdtree"]
+	path = vim/bundle/nerdtree
+	url = git://github.com/scrooloose/nerdtree.git
+[submodule "vim/bundle/css3"]
+	path = vim/bundle/css3
+	url = git://github.com/hail2u/vim-css3-syntax.git
+[submodule "vim/bundle/supertab"]
+	path = vim/bundle/supertab
+	url = git://github.com/ervandew/supertab.git
+[submodule "vim/bundle/indent-object"]
+	path = vim/bundle/indent-object
+	url = git://github.com/michaeljsmith/vim-indent-object.git
+[submodule "vim/bundle/buffergator"]
+	path = vim/bundle/buffergator
+	url = git://github.com/jeetsukumaran/vim-buffergator.git
+[submodule "vim/bundle/nrrwrgn"]
+	path = vim/bundle/nrrwrgn
+	url = git://github.com/chrisbra/NrrwRgn.git
+[submodule "vim/bundle/javascript"]
+	path = vim/bundle/javascript
+	url = git://github.com/pangloss/vim-javascript.git
+[submodule "vim/bundle/git"]
+	path = vim/bundle/git
+	url = git://github.com/tpope/vim-git.git
+[submodule "vim/bundle/tagbar"]
+	path = vim/bundle/tagbar
+	url = git://github.com/majutsushi/tagbar.git
+[submodule "vim/bundle/ctrlp"]
+	path = vim/bundle/ctrlp
+	url = git://github.com/kien/ctrlp.vim.git
+[submodule "vim/bundle/scss"]
+	path = vim/bundle/scss
+	url = git://github.com/cakebaker/scss-syntax.vim.git
+[submodule "vim/bundle/pasta"]
+	path = vim/bundle/pasta
+	url = git://github.com/sickill/vim-pasta.git
--- a/README.md
+++ b/README.md
@ -1,15 +1,37 @@
 # My dotfiles

-This is a collection of my dotfiles. To install on your local machine do:
+This is a collection of my dotfiles. To install on your local machine run the following commands:

 ```
 git clone git://github.com/nebelschwade/dotfiles ~/Dotfiles
 cd ~/Dotfiles
-rake install
+ln -s ~/Dotfiles/vim ~/.vim
+ln -s ~/Dotfiles/gitconfig ~/.gitconfig
+ln -s ~/Dotfiles/gitignore ~/.gitignore
+ln -s ~/Dotfiles/inputrc ~/.inputrc
+ln -s ~/Dotfiles/jshintrc ~/.jshintrc
+ln -s ~/Dotfiles/pearrc ~/.pearrc
+ln -s ~/Dotfiles/profile ~/.profile
+ln -s ~/Dotfiles/pearrc ~/.pearrc
+ln -s ~/Dotfiles/vimrc ~/.vimrc
+git submodule init
+git submodule update
+git submodule foreach git checkout master
+git submodule foreach git pull
 ```

-Thanks a lot to Ryan Bates for his install-script [here](https://github.com/ryanb/dotfiles).
-The Vim-config is highly influenced by [janus](https://github.com/carlhuda/janus).
+Then create a file `.gitconfig.user` in your home-folder and provide your git credentials, such as:
+
+```
+[user]
+  name = Your name
+  email = youremail@domain.de
+[github]
+  user = username
+  token = 1235687641287364
+```
+
+Restart your terminal and vim, and you are ready to go.

 ## VIM

--- a/52
+++ b/52
@ -0,0 +1,52 @@
+[include]
+  path = .gitconfig.user
+
+[core]
+  excludesfile = ~/.gitignore
+  editor = mvim -f
+  autocrlf = input
+  eol = lf
+  whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
+
+[color]
+  ui = auto
+[color "branch"]
+  current = yellow reverse 
+  local = yellow
+  remote = green
+[color "diff"]
+  meta = yellow bold 
+  frag = magenta bold 
+  old = red bold
+  new = green bold
+  whitespace = red reverse
+[color "status"] 
+  added = yellow 
+  changed = green 
+  untracked = cyan
+
+[alias]
+  st = status
+  cm = commit
+  co = checkout
+  br = branch
+  ps = push
+  pl = pull
+  hub = push origin master
+  rmall = rm $(git ls-files --deleted)
+  subup= submodule foreach git pull
+  rs = reset master --hard
+  hist = log --pretty=format:\"%h | %ad | %s%d [%an]\" --graph --date=local
+  lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
+  type = cat-file -t
+  dump = cat-file -p
+
+[merge]
+  tool = sourcetree
+  summary = true
+[difftool "sourcetree"]
+  cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+  path = 
+[mergetool "sourcetree"]
+  cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+  trustExitCode = true
--- a/vim/bundle/ack
+++ b/vim/bundle/ack
@ -0,0 +1 @@
+Subproject commit 9895285042a2fd5691b2f6582aa979e4d1bdffea
--- a/vim/bundle/browser-refresh
+++ b/vim/bundle/browser-refresh
@ -0,0 +1 @@
+Subproject commit ad47e231f194156e848d07eaab857e00bb9f6c5c
--- a/vim/bundle/buffergator
+++ b/vim/bundle/buffergator
@ -0,0 +1 @@
+Subproject commit dc879d00891af7c53242f44ec1b571ee19bd9016
--- a/vim/bundle/css3
+++ b/vim/bundle/css3
@ -0,0 +1 @@
+Subproject commit 9416edfb3b8c96be15b46367a7bd48d66154a05f
--- a/vim/bundle/ctrlp
+++ b/vim/bundle/ctrlp
@ -0,0 +1 @@
+Subproject commit b1035a2c6d29a80ea7fd44077814d0bbfc9cdba7
--- a/vim/bundle/easymotion
+++ b/vim/bundle/easymotion
@ -0,0 +1 @@
+Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4
--- a/vim/bundle/fugitive
+++ b/vim/bundle/fugitive
@ -0,0 +1 @@
+Subproject commit 6515bd43acc28c86fcf3bea64ce8a6b3d7db19ff
--- a/vim/bundle/gist
+++ b/vim/bundle/gist
@ -0,0 +1 @@
+Subproject commit 5954a994fba2ce75c92d9d211487534c2a525824
--- a/vim/bundle/git
+++ b/vim/bundle/git
@ -0,0 +1 @@
+Subproject commit 3d31cb0cc9470d57adf36cc3224814ccb0293cc9
--- a/vim/bundle/html5
+++ b/vim/bundle/html5
@ -0,0 +1 @@
+Subproject commit b8620d98a5a328a89e9b4ce74982357de2e47eeb
--- a/vim/bundle/indent-guides
+++ b/vim/bundle/indent-guides
@ -0,0 +1 @@
+Subproject commit 66306748d8960945342d04d41fe6131a00bbf7cb
--- a/vim/bundle/indent-object
+++ b/vim/bundle/indent-object
@ -0,0 +1 @@
+Subproject commit 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e
--- a/vim/bundle/javascript
+++ b/vim/bundle/javascript
@ -0,0 +1 @@
+Subproject commit a599ac8ecede3a30f5a89e6f9f704d97a04f982e
--- a/vim/bundle/jellybeans
+++ b/vim/bundle/jellybeans
@ -0,0 +1 @@
+Subproject commit 9baa7cec7dbfb161a0c7eab696e21a83254b9eff
--- a/vim/bundle/markdown
+++ b/vim/bundle/markdown
@ -0,0 +1 @@
+Subproject commit 3a99157473cb6508d1bc6f5980f928f27f52d65b
--- a/vim/bundle/matchit
+++ b/vim/bundle/matchit
@ -0,0 +1 @@
+Subproject commit ceaf496a3763f3c20bc7f50c2135df4f1775ae05
--- a/vim/bundle/mw-utils
+++ b/vim/bundle/mw-utils
@ -0,0 +1 @@
+Subproject commit d1bfbc589944fcb84af887aec79074d80a327f4c
--- a/vim/bundle/nerdtree
+++ b/vim/bundle/nerdtree
@ -0,0 +1 @@
+Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d
--- a/vim/bundle/nrrwrgn
+++ b/vim/bundle/nrrwrgn
@ -0,0 +1 @@
+Subproject commit 69be73bb8c005c533010440ea241a0ba71434c03
--- a/vim/bundle/pasta
+++ b/vim/bundle/pasta
@ -0,0 +1 @@
+Subproject commit 736e2df09c11a623080e71150576e94fb700e8b8
--- a/vim/bundle/php-indent
+++ b/vim/bundle/php-indent
@ -0,0 +1 @@
+Subproject commit 22377974dce6a345e9284148e3abc849fc94f27a
--- a/vim/bundle/ragtag
+++ b/vim/bundle/ragtag
@ -0,0 +1 @@
+Subproject commit 22b8dbe92df63ba546960f288fc1551699b9410f
--- a/vim/bundle/repeat
+++ b/vim/bundle/repeat
@ -0,0 +1 @@
+Subproject commit d75a544b786710705f0db0d8d8fd66ca4a5a7239
--- a/vim/bundle/scss
+++ b/vim/bundle/scss
@ -0,0 +1 @@
+Subproject commit d4016f8b31f786d830bb59bb78979c6b5d5a200d
--- a/vim/bundle/snipmate
+++ b/vim/bundle/snipmate
@ -0,0 +1 @@
+Subproject commit 3f52de449280badc57c0d41014e64d051166e741
--- a/vim/bundle/snipmate-snippets
+++ b/vim/bundle/snipmate-snippets
@ -0,0 +1 @@
+Subproject commit 9a899001f7f34e8bfc7507199fe8333fc66f8772
--- a/vim/bundle/sparkup
+++ b/vim/bundle/sparkup
@ -0,0 +1 @@
+Subproject commit 0d038a897307f53ca95e2eec2f4981f95241837e
--- a/vim/bundle/statusline
+++ b/vim/bundle/statusline
@ -0,0 +1 @@
+Subproject commit ca01421676716c0291641b1b501f612c79b22ec3
--- a/vim/bundle/supertab
+++ b/vim/bundle/supertab
@ -0,0 +1 @@
+Subproject commit 8302775fc2dee4935c35f3436e59486940dba3b8
--- a/vim/bundle/surround
+++ b/vim/bundle/surround
@ -0,0 +1 @@
+Subproject commit 489a1e8c676ad47dd358dbf883bfaf492148d38b
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@ -0,0 +1 @@
+Subproject commit 025fa81d981c48096d6157f939f007263dc3fab0
--- a/vim/bundle/tabular
+++ b/vim/bundle/tabular
@ -0,0 +1 @@
+Subproject commit ad2a5a1d54443ab27f1282c5617f55b8e0819623
--- a/vim/bundle/tagbar
+++ b/vim/bundle/tagbar
@ -0,0 +1 @@
+Subproject commit ee1c4e137e33c64c787df68efcca7e9af4c5f790
--- a/vim/bundle/tcomment
+++ b/vim/bundle/tcomment
@ -0,0 +1 @@
+Subproject commit 4a88c09abb4944bfe48e0be3a37a52d3b3cb2bc0
--- a/vim/bundle/tlib
+++ b/vim/bundle/tlib
@ -0,0 +1 @@
+Subproject commit 4d2b437055c56cabc65a19044659bc01ff86870b
--- a/vim/bundle/typoscript
+++ b/vim/bundle/typoscript
@ -0,0 +1 @@
+Subproject commit cc060171827398e157aa1f8133ed4193b3051b79
--- a/vim/bundle/unimpaired
+++ b/vim/bundle/unimpaired
@ -0,0 +1 @@
+Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
--- a/vim/bundle/yankring
+++ b/vim/bundle/yankring
@ -0,0 +1 @@
+Subproject commit 8ebc225b364887c0557ab47ab2ca752a70123bee
--- a/vim/bundle/zoomwin
+++ b/vim/bundle/zoomwin
@ -0,0 +1 @@
+Subproject commit e7ee18e2e7ed60509aa951cd34b57193fa14e5ab
				`@ -0,0 +1 @@`
				`Subproject commit 9895285042a2fd5691b2f6582aa979e4d1bdffea`
				`@ -0,0 +1 @@`
				`Subproject commit ad47e231f194156e848d07eaab857e00bb9f6c5c`
				`@ -0,0 +1 @@`
				`Subproject commit dc879d00891af7c53242f44ec1b571ee19bd9016`
				`@ -0,0 +1 @@`
				`Subproject commit 9416edfb3b8c96be15b46367a7bd48d66154a05f`
				`@ -0,0 +1 @@`
				`Subproject commit b1035a2c6d29a80ea7fd44077814d0bbfc9cdba7`
				`@ -0,0 +1 @@`
				`Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4`
				`@ -0,0 +1 @@`
				`Subproject commit 6515bd43acc28c86fcf3bea64ce8a6b3d7db19ff`
				`@ -0,0 +1 @@`
				`Subproject commit 5954a994fba2ce75c92d9d211487534c2a525824`
				`@ -0,0 +1 @@`
				`Subproject commit 3d31cb0cc9470d57adf36cc3224814ccb0293cc9`
				`@ -0,0 +1 @@`
				`Subproject commit b8620d98a5a328a89e9b4ce74982357de2e47eeb`