From ef816c5c7ea7ae36effc6ead8c1bbe62249c9f18 Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Mon, 13 Feb 2023 19:31:13 -0500
Subject: offline mail cache fix and other tweaks

---
 share/mpop-temp          | 2 ++
 share/mutt-temp          | 6 ++----
 share/mutt-wizard.muttrc | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'share')

diff --git a/share/mpop-temp b/share/mpop-temp
index 9489a12..cc51d75 100644
--- a/share/mpop-temp
+++ b/share/mpop-temp
@@ -2,5 +2,7 @@ account $fulladdr
 tls on
 user $login
 host $imap
+port $iport
+timeout 10
 delivery maildir $maildir/$fulladdr/INBOX
 passwordeval pass $passprefix$fulladdr
diff --git a/share/mutt-temp b/share/mutt-temp
index 89bbc8f..81148a1 100644
--- a/share/mutt-temp
+++ b/share/mutt-temp
@@ -5,8 +5,8 @@ set from = "$fulladdr"
 set sendmail = "msmtp -a $fulladdr"
 alias me $realname <$fulladdr>
 set folder = "$folder"
-set header_cache = $cachedir/$fulladdr/headers
-set message_cachedir = $cachedir/$fulladdr/bodies
+set header_cache = "$cachedir/$safename/headers"
+set message_cachedir = "$cachedir/$safename/bodies"
 set mbox_type = Maildir
 set hostname = "$hostname"
 source $muttshare/switch.muttrc
@@ -16,5 +16,3 @@ set trash = "+Trash"
 set record = "+Sent"
 $extra
 macro index o "<shell-escape>mailsync $fulladdr<enter>" "sync $fulladdr"
-macro index \eg "<enter-command>unset wait_key<enter><shell-escape>gpg --list-secret-keys; printf 'Enter email ID of user to publish: '; read eID; printf 'Enter fingerprint of GPG key to publish: '; read eFGPT; $prefix/libexec/gpg-wks-client --create \\\$eFGPT \\\$eID | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>"  "publish GPG key to WKS provider"
-macro index \eh "<pipe-message>$prefix/libexec/gpg-wks-client --receive | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>" "confirm GPG publication"
diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc
index 9d9d12a..541f6c1 100644
--- a/share/mutt-wizard.muttrc
+++ b/share/mutt-wizard.muttrc
@@ -95,6 +95,8 @@ macro index,pager Ca ";<copy-message>=Archive<enter>" "copy mail to archive"
 #set crypt_opportunistic_encrypt = yes
 #set pgp_self_encrypt = yes
 #set pgp_default_key  = 'your@gpgemailaddre.ss'
+macro index \eg "<enter-command>unset wait_key<enter><shell-escape>gpg --list-secret-keys; printf 'Enter email ID of user to publish: '; read eID; printf 'Enter fingerprint of GPG key to publish: '; read eFGPT; $prefix/libexec/gpg-wks-client --create \\\$eFGPT \\\$eID | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>"  "publish GPG key to WKS provider"
+macro index \eh "<pipe-message>$prefix/libexec/gpg-wks-client --receive | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>" "confirm GPG publication"
 
 macro index,pager a "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
-- 
cgit v1.2.3