From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Fri, 6 May 2016 11:45:24 +0000 (+0100)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=c801d445d62d85d841ca22e0af546ef9f0821228;hp=04049574d9402109c0661093d2f90ee1b15104f5;p=max%2Fdotfiles.git

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

Conflicts:
	mutt/.mutt/muttrc
---

diff --git a/mutt/.mutt/account.uk.co.musoft.max b/mutt/.mutt/account.uk.co.musoft.max
new file mode 100644
index 0000000..20cf33e
--- /dev/null
+++ b/mutt/.mutt/account.uk.co.musoft.max
@@ -0,0 +1,14 @@
+set imap_user = "max@musoft.co.uk"
+set imap_pass = $my_musoft_password
+set smtp_url = "smtp://max@musoft.co.uk@smtp.gmail.com:587/"
+set smtp_pass = $my_musoft_password 
+set from = "max@musoft.co.uk"
+set realname = "Maximilian Friedersdorff"
+set folder = "imaps://imap.gmail.com:993"
+set spoolfile = "+INBOX"
+set postponed ="+[Gmail]/Drafts"
+set header_cache = ~/.mutt/uk.co.musoft.max/cache/headers
+set message_cachedir = ~/.mutt/uk.co.musoft.max/cache/bodies
+set certificate_file = ~/.mutt/uk.co.musoft.max/certificates
+
+set trash = ""
diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index 4dee74f..e19dc76 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -1,12 +1,15 @@
 # Macro keys for different mailboxes
 macro index <f2> '<sync-mailbox><change-folder>imaps://mail.friedersdorff.com<enter>'
 macro index <f3> '<sync-mailbox><change-folder>imaps://outlook.office365.com<enter>'
-macro index <f4> '<sync-mailbox><change-folder>imaps://imap.gmail.com<enter>'
+macro index <f4> '<sync-mailbox><change-folder>imaps://maxf130@imap.gmail.com<enter>'
+macro index <f5> '<sync-mailbox><change-folder>imaps://max@musoft.co.uk@imap.gmail.com<enter>'
+
 
 # Configuration files for different mailboxes
 folder-hook 'friedersdorff.com' 'source ~/.mutt/account.com.friedersdorff.max'
 folder-hook 'office365.com' 'source ~/.mutt/account.uk.ac.le.student.mf195'
-folder-hook 'gmail.com' 'source ~/.mutt/account.com.gmail.maxf130'
+folder-hook 'maxf130@imap.gmail.com' 'source ~/.mutt/account.com.gmail.maxf130'
+folder-hook 'max@musoft.co.uk@imap.gmail.com' 'source ~/.mutt/account.uk.co.musoft.max'
 
 macro index 'c' '<change-folder>?<change-dir><home>^K+<enter>'
 
diff --git a/mutt/.mutt/passwords.gpg b/mutt/.mutt/passwords.gpg
index 1ed4e2b..6d48e69 100644
Binary files a/mutt/.mutt/passwords.gpg and b/mutt/.mutt/passwords.gpg differ