Merge branch 'master' of lugh.ch:/var/www/git/dotfiles

.vimrc

@@ -14,7 +14,7 @@ source ~/.vim/bundle/flake8/ftplugin/python_flake8.vim
 let g:flake8_builtins="_,apply"
 autocmd FileType python map <buffer> <F3> :call Flake8()<CR>
 
-set background=dark
+set background=light
 set showcmd
 
 " highlight searches
@@ -25,14 +25,14 @@ set incsearch
 " Relative line numbers except the current line
 " Both relativenumber with number works on vim 7.4+
 "set relativenumber
-set number
+"set number
 
 let g:solarized_termcolors=256
 colorscheme solarized
 
 " Highlight 80 column
 set colorcolumn=80
-highlight ColorColumn ctermbg=233
+highlight ColorColumn ctermbg=223
 
 " Jump to last position in file when reopening
 if has("autocmd")
@@ -51,5 +51,33 @@ set t_Co=256
 " always show vim-airline
 set laststatus=2
 
+let g:airline#extensions#branch#format = 1
+
+  if !exists('g:airline_symbols')
+    let g:airline_symbols = {}
+  endif
+
+  " unicode symbols
+  let g:airline_left_sep = '»'
+  let g:airline_left_sep = '▶'
+  let g:airline_right_sep = '«'
+  let g:airline_right_sep = '◀'
+  let g:airline_symbols.crypt = '🔒'
+  let g:airline_symbols.linenr = '␊'
+  let g:airline_symbols.linenr = '␤'
+  let g:airline_symbols.linenr = '¶'
+  let g:airline_symbols.maxlinenr = '☰'
+  let g:airline_symbols.maxlinenr = ''
+  let g:airline_symbols.branch = '⎇'
+  let g:airline_symbols.paste = 'ρ'
+  let g:airline_symbols.paste = 'Þ'
+  let g:airline_symbols.paste = '∥'
+  let g:airline_symbols.spell = 'Ꞩ'
+  let g:airline_symbols.notexists = '∄'
+  let g:airline_symbols.whitespace = 'Ξ'
+
 " Fix intendation
 map <F5> mzgg=G`z<CR>
+
+" editorconfig should not tamper with fugitive
+let g:EditorConfig_exclude_patterns = ['fugitive://.*']