X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/ce9777d2eb1dd03c5124dca2add71213b550d59f..a59aa3f7d15dae57e2d066e47af3556c46d9dac4:/mbsync/config

diff --git a/mbsync/config b/mbsync/config
index ce7eb95..4b7a9ec 100644
--- a/mbsync/config
+++ b/mbsync/config
@@ -4,80 +4,68 @@ Expunge Both
 Create Both
 CopyArrivalDate yes
 
-IMAPAccount     gmail
-Host            imap.gmail.com
-User            samir.benmendil@gmail.com
-PassCmd         "sed -En '/imap.gmail.com.*samir.benmendil@gmail.com/ s/.*password (.*)/\\1/p' ~/.netrc"
+IMAPAccount     mailfence
+Host            imap.mailfence.com
+User            samirbenmendil
+PassCmd         "sed -En '/imap.mailfence.com.*samirbenmendil/ s/.*password (.*)/\\1/p' ~/.netrc"
 AuthMechs       LOGIN
-SSLType         IMAPS
-SSLVersion      SSLv3
+TLSType         IMAPS
+TLSVersions     +1.2
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
-IMAPStore gmail-remote
-Account gmail
+IMAPStore mailfence-remote
+Account mailfence
 
-MaildirStore gmail-local
-Path         ~/mail/gmail/
-Inbox        ~/mail/gmail/inbox/
+MaildirStore mailfence-local
+Path         ~/mail/mailfence/
+Inbox        ~/mail/mailfence/inbox
 SubFolders   Verbatim
 
-Channel gmail-default
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "INBOX"
-
-Channel gmail-youtube
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube"
-
-Channel gmail-youtube-orig
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube-orig"
-
-Channel gmail-archive
-Master :gmail-remote:"[Google Mail]/All Mail"
-Slave :gmail-local:"archive"
-
-Channel gmail-drafts
-Master :gmail-remote:"[Google Mail]/Drafts"
-Slave :gmail-local:"drafts"
-
-Channel gmail-sent
-Master :gmail-remote:"[Google Mail]/Sent Mail"
-Slave :gmail-local:"sent"
-
-Channel gmail-spam
-Master :gmail-remote:"[Google Mail]/Spam"
-Slave :gmail-local:"spam"
-
-Channel gmail-flagged
-Master :gmail-remote:"[Google Mail]/Starred"
-Slave :gmail-local:"flagged"
-
-Channel gmail-bin
-Master :gmail-remote:"[Google Mail]/Bin"
-Slave :gmail-local:"bin"
-
-Group gmail
-Channel gmail-default
-Channel gmail-youtube
-Channel gmail-youtube-orig
-Channel gmail-archive
-Channel gmail-drafts
-Channel gmail-sent
-Channel gmail-spam
-Channel gmail-flagged
-Channel gmail-bin
+Channel mailfence/inbox
+Far  :mailfence-remote:
+Near :mailfence-local:
+Patterns INBOX
+
+Channel mailfence/drafts
+Far  :mailfence-remote:"Drafts"
+Near :mailfence-local:"drafts"
+
+Channel mailfence/sent
+Far  :mailfence-remote:"Sent Items"
+Near :mailfence-local:"sent"
+
+Channel mailfence/spam
+Far  :mailfence-remote:"Spam?"
+Near :mailfence-local:"spam"
+
+Channel mailfence/bin
+Far  :mailfence-remote:"Trash"
+Near :mailfence-local:"trash"
+
+Channel mailfence/important
+Far  :mailfence-remote:important
+Near :mailfence-local:important
+
+Channel mailfence/archive
+Far  :mailfence-remote:
+Near :mailfence-local:
+Patterns archive*
+
+Group mailfence
+Channel mailfence/inbox
+Channel mailfence/drafts
+Channel mailfence/sent
+Channel mailfence/important
+Channel mailfence/spam
+Channel mailfence/bin
+Channel mailfence/archive
 
 IMAPAccount     fpp
 Host            imap.gmail.com
 User            samir@fppnt.com
-PassCmd         "sed -En '/imap.gmail.com.*samir@fppnt.com/ s/.*password (.*)/\\1/p' ~/.netrc"
-AuthMechs       LOGIN
-SSLType         IMAPS
-SSLVersion      SSLv3
+PassCmd         "~/.config/mutt/mutt_oauth2.py ~/.cache/mutt_oauth2/samir@fppnt.com.tokens"
+AuthMechs       XOAUTH2
+TLSType         IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore fpp-remote
@@ -88,40 +76,40 @@ Path         ~/mail/fpp/
 Inbox        ~/mail/fpp/inbox/
 SubFolders   Verbatim
 
-Channel fpp-default
-Master  :fpp-remote:
-Slave   :fpp-local:
+Channel fpp/inbox
+Far  :fpp-remote:
+Near :fpp-local:
 Patterns "INBOX"
 
-Channel fpp-archive
-Master :fpp-remote:"[Gmail]/All Mail"
-Slave :fpp-local:"archive"
+Channel fpp/archive
+Far  :fpp-remote:"[Gmail]/All Mail"
+Near :fpp-local:"archive"
 
-Channel fpp-drafts
-Master :fpp-remote:"[Gmail]/Drafts"
-Slave :fpp-local:"drafts"
+Channel fpp/drafts
+Far  :fpp-remote:"[Gmail]/Drafts"
+Near :fpp-local:"drafts"
 
-Channel fpp-sent
-Master :fpp-remote:"[Gmail]/Sent Mail"
-Slave :fpp-local:"sent"
+Channel fpp/sent
+Far  :fpp-remote:"[Gmail]/Sent Mail"
+Near :fpp-local:"sent"
 
-Channel fpp-spam
-Master :fpp-remote:"[Gmail]/Spam"
-Slave :fpp-local:"spam"
+Channel fpp/spam
+Far  :fpp-remote:"[Gmail]/Spam"
+Near :fpp-local:"spam"
 
-Channel fpp-flagged
-Master :fpp-remote:"[Gmail]/Starred"
-Slave :fpp-local:"flagged"
+Channel fpp/flagged
+Far  :fpp-remote:"[Gmail]/Starred"
+Near :fpp-local:"flagged"
 
-Channel fpp-bin
-Master :fpp-remote:"[Gmail]/Bin"
-Slave :fpp-local:"bin"
+Channel fpp/bin
+Far  :fpp-remote:"[Gmail]/Trash"
+Near :fpp-local:"bin"
 
 Group fpp
-Channel fpp-default
-Channel fpp-archive
-Channel fpp-drafts
-Channel fpp-sent
-Channel fpp-spam
-Channel fpp-flagged
-Channel fpp-bin
+Channel fpp/inbox
+Channel fpp/archive
+Channel fpp/drafts
+Channel fpp/sent
+Channel fpp/spam
+Channel fpp/flagged
+Channel fpp/bin