Replaced ssmtp by msmtp

3 files changed, 25 insertions, 3 deletions

diff --git a/make b/make
index c1a9bbe..b00ac4b 100755
--- a/make
+++ b/make
@@ -4,12 +4,13 @@ dir=~/dotfiles
 olddir=~/dotfiles_old
 
 # Files to sync
-files="vim mutt passwords vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig"
+files="vim mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig"
 
 rm -rf $olddir
 mkdir -p $olddir
 
 cd $dir
+chmod 600 msmtprc
 for file in $files; do
     echo $file
     mv ~/.$file $olddir
diff --git a/msmtprc b/msmtprc
new file mode 100644
index 0000000..99e0e3e
--- /dev/null
+++ b/msmtprc
@@ -0,0 +1,22 @@
+defaults
+auth           on
+tls            on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+logfile        ~/.msmtp.log
+
+account        gmail
+host           smtp.gmail.com
+port           587
+from           urbain.p.vaes@gmail.com
+user           urbain.p.vaes
+passwordeval   "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.passwords/main.asc"
+
+account        imperial
+host           smtp.cc.ic.ac.uk
+from           u.vaes13@imperial.ac.uk
+user           uv113
+passwordeval   "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.passwords/imperial.asc"
+port           587
+
+# Set a default account
+account default : imperial
diff --git a/mutt/muttrc b/mutt/muttrc
index 71d5d84..32f033e 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -5,7 +5,6 @@ set use_from         = yes
 set envelope_from    = "yes"
 
 # Folders
-set folder = "~/.mail"
 set folder           = ~/.mail
 set alias_file       = ~/.mutt/alias
 set header_cache     = ~/.mutt/cache/headers
@@ -68,7 +67,7 @@ set edit_headers
 set include=yes
 
 # Mail out
-set sendmail="/usr/sbin/ssmtp"
+set sendmail="/usr/bin/msmtp"
 
 set beep_new