Merge pull request #84 from TTWShell/feature/airline

use airline instead of powerline

Author: TTWShell

.travis.yml

@@ -6,11 +6,6 @@ os:
   - linux
   - osx
 
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository --yes ppa:kalakris/cmake && sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository --yes ppa:bcandrea/backports; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
-
 install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y clang golang; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-4.9" CC="gcc-4.9" GOROOT="/usr/lib/go" GOPATH=$HOME/gocode PATH=$PATH:$GOPATH/bin; fi
@@ -20,7 +15,8 @@ addons:
     sources:
      # The Travis apt source whitelist can be found here:
      #   https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
-     - ubuntu-toolchain-r-test  # for new libstdc++
+     - george-edison55-precise-backports
+     - ubuntu-toolchain-r-test
      - george-edison55-precise-backports # for a more recent version of cmake (3.2.3)
     packages:
      - cmake-data
@@ -43,6 +39,7 @@ addons:
      - libncursesw5-dev
 
 compiler:
+  - clang
   - gcc
 
 script:

README.md

@@ -10,7 +10,7 @@
 
 个人vim配置。**支持python、go等自动提示，支持python、go的函数跳转（python支持虚拟环境）。** 最终效果图（函数列表的feature已移除，因为大项目会导致性能问题）：
 
-![qq20161017-0](https://cloud.githubusercontent.com/assets/8017604/19426340/4def15cc-946e-11e6-891b-924f52486144.png)
+![wx20170920-101535](https://user-images.githubusercontent.com/8017604/30623828-ab21327e-9dec-11e7-89e7-09b2645a987c.png)
 
 支持Python自动补全的最好插件是YouCompleteMe。而YouCompleteMe需要比较高版本的vim(>=7.4.143)，所以，需要编译安装vim，参见相关文档[1]。另外还需要一些C库，参见相关文档[2]。
 

fonts/install-fonts.sh

@@ -24,4 +24,4 @@ if command -v fc-cache @>/dev/null ; then
     fc-cache -f $font_dir
 fi
 
-echo "All Powerline fonts installed to $font_dir"
+echo "All Powerline fonts installed to $font_dir"

scripts/init-vim-centos.sh

@@ -9,7 +9,7 @@ cd ~ && rm -rf vim && git clone git@github.com:vim/vim.git && cd vim
 ./configure --with-features=huge \
             --enable-multibyte \
             --enable-pythoninterp \
-	    #--with-python-config-dir=/usr/lib/python2.7/config \
+            #--with-python-config-dir=/usr/lib/python2.7/config \
             --enable-python3interp \
             #--with-python3-config-dir=/usr/lib/python3.4/config \
             --with-mac-arch=x86_64 \

scripts/init-vim-ubuntu.sh

@@ -24,7 +24,7 @@ cd ~ && rm -rf vim && git clone https://github.com/vim/vim.git && cd vim
 ./configure --with-features=huge \
             --enable-multibyte \
             --enable-pythoninterp \
-	    #--with-python-config-dir=/usr/lib/python2.7/config \
+            #--with-python-config-dir=/usr/lib/python2.7/config \
             --enable-python3interp \
             #--with-python3-config-dir=/usr/lib/python3.4/config \
             --with-mac-arch=x86_64 \

vimrc

@@ -37,7 +37,9 @@ Plugin 'scrooloose/nerdtree'
 Plugin 'Xuyuanp/nerdtree-git-plugin'
 
 " show venv、git branch、file
-Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
+" Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
 
 " enhance za
 Plugin 'tmhedberg/SimpylFold'
@@ -55,7 +57,6 @@ Plugin 'vim-scripts/nginx.vim'
 Plugin 'fatih/vim-go'
 Plugin 'othree/javascript-libraries-syntax.vim'
 Plugin 'hynek/vim-python-pep8-indent'
-Plugin 'unblevable/quick-scope'
 Plugin 'elzr/vim-json'
 Plugin 'dyng/ctrlsf.vim'
 Plugin 'kylef/apiblueprint.vim'
@@ -150,14 +151,10 @@ let g:ycm_global_ycm_extra_conf = '~/.vim/bundle/YouCompleteMe/third_party/ycmd/
 " http://stackoverflow.com/questions/2169645/vims-autocomplete-is-excruciatingly-slow
 set complete-=i
 
-" auto update tagfile when save
-" au BufWritePost *.py silent! :UpdateTags
-
 """""""""""""""""""""""""""""""""""""""""""""
 "              Vim UI                       "
 """""""""""""""""""""""""""""""""""""""""""""
 syntax on
-
 au BufNewFile,BufRead *
 \ set tabstop=4 |
 \ set softtabstop=4 |
@@ -166,10 +163,8 @@ au BufNewFile,BufRead *
 \ set autoindent |
 \ set fileformat=unix |
 \ set list listchars=tab:>-
-
 au BufNewFile,BufRead *.c,*.py
 \ set colorcolumn=80
-
 au BufNewFile,BufRead *.go
 \ set nolist
 
@@ -221,13 +216,31 @@ let g:NERDTreeIndicatorMapCustom = {
     \ "Unknown"   : "?"
     \ }
 
-" for powerline
-set laststatus=2
-set term=xterm-256color
-set termencoding=utf-8
-set guifont=Ubuntu\ Mono\ derivative\ Powerline:10
+" for powerline 已弃用
+" set laststatus=2
+" set term=xterm-256color
+" set termencoding=utf-8
+" set guifont=Ubuntu\ Mono\ derivative\ Powerline:10
 " set guifont=Ubuntu\ Mono
-let g:Powerline_symbols = 'fancy'
+" let g:Powerline_symbols = 'fancy'
+
+" for airline
+" 使用powerline打过补丁的字体
+let g:airline_powerline_fonts = 1
+let g:airline_theme='dark_minimal'
+" 开启tabline
+let g:airline#extensions#tabline#enabled = 1
+" 显示buffer编号
+let g:airline#extensions#tabline#buffer_nr_show = 1
+" tabline中当前buffer两端的分隔字符
+let g:airline#extensions#tabline#left_sep = '🔥'
+" tabline中未激活buffer两端的分隔字符
+let g:airline#extensions#tabline#left_alt_sep = '💦'
+" 关于buffer使用：
+"     :ls 查看buffer
+"     :bn (buffer next)
+"     :bp (buffer previous)
+"     :b <num> 打开编号为num的buffer
 
 " color scheme
 set background=dark        " Assume a dark background