From 045fa59b80c23147ea12812fafb4be6b5df22a60 Mon Sep 17 00:00:00 2001
From: Jeremy Dormitzer <jeremydormitzer@lola.com>
Date: Tue, 21 Apr 2020 14:01:36 -0400
Subject: [PATCH] mbsync: extract common params and fix inbox sync

---
 mbsync/.mbsyncrc | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 5053bbf..7cf41fc 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -1,3 +1,7 @@
+Create Both
+Expunge Both
+SyncState *
+
 IMAPAccount jeremy-dormitzer-gmail-com
 Host imap.gmail.com
 User jeremy.dormitzer@gmail.com
@@ -15,39 +19,34 @@ Path ~/.mail/jeremy-dormitzer-gmail-com/
 Inbox ~/.mail/jeremy-dormitzer-gmail-com/Inbox
 SubFolders Verbatim
 
+Channel jeremy-dormitzer-gmail-com-inbox
+Master :jeremy-dormitzer-gmail-com-remote:INBOX
+Slave :jeremy-dormitzer-gmail-com-local:Inbox
+
 Channel jeremy-dormitzer-gmail-com-all
 Master :jeremy-dormitzer-gmail-com-remote:
 Slave :jeremy-dormitzer-gmail-com-local:
-Patterns * ![Gmail]* !"[Google Mail]*" !Archive !Trash !Sent !Drafts
-Create Both
-SyncState *
+Patterns * ![Gmail]* !"[Google Mail]*" !INBOX !Inbox !Archive !Trash !Sent !Drafts
 
 Channel jeremy-dormitzer-gmail-com-trash
 Master :jeremy-dormitzer-gmail-com-remote:"[Gmail]/Trash"
 Slave :jeremy-dormitzer-gmail-com-local:"Trash"
-Create Both
-SyncState *
 
 Channel jeremy-dormitzer-gmail-com-sent
 Master :jeremy-dormitzer-gmail-com-remote:"[Gmail]/Sent Mail"
 Slave :jeremy-dormitzer-gmail-com-local:"Sent"
-Create Both
-SyncState *
 
 Channel jeremy-dormitzer-gmail-com-drafts
 Master :jeremy-dormitzer-gmail-com-remote:"[Gmail]/Drafts"
 Slave :jeremy-dormitzer-gmail-com-local:"Drafts"
-Create Both
-SyncState *
 
 Channel jeremy-dormitzer-gmail-com-archive
 Master :jeremy-dormitzer-gmail-com-remote:"[Gmail]/All Mail"
 Slave :jeremy-dormitzer-gmail-com-local:"Archive"
-Create Both
-SyncState *
 
 Group jeremy-dormitzer-gmail-com
 Channel jeremy-dormitzer-gmail-com-trash
+Channel jeremy-dormitzer-gmail-com-inbox
 Channel jeremy-dormitzer-gmail-com-all
 Channel jeremy-dormitzer-gmail-com-drafts
 Channel jeremy-dormitzer-gmail-com-sent
@@ -70,39 +69,34 @@ Path ~/.mail/jeremydormitzer-lola-com/
 Inbox ~/.mail/jeremydormitzer-lola-com/Inbox
 SubFolders Verbatim
 
+Channel jeremydormitzer-lola-com-inbox
+Master :jeremydormitzer-lola-com-remote:INBOX
+Slave :jeremydormitzer-lola-com-local:Inbox
+
 Channel jeremydormitzer-lola-com-all
 Master :jeremydormitzer-lola-com-remote:
 Slave :jeremydormitzer-lola-com-local:
-Patterns * ![Gmail]* !"[Google Mail]*" !Archive !Trash !Sent !Drafts
-Create Both
-SyncState *
+Patterns * ![Gmail]* !"[Google Mail]*" !INBOX !Inbox !Archive !Trash !Sent !Drafts
 
 Channel jeremydormitzer-lola-com-trash
 Master :jeremydormitzer-lola-com-remote:"[Gmail]/Trash"
 Slave :jeremydormitzer-lola-com-local:"Trash"
-Create Both
-SyncState *
 
 Channel jeremydormitzer-lola-com-sent
 Master :jeremydormitzer-lola-com-remote:"[Gmail]/Sent Mail"
 Slave :jeremydormitzer-lola-com-local:"Sent"
-Create Both
-SyncState *
 
 Channel jeremydormitzer-lola-com-drafts
 Master :jeremydormitzer-lola-com-remote:"[Gmail]/Drafts"
 Slave :jeremydormitzer-lola-com-local:"Drafts"
-Create Both
-SyncState *
 
 Channel jeremydormitzer-lola-com-archive
 Master :jeremydormitzer-lola-com-remote:"[Gmail]/All Mail"
 Slave :jeremydormitzer-lola-com-local:"Archive"
-Create Both
-SyncState *
 
 Group jeremydormitzer-lola-com
 Channel jeremydormitzer-lola-com-trash
+Channel jeremydormitzer-lola-com-inbox
 Channel jeremydormitzer-lola-com-all
 Channel jeremydormitzer-lola-com-drafts
 Channel jeremydormitzer-lola-com-sent