From 071387457ff1b23732e4f09704a0723062ba9b21 Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@posteo.net>
Date: Tue, 12 Jul 2022 11:30:30 +0200
Subject: [PATCH] use mfauth and better sending server selection

---
 mblaze/filter  |  1 +
 mblaze/profile |  2 +-
 mbsyncrc       | 10 ++++++----
 msmtprc        | 23 +++++++++++------------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/mblaze/filter b/mblaze/filter
index 5c8d4f9..2aadcb9 100644
--- a/mblaze/filter
+++ b/mblaze/filter
@@ -2,3 +2,4 @@ text/html: w3m -dump -o display_link_number=1 -I $PIPE_CHARSET -T text/html
 text/calendar: cat
 application/ics: khal printics
 text/plain: mflow -w 72
+multipart/encrypted: gpg 2>&1 && exit 64
diff --git a/mblaze/profile b/mblaze/profile
index e5f9021..a53cfca 100644
--- a/mblaze/profile
+++ b/mblaze/profile
@@ -1,6 +1,6 @@
 Local-Mailbox: Felix Van der Jeugt <felix.vanderjeugt@posteo.net>
 Alternate-Mailboxes: Felix Van der Jeugt <Felix.VanderJeugt@ugent.be>,Felix Van der Jeugt <Felix.VanderJeugt@UGent.be>,Felix Van der Jeugt <felix.vanderjeugt@ugent.be>,Felix Van der Jeugt <felix.vanderjeugt@gmail.com>,Felix Van der Jeugt <felix.vanderjeugt@12urenloop.be>
-Sendmail: msmtp
+Sendmail: msmtp --read-envelope-from
 FQDN: mantle
 Outbox: /data/mail/outbox
 Scan-Format: %c%u %3n  %d  %17f  %i%S
diff --git a/mbsyncrc b/mbsyncrc
index 8bc53d7..a9fa9a7 100644
--- a/mbsyncrc
+++ b/mbsyncrc
@@ -1,10 +1,12 @@
 # Accounts {{{
 IMAPAccount     ugent
-Host            "owa.ugent.be"
+Host            "outlook.office365.com"
+Port            993
 User            "felix.vanderjeugt@ugent.be"
-PassCmd         "pass show ugent/_ | head -1"
-AuthMechs       "PLAIN"
-SSLTYPE         "IMAPS"
+PassCmd         "mfauth access microsoft"
+AuthMechs       "XOAUTH2"
+SSLType         "IMAPS"
+SSLVersions     "TLSv1"
 CertificateFile "/etc/ssl/certs/ca-certificates.crt"
 
 IMAPAccount     posteo
diff --git a/msmtprc b/msmtprc
index 78d5423..554da5c 100644
--- a/msmtprc
+++ b/msmtprc
@@ -6,19 +6,16 @@ tls            on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile        ~/.local/share/msmtp.log
 
-account        gmail
-host           smtp.gmail.com
-port           587
-from           felix.vanderjeugt@gmail.com
-user           felix.vanderjeugt
-passwordeval   "pass show other/gmail"
-
 account        ugent
-host           smtp.ugent.be
-port           587
 from           felix.vanderjeugt@ugent.be
+auth           xoauth2
+host           outlook.office365.com
+port           587
 user           felix.vanderjeugt@ugent.be
-passwordeval   "pass show ugent/_ | head -1"
+tls            on
+tls_starttls   on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+passwordeval   "mfauth access microsoft"
 
 account        posteo
 host           posteo.de
@@ -27,5 +24,7 @@ from           felix.vanderjeugt@posteo.net
 user           felix.vanderjeugt@posteo.net
 passwordeval   "pass show web/posteo.de | head -1"
 
-# Set a default account
-account default : ugent
+account        posteoplus : posteo
+from           felixvdj@posteo.be
+
+account default : posteo
\ No newline at end of file