Update the online mail config

diff --git a/online_mail/.mailcap b/online_mail/.mailcap
new file mode 100644 (file)
index 0000000..e4400e4
--- /dev/null
+++ b/online_mail/.mailcap
@@ -0,0 +1 @@
+text/html; lynx -stdin -dump -force_html ; copiousoutput

diff --git a/online_mail/.mutt/account.com.friedersdorff.max b/online_mail/.mutt/account.com.friedersdorff.max
index eea065dcd18d4179c8c235bb13301e3523171dbb..db14c31c5ca07513038e80b332c78aea010bceaa 100644 (file)
--- a/online_mail/.mutt/account.com.friedersdorff.max
+++ b/online_mail/.mutt/account.com.friedersdorff.max
@@ -1,10 +1,10 @@
 set imap_user = "max@friedersdorff.com"
 set imap_pass = $my_personal_password
-set smtp_url = "smtp://max@mail.friedersdorff.com:587"
+set smtp_url = "smtp://max@friedersdorff.com@mail.friedersdorff.com:587"
 set smtp_pass = $my_personal_password
 set from = "max@friedersdorff.com"
 set realname = "Maximilian Friedersdorff"
-set folder = "imaps://max@mail.friedersdorff.com:993"
+set folder = "imaps://max@friedersdorff.com@mail.friedersdorff.com:993"
 set spoolfile = "+INBOX"
 set postponed = "+Drafts"
 set header_cache = ~/.mutt/com.friedersdorff.max/cache/headers

diff --git a/online_mail/.mutt/account.com.gmail.maxf130 b/online_mail/.mutt/account.com.gmail.maxf130
deleted file mode 100644 (file)
index 5bf21b2..0000000
--- a/online_mail/.mutt/account.com.gmail.maxf130
+++ /dev/null
@@ -1,17 +0,0 @@
-set imap_user = "maxf130@gmail.com"
-set imap_pass = $my_personal_gmail_password
-set smtp_url = "smtp://maxf130@smtp.gmail.com:587"
-set smtp_pass = $my_personal_gmail_password
-set from = "maxf130@gmail.com"
-set realname = "Maximilian Friedersdorff"
-set folder = "imaps://imap.gmail.com:993"
-set spoolfile = "+INBOX"
-set postponed = "+[Gmail]/Drafts"
-set header_cache = ~/.mutt/com.gmail.maxf130/cache/headers
-set message_cachedir = ~/.mutt/com.gmail.maxf130/cache/bodies
-set certificate_file = ~/.mutt/com.gmail.maxf130/certificates
-
-set trash = ""
-set record = ""
-
-set pgp_sign_as="0x153CBB66"

diff --git a/online_mail/.mutt/account.uk.ac.aber.maf54 b/online_mail/.mutt/account.uk.ac.aber.maf54
new file mode 100644 (file)
index 0000000..72bdbde
--- /dev/null
+++ b/online_mail/.mutt/account.uk.ac.aber.maf54
@@ -0,0 +1,15 @@
+set imap_user = "maf54@aber.ac.uk"
+set imap_pass = $my_aber_password
+set smtp_url = "smtp://maf54@aber.ac.uk@smtp.office365.com:587"
+set smtp_pass = $my_aber_password
+set from = "maf54@aber.ac.uk"
+set realname = "Maximilian Friedersdorff"
+set folder = "imaps://maf54@aber.ac.uk@outlook.office365.com:993"
+set spoolfile = "+INBOX"
+set postponed = "+Drafts"
+set header_cache = ~/.mutt/uk.ac.aber.maf54/cache/headers
+set message_cachedir = ~/.mutt/uk.ac.aber.maf54/cache/bodies
+set certificate_file = ~/.mutt/uk.ac.aber.maf54/certificates
+
+set trash = "+Trash"
+set record = "+Sent"
\ No newline at end of file

diff --git a/online_mail/.mutt/account.uk.ac.le.student.mf195 b/online_mail/.mutt/account.uk.ac.le.student.mf195
deleted file mode 100644 (file)
index 6c0bf50..0000000
--- a/online_mail/.mutt/account.uk.ac.le.student.mf195
+++ /dev/null
@@ -1,17 +0,0 @@
-set imap_user = "mf195@student.le.ac.uk"
-set imap_pass = $my_student_password
-set smtp_url = "smtp://mf195@student.le.ac.uk@smtp.office365.com:587"
-set smtp_pass = $my_student_password
-set from = "mf195@student.le.ac.uk"
-set realname = "Maximilian Friedersdorff"
-set folder = "imaps://outlook.office365.com:993"
-set spoolfile = "+INBOX"
-set postponed = "+Drafts"
-set header_cache = ~/.mutt/uk.ac.le.student.mf195/cache/headers
-set message_cachedir = ~/.mutt/uk.ac.le.student.mf195/cache/bodies
-set certificate_file = ~/.mutt/uk.ac.le.student.mf195/certificates
-
-set trash="+Trash"
-set record="+Sent"
-
-set pgp_sign_as="0x33FA1EFF"

diff --git a/online_mail/.mutt/account.uk.co.musoft.max b/online_mail/.mutt/account.uk.co.musoft.max
deleted file mode 100644 (file)
index b9bc431..0000000
--- a/online_mail/.mutt/account.uk.co.musoft.max
+++ /dev/null
@@ -1,17 +0,0 @@
-set imap_user = "max@musoft.co.uk"
-set imap_pass = $my_musoft_password
-set smtp_url = "smtp://max@musoft.co.uk@smtp.gmail.com:587/"
-set smtp_pass = $my_musoft_password 
-set from = "max@musoft.co.uk"
-set realname = "Maximilian Friedersdorff"
-set folder = "imaps://imap.gmail.com:993"
-set spoolfile = "+INBOX"
-set postponed ="+[Gmail]/Drafts"
-set header_cache = ~/.mutt/uk.co.musoft.max/cache/headers
-set message_cachedir = ~/.mutt/uk.co.musoft.max/cache/bodies
-set certificate_file = ~/.mutt/uk.co.musoft.max/certificates
-
-set trash = ""
-set record = ""
-
-set pgp_sign_as="0x2EA4B143"

diff --git a/online_mail/.mutt/colors.mutt b/online_mail/.mutt/colors.mutt
new file mode 100644 (file)
index 0000000..b14068c
--- /dev/null
+++ b/online_mail/.mutt/colors.mutt
@@ -0,0 +1,17 @@
+# vim: filetype=muttrc
+
+color normal        brightyellow    default         
+color error         red             default         
+color tilde         black           default         
+color message       cyan            default         
+color markers       red             white           
+color attachment    white           default         
+color search        brightmagenta   default         
+color status        brightyellow    black           
+color indicator     brightblack     yellow          
+color tree          yellow          default # arrow in threads
+
+color index         brightmagenta   default         "~Q"                        # messages that have been replied to
+color index         blue            default         "~U"                        # unread messages
+color index         blue            default         "~U~$"                      # unread, unreferenced messages
+color index         black           red             "~D"                        # deleted messages

diff --git a/online_mail/.mutt/mailcap b/online_mail/.mutt/mailcap
deleted file mode 100644 (file)
index c9f551b..0000000
--- a/online_mail/.mutt/mailcap
+++ /dev/null
@@ -1 +0,0 @@
-text/html; w3m -I %{charset} -T text/html; copiousoutput

diff --git a/online_mail/.mutt/muttrc b/online_mail/.mutt/muttrc
index 3c3ba25cd99bde915df33ef7846447311fc70e80..9ef64ec5b0470786f1a6e5bd82726e7c61382be0 100644 (file)
--- a/online_mail/.mutt/muttrc
+++ b/online_mail/.mutt/muttrc
@@ -1,20 +1,16 @@
 # Macro keys for different mailboxes
 macro index \e1 '<sync-mailbox><change-folder>imaps://mail.friedersdorff.com<enter>'
 macro index \e2 '<sync-mailbox><change-folder>imaps://outlook.office365.com<enter>'
-macro index \e3 '<sync-mailbox><change-folder>imaps://maxf130@imap.gmail.com<enter>'
-macro index \e4 '<sync-mailbox><change-folder>imaps://max@musoft.co.uk@imap.gmail.com<enter>'
 
 
 # Configuration files for different mailboxes
 folder-hook 'friedersdorff.com' 'source ~/.mutt/account.com.friedersdorff.max'
-folder-hook 'office365.com' 'source ~/.mutt/account.uk.ac.le.student.mf195'
-folder-hook 'maxf130@imap.gmail.com' 'source ~/.mutt/account.com.gmail.maxf130'
-folder-hook 'max@musoft.co.uk@imap.gmail.com' 'source ~/.mutt/account.uk.co.musoft.max'
+folder-hook 'outlook.office365.com' 'source ~/.mutt/account.uk.ac.aber.maf54'
 
 macro index 'c' '<change-folder>?<change-dir><home>^K+<enter>'
 
 # Source the passwords file
-source "gpg -dq ~/.mutt/passwords.gpg |"
+source "gpg2 -dq ~/.mutt/passwords.gpg |"
 # Always check personal email first
 source ~/.mutt/account.com.friedersdorff.max
 
@@ -32,7 +28,19 @@ macro index \cb   "|urlview\n"
 macro pager \cb   "|urlview\n"
 
 set text_flowed=yes
+set reflow_text=yes
 set editor="vim +':set textwidth=72' +'set fo=aw'"
 
 # 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
\ No newline at end of file

diff --git a/online_mail/.mutt/passwords.gpg b/online_mail/.mutt/passwords.gpg
index 6d48e698446d33347c3ea1fb4186de8820d4ba00..6c3883bc6e3a80b6477c8189de9acb911a717d35 100644 (file)
Binary files a/online_mail/.mutt/passwords.gpg and b/online_mail/.mutt/passwords.gpg differ