commit 72d8ba03cee91b75d73f7668a6ed459b45a4b11f parent faa7d3e48311c56451c44fd6e101dffd39cd9bb6 Author: Xiaodong Xu <[email protected]> Date: Sat May 19 00:11:29 +0800 Add sunburst colorscheme Diffstat:
| .gitmodules | | | 6 | ++++++ |
| _vim/bundle/ctrlp | | | 2 | +- |
| _vim/bundle/fugitive | | | 2 | +- |
| _vim/bundle/sunburst | | | 1 | + |
| _vim/bundle/tagbar | | | 2 | +- |
| _vim/bundle/the-nerd-tree | | | 1 | + |
| _vim/conf/funcs.vim | | | 4 | ++-- |
| _vim/conf/plugin.vim | | | 14 | +++++--------- |
| _vimrc | | | 4 | ++-- |
| vimenv | | | 25 | ++++++++++++------------- |
diff --git a/.gitmodules b/.gitmodules @@ -34,3 +34,9 @@ [submodule "_vim/bundle/surround"] path = _vim/bundle/surround url = git://github.com/tpope/vim-surround.git +[submodule "_vim/bundle/the-nerd-tree"] + path = _vim/bundle/the-nerd-tree + url = git://github.com/vim-scripts/The-NERD-tree.git +[submodule "_vim/bundle/sunburst"] + path = _vim/bundle/sunburst + url = git://github.com/sickill/vim-sunburst.git diff --git a/_vim/bundle/ctrlp b/_vim/bundle/ctrlp @@ -1 +1 @@ -Subproject commit 80bc9cea8cc435c9aa9d5ad20b768bb420e4686e +Subproject commit f7561810bf259a1b44c409095e4af1ca7cec1288 diff --git a/_vim/bundle/fugitive b/_vim/bundle/fugitive @@ -1 +1 @@ -Subproject commit 765c921e1f0281963009b3e06a94227a8c0a2408 +Subproject commit 6515bd43acc28c86fcf3bea64ce8a6b3d7db19ff diff --git a/_vim/bundle/sunburst b/_vim/bundle/sunburst @@ -0,0 +1 @@ +Subproject commit a4bb928e1c994e4917d38fda319d8100aaa371aa diff --git a/_vim/bundle/tagbar b/_vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit 272e2e84784e9a4bc7603da9ca26a22ff6c8e6b9 +Subproject commit ee1c4e137e33c64c787df68efcca7e9af4c5f790 diff --git a/_vim/bundle/the-nerd-tree b/_vim/bundle/the-nerd-tree @@ -0,0 +1 @@ +Subproject commit af65bd23e69a3a5fc1a39eb47733191b7110bb1e diff --git a/_vim/conf/funcs.vim b/_vim/conf/funcs.vim @@ -1,6 +1,6 @@ " " author: Xu Xiaodong <[email protected]> -" modified: 2011 Nov 26 +" modified: 2012 May 10 " "-- update timestamps --" @@ -9,7 +9,7 @@ function! _last_modified() if &modified let save_cursor = getpos(".") let n = min([20, line("$")]) - keepjumps exe '1,' . n . 's#^\(.\{,10}modified: \+\).*#\1' . + keepjumps exe '1,' . n . 's#^\(.\{,10}modified *: \+\).*#\1' . \ strftime('%Y %b %d') . '#e' call histdel('search', -1) call setpos('.', save_cursor) diff --git a/_vim/conf/plugin.vim b/_vim/conf/plugin.vim @@ -1,6 +1,6 @@ " " author: Xu Xiaodong <[email protected]> -" modified: 2012 Apr 24 +" modified: 2012 May 15 " "-- plugin --" @@ -10,21 +10,17 @@ runtime bundle/pathogen/autoload/pathogen.vim call pathogen#infect() call pathogen#helptags() -" Powerline +" powerline "let g:Powerline_symbols='fancy' -" commant-t -let g:CommandTAlwaysShowDotFiles=1 -let g:CommandTScanDotDirectories=1 - -" gsession -let g:local_session_filename='.session.vim' - " align vmap <silent> <leader>i= <esc>:AlignPush<cr>:AlignCtrl lp1P1<cr>:'<,'>Align =<cr>:AlignPop<cr> vmap <silent> <leader>i, <esc>:AlignPush<cr>:AlignCtrl lp0P1<cr>:'<,'>Align ,<cr>:AlignPop<cr> vmap <silent> <leader>i( <esc>:AlignPush<cr>:AlignCtrl lp0P0<cr>:'<,'>Align (<cr>:AlignPop<cr> +" gsession +let g:local_session_filename='.session.vim' + " yankring map <leader>y :YRShow<cr> diff --git a/_vimrc b/_vimrc @@ -1,6 +1,6 @@ " " author: Xu Xiaodong <[email protected]> -" modified: 2012 Apr 17 +" modified: 2012 May 18 " "-- source --" @@ -75,7 +75,7 @@ set iskeyword+=: set matchpairs+=<:> set whichwrap+=<,>,h,l -set list +set nolist set listchars=tab:›\ ,eol:¬ "set formatprg=par-format\ -w78 diff --git a/vimenv b/vimenv @@ -1,11 +1,10 @@ #!/usr/bin/env ruby -# coding: utf-8 # -# name: vimenv -# author: Xu Xiaodong <[email protected]> -# license: GPL -# created: 2012 Apr 14 -# modified: 2012 May 08 +# name : vimenv, configure vim environment +# author : Xu Xiaodong <[email protected]> +# license : GPL +# created : 2012 Apr 14 +# modified : 2012 May 19 # require 'fileutils' @@ -14,9 +13,9 @@ require 'optparse' def init conf = %w[vimrc vim] conf.each do |item| - orig = Dir.pwd + '/_' + item - target = Dir.home + '/.' + item - bak = target + '.bak' + orig = "#{Dir.pwd}/_#{item}" + target = "#{Dir.home}/.#{item}" + bak = "#{target}.old" if File.exist?(target) && ! File.symlink?(target) puts "Backuping #{target} to #{bak}" @@ -40,16 +39,16 @@ end def add(author_slash_name) name = author_slash_name.gsub(/^.*\/(?:vim-)?(.*?)(?:[-\.]vim)?$/, '\1').downcase - src = 'git://github.com/' + author_slash_name + '.git' - desc = '_vim/bundle/' + name + src = "git://github.com/#{author_slash_name}.git" + desc = "_vim/bundle/#{name}" puts "Adding #{src} to #{desc}" system "git submodule add #{src} #{desc}" end def remove(name) - path = '_vim/bundle/' + name.downcase - git_path = '.git/modules/' + path + path = "_vim/bundle/#{name.downcase}" + git_path = ".git/modules/#{path}" files = [".git/config", ".gitmodules"] puts "Removing #{path}"