From 2bc64123214135f5eedecbd854c2a50279cf8dd7 Mon Sep 17 00:00:00 2001
From: Miquel Sabaté Solà <msabate@suse.com>
Date: Mon, 11 Dec 2023 11:50:56 +0100
Subject: SUSE has moved from Microsoft to Google
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
---
 .config/msmtp/config |  7 +++----
 .mbsyncrc            | 39 +++++++++++++++++++++++++++++++++------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/.config/msmtp/config b/.config/msmtp/config
index 4a5a9d2..8fbcdc1 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -14,12 +14,11 @@ passwordeval "gpg --quiet --for-your-eyes-only --no-tty --decrypt ~/.mbsyncpassg
 
 # suse.com
 account      comsuse
-host         smtp.office365.com
+host         smtp.gmail.com
 port         587
-auth         xoauth2
 from         msabate@suse.com
-user         msabate@suse.com
-passwordeval ~/bin/mutt_oauth2.py /home/backup/mail/comsuse/sessionfile
+user         msabate
+passwordeval "gpg --quiet --for-your-eyes-only --no-tty --decrypt ~/.mbsyncpasssusecom.gpg"
 
 # suse.de
 account      desuse
diff --git a/.mbsyncrc b/.mbsyncrc
index 84fe9e2..b7c68f8 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -65,31 +65,58 @@ Channel gmail-sent
 # suse.com
 
 IMAPAccount comsuse
-Host outlook.office365.com
+Host imap.gmail.com
 User msabate@suse.com
-PassCmd "~/bin/mutt_oauth2.py /home/mssola/data/mail/comsuse/sessionfile"
+PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.mbsyncpasssusecom.gpg"
 SSLType IMAPS
-AuthMechs XOAUTH2
+AuthMechs Login
 CertificateFile /etc/ssl/ca-bundle.pem
-Timeout 0
 
+# Use the account specified above as the remote storage.
 IMAPStore comsuse-remote
 Account comsuse
 
+# Let's use /home/mssola/data/mail as the prefix for the local storage.
 MaildirStore comsuse-local
 Path /home/mssola/data/mail/comsuse/
 Inbox /home/mssola/data/mail/comsuse/inbox
 SubFolders Verbatim
 
-Channel comsuse
+# We could have one only channel, and filter them through the Patterns
+# directive. I prefer having multiple channels and then group them.
+
+Channel comsuse-inbox
 Far :comsuse-remote:
 Near :comsuse-local:
-Patterns * !Calendar
+Patterns "INBOX"
+Create Both
+Expunge Both
+Sync All
+SyncState *
+
+Channel comsuse-all
+Far :comsuse-remote:"[Gmail]/Tot el correu"
+Near :comsuse-local:"All"
 Create Both
+Expunge Both
 Sync All
+SyncState *
+
+Channel comsuse-sent
+Far :comsuse-remote:"[Gmail]/Enviats"
+Near :comsuse-local:"Sent"
+Create Both
 Expunge Both
+Sync All
 SyncState *
 
+# And finally group everything here.
+
+Group comsuse
+Channel comsuse-inbox
+Channel comsuse-all
+Channel comsuse-sent
+
 ##
 # ajuntament: notice that in this case the mailbox is configured to 'Pull' only
 # and that deletions are not propagated. This is done to workaround the
-- 
cgit v1.2.3