From 559c51453d659b7197a22945c684b6d96e7d426b Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 26 Jan 2015 10:44:47 +0100
Subject: [PATCH] added mailcap, new plugin vim, update xresources and bashrc

---
 .Xresources           |  3 +++
 .bashrc               |  3 +++
 .gitmodules           |  3 +++
 .mutt/mailcap         |  2 ++
 .mutt/muttrc          | 23 +++++++++++++++++------
 .mutt/offlineimaprc   |  5 +++--
 .vim/bundle/syntastic |  1 +
 .vimrc                | 10 ++++++++++
 8 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 .mutt/mailcap
 create mode 160000 .vim/bundle/syntastic

diff --git a/.Xresources b/.Xresources
index 15283ca..83bb4ef 100644
--- a/.Xresources
+++ b/.Xresources
@@ -43,3 +43,6 @@ URxvt.perl-ext-common: font-size
 URxvt.keysym.C-Up: perl:font-size:increase
 URxvt.keysym.C-Down: perl:font-size:decrease
 URxvt.keysym.C-Left: perl:font-size:reset
+
+gv.watchFile: 1
+gv.saveposFilename: ~/.cache/gv.savepos
diff --git a/.bashrc b/.bashrc
index c048415..2cdb213 100644
--- a/.bashrc
+++ b/.bashrc
@@ -12,8 +12,11 @@ export HISTFILESIZE=10000
 export HISTSIZE=100000
 export HISTCONTROL=ignoreboth
 
+export PATH=$PATH:/usr/local/texlive/2014/bin/x86_64-linux
+
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
+alias vi=vim
 
 set_prompt(){
 	last_c=$?
diff --git a/.gitmodules b/.gitmodules
index db6a3a4..49e6256 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule ".vim/bundle/vim-addon-mw-utils"]
 	path = .vim/bundle/vim-addon-mw-utils
 	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule ".vim/bundle/syntastic"]
+	path = .vim/bundle/syntastic
+	url = https://github.com/scrooloose/syntastic.git
diff --git a/.mutt/mailcap b/.mutt/mailcap
new file mode 100644
index 0000000..15d34c1
--- /dev/null
+++ b/.mutt/mailcap
@@ -0,0 +1,2 @@
+application/msword; libreoffice %s;
+text/html; w3m -I %{charset} -T text/html; copiousoutput;
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 523d813..d8c2c1f 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -4,13 +4,21 @@ set envelope_from=yes
 
 set sendmail="msmtp -C /home/mart/.mutt/msmtprc"
 
-macro index,pager $ "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter>" "Force refresh"
+macro index,pager $ "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter><sync-mailbox>" "Force refresh"
 macro index <F8> \
-				"<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
-				<shell-escape>notmuch-mutt -r --prompt search<enter>\
-				<change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
-				<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
-				"notmuch: search mail"
+	"<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
+	<shell-escape>notmuch-mutt -r --prompt search<enter>\
+	<change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
+	<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
+	"notmuch: search mail"
+
+macro index,pager \Ct "\
+<tag-pattern>~C vim@vim.org | ~C vim_use<enter><tag-prefix-cond><save-message>=vim<enter><end-cond>\
+<tag-pattern>~C lists.debian.org<enter><tag-prefix-cond><save-message>=debian<enter><end-cond>\
+<tag-pattern>~C mutt-users@mutt.org<enter><tag-prefix-cond><save-message>=mutt<enter><end-cond>\
+<tag-pattern>~C praat-users<enter><tag-prefix-cond><save-message>=praat<enter><end-cond>\
+<tag-pattern>~C i3-discuss@i3.zekjur.net<enter><tag-prefix-cond><save-message>=i3<enter><end-cond>\
+<sync-mailbox>" "Clean up mailing lists"
 
 macro index,pager \cb "| urlview\n"
 
@@ -24,6 +32,9 @@ set mask="!^\\.[^.]"
 set timeout=2
 set mail_check=0
 source ~/.mutt/mailboxes
+set mailcap_path=~/.mutt/mailcap
+set mailcap_sanitize=yes
+auto_view text/html
 
 unset wait_key
 unset markers
diff --git a/.mutt/offlineimaprc b/.mutt/offlineimaprc
index 992f968..8b20e88 100644
--- a/.mutt/offlineimaprc
+++ b/.mutt/offlineimaprc
@@ -7,7 +7,7 @@ ui = quiet
 [Account net]
 localrepository = Local
 remoterepository = Remote
-postsynchook = notmuch new
+postsynchook = notmuch new && notmuch compact
 
 [Repository Local]
 type = Maildir
@@ -19,7 +19,8 @@ remotepasseval = mailpasswd()
 remotehost = mail.martlubbers.net
 remoteuser = mart@martlubbers.net
 ssl = yes
-cert_fingerprint = bb330825807b130ef600f6fcacb67196788b07b5
+#cert_fingerprint = bb330825807b130ef600f6fcacb67196788b07b5
+cert_fingerprint = d8f2613ee3017fe9eaec772cd07094342945f632
 
 [mbnames]
 enabled = yes
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
new file mode 160000
index 0000000..8b97caa
--- /dev/null
+++ b/.vim/bundle/syntastic
@@ -0,0 +1 @@
+Subproject commit 8b97caa2d9bba56e76d066b5dacff0f1f919297c
diff --git a/.vimrc b/.vimrc
index 44c3fb1..b2e722e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -39,3 +39,13 @@ endfor
 
 let g:GPGPreferArmor=1
 let g:GPGPreferSign=1
+
+" Syntastic options
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 0
+let g:syntastic_check_on_wq = 0
-- 
2.20.1