commit 25d61acda35ce830b3db54a48f8efcb674b93ec0 parent b2a11354779a852a62fc406eef42ed2c177a6f4f Author: Xiaodong Xu <[email protected]> Date: Sun Jun 30 13:52:31 +0800 Add plugins Diffstat:
| .gitmodules | | | 24 | ++++++++++++++++++++++++ |
| _vim/bundle/color_highlight | | | 1 | + |
| _vim/bundle/gitgutter | | | 1 | + |
| _vim/bundle/indent-guides | | | 1 | + |
| _vim/bundle/multiple-cursors | | | 1 | + |
| _vim/bundle/neocomplcache | | | 1 | + |
| _vim/bundle/nerdtree | | | 1 | + |
| _vim/bundle/tabular | | | 1 | + |
| _vim/bundle/tomorrow | | | 1 | + |
| _vim/conf/abbrevs.vim | | | 6 | +++++- |
| _vim/conf/plugin.vim | | | 10 | +++++++++- |
| _vimrc | | | 10 | +++++----- |
diff --git a/.gitmodules b/.gitmodules @@ -91,3 +91,27 @@ [submodule "_vim/bundle/ansiesc"] path = _vim/bundle/ansiesc url = git://github.com/vim-scripts/AnsiEsc.vim.git +[submodule "_vim/bundle/tomorrow"] + path = _vim/bundle/tomorrow + url = git://github.com/chriskempson/vim-tomorrow-theme.git +[submodule "_vim/bundle/color_highlight"] + path = _vim/bundle/color_highlight + url = git://github.com/chrisbra/color_highlight.git +[submodule "_vim/bundle/multiple-cursors"] + path = _vim/bundle/multiple-cursors + url = git://github.com/terryma/vim-multiple-cursors.git +[submodule "_vim/bundle/nerdtree"] + path = _vim/bundle/nerdtree + url = git://github.com/scrooloose/nerdtree.git +[submodule "_vim/bundle/gitgutter"] + path = _vim/bundle/gitgutter + url = git://github.com/airblade/vim-gitgutter.git +[submodule "_vim/bundle/neocomplcache"] + path = _vim/bundle/neocomplcache + url = git://github.com/Shougo/neocomplcache.vim.git +[submodule "_vim/bundle/indent-guides"] + path = _vim/bundle/indent-guides + url = git://github.com/nathanaelkane/vim-indent-guides.git +[submodule "_vim/bundle/tabular"] + path = _vim/bundle/tabular + url = git://github.com/godlygeek/tabular.git diff --git a/_vim/bundle/color_highlight b/_vim/bundle/color_highlight @@ -0,0 +1 @@ +Subproject commit 866bb9efc990770b35ce7cf037d111af27f90a53 diff --git a/_vim/bundle/gitgutter b/_vim/bundle/gitgutter @@ -0,0 +1 @@ +Subproject commit ff031d022f2123353bc93a3aa97290287c10a287 diff --git a/_vim/bundle/indent-guides b/_vim/bundle/indent-guides @@ -0,0 +1 @@ +Subproject commit eec1b629dc4cfa3986d20f21d4b4489732cd3f5a diff --git a/_vim/bundle/multiple-cursors b/_vim/bundle/multiple-cursors @@ -0,0 +1 @@ +Subproject commit 8c9bcedc6c534d3f308fa3ade6a459977ee4a58a diff --git a/_vim/bundle/neocomplcache b/_vim/bundle/neocomplcache @@ -0,0 +1 @@ +Subproject commit bddebcfb734248eca615bebb95ec68311f8b9c55 diff --git a/_vim/bundle/nerdtree b/_vim/bundle/nerdtree @@ -0,0 +1 @@ +Subproject commit b0bb781fc73ef40365e4c996a16f04368d64fc9d diff --git a/_vim/bundle/tabular b/_vim/bundle/tabular @@ -0,0 +1 @@ +Subproject commit 60f25648814f0695eeb6c1040d97adca93c4e0bb diff --git a/_vim/bundle/tomorrow b/_vim/bundle/tomorrow @@ -0,0 +1 @@ +Subproject commit 00f8345852c3d85ebb320d6dc0b42c7352d856dd diff --git a/_vim/conf/abbrevs.vim b/_vim/conf/abbrevs.vim @@ -1,6 +1,6 @@ " " author : Xu Xiaodong <[email protected]> -" modified : 2012 May 20 +" modified : 2012 Jul 21 " "-- abbrevs --" @@ -18,3 +18,7 @@ iab _rb #!/usr/bin/env ruby iab _xt http://linuxtoy.org iab _xm <!--more--> + +iab _hlb {% highlight bash %} +iab _hlr {% highlight ruby %} +iab _ehl {% endhighlight %} diff --git a/_vim/conf/plugin.vim b/_vim/conf/plugin.vim @@ -1,6 +1,6 @@ " " author : Xu Xiaodong <[email protected]> -" modified : 2012 Jul 07 +" modified : 2013 Jun 30 " "-- plugin --" @@ -34,6 +34,14 @@ nmap to :TagbarToggle<cr> " slime let g:slime_target='tmux' +" neocomplcache +let g:neocomplcache_enable_at_startup = 1 + +" indent guides +let g:indent_guides_enable_on_vim_startup=0 +let g:indent_guides_start_level=1 +let g:indent_guides_guide_size=1 + " markdown autocmd BufRead *.md set ft=markdown diff --git a/_vimrc b/_vimrc @@ -1,6 +1,6 @@ " " author: Xu Xiaodong <[email protected]> -" modified: 2012 Jul 08 +" modified: 2013 Jun 30 " "-- source --" @@ -36,10 +36,10 @@ syntax on "-- colorscheme --" +set background=dark if &t_Co < 256 colorscheme miro8 else - "set background=dark colorscheme Tomorrow-Night endif @@ -60,9 +60,9 @@ set fileencodings=ucs-bom,utf-8,gb18030,default set expandtab set smarttab set shiftround -set tabstop=2 -set shiftwidth=2 -set softtabstop=2 +set tabstop=4 +set shiftwidth=4 +set softtabstop=4 set textwidth=78 set autoindent