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

.bash_aliases

@@ -1,7 +1,7 @@
 alias grep='grep --color'
 alias l='ls -lhatr'
-alias ls='ls --color=auto'
-alias rm='rm -I'
+#alias ls='ls --color=auto'
+alias rm='rm -i'
 
 # Git stuff
 alias gdp='git diff --color HEAD^ HEAD'

.gitconfig

@@ -13,3 +13,6 @@
 
 [credential]
 	helper = cache --timeout 43200
+
+[diff]
+	tool = vimdiff

.gnupg/gpg.conf

@@ -0,0 +1,10 @@
+# source: https://www.jfry.me/articles/2015/gpg-smartcard/
+no-emit-version
+no-comments
+keyid-format 0xlong
+with-fingerprint
+use-agent
+personal-cipher-preferences AES256 AES192 AES CAST5
+personal-digest-preferences SHA512 SHA384 SHA256 SHA224
+cert-digest-algo SHA512
+default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed

.vim/bundle/flake8

@@ -1 +1 @@
-Subproject commit d1bb8f1d440a4656342bcc536574e0e1627dedcb
+Subproject commit 91818a7d5f5a0af5139e9adfedc9d00fa963e699

.vim/bundle/jedi-vim

@@ -1 +1 @@
-Subproject commit d9a43db019da0390406e34cb161a61fba43bf250
+Subproject commit 6411de0cd1d2a2959f5a0bf977b3f8ecea2209d0

.vim/bundle/vim-airline

@@ -1 +1 @@
-Subproject commit fae68dbcb74b3d7a3144a9b57253b5051f26e207
+Subproject commit 72e5f04f7c422e21cb6f6856c4e94cef25ea2288

.vim/bundle/vim-fugitive

@@ -1 +1 @@
-Subproject commit 546a6bf2197529ed1bd402244cbf6e72ed62b2ca
+Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5

.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://.*']