From c43f113a723fdf4ff354c58c6d4afc4001228404 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 20 Jun 2018 15:29:39 +0100
Subject: [PATCH] Move common configuration items into common.mutt

---
 aber_offline_mail/.mutt/common.mutt           | 61 ++++++++++++++++++
 aber_offline_mail/.mutt/mutt.uk.ac.aber.maf54 | 62 +------------------
 2 files changed, 63 insertions(+), 60 deletions(-)
 create mode 100644 aber_offline_mail/.mutt/common.mutt

diff --git a/aber_offline_mail/.mutt/common.mutt b/aber_offline_mail/.mutt/common.mutt
new file mode 100644
index 0000000..4b8b7ac
--- /dev/null
+++ b/aber_offline_mail/.mutt/common.mutt
@@ -0,0 +1,61 @@
+# Automatically render html emails.  Not sure if this is a good idea
+auto_view text/html
+alternative_order text/plain text/enriched text/html
+
+# use abook for aliases
+set alias_file=~/.aliases
+set sort_alias= alias
+source $alias_file
+set query_command = "abook --mutt-query '%s'" 
+macro index,pager A "<pipe-message>abook --add-email-quiet<return>" "add the sender address to abook"
+
+# View urls more easily with urlview
+macro index \cb   "|urlview\n"
+macro pager \cb   "|urlview\n"
+
+macro pager \cb	"\
+:set my_tmp_pipe_decode=\$pipe_decode\n\
+:set pipe_decode\n\
+|urlview\n\
+:set pipe_decode=\$my_tmp_pipe_decode\n\
+:unset my_tmp_pipe_decode\n" \
+# call urlview to extract URLS out of a message
+
+set text_flowed=yes
+set reflow_text=yes
+set editor="vim -v +':set textwidth=72' +'set fo=aw'"
+
+# Speed up folder switch
+set sleep_time=0 
+
+set sort=threads
+set sort_aux=last-date-received
+
+set fast_reply=yes
+
+# Show message some message headers when reading mail
+set pager_index_lines=10
+
+# Show some context when paging through email
+set pager_context=5
+
+# Stop at the end of the email
+set pager_stop=yes
+
+# Remove all headers by default
+ignore *
+unignore from date subject to cc
+
+# Use sidebar
+set mail_check_stats
+set sidebar_visible=yes
+set sidebar_width=25
+set sidebar_folder_indent=yes
+set sidebar_short_path=yes
+set sidebar_divider_char='│'
+set sidebar_format='%B%* %N'
+
+bind index,pager \CP sidebar-prev
+bind index,pager \CN sidebar-next
+bind index,pager \CO sidebar-open
+unmailboxes *
diff --git a/aber_offline_mail/.mutt/mutt.uk.ac.aber.maf54 b/aber_offline_mail/.mutt/mutt.uk.ac.aber.maf54
index 1e2e07c..f23dc81 100644
--- a/aber_offline_mail/.mutt/mutt.uk.ac.aber.maf54
+++ b/aber_offline_mail/.mutt/mutt.uk.ac.aber.maf54
@@ -4,73 +4,15 @@ macro index 'c' '<change-folder>?<change-dir><home>^K+<enter>'
 #source "gpg2 -dq ~/.mutt/passwords.gpg |"
 set my_aber_password=`pass Aber/Main | head -n 1`
 
-# Automatically render html emails.  Not sure if this is a good idea
-auto_view text/html
-alternative_order text/plain text/enriched text/html
-
-# use abook for aliases
-set alias_file=~/.aliases
-set sort_alias= alias
-source $alias_file
-set query_command = "abook --mutt-query '%s'" 
-macro index,pager A "<pipe-message>abook --add-email-quiet<return>" "add the sender address to abook"
-
-# View urls more easily with urlview
-macro index \cb   "|urlview\n"
-macro pager \cb   "|urlview\n"
-
-macro pager \cb	"\
-:set my_tmp_pipe_decode=\$pipe_decode\n\
-:set pipe_decode\n\
-|urlview\n\
-:set pipe_decode=\$my_tmp_pipe_decode\n\
-:unset my_tmp_pipe_decode\n" \
-# call urlview to extract URLS out of a message
-
-set text_flowed=yes
-set reflow_text=yes
-set editor="vim -v +':set textwidth=72' +'set fo=aw'"
+# Get common settings
+source ~/.mutt/common.mutt
 
 # Encryption
 source ~/.mutt/gpg.rc
 
-# Speed up folder switch
-set sleep_time=0 
-
 # Mutt colors
 source ~/.mutt/colors.mutt
 
-set sort=threads
-set sort_aux=last-date-received
-
-set fast_reply=yes
-
-# Show message some message headers when reading mail
-set pager_index_lines=10
-
-# Show some context when paging through email
-set pager_context=5
-
-# Stop at the end of the email
-set pager_stop=yes
-
-# Remove all headers by default
-ignore *
-unignore from date subject to cc
-
-# Use sidebar
-set mail_check_stats
-set sidebar_visible=yes
-set sidebar_width=25
-set sidebar_folder_indent=yes
-set sidebar_short_path=yes
-set sidebar_divider_char='│'
-set sidebar_format='%B%* %N'
-
-bind index,pager \CP sidebar-prev
-bind index,pager \CN sidebar-next
-bind index,pager \CO sidebar-open
-unmailboxes *
 
 # Mailbox specific settings
 set smtp_url = "smtp://maf54@aber.ac.uk@smtp.office365.com:587"
-- 
2.44.0