From 9ed401a9b2b8042a035996d9be4c6d43bad08cff Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 17 Feb 2016 12:34:37 +0100
Subject: [PATCH] network chooser script and notmuch for arch

---
 email/.mutt/muttrc         |  3 +++
 email/.mutt/notmuch.muttrc | 19 +++++++++++++++++++
 vim/.vimrc                 |  1 +
 x/.Xresources              |  5 -----
 x/.local/bin/network       |  5 +++--
 5 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 email/.mutt/notmuch.muttrc

diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index 4ac8ff3..ac95589 100644
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -66,6 +66,9 @@ macro index,pager A \
 # Colors
 source ~/.mutt/colors.muttrc
 
+# notmuch
+source ~/.mutt/notmuch.muttrc
+
 # Crypto
 set crypt_use_gpgme=yes
 set crypt_autosign
diff --git a/email/.mutt/notmuch.muttrc b/email/.mutt/notmuch.muttrc
new file mode 100644
index 0000000..6b299dc
--- /dev/null
+++ b/email/.mutt/notmuch.muttrc
@@ -0,0 +1,19 @@
+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"
+
+macro index <F9> \
+"<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
+<pipe-message>notmuch-mutt -r thread<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: reconstruct thread"
+
+macro index <F6> \
+"<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
+<pipe-message>notmuch-mutt tag -- -inbox<enter>\
+<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
+      "notmuch: remove message from inbox"
diff --git a/vim/.vimrc b/vim/.vimrc
index bf5bb9c..7811221 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -9,6 +9,7 @@ autocmd! bufwritepost .Xresources !xrdb -merge %
 " Some general options
 syntax enable
 filetype indent plugin on
+color elflord
 set encoding=utf-8
 set history=1000
 set number
diff --git a/x/.Xresources b/x/.Xresources
index 545ba0e..52017db 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -45,11 +45,6 @@ URxvt.keysym.C-Up: perl:font-size:increase
 URxvt.keysym.C-Down: perl:font-size:decrease
 URxvt.keysym.C-Left: perl:font-size:reset
 
-x11-ssh-askpass*font: xft:DejaVu Sans Mono:style=Book:pixelsize=12
-x11-ssh-askpass*borderWidth: 0
-x11-ssh-askpass*minimumCount: 3
-x11-ssh-askpass*maximumCount: 4
-
 gv.watchFile: 1
 gv.saveposFilename: ~/.cache/gv.savepos
 gv.style: gv_widgetless.dat
diff --git a/x/.local/bin/network b/x/.local/bin/network
index 2d24504..a1cf48a 100755
--- a/x/.local/bin/network
+++ b/x/.local/bin/network
@@ -1,2 +1,3 @@
-#!/bin/bash -e
-sudo -A netctl switch-to "$(netctl list | cut -b 3- | dmenu)"
+#!/bin/bash
+network="$(netctl list | cut -b 3- | dmenu)"
+[[ $network != "" ]] && sudo -A netctl switch-to "$network" || true
-- 
2.20.1