X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/653437cf2b2ba1daa275af7c355c559fd1750bfe..02b33a1260a825fae9f3b8d68229a328b58a28e7:/mbsync/config?ds=sidebyside

diff --git a/mbsync/config b/mbsync/config
index a51b7a6..bd74cf6 100644
--- a/mbsync/config
+++ b/mbsync/config
@@ -10,6 +10,7 @@ User            samirbenmendil
 PassCmd         "sed -En '/imap.mailfence.com.*samirbenmendil/ s/.*password (.*)/\\1/p' ~/.netrc"
 AuthMechs       LOGIN
 SSLType         IMAPS
+SSLVersions     TLSv1.2
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore mailfence-remote
@@ -20,112 +21,45 @@ Path         ~/mail/mailfence/
 Inbox        ~/mail/mailfence/inbox
 SubFolders   Verbatim
 
-Channel mailfence-inbox
+Channel mailfence/inbox
 Master  :mailfence-remote:
 Slave   :mailfence-local:
 Patterns INBOX
 
-Channel mailfence-drafts
+Channel mailfence/drafts
 Master  :mailfence-remote:"Drafts"
 Slave   :mailfence-local:"drafts"
 
-Channel mailfence-sent
+Channel mailfence/sent
 Master  :mailfence-remote:"Sent Items"
 Slave   :mailfence-local:"sent"
 
-Channel mailfence-spam
+Channel mailfence/spam
 Master  :mailfence-remote:"Spam?"
 Slave   :mailfence-local:"spam"
 
-Channel mailfence-bin
+Channel mailfence/bin
 Master  :mailfence-remote:"Trash"
 Slave   :mailfence-local:"trash"
 
-Channel mailfence-archive
+Channel mailfence/youtube
+Master  :mailfence-remote:
+Slave   :mailfence-local:
+Patterns youtube*
+
+Channel mailfence/archive
 Master  :mailfence-remote:
 Slave   :mailfence-local:
 Patterns archive*
 
 Group mailfence
-Channel mailfence-inbox
-Channel mailfence-drafts
-Channel mailfence-sent
-Channel mailfence-spam
-Channel mailfence-bin
-Channel mailfence-archive
-
-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"
-AuthMechs       LOGIN
-SSLType         IMAPS
-SSLVersion      SSLv3
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-
-IMAPStore gmail-remote
-Account gmail
-
-MaildirStore gmail-local
-Path         ~/mail/gmail/
-Inbox        ~/mail/gmail/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-watch.later
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube-watch.later"
-
-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-watch.later
-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
+Channel mailfence/drafts
+Channel mailfence/sent
+Channel mailfence/spam
+Channel mailfence/bin
+Channel mailfence/youtube
+Channel mailfence/archive
 
 IMAPAccount     fpp
 Host            imap.gmail.com
@@ -170,7 +104,7 @@ Master :fpp-remote:"[Gmail]/Starred"
 Slave :fpp-local:"flagged"
 
 Channel fpp-bin
-Master :fpp-remote:"[Gmail]/Bin"
+Master :fpp-remote:"[Gmail]/Trash"
 Slave :fpp-local:"bin"
 
 Group fpp