From 836d8e51603a7420086d65c79c746e4cdaee0291 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 21 Dec 2018 12:15:15 +0100
Subject: mbsync: Improve gmail folder layout

---
 emacs/.emacs.d/main.el | 16 ++++++++--------
 isync/.mbsyncrc        | 11 +++++------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 9421e855..6313a5d9 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -1224,15 +1224,15 @@ With two prefix arguments, write out the day and month name."
                                     (mu4e-message-contact-field-matches
                                      msg :to "alan@satoshipay.io")))
                     :vars `((user-mail-address . "alan@satoshipay.io")
-                            (mu4e-sent-messages-behavior . sent)
-                            (mu4e-drafts-folder . "/satoshipay/[Gmail]/Drafts")
-                            (mu4e-sent-folder .   "/satoshipay/[Gmail]/Sent Mail")
-                            (mu4e-refile-folder . "/satoshipay/[Gmail]/All Mail")
-                            (mu4e-trash-folder .  "/satoshipay/[Gmail]/Bin")
+                            (mu4e-sent-messages-behavior . 'delete)
+                            (mu4e-drafts-folder . "/satoshipay/Drafts")
+                            (mu4e-sent-folder .   "/satoshipay/Sent Mail")
+                            (mu4e-refile-folder . "/satoshipay/All Mail")
+                            (mu4e-trash-folder .  "/satoshipay/Bin")
                             (mu4e-maildir-shortcuts . (("/satoshipay/INBOX" . ?i)
-                                                       ("/satoshipay/[Gmail]/All Mail" . ?a)
-                                                       ("/satoshipay/[Gmail]/Sent Mail" . ?s)
-                                                       ("/satoshipay/[Gmail]/Spam" . ?p)))))))
+                                                       ("/satoshipay/All Mail" . ?a)
+                                                       ("/satoshipay/Sent Mail" . ?s)
+                                                       ("/satoshipay/Spam" . ?p)))))))
             (define-hook-helper mu4e-view-mode ()
               ;; try to emulate some of the eww key-bindings
               (local-set-key (kbd "<tab>") 'shr-next-link)
diff --git a/isync/.mbsyncrc b/isync/.mbsyncrc
index 09286ba6..8991b154 100644
--- a/isync/.mbsyncrc
+++ b/isync/.mbsyncrc
@@ -3,6 +3,7 @@ Create Both
 Remove Both
 Expunge Both
 CopyArrivalDate yes
+FSync no
 
 ## Satoshipay
 # Account
@@ -27,12 +28,10 @@ SubFolders Verbatim
 Channel satoshipay
 Master :satoshipay.io-remote:
 Slave :satoshipay.io-local:
-Patterns * "[Gmail]*"
+Patterns INBOX
 SyncState *
 
-Channel satoshipay-rubbish
-Master :satoshipay.io-remote:
+Channel satoshipay-gmail
+Master :satoshipay.io-remote:[Gmail]/
 Slave :satoshipay.io-local:
-Patterns "[Gmail]/Bin"
-Create Both
-Expunge Both
\ No newline at end of file
+Patterns * !INBOX
\ No newline at end of file
-- 
cgit 1.4.1