X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=aber_offline_mail%2F.mutt%2Fmutt.uk.ac.aber.maf54;h=202e2dbe94146cc3218f76edb885347d30866b43;hb=c85ac259177aaea873e1947a1b1edfab2fd4370e;hp=880fa11e3244256f0dfc6650fd0cf270a8855004;hpb=f7af51c5b597a0d5d227312fe6e67b720cabb89e;p=max%2Fdotfiles.git

diff --git a/aber_offline_mail/.mutt/mutt.uk.ac.aber.maf54 b/aber_offline_mail/.mutt/mutt.uk.ac.aber.maf54
index 880fa11..202e2db 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"
@@ -83,6 +25,6 @@ set postponed = "+Drafts"
 set trash = "+Trash"
 set record = "+Sent"
 
-set pgp_sign_as="0x251C939D"
+set pgp_sign_as="0xDA2EDF6D"
 
-mailboxes "+Inbox" "+Lists" "+Lists/ibers-all" "+Lists/centos-sec" "+Lists/ubuntu-sec" "+Notifications" "+Notifications/ibers-cs" "+Notifications/NPPC" "+Notifications/NPPC/Updates" "+Notifications/NPPC/Uptime" "+Notifications/NPPC/Icinga" "+UCU" "+Suppliers" "+Suppliers/BrightComputing" "+Suppliers/ClusterVision"
+mailboxes "+Inbox" "+Inbox/staging" "+Lists" "+Lists/ibers-all" "+Lists/centos-sec" "+Lists/ubuntu-sec" "+Notifications" "+Notifications/ibers-cs" "+Notifications/ibers-cs/vmcpuload" "+Notifications/NPPC" "+Notifications/NPPC/Updates" "+Notifications/NPPC/Uptime" "+Notifications/NPPC/Icinga" "+UCU" "+Suppliers" "+Suppliers/BrightComputing" "+Suppliers/ClusterVision"