From 6d9c789ae8458589a27e5ae1e39bb3dc25cdaa16 Mon Sep 17 00:00:00 2001
From: Frederik Vanrenterghem <frederik@vanrenterghem.biz>
Date: Wed, 11 Sep 2019 20:24:35 +0800
Subject: [PATCH 1/1] Add to mutt configuration.

Include GPG options and have mutt determine sender instead of msmtp.
---
 gnupg/.gnupg/gpg.conf         |  1 +
 msmtp/.config/msmtp/config    |  2 --
 mutt/.config/mutt/mutt.gpg.rc |  7 +++++++
 mutt/.config/mutt/muttrc      | 16 +++++++++++++++-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 gnupg/.gnupg/gpg.conf
 create mode 100644 mutt/.config/mutt/mutt.gpg.rc

diff --git a/gnupg/.gnupg/gpg.conf b/gnupg/.gnupg/gpg.conf
new file mode 100644
index 0000000..344bedc
--- /dev/null
+++ b/gnupg/.gnupg/gpg.conf
@@ -0,0 +1 @@
+default-key EA89DD8B41D4C9EDE02437E128A8415654E86F1F
diff --git a/msmtp/.config/msmtp/config b/msmtp/.config/msmtp/config
index 66128d6..7e9b502 100644
--- a/msmtp/.config/msmtp/config
+++ b/msmtp/.config/msmtp/config
@@ -4,7 +4,6 @@ tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
 account biz
 host smtp.gmail.com
-from frederik@vanrenterghem.biz
 tls on
 tls_starttls on
 tls_certcheck off
@@ -14,7 +13,6 @@ passwordeval gpg --no-tty -q -d ~/Documents/paswoorden/frederik@vanrenterghem.bi
 
 account io
 host mail.vanrenterghem.io
-from frederik@vanrenterghem.io
 tls on
 tls_starttls on
 tls_certcheck off
diff --git a/mutt/.config/mutt/mutt.gpg.rc b/mutt/.config/mutt/mutt.gpg.rc
new file mode 100644
index 0000000..6ce1fcc
--- /dev/null
+++ b/mutt/.config/mutt/mutt.gpg.rc
@@ -0,0 +1,7 @@
+set pgp_default_key = "BAD1125C62E5E2A9"
+set crypt_use_gpgme = yes
+set crypt_autosign = no
+set crypt_verify_sig = yes
+set crypt_replysign = yes
+set crypt_replyencrypt = yes
+set crypt_replysignencrypted = yes
diff --git a/mutt/.config/mutt/muttrc b/mutt/.config/mutt/muttrc
index 87a341b..b13350e 100644
--- a/mutt/.config/mutt/muttrc
+++ b/mutt/.config/mutt/muttrc
@@ -4,13 +4,27 @@ set editor = vim
 
 # Configure neomutt sidebar
 set sidebar_visible = yes
-mailboxes = +biz/Inbox = +io/Inbox
+set sidebar_short_path = yes
+set sidebar_format = "%B %?N?(%N)?%* %S"
+
+mailboxes = "--biz------------"
+mailboxes = +biz/Inbox
+mailboxes = +biz/sent
+mailboxes = "--io-------------"
+mailboxes = +io/Inbox = +io/sent = +io/archive = +io/junk
+
 bind index,pager \Cp sidebar-prev       # Ctrl-p - Previous Mailbox
 bind index,pager \Cn sidebar-next       # Ctrl-n - Next Mailbox
 bind index,pager \Co sidebar-open       # Ctrl-o - Open Highlighted Mailbox
 
+# Compose options
+set envelope_from                    # allow setting who the sender is
+set edit_headers                     # show headers when composing
+
 # Set default account
 source ~/.config/mutt/mutt.account.biz
 
 folder-hook io/* source ~/.config/mutt/mutt.account.io
 folder-hook biz/* source ~/.config/mutt/mutt.account.biz
+
+source ~/.config/mutt/mutt.gpg.rc
-- 
2.39.5