Externalizing all settings to separate files.

7 files changed, 51 insertions, 42 deletions

diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc
new file mode 100644
index 0000000..5c9b8df
--- /dev/null
+++ b/.mutt/accounts.rc
@@ -0,0 +1,10 @@
+# dave@sleepmap.de (default)
+set spoolfile = "+sleepmap.de/INBOX"
+source "~/.mutt/dave@sleepmap.de.rc"
+folder-hook sleepmap.de/* source ~/.mutt/dave@sleepmap.de.rc
+
+# david.runge@tu-berlin.de
+folder-hook tu-berlin.de/* source ~/.mutt/david.runge@campus.tu-berlin.de.rc
+
+# dave@c-base.org
+folder-hook c-base.org/* source ~/.mutt/dave@c-base.org.rc
diff --git a/.mutt/default.rc b/.mutt/default.rc
new file mode 100644
index 0000000..1abf116
--- /dev/null
+++ b/.mutt/default.rc
@@ -0,0 +1,4 @@
+set editor=`echo \$EDITOR`
+set folder = "~/Mail"
+set mbox_type = Maildir
+set mail_check = 60
diff --git a/.mutt/khard.rc b/.mutt/khard.rc
new file mode 100644
index 0000000..e589ca2
--- /dev/null
+++ b/.mutt/khard.rc
@@ -0,0 +1,5 @@
+# auto-completing mails when pressing tab in "new mail" dialog using khard address books
+set query_command= "khard mutt --search '%s'"
+bind editor <Tab> complete-query
+bind editor ^T    complete
+
diff --git a/.mutt/macros.rc b/.mutt/macros.rc
new file mode 100644
index 0000000..3b35e1c
--- /dev/null
+++ b/.mutt/macros.rc
@@ -0,0 +1,10 @@
+
+# source folder settings and enter folder
+macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.mutt/dave@sleepmap.de.rc<enter><change-folder>!<enter>'
+macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.mutt/david.runge@campus.tu-berlin.de.rc<enter><change-folder>!<enter>'
+macro index,pager <f4> '<sync-mailbox><enter-command>source ~/.mutt/dave@c-base.org.rc<enter><change-folder>!<enter>'
+
+# adding e-mail addresses to khard address book
+macro index,pager A \
+  "<pipe-message>khard add-email<return>" \
+  "add the sender email address to khard"
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 87ec844..3488a0d 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -1,50 +1,26 @@
-# General settings
-set editor=`echo \$EDITOR`
-set my_name="David Runge"
-source "~/.mutt/color.rc"
-# GPG
-source "~/.mutt/gpg.rc"
-message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
-
-# IMAP: offlineimap
-set folder = "~/Mail"
-source ~/.mutt/mailboxes
-set mail_check = 60
-set sort = "threads"
-set sort_aux = "last-date-received"
-set mbox_type = Maildir
-#source "gpg -dq ~/.mutt/my-pwds.gpg |"
-
-## khard
-# auto-completing mails when pressing tab in "new mail" dialog using khard address books
-set query_command= "khard mutt --search '%s'"
-bind editor <Tab> complete-query
-bind editor ^T    complete
-
-# adding e-mail addresses to khard address book
-macro index,pager A \
-    "<pipe-message>khard add-email<return>" \
-        "add the sender email address to khard"
+# defaults
+source "~/.mutt/default.rc"
 
+# color
+source "~/.mutt/color.rc"
 
-## dave@sleepmap.de
-set spoolfile = "+sleepmap.de/INBOX"
-source "~/.mutt/dave@sleepmap.de.rc"
-folder-hook sleepmap.de/* source ~/.mutt/dave@sleepmap.de.rc
+# gnupg
+source "~/.mutt/gpg.rc"
 
-## david.runge@tu-berlin.de
-folder-hook tu-berlin.de/* source ~/.mutt/david.runge@campus.tu-berlin.de.rc
+# mailboxes (set by offlineimap)
+source "~/.mutt/mailboxes.rc"
 
-## dave@c-base.org
-folder-hook c-base.org/* source ~/.mutt/dave@c-base.org.rc
+# sorting
+source "~/.mutt/sorting.rc"
 
-## Shortcuts
-macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.mutt/dave@sleepmap.de.rc<enter><change-folder>!<enter>'
-macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.mutt/david.runge@campus.tu-berlin.de.rc<enter><change-folder>!<enter>'
-macro index,pager <f4> '<sync-mailbox><enter-command>source ~/.mutt/dave@c-base.org.rc<enter><change-folder>!<enter>'
+# khard (contacts)
+source "~/.mutt/khard.rc"
 
+# accounts
+source "~/.mutt/accounts.rc"
 
-## Security
-# Disable enter-command
-bind generic,alias,attach,browser,editor,index,compose,pager,pgp,postpone ':' noop
+# macros
+source "~/.mutt/macros.rc"
 
+# security
+source "~/.mutt/security.rc"
diff --git a/.mutt/security.rc b/.mutt/security.rc
new file mode 100644
index 0000000..af00478
--- /dev/null
+++ b/.mutt/security.rc
@@ -0,0 +1,2 @@
+# disable enter-command (so password commands won't show up in command history)
+bind generic,alias,attach,browser,editor,index,compose,pager,pgp,postpone ':' noop
diff --git a/.mutt/sorting.rc b/.mutt/sorting.rc
new file mode 100644
index 0000000..48827f7
--- /dev/null
+++ b/.mutt/sorting.rc
@@ -0,0 +1,2 @@
+set sort = "threads"
+set sort_aux = "last-date-received"