2 files changed, 20 insertions, 43 deletions
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index b9bbbd0..3ddc06e 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -1,37 +1,3 @@
-IMAPAccount home
-Host imap.gmail.com
-UserCmd "pass mbsync/home-gmail-email"
-PassCmd "pass mbsync/home-gmail"
-SSLType IMAPS
-AuthMechs LOGIN
-
-IMAPStore home-remote
-Account home
-
-MaildirStore home-local
-Subfolders Verbatim
-# The trailing "/" is important
-Path ~/Mail/gmail-home/
-Inbox ~/Mail/gmail-home/Inbox
-
-Channel home-inbox
-Far :home-remote:
-Near :home-local:
-Patterns "INBOX"
-
-Channel home-sent
-Far :home-remote:"[Gmail]/Sent Mail"
-Near :home-local:sent
-
-Channel home-trash
-Far :home-remote:"[Gmail]/Trash"
-Near :home-local:trash
-
-Group home
-Channel home-inbox
-Channel home-sent
-Channel home-trash
-
 # Gmail mailboxes:
 # "All Mail"
 # "Drafts"
@@ -58,19 +24,30 @@ Path ~/Mail/gmail-devel/
 Inbox ~/Mail/gmail-devel/Inbox
 
 Channel devel-inbox
-Far :devel-remote:
-Near :devel-local:
-Patterns "INBOX"
+Far :devel-remote:INBOX
+Near :devel-local:Inbox
+Create Both
+Expunge Both
+Sync All
+CopyArrivalDate yes
 
 Channel devel-sent
 Far :devel-remote:"[Gmail]/Sent Mail"
 Near :devel-local:sent
+Create Both
+Expunge Both
+Sync All
+CopyArrivalDate yes
 
 Channel devel-trash
 Far :devel-remote:"[Gmail]/Trash"
 Near :devel-local:trash
+Create Both
+Expunge Both
+Sync All
+CopyArrivalDate yes
 
 Group devel
 Channel devel-inbox
 Channel devel-sent
-Channel devel-trash
-\ No newline at end of file
+Channel devel-trash
diff --git a/msmtp/.config/msmtp/config b/msmtp/.config/msmtp/config
index 0ab1060..2a68abe 100644
--- a/msmtp/.config/msmtp/config
+++ b/msmtp/.config/msmtp/config
@@ -6,12 +6,12 @@ tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile        ~/.msmtp.log
 
 # account_name
-account gmail-home
+account devel-gmail
 host smtp.gmail.com
 port 465
 tls_starttls off
-eval echo from $(pass mbsync/home-gmail-username)
-eval echo user $(pass mbsync/home-gmail-email)
-passwordeval "pass mbsync/home-gmail"
+eval echo from $(pass mbsync/devel-gmail-email)
+eval echo user $(pass mbsync/devel-gmail-email)
+passwordeval "pass mbsync/devel-gmail"
 
-account default : gmail-home
+account default : devel-gmail