More cleanup and organization

1 files changed, 22 insertions, 61 deletions

diff --git a/muttrc.dot.link b/muttrc.dot.link
index 240bf5f..b850c1e 100644
--- a/muttrc.dot.link
+++ b/muttrc.dot.link
@@ -71,6 +71,8 @@ set tilde = no
 # ---------
 set editor = "vim -X"
 set postponed = "~/temp/mutt/postponed"
+macro compose q "<exit> <enter>" "Postpone message"
+macro compose x "<exit> n"       "Discard message"
 
 # --------
 # Replying
@@ -103,12 +105,15 @@ set envelope_from = yes
 set alias_file = "~/.custom/mutt/aliases"
 source "~/.custom/mutt/aliases"
 
-# ------------------
+# ----------------------------------------
 # Attached documents
-# ------------------
+# http://wiki.mutt.org/?MuttFaq/Attachment
+# ----------------------------------------
 set attach_format = "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "
 set attach_sep = "\n"
 set attach_split = yes
+macro attach W <save-entry><kill-line>~/load/
+macro attach E <save-entry><kill-line>~/load/<enter>
 
 # ----
 # MIME
@@ -153,42 +158,6 @@ set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secr
 set pgp_getkeys_command=""
 set pgp_good_sign="^gpg: Assinatura correta de"
 
-# ---------------------------
-# Patch: pgp-menu-traditional
-# ---------------------------
-# * introduce pgp_replyinline boolean (default no)
-#   When set, this option will (attempt) to reply to
-#   inline (traditional) messages as inline (traditional).
-# * introduce pgp_autoinline boolean (default no)
-#   When set, this option will (attempt) to send messages as inline (traditional).
-# * change pgp_create_traditional to a synonym for pgp_autoinline
-#   Warning: this changes pgp_create_traditional from a quad variable to a boolean.
-# * introduce pgp_mime_ask quad option (default no)
-
-# --------------------------
-# Patch: multiple-crypt-hook
-# --------------------------
-# Allows multiple key-ids for the same pattern With this patch, you can have
-# multiple crypt-hook instances with the same pattern (recipient). This allows
-# one to specify multiple key-ids for a particular pattern (recipient). 
-
-# -------------------------
-# Patch: confirm-crypt-hook
-# -------------------------
-# This patch adds the variable crypt_confirmhook (default yes),
-# to allow you to skip the "Use keyID" prompt, which is frustrating
-# for so many people. Typical (for me) use of crypt-hook implies
-# selection of a known key (assuming no typos), so crypt_confirmhook
-# can be unset if you know your crypt-hooks are valid; you won't be
-# prompted for confirmation anymore. You should verify all your
-# crypt-hooks are correct before unsetting this variable.
-#
-# set crypt_confirmhook = no
-# pgp-hook mailing@lists.org listname
-# pgp-hook mailing@lists.org KEYID_1
-# pgp-hook mailing@lists.org KEYID_2
-#
-
 # ---------
 # Mailboxes
 # ---------
@@ -201,13 +170,18 @@ mailboxes `echo $HOME/mail/Sync/*/*`
 macro pager z "<enter-command>unset wait_key\n!clear ; fetchmail || [ $? -eq 1 ]\n<change-folder>=INBOX/\n<sync-mailbox><buffy-list>" "Fetch new mail"
 macro index z "<enter-command>unset wait_key\n!clear ; fetchmail || [ $? -eq 1 ]\n<change-folder>=INBOX/\n<sync-mailbox><buffy-list>" "Fetch new mail"
 
-# ----------
+# ----------------------------------------
 # Navigation
-# ----------
+# http://blog.jwcxz.com/?p=810
+# http://rc.vc/files/mutt/keybindings.html
+# ----------------------------------------
+bind index P collapse-all
 macro index n "<next-unread-mailbox>"
 macro pager n "<next-unread-mailbox>"
+macro index,pager M "T \n;WN^t \n" "Mark all messages read"
 macro index,pager c "<change-folder>?<change-dir><kill-line>~/mail<enter>" "Change folder"
 macro index,pager y "<change-folder>?<toggle-mailboxes>1\n\n" "Back to INBOX"
+macro index,pager \' "<search>~F<enter>" "Jump to next important message"
 
 # -------------
 # Ignore fields
@@ -278,13 +252,17 @@ macro pager X "<enter-command>unset wait_key\n<pipe-entry>bogofilter -MNs\n<ente
 macro index H "<enter-command>unset wait_key\n<pipe-entry>bogofilter -n\n" "Learn as ham and save"
 macro pager H "<enter-command>unset wait_key\n<pipe-entry>bogofilter -n\n" "Learn as ham and save"
 
+# ----------------
 # Disable printing
+# ----------------
 bind index p noop
 bind pager p noop
 bind pager P noop
 
+# ----------------------------------------------------------------
 # Schleuder config
 # see http://schleuder2.nadir.org/contrib/schleuder-with-mutt.html
+# ----------------------------------------------------------------
 #color body red default "^From: .*"
 #color body red default "^To: .*"
 #color body red default "^Cc: .*"
@@ -296,7 +274,9 @@ bind pager P noop
 #color body red default "^Resent-to: .*"
 #color body brightred default "^Note: .*"
 
+# -----------------------------------
 # Schleuder config, solarized version
+# -----------------------------------
 color body red color234 "^From: .*"
 color body red color234 "^To: .*"
 color body red color234 "^Cc: .*"
@@ -308,30 +288,11 @@ color body red color234 "^Sig: Good signature.*"
 color body red color234 "^Resent-to: .*"
 color body brightred color234 "^Note: .*"
 
-# Macro for jumping to the next important message
-macro index,pager \' "<search>~F<enter>" "Jump to next important message"
-
+# -------
 # Sidebar
+# -------
 source "~/.mutt/sidebar"
 
-# http://wiki.mutt.org/?MuttFaq/Attachment
-macro attach W <save-entry><kill-line>~/load/
-macro attach E <save-entry><kill-line>~/load/<enter>
-
-# Mark messages as read
-# http://blog.jwcxz.com/?p=810
-# http://rc.vc/files/mutt/keybindings.html
-#macro index <esc>m "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>" "mark all messages read"
-macro index M "T \n;WN^t \n" "Mark all messages read"
-macro pager M "T \n;WN^t \n" "Mark all messages read"
-
-# Compose macros
-macro compose q "<exit> <enter>" "Postpone message"
-macro compose x "<exit> n"       "Discard message"
-
-# Collapse
-bind index P collapse-all
-
 #-----------------------------------------------------
 # Custom configuration
 #