From 5a70175728af9693730e721fa2fb02f9cc4ef064 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Thu, 16 Apr 2015 19:38:12 +0100
Subject: Tmux

---
 make | 1 +
 1 file changed, 1 insertion(+)

(limited to 'make')

diff --git a/make b/make
index 0e1cfb7..1e2a73b 100755
--- a/make
+++ b/make
@@ -44,4 +44,5 @@ mkdir temp
 cd 
 rm -rf .tmux
 git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+
 tmux source-file ~/.tmux.conf
-- 
cgit v1.2.3


From e5b50746586ef6204d7cb237d7889972b47863e1 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sun, 19 Apr 2015 19:23:25 +0100
Subject: added encryption to offlineimap passwords

---
 make           |  2 +-
 offlineimap.py | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 offlineimap.py

(limited to 'make')

diff --git a/make b/make
index 1e2a73b..c1a9bbe 100755
--- a/make
+++ b/make
@@ -4,7 +4,7 @@ dir=~/dotfiles
 olddir=~/dotfiles_old
 
 # Files to sync
-files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc inputrc latexmkrc crontab gitconfig"
+files="vim mutt passwords vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig"
 
 rm -rf $olddir
 mkdir -p $olddir
diff --git a/offlineimap.py b/offlineimap.py
new file mode 100644
index 0000000..c63b82d
--- /dev/null
+++ b/offlineimap.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+import os
+import subprocess
+def mailpasswd(acct):
+    acct = os.path.basename(acct)
+    path = "/home/urbain/.passwords/%s.asc" % acct
+    args = ["gpg", "--use-agent", "--quiet", "--batch", "-d", path]
+    try:
+        return subprocess.check_output(args).strip()
+    except subprocess.CalledProcessError:
+        return ""
-- 
cgit v1.2.3


From 2d38e5a553b7a1c8e20597b0c2351f8b2f36ec41 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sun, 19 Apr 2015 19:59:11 +0100
Subject: Replaced ssmtp by msmtp

---
 make        |  3 ++-
 msmtprc     | 22 ++++++++++++++++++++++
 mutt/muttrc |  3 +--
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 msmtprc

(limited to 'make')

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
 
-- 
cgit v1.2.3