From ac4ab31c495ffd7d902465037050bebb3501b92a Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Sun, 11 Jun 2017 11:09:38 +0200
Subject: [PATCH] fix mutt for archlinux, add tlmgr update

---
 email/.mutt/muttrc         |  3 +++
 email/.mutt/notmuch.muttrc | 19 +++++++++++++++++++
 email/.mutt/sidebar.muttrc |  6 +++---
 shell/.local/bin/update    |  2 +-
 x/.config/i3/config        |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 email/.mutt/notmuch.muttrc

diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index d341140..701f965 100644
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -80,6 +80,9 @@ macro index,pager A \
 # sidebar
 source ~/.mutt/sidebar.muttrc
 
+# notmuch
+source ~/.mutt/notmuch.muttrc
+
 # Crypto
 source ~/.mutt/gpg.muttrc
 
diff --git a/email/.mutt/notmuch.muttrc b/email/.mutt/notmuch.muttrc
new file mode 100644
index 0000000..673ec6f
--- /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/email/.mutt/sidebar.muttrc b/email/.mutt/sidebar.muttrc
index a998759..c22b565 100644
--- a/email/.mutt/sidebar.muttrc
+++ b/email/.mutt/sidebar.muttrc
@@ -7,9 +7,9 @@ set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S'
 set sidebar_sort_method = 'path'
 
 # Keybindings
-bind index,pager \Cj sidebar-prev
-bind index,pager \Ck sidebar-next
-bind index,pager \Cl sidebar-open
+bind index,pager K sidebar-prev
+bind index,pager J sidebar-next
+bind index,pager L sidebar-open
 bind index,pager B sidebar-toggle-visible
 
 # Colors
diff --git a/shell/.local/bin/update b/shell/.local/bin/update
index 086ef27..3113604 100755
--- a/shell/.local/bin/update
+++ b/shell/.local/bin/update
@@ -14,4 +14,4 @@ cmd() {
 }
 
 sudo sh -c "`cmd`"
-sh -c "offlineimap -u ttyui && vdirsyncer sync && khal $NUL && khard $NUL"
+sh -c "tlmgr update --all --self && offlineimap -u ttyui && vdirsyncer sync && khal $NUL && khard $NUL"
diff --git a/x/.config/i3/config b/x/.config/i3/config
index abbfdde..54a68cf 100644
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -14,7 +14,7 @@ set $font DejaVu Sans Mono
 set $fontsize 12
 
 # lock the screen after 10 minutes
-exec xautolock -locker ~/.local/bin/lock.sh & dunst & setxkbmap -layout dvorak,ru,us -variant ,phonetic_dvorak, -option compose:ralt,grp:menu_toggle,caps:super
+exec setxkbmap -layout dvorak,ru,us -variant ,phonetic_dvorak, -option compose:ralt,grp:menu_toggle,caps:super
 
 # Toggle playback
 bindsym Pause exec mpc toggle
-- 
2.20.1