Merge branch 'master' into master

4 files changed, 18 insertions, 9 deletions

diff --git a/share/domains.csv b/share/domains.csv
index eaa0be1..beb7a1e 100644
--- a/share/domains.csv
+++ b/share/domains.csv
@@ -53,6 +53,7 @@ carleton.ca,imap-mail.outlook.com,993,smtp-mail.outlook.com,587
 cash4u.com,imap.mail.com,993,smtp.mail.com,587
 cedars.xyz,mail.cedars.xyz,993,mail.cedars.xyz,465
 ceng.metu.edu.tr,imap.ceng.metu.edu.tr,993,mailhost.ceng.metu.edu.tr,587
+cerex.no,mail.cerex.no,993,mail.cerex.no,465
 cheerful.com,imap.mail.com,993,smtp.mail.com,587
 chef.net,imap.mail.com,993,smtp.mail.com,587
 chemist.com,imap.mail.com,993,smtp.mail.com,587
@@ -88,6 +89,7 @@ diplomats.com,imap.mail.com,993,smtp.mail.com,587
 dismail.de,imap.dismail.de,993,smtp.dismail.de,465
 disroot.org,disroot.org,993,disroot.org,587
 distruzione.org,mail.autistici.org,993,smtp.autistici.org,465
+domeneshop.no,imap.domeneshop.no,993,smtp.domeneshop.no,587
 dorriseaton.com,outlook.office365.com,993,smtp.office365.com,587
 dr.com,imap.mail.com,993,smtp.mail.com,587
 duke.edu,outlook.office365.com,993,smtp.office365.com,587
@@ -115,9 +117,10 @@ freedom.nl,imap.freedom.nl,993,smtp.freedom.nl,465
 freedom.xyz,imap.nixnet.email,143,smtp.nixnet.email,587
 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
+fz-juelich.de,imap.fz-juelich.de,993,mail.fz-juelich.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
+ghalv.no,mail.ghalv.no,993,mail.ghalv.no,465
 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
@@ -198,7 +201,7 @@ national.shitposting.agency,mail.cock.li,993,mail.cock.li,587
 ncsu.edu,imap.gmail.com,993,smtp.gmail.com,587
 netcourrier.com,mail.netcourrier.com,993,mail.netcourrier.com,465
 nigge.rs,mail.cock.li,993,mail.cock.li,587
-niser.ac.in,imap.gmail.com,993,smtp.gmail.com,587
+niser.ac.in,imap.gmail.com,993,smtp.gmail.com,465
 nixnet.email,imap.nixnet.email,143,smtp.nixnet.email,587
 nixnet.xyz,imap.nixnet.email,143,smtp.nixnet.email,587
 nixnetmail.com,imap.nixnet.email,143,smtp.nixnet.email,587
diff --git a/share/mbsync-temp b/share/mbsync-temp
index 46cd51b..4e77b09 100644
--- a/share/mbsync-temp
+++ b/share/mbsync-temp
@@ -16,7 +16,7 @@ Channel $fulladdr
 Expunge Both
 $master :$fulladdr-remote:
 $slave :$fulladdr-local:
-Patterns * !"[Gmail]/All Mail"
+Patterns * !"[Gmail]/All Mail" !"*fts-flatcurve*" !"*virtual*"
 Create Both
 SyncState *
 MaxMessages $maxmes
diff --git a/share/mutt-temp b/share/mutt-temp
index 81148a1..63841ad 100644
--- a/share/mutt-temp
+++ b/share/mutt-temp
@@ -1,6 +1,6 @@
 # vim: filetype=neomuttrc
 # muttrc file for account $fulladdr
-set realname = "$realname"
+set real_name = "$realname"
 set from = "$fulladdr"
 set sendmail = "msmtp -a $fulladdr"
 alias me $realname <$fulladdr>
@@ -10,7 +10,7 @@ set message_cachedir = "$cachedir/$safename/bodies"
 set mbox_type = Maildir
 set hostname = "$hostname"
 source $muttshare/switch.muttrc
-set spoolfile = "+INBOX"
+set spool_file = "+INBOX"
 set postponed = "+Drafts"
 set trash = "+Trash"
 set record = "+Sent"
diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc
index 47d48c3..f236bc4 100644
--- a/share/mutt-wizard.muttrc
+++ b/share/mutt-wizard.muttrc
@@ -15,7 +15,8 @@ set rfc2047_parameters = yes
 set sleep_time = 0		# Pause 0 seconds for informational messages
 set markers = no		# Disables the `+` displayed at line wraps
 set mark_old = no		# Unread mail stay unread until read
-set mime_forward = yes		# attachments are forwarded with mail
+set mime_forward = no	# mail body is forwarded as text
+set forward_attachments = yes	# attachments are forwarded with mail
 set wait_key = no		# mutt won't ask "press key to continue"
 set fast_reply			# skip to compose when replying
 set fcc_attach			# save attachments with the body
@@ -90,7 +91,7 @@ macro index,pager ga "<change-folder>=Archive<enter>" "go to archive"
 macro index,pager Ma ";<save-message>=Archive<enter>" "move mail to archive"
 macro index,pager Ca ";<copy-message>=Archive<enter>" "copy mail to archive"
 
-#set crypt_autosign = yes
+#set crypt_auto_sign = yes
 #set crypt_opportunistic_encrypt = yes
 #set pgp_self_encrypt = yes
 #set pgp_default_key  = 'your@gpgemailaddre.ss'
@@ -99,8 +100,8 @@ macro index \eh "<pipe-message>$prefix/libexec/gpg-wks-client --receive | msmtp
 
 macro index,pager a "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
-macro index O "<shell-escape>mw -Y<enter>" "run mw -Y to sync all mail"
-macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
+macro index O "<shell-escape>mailsync<enter>" "run mailsync to sync all mail"
+macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >\"\${XDG_CACHE_HOME:-\$HOME/.cache}/mutt_terms\"<enter><limit>~i \"\`notmuch search --output=messages \$(cat \"\${XDG_CACHE_HOME:-\$HOME/.cache}/mutt_terms\") | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/g for@a; s/\\$/\\\\\\$/g for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
 macro index A "<limit>all\n" "show all messages (undo limit)"
 
 # Sidebar mappings
@@ -133,6 +134,11 @@ color index brightyellow blue "~T"
 color index_author brightred blue "~T"
 color index_subject brightcyan blue "~T"
 
+# Flagged mail is highlighted:
+color index brightgreen default "~F"
+color index_subject brightgreen default "~F"
+color index_author brightgreen default "~F"
+
 # Other colors and aesthetic settings:
 mono bold bold
 mono underline underline