From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Sat, 30 Jan 2016 16:21:50 +0000 (+0000)
Subject: Use gpg-agent and set trash folders for imap accounts
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=d93b97d10a09e90cbadc08c73faf6b99b2cef245;p=max%2Fdotfiles.git

Use gpg-agent and set trash folders for imap accounts
---

diff --git a/bash_profile b/bash_profile
index 258a01f..5baa828 100644
--- a/bash_profile
+++ b/bash_profile
@@ -9,12 +9,21 @@ MANPATH="$NPM_PACKAGES/share/man:$(manpath)"
 NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
 
 if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
+  # include .bashrc if it exists
+  if [ -f "$HOME/.bashrc" ]; then
+    . "$HOME/.bashrc"
+  fi
 fi
 
 if [ -f /etc/bash_completion ]; then
   . /etc/bash_completion
 fi
+
+envfile="$HOME/.gnupg/gpg-agent.env"
+if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then
+  eval "$(cat "$envfile")"
+else
+  eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")"
+fi
+export GPG_AGENT_INFO  # the env file does not contain the export statement
+export SSH_AUTH_SOCK   # enable gpg-agent for ssh
diff --git a/mutt/account.com.friedersdorff.max b/mutt/account.com.friedersdorff.max
index d67ad5d..fe66709 100644
--- a/mutt/account.com.friedersdorff.max
+++ b/mutt/account.com.friedersdorff.max
@@ -10,3 +10,5 @@ set postponed = "+Drafts"
 set header_cache = ~/.mutt/com.friedersdorff.max/cache/headers
 set message_cachedir = ~/.mutt/com.friedersdorff.max/cache/bodies
 set certificate_file = ~/.mutt/com.friedersdorff.max/certificates
+
+set trash = "+Trash"
diff --git a/mutt/account.com.gmail.maxf130 b/mutt/account.com.gmail.maxf130
index fdff011..14153bc 100644
--- a/mutt/account.com.gmail.maxf130
+++ b/mutt/account.com.gmail.maxf130
@@ -7,6 +7,6 @@ set realname = "Maximilian Friedersdorff"
 set folder = "imaps://imap.gmail.com:993"
 set spoolfile = "+INBOX"
 set postponed = "+[Gmail]/Drafts"
-set header_cache = ~/.mutt/com.gmail.maxf130.account/cache/headers
-set message_cachedir = ~/.mutt/com.gmail.maxf130.account/cache/bodies
-set certificate_file = ~/.mutt/com.gmail.maxf130.account/certificates
+set header_cache = ~/.mutt/com.gmail.maxf130/cache/headers
+set message_cachedir = ~/.mutt/com.gmail.maxf130/cache/bodies
+set certificate_file = ~/.mutt/com.gmail.maxf130/certificates
diff --git a/mutt/account.uk.ac.le.student.mf195 b/mutt/account.uk.ac.le.student.mf195
index 6013b83..32851b7 100644
--- a/mutt/account.uk.ac.le.student.mf195
+++ b/mutt/account.uk.ac.le.student.mf195
@@ -10,3 +10,5 @@ set postponed = "+Drafts"
 set header_cache = ~/.mutt/uk.ac.le.student.mf195/cache/headers
 set message_cachedir = ~/.mutt/uk.ac.le.student.mf195/cache/bodies
 set certificate_file = ~/.mutt/uk.ac.le.student.mf195/certificates
+
+set trash="+Trash"