Merge branch 'master' of github.com:LukeSmithxyz/mutt-wizard

3 files changed, 9 insertions, 2 deletions

diff --git a/share/domains.csv b/share/domains.csv
index d59cd32..e0aa74c 100644
--- a/share/domains.csv
+++ b/share/domains.csv
@@ -111,6 +111,7 @@ fsmpi.rwth-aachen.de,mail.fsmpi.rwth-aachen.de,993,mail.fsmpi.rwth-aachen.de,465
 fsu-jena,exchange.uni-jena.de,993,smtp.uni-jena.de,587
 gcc.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587
 getbackinthe.kitchen,mail.cock.li,993,mail.cock.li,587
+ghalv.no,mail.ghalv.no,993,mail.ghalv.no,587
 gmail.com,imap.gmail.com,993,smtp.gmail.com,587
 gmx.*,imap.gmx.net,993,mail.gmx.net,587
 go2.pl,poczta.o2.pl,993,poczta.o2.pl,465
@@ -149,6 +150,7 @@ kean.edu,imap.gmail.com,993,smtp.gmail.com,587
 kipras.org,mail.kipras.org,993,mail.kipras.org,587
 krutt.org,mail.autistici.org,993,smtp.autistici.org,465
 kth.se,webmail.kth.se,993,smtp.kth.se,587
+lancaster.ac.uk,outlook.office365.com,993,smtp.office365.com,587
 larbs.xyz,mail.larbs.xyz,993,mail.larbs.xyz,587
 lavabit.com,lavabit.com,993,lavabit.com,587
 librem.one,imap.librem.one,993,smtp.librem.one,465
@@ -273,6 +275,7 @@ tecnico.ulisboa.pt,mail.tecnico.ulisboa.pt,993,mail.tecnico.ulisboa.pt,465
 teknik.io,mail.teknik.io,993,mail.teknik.io,587
 telenet.be,imap.telenet.be,993,smtp.telenet.be,587
 tfwno.gf,mail.cock.li,993,mail.cock.li,587
+thamognya.com,mail.thamognya.com,993,mail.thamognya.com,587
 thunix.net,thunix.net,143,thunix.net,25
 tlen.pl,poczta.o2.pl,993,poczta.o2.pl,465
 tlu.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587
@@ -283,6 +286,7 @@ tum.de,xmail.mwn.de,993,postout.lrz.de,587
 txstate.edu,outlook.office365.com,993,smtp.office365.com,587
 ua.pt,outlook.office365.com,993,mail.ua.pt,25
 uach.mx,imap.gmail.com,993,smtp.gmail.com,587
+ucalgary.ca,outlook.office365.com,993,smtp.office365.com,587
 ucdavis.edu,imap.gmail.com,993,smtp.gmail.com,587
 uclive.ac.nz,outlook.office365.com,993,smtp.office365.com,587
 ucsb.edu,imap.gmail.com,993,smtp.gmail.com,587
@@ -290,6 +294,7 @@ ucsc.edu,imap.gmail.com,993,smtp.gmail.com,587
 ukr.net,imap.ukr.net,993,smtp.ukr.net,465
 uni-duesseldorf.de,mail.hhu.de,993,mail.hhu.de,465
 uni-jena.de,imap.uni-jena.de,993,smtp.uni-jena.de,587
+uni.edu.pe,imap.gmail.com,993,smtp.gmail.com,587
 uni.strath.ac.uk,outlook.office365.com,993,smtp.office365.com,587
 unilodz.eu,outlook.office365.com,993,smtp.office365.com,587
 unitn.it,imap.gmail.com,993,smtp.gmail.com,587
@@ -326,3 +331,4 @@ zaclys.net,mail.zaclys.net,993,mail.zaclys.net,465
 zju.edu.cn,imap.zju.edu.cn,993,smtp.zju.edu.cn,994
 zoho.com,imap.zoho.com,993,smtp.zoho.com,465
 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465
+sis.hust.edu.vn,outlook.office365.com,993,smtp.office365.com,587
diff --git a/share/mailcap b/share/mailcap
index b355f32..a49145f 100644
--- a/share/mailcap
+++ b/share/mailcap
@@ -1,6 +1,6 @@
 text/plain; $EDITOR %s ;
 text/html; openfile %s ; nametemplate=%s.html
-text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput;
+text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump -width=1024 %s; nametemplate=%s.html; copiousoutput;
 image/*; openfile %s ;
 video/*; setsid mpv --quiet %s &; copiousoutput
 audio/*; mpv %s ;
diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc
index a12a77e..3537aa8 100644
--- a/share/mutt-wizard.muttrc
+++ b/share/mutt-wizard.muttrc
@@ -3,7 +3,7 @@
 # mutt-wizard will have this file sourced from your muttrc.
 # In the interest of seamless updating, do not edit this file.
 # If you want to override any settings, set those in your muttrc.
-set mailcap_path = /usr/local/share/mutt-wizard/mailcap:$mailcap_path
+set mailcap_path = $HOME/.config/mutt/mailcap:/usr/local/share/mutt-wizard/mailcap:$mailcap_path
 set mime_type_query_command = "file --mime-type -b %s"
 set date_format="%y/%m/%d %I:%M%p"
 set index_format="%2C %Z %?X?A& ? %D %-15.15F %s (%-4.4c)"
@@ -27,6 +27,7 @@ auto_view text/html		# automatically show html (mailcap uses lynx)
 auto_view application/pgp-encrypted
 #set display_filter = "tac | sed '/\\\[-- Autoview/,+1d' | tac" # Suppress autoview messages.
 alternative_order text/plain text/enriched text/html
+set width = 80 # wordwrap when reading emails
 
 bind index,pager i noop
 bind index,pager g noop