From c045ec549757ff125addb80e9225c71ddfa8a25b Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 19 May 2020 22:50:48 +1200
Subject: Add autocrypt settings to main muttrc

---
 Makefile    | 3 ++-
 mutt/muttrc | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 248f7ac8..fb861593 100644
--- a/Makefile
+++ b/Makefile
@@ -496,7 +496,8 @@ install-mpv:
 install-mutt: install-gnupg install-mail
 	mkdir -p -- $(XDG_CONFIG_HOME)/mutt \
 		$(XDG_CONFIG_HOME)/mutt/muttrc.d \
-		$(XDG_CACHE_HOME)/mutt
+		$(XDG_CACHE_HOME)/mutt \
+		$(XDG_DATA_HOME)/mutt/autocrypt
 	cp -p -- mutt/muttrc $(XDG_CONFIG_HOME)/mutt
 	cp -p -- mutt/muttrc.d/src $(XDG_CONFIG_HOME)/mutt/muttrc.d
 
diff --git a/mutt/muttrc b/mutt/muttrc
index 74afc4db..56224102 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -153,6 +153,12 @@ send2-hook '~G !~g' 'push <pgp-menu>s'
 #
 send-hook '!~G !~g' 'push <pgp-menu><enter>'
 
+# Failing all of the above, maybe autocrypt will passively give us a key to
+# use, but don't store its keys in our primary keyring.
+#
+set autocrypt
+set autocrypt_dir = ~/.local/share/mutt/autocrypt
+
 # Save message to whatever box Mutt guesses, without confirmation
 macro index,pager S \
 	'<save-message><enter>' \
-- 
cgit v1.2.3