X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/c605a147f08bc3d660bca9da5cd4884173554a5f..refs/heads/lazyvim:/mbsync/config

diff --git a/mbsync/config b/mbsync/config
index bd74cf6..6f705ab 100644
--- a/mbsync/config
+++ b/mbsync/config
@@ -22,52 +22,50 @@ Inbox        ~/mail/mailfence/inbox
 SubFolders   Verbatim
 
 Channel mailfence/inbox
-Master  :mailfence-remote:
-Slave   :mailfence-local:
+Far  :mailfence-remote:
+Near :mailfence-local:
 Patterns INBOX
 
 Channel mailfence/drafts
-Master  :mailfence-remote:"Drafts"
-Slave   :mailfence-local:"drafts"
+Far  :mailfence-remote:"Drafts"
+Near :mailfence-local:"drafts"
 
 Channel mailfence/sent
-Master  :mailfence-remote:"Sent Items"
-Slave   :mailfence-local:"sent"
+Far  :mailfence-remote:"Sent Items"
+Near :mailfence-local:"sent"
 
 Channel mailfence/spam
-Master  :mailfence-remote:"Spam?"
-Slave   :mailfence-local:"spam"
+Far  :mailfence-remote:"Spam?"
+Near :mailfence-local:"spam"
 
 Channel mailfence/bin
-Master  :mailfence-remote:"Trash"
-Slave   :mailfence-local:"trash"
+Far  :mailfence-remote:"Trash"
+Near :mailfence-local:"trash"
 
-Channel mailfence/youtube
-Master  :mailfence-remote:
-Slave   :mailfence-local:
-Patterns youtube*
+Channel mailfence/important
+Far  :mailfence-remote:important
+Near :mailfence-local:important
 
 Channel mailfence/archive
-Master  :mailfence-remote:
-Slave   :mailfence-local:
+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/youtube
 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
+PassCmd         "~/.config/mutt/mutt_oauth2.py ~/.cache/mutt_oauth2/samir@fppnt.com.tokens"
+AuthMechs       XOAUTH2
 SSLType         IMAPS
-SSLVersion      SSLv3
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore fpp-remote
@@ -78,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]/Trash"
-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