diff --git a/emacs/.emacs.d/config/init-email.el b/emacs/.emacs.d/config/init-email.el index 9162a3c..e7a9315 100644 --- a/emacs/.emacs.d/config/init-email.el +++ b/emacs/.emacs.d/config/init-email.el @@ -26,7 +26,7 @@ ("View in browser" . mu4e-action-view-in-browser)) ;; Bookmarked searches mu4e-bookmarks '((:name "Inbox" - :query "maildir:/jeremy-dormitzer-gmail-com/Inbox OR maildir:/jeremydormitzer-lola-com/Inbox" + :query "maildir:/jeremy-dormitzer-gmail-com/Inbox" :key ?i) (:name "Unread messages" :query "flag:unread AND NOT flag:trashed" @@ -46,7 +46,7 @@ ;; Let Gmail handle putting sent messages in the sent folder mu4e-sent-messages-behavior 'delete ;; Move to trash folder instead of adding trash flag for Gmail mailboxes - mu4e-move-to-trash-patterns '("jeremy-dormitzer-gmail-com" "jeremydormitzer-lola-com") + mu4e-move-to-trash-patterns '("jeremy-dormitzer-gmail-com") ;; HTML email rendering shr-use-colors nil ;; Make sure mu4e knows about my different accounts @@ -54,25 +54,6 @@ mu4e-compose-context-policy 'ask mu4e-contexts `(,(make-mu4e-context - :name "Lola Gmail" - :match-func (lambda (msg) - (when msg - (or - (mu4e-message-contact-field-matches msg - :to - "lola.com") - (string-match-p - "jeremydormitzer-lola-com" - (mu4e-message-field msg :path))))) - :vars '((user-mail-address . "jeremydormitzer@lola.com") - (message-signature-insert-empty-line . t) - (mu4e-sent-folder . "/jeremydormitzer-lola-com/Sent") - (mu4e-drafts-folder . "/jeremydormitzer-lola-com/Drafts") - (mu4e-refile-folder . "/jeremydormitzer-lola-com/Archive") - (mu4e-trash-folder . "/jeremydormitzer-lola-com/Trash") - (message-sendmail-extra-arguments - . ("-a" "jeremydormitzer-lola-com")))) - ,(make-mu4e-context :name "Personal Gmail" :match-func (lambda (msg) (when msg diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc index d7aa212..05de681 100644 --- a/mbsync/.mbsyncrc +++ b/mbsync/.mbsyncrc @@ -51,54 +51,4 @@ Channel jeremy-dormitzer-gmail-com-inbox Channel jeremy-dormitzer-gmail-com-all Channel jeremy-dormitzer-gmail-com-drafts Channel jeremy-dormitzer-gmail-com-sent -Channel jeremy-dormitzer-gmail-com-archive - -IMAPAccount jeremydormitzer-lola-com -Host imap.gmail.com -User jeremydormitzer@lola.com -PassCmd "pass show lola-gmail | head -n 1" -SSLType IMAPS -CertificateFile ~/cert.pem -AuthMechs LOGIN -PipelineDepth 50 - -IMAPStore jeremydormitzer-lola-com-remote -Account jeremydormitzer-lola-com - -MaildirStore jeremydormitzer-lola-com-local -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]*" !INBOX !Inbox !Archive !Trash !Sent !Drafts - -Channel jeremydormitzer-lola-com-trash -Master :jeremydormitzer-lola-com-remote:"[Gmail]/Trash" -Slave :jeremydormitzer-lola-com-local:"Trash" - -Channel jeremydormitzer-lola-com-sent -Master :jeremydormitzer-lola-com-remote:"[Gmail]/Sent Mail" -Slave :jeremydormitzer-lola-com-local:"Sent" - -Channel jeremydormitzer-lola-com-drafts -Master :jeremydormitzer-lola-com-remote:"[Gmail]/Drafts" -Slave :jeremydormitzer-lola-com-local:"Drafts" - -Channel jeremydormitzer-lola-com-archive -Master :jeremydormitzer-lola-com-remote:"[Gmail]/All Mail" -Slave :jeremydormitzer-lola-com-local:"Archive" - -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 -Channel jeremydormitzer-lola-com-archive +Channel jeremy-dormitzer-gmail-com-archive \ No newline at end of file