3 files changed, 24 insertions, 55 deletions
diff --git a/host-overrides/jesterpm.net/host-specific/bashrc b/host-overrides/jesterpm.net/host-specific/bashrc
index 295e969..4d8c58b 100644
--- a/host-overrides/jesterpm.net/host-specific/bashrc
+++ b/host-overrides/jesterpm.net/host-specific/bashrc
@@ -6,5 +6,8 @@
 export MAILUSER="jesse"
 export MAILNAME="Jesse Morgan"
 export MAILHOST="jesterpm.net"
-export MAIL=$HOME/.maildir/INBOX
+export MAIL=$HOME/.maildir/
 export MAILDIR=$MAIL
+
+
+export AWS_ACCOUNT_ID=206578203396
diff --git a/host-overrides/jesterpm.net/host-specific/muttrc b/host-overrides/jesterpm.net/host-specific/muttrc
index 637ce85..f75c451 100644
--- a/host-overrides/jesterpm.net/host-specific/muttrc
+++ b/host-overrides/jesterpm.net/host-specific/muttrc
@@ -5,7 +5,8 @@ set sendmail="msmtp"
 set use_from=yes
 set envelope_from=yes
 
-set postponed="+drafts"
-set record="+sent"
+set trash="=trash"
+set postponed="=drafts"
+set record="=sent"
 
-mailboxes =INBOX =archive =spam =trash =sent
+mailboxes =archive =spam =trash =sent
diff --git a/host-overrides/jesterpm.net/mbsyncrc b/host-overrides/jesterpm.net/mbsyncrc
index 6c72578..3335918 100644
--- a/host-overrides/jesterpm.net/mbsyncrc
+++ b/host-overrides/jesterpm.net/mbsyncrc
@@ -1,58 +1,23 @@
-IMAPAccount gmail
-Host imap.gmail.com
-User jesterpm@gmail.com
-PassCmd "imap-pass -g jesterpm@gmail.com"
-SSLType IMAPS
-CertificateFile ~/.cert/imap.gmail.com.pem
-
-IMAPStore gmail-remote
-Account gmail
-
-MaildirStore gmail-local
+MaildirStore local
 Path ~/.maildir/
-Inbox ~/.maildir/INBOX
+Inbox ~/.maildir/
+SubFolders Verbatim
 
-Channel sync-gmail-default
-Master :gmail-remote:
-Slave :gmail-local:
-Patterns "INBOX"
-Expunge Both
-Create Slave
-
-Channel sync-gmail-sent
-Master :gmail-remote:"[Gmail]/Sent Mail"
-Slave :gmail-local:sent
-Expunge Both
-Create Slave
+IMAPAccount cobalt
+Host cobalt.jesterpm.net
+User jesterpm
+PassCmd "imap-pass -g jesterpm@cobalt.jesterpm.net"
+SSLType IMAPS
 
-Channel sync-gmail-trash
-Master :gmail-remote:"[Gmail]/Bin"
-Slave :gmail-local:trash
-Expunge Both
-Create Slave
+IMAPStore cobalt
+Account cobalt
 
-Channel sync-gmail-drafts
-Master :gmail-remote:"[Gmail]/Drafts"
-Slave :gmail-local:drafts
-Expunge Both
-Create Slave
-
-Channel sync-gmail-archive
-Master :gmail-remote:"[Gmail]/All Mail"
-Slave :gmail-local:archive
-Expunge Both
-Create Slave
 
-Channel sync-gmail-spam
-Master :gmail-remote:"[Gmail]/Spam"
-Slave :gmail-local:spam
+Channel sync-cobalt-local
+Master :cobalt:
+Slave :local:
+Pattern *
+Create Both
+Remove Both
 Expunge Both
-Create Slave
 
-Group gmail
-Channel sync-gmail-default
-Channel sync-gmail-sent
-Channel sync-gmail-trash
-Channel sync-gmail-drafts
-Channel sync-gmail-archive
-Channel sync-gmail-spam