Merge branch 'master' of github.com:maxf130/dotfiles

diff --combined offline_mail/.mbsync/personal.mbsync
index 9174faeb5cb08861cc641f504bb69dcabe1f81cd,0615b5e7aaed0db2831e28912a264b2da945e4ee..3617cd60f3213c1641c6cfdc23c2d776b7bca574
--- 1/offline_mail/.mbsync/personal.mbsync
--- 2/offline_mail/.mbsync/personal.mbsync
+++ b/offline_mail/.mbsync/personal.mbsync
@@@ -2,7 -2,7 +2,7 @@@ IMAPAccount persona
  Host mail.friedersdorff.com
  User max
  PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mail_pass/personal.gpg"
- UseIMAPS yes
+ SSLType STARTTLS
  CertificateFile /etc/ssl/certs/ca-certificates.crt
  
  IMAPStore personal-remote
@@@ -15,6 -15,6 +15,6 @@@ Inbox ~/mail/personal/Inbo
  Channel personal
  Master :personal-remote:
  Slave :personal-local:
 -Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "Sec-Announce" "Support-blfs" "Dev-blfs"
 +Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "slackware"
  Create Both
  SyncState *