Merge branch 'master' of sleepmap:dotfiles

* 'master' of sleepmap:dotfiles:
  .vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters.
  .vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise.
  termite/config: Switching to Inconsolata (made available through powerline-fonts-git).
  pavucontrol.ini: Removing, as it's going to be rewritten each call anyways.
  .tmux.conf: Updating colours, incorporating tpm, removing powerline stuff.
  .compton.conf: Adding MPlayer to comptons exclude lists.

1 files changed, 16 insertions, 15 deletions

diff --git a/.vim/addons-settings.vim b/.vim/addons-settings.vim
index 77a36aa..234ede3 100644
--- a/.vim/addons-settings.vim
+++ b/.vim/addons-settings.vim
@@ -80,24 +80,25 @@ autocmd BufRead,BufNewFile *.js set ft=javascript syntax=jquery
 
 " ================ lightline settings ================
 let g:lightline = {
-      \ 'colorscheme': 'wombat',
-      \ 'active': {
-      \   'left': [ [ 'mode' ],
-      \             [ 'fugitive', 'readonly', 'filename', 'modified' ] ]
-      \ },
-      \ 'component': {
-      \   'readonly': '%{&readonly?"⭤":""}',
-      \   'fugitive': '%{exists("*fugitive#head")?fugitive#head():""}'
-      \ },
-      \ 'component_visible_condition': {
-      \   'fugitive': '(exists("*fugitive#head") && ""!=fugitive#head())'
-      \ },
-      \ 'separator': { 'left': '⮀', 'right': '⮂' },
-      \ 'subseparator': { 'left': '⮁', 'right': '⮃' }
-      \ }
+  \ 'colorscheme': 'solarized',
+  \ 'active': {
+  \   'left': [ [ 'mode' ],
+  \             [ 'fugitive', 'readonly', 'filename', 'modified' ] ]
+  \ },
+  \ 'component': {
+  \   'readonly': '%{&readonly?"x":""}',
+  \   'fugitive': '%{exists("*fugitive#head")?fugitive#head():""}'
+  \ },
+  \ 'component_visible_condition': {
+  \   'fugitive': '(exists("*fugitive#head") && ""!=fugitive#head())'
+  \ },
+  \ 'separator': { 'left': '', 'right': '' },
+  \ 'subseparator': { 'left': '|', 'right': '|' }
+  \ }
 
 set laststatus=2
 
+
 " ================ nerdtree-tabs settings ================
 " Auto open nerd tree on startup
 let g:nerdtree_tabs_open_on_gui_startup = 0