mutt

4 files changed, 24 insertions, 54 deletions

diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index 8284bc6..89d1889 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -5,7 +5,7 @@ set header_cache     = ~/.mutt/cache/headers
 set message_cachedir = ~/.mutt/cache/messages
 set mailcap_path     = ~/.mutt/mailcap
 set signature        = ~/.mutt/sig
-set tmpdir           = ~/.mutt/tmp
+set tmpdir           = /tmp/mutt
 set realname         = "Patrick Simianer"
 set from             = "p@simianer.de"
 set use_from         = yes
@@ -19,8 +19,8 @@ auto_view text/html
 
 # macros
 set wait_key = no
-macro index,pager G "<shell-escape>imapfilter -c ~/.imapfilter/private.lua &>/dev/null && mbsync private && notmuch new 2>/dev/null<enter>"
-macro index,pager H "<shell-escape>imapfilter -c ~/.imapfilter/work.lua &>/dev/null && mbsync work && notmuch new 2>/dev/null<enter>"
+macro index,pager G "<shell-escape>imapfilter -c ~/.imapfilter/personal.lua &>/dev/null && mbsync personal && notmuch new 2>/dev/null<enter>"
+macro index,pager H "<shell-escape>imapfilter -c ~/.imapfilter/work.lua &>/dev/null      && mbsync work      && notmuch new 2>/dev/null<enter>"
 macro index,pager J "<shell-escape>mbsync -a && notmuch new 2>/dev/null<enter>"
 macro index <esc>m "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>" "mark all messages read"
 macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
@@ -37,21 +37,15 @@ unignore from date subject to cc
 hdr_order from to cc date subject
 
 # mailboxes
-mailboxes \
-+private/inbox \
-+private/drafts \
-+private/work \
-+private/all \
-+work/inbox \
-+work/drafts \
-+work/all \
-+work/lists
+mailboxes =personal/inbox =personal/drafts =personal/work =personal/all
+mailboxes '^^^^^^^^^^^^^^^^^^^^'
+mailboxes =work/inbox =work/drafts =work/all
 
 # folder hooks
-folder-hook private/* source ~/.mutt/private.rc
+folder-hook personal/* source ~/.mutt/personal.rc
 folder-hook work/* source ~/.mutt/work.rc
 folder-hook . 'set read_inc=1'
-folder-hook private/all 'set read_inc=1000'
+folder-hook personal/all 'set read_inc=1000'
 folder-hook work/all 'set read_inc=1000'
 folder-hook work/lists 'set read_inc=1000'
 
@@ -87,32 +81,8 @@ set tilde
 unset markers
 
 # colors
-color normal          color0          color231
-color error           brightcolor15   color196
-color indicator       color201        color255
-color status          color243        color231
-color hdrdefault      color245        color231
-color header          color231        color0   "^(Subject): "
-color signature       color243        color231
-color body            color21         color231 "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+"
-color body            color21         color231 "((https?|ftp)://|www)+[\-\.\;@,/%~_:?&=\#a-zA-Z0-9+]+"
-color quoted          color243        color231
-color quoted1         color196        color231
-color quoted2         color22         color231
-color quoted3         color130        color231
-color quoted4         color51         color231
-color tilde           color243        color231
-color tree            color238        color231
-color attachment      color196        color231
-color index           color201        color231 "~N"
-color index           color243        color231 "~P"
-color index           brightcolor221  color231 "~F"
-color index           brightcolor39   color231 "~T"
-color index           color196        color231 "~D"
-color sidebar_new     black           white
-color sidebar_flagged black           white
-unset help
+source ~/.mutt/colors.rc
 
-# default private
-source ~/.mutt/private.rc
+# default personal
+source ~/.mutt/personal.rc
 
diff --git a/mutt/.mutt/personal.rc b/mutt/.mutt/personal.rc
new file mode 100644
index 0000000..bb1d935
--- /dev/null
+++ b/mutt/.mutt/personal.rc
@@ -0,0 +1,12 @@
+color status            blue color231
+color sidebar_divider   color231 blue
+color sidebar_highlight blue white
+
+set from      = "p@simianer.de"
+set sendmail  = "/Users/pks/.local/bin/msmtp -a personal"
+set record    = "+personal/all"
+set postponed = "+personal/drafts"
+set spoolfile = "+personal/inbox"
+
+macro index,pager S "<save-message>+personal/all<enter><enter><sync-mailbox>"
+
diff --git a/mutt/.mutt/private.rc b/mutt/.mutt/private.rc
deleted file mode 100644
index 53d8713..0000000
--- a/mutt/.mutt/private.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-color status            blue color231
-color sidebar_divider   color231 blue
-color sidebar_highlight blue white
-
-set from      = "p@simianer.de"
-set sendmail  = "/Users/pks/.local/bin/msmtp -a private"
-set record    = "+private/all"
-set postponed = "+private/drafts"
-set spoolfile = "+private/inbox"
-
-macro index,pager S "<save-message>+private/all<enter><enter><sync-mailbox>"
-
diff --git a/mutt/.mutt/work.rc b/mutt/.mutt/work.rc
index a233eb4..a08926c 100644
--- a/mutt/.mutt/work.rc
+++ b/mutt/.mutt/work.rc
@@ -2,7 +2,7 @@ color status            red color231
 color sidebar_divider   color231 red
 color sidebar_highlight red white
 
-set from      = "simianer@cl.uni-heidelberg.de"
+set from      = "qlt@mensa.uberspace.de"
 set sendmail  = "/Users/pks/.local/bin/msmtp -a work"
 set record    = "+work/all"
 set postponed = "+work/drafts"