From 54fc25964ed2bc65a2ffcbf0dafef2bfef3537a0 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Fri, 30 Oct 2015 13:48:17 +0000
Subject: Add various changes

---
 .offlineimap/offlineimap.py | 2 +-
 .passwords                  | 2 +-
 .vim/vimrc                  | 4 ++--
 .xinitrc                    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.offlineimap/offlineimap.py b/.offlineimap/offlineimap.py
index 6b2c466..7d2b481 100644
--- a/.offlineimap/offlineimap.py
+++ b/.offlineimap/offlineimap.py
@@ -7,7 +7,7 @@ import subprocess
 def mailpasswd(acct):
     acct = os.path.basename(acct)
     path = "/home/urbain/.password-store/Mail/%s.gpg" % acct
-    args = ["gpg", "--use-agent", "--quiet", "--batch", "-d", path]
+    args = ["gpg2", "--use-agent", "--quiet", "--batch", "-d", path]
     try:
         return subprocess.check_output(args).strip()
     except subprocess.CalledProcessError:
diff --git a/.passwords b/.passwords
index 8dd5cc3..988f5b2 160000
--- a/.passwords
+++ b/.passwords
@@ -1 +1 @@
-Subproject commit 8dd5cc33702e5314a50ff59d31309b0ca506025b
+Subproject commit 988f5b22c41957cf55f0bb7154bbc1760c757a06
diff --git a/.vim/vimrc b/.vim/vimrc
index d09a6c6..1c814fd 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -23,11 +23,13 @@ Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
 Plug 'scrooloose/syntastic'
 Plug 'SirVer/ultisnips'
 Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
+Plug 'stephpy/vim-yaml'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'tomasr/molokai'
 Plug 'tommcdo/vim-exchange'
 Plug 'ton/vim-bufsurf'
 Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-dispatch'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-obsession'
 Plug 'tpope/vim-repeat'
@@ -256,14 +258,12 @@ if has("nvim")
     tnoremap <C-_> <C-\><C-n><C-^>:ZoomWinTabOut<cr>
     nnoremap <C-_> :ZoomWinTabIn<cr>:b term<cr>i
     inoremap <C-_> <Esc>:b term<cr>i
-    nnoremap ym :Neomake!<cr>
 endif
 
 "" Restore cursor position
 augroup vimrc
     au!
     autocmd BufWritePost *vimrc source %
-    autocmd BufWritePost *.cpp Neomake!
     autocmd BufReadPost *
                 \ if line("'\"") > 1 && line("'\"") <= line("$") |
                 \   exe "normal! g`\"" |
diff --git a/.xinitrc b/.xinitrc
index 5de049f..77b7c95 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -6,8 +6,8 @@ xset r rate 400 50
 # Load key bindings
 $HOME/bin/keyboard
 
-# Load Xresources to dark colorscheme
-xrdb $HOME/.Xresources/dark
+# Load Xresources to light colorscheme
+xrdb $HOME/.Xresources/light
 
 # Background
 feh --bg-fill --randomize /usr/share/backgrounds
-- 
cgit v1.2.3