2025-07

diff --git a/.muttrc b/.muttrc
index cec7047b45c68351764f802a435f65c2475a954f..94b4cc04fe71d40aefcec379a3446f984bb04e93 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -1,5 +1,5 @@
 # used to tell me when I have new mail. a bit redundant since I use procmail so much
-mailboxes ~/Maildir/sgn/INBOX
+mailboxes ~/Maildir/mjollnir/INBOX ~/Maildir/gmail/INBOX ~/Maildir/greens/INBOX
 
 # use maildir format
 set mbox_type="Maildir"
@@ -21,7 +21,7 @@ set index_format="%4C %Z %{%Y-%m-%d %H:%M}   %-15.15L (%?l?%4l&%4c?) %s"
 set print_command="muttprint"
 
 # no idea what this does since I'm using lbdbq now
-set query_command="abook --mutt-query '%s'"
+#set query_command="abook --mutt-query '%s'"
 
 # use mailplate for our editor
 set editor="mailplate --edit --auto --keep-unknown"
@@ -44,29 +44,30 @@ set pgp_create_traditional="no"
 set pgp_timeout=1800
 set pgp_replyencrypt
 set pipe_decode="yes"
-set pgp_sign_as="A30EC22B"
+#set pgp_sign_as="A30EC22B"
+set pgp_sign_as="A110DDD2"
 #set header_cache="~/.mutt/cache"
-send-hook '~t vf@eisti\.fr' 'unset pgp_autosign'
+#send-hook '~t vf@eisti\.fr' 'unset pgp_autosign'
 #set xterm_set_titles=yes
-#  my_hdr X-Request-PGP: http://people.debian.org/~francois/public_key.asc 
+#  my_hdr X-Request-PGP: http://people.debian.org/~francois/public_key.asc
 
 # start tofu
-set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'
-macro generic \e0 ":unset display_filter\n" "Turn TOFU protection off"
-macro generic \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'\n" "Turn TOFU protection on"
+#set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'
+#macro generic \e0 ":unset display_filter\n" "Turn TOFU protection off"
+#macro generic \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'\n" "Turn TOFU protection on"
 
-macro pager \e0 ":unset display_filter; exec exit\n:exec display-message\n" "Turn TOFU protection off"
-macro pager \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'; exec exit\n:exec display-message\n" "Turn TOFU protection on"
+#macro pager \e0 ":unset display_filter; exec exit\n:exec display-message\n" "Turn TOFU protection off"
+#macro pager \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-move-vrf -Mmutt'; exec exit\n:exec display-message\n" "Turn TOFU protection on"
 
 color body      brightmagenta           black   "^\\[---.*"
 color body      green                   black   "^#v[-+]"
 # end tofu
 
 
-alternative_order text/plain text/enriched  text/html
+alternative_order text/html text/enriched text/plain
 auto_view text/html
 auto_view text/x-vcard
-auto_view application/msword
+#auto_view application/msword
 
 set strict_threads
 set move=no
@@ -74,29 +75,21 @@ set use_from
 set reverse_name=yes
 set fcc_attach=yes
 set from="penny@mjollnir.org"
-set record="~/Maildir/sgn/store/"
+set record="~/Maildir/mjollnir/store/"
 
-fcc-hook "~f .*penny@catalyst.net.nz.*"              +catalyst/Sent
-fcc-hook "~f .*penny.leach@liip.ch.*"                +liip/store
-fcc-hook "~f .*penny@liip.ch.*"                      +liip/store
-fcc-hook "~C .*dev@mahara.org.*"                     +sgn/mahara.dev
-fcc-hook "~C .*PORTFOLIO-INTEROPERABILITY-WORK.*"    +sgn/mahara.leap
-fcc-hook "~C .*debian-women@lists.debian.org.*"      +sgn/debian.women
-fcc-hook "~C .*grrls-only@linuxchix.org.*"           +sgn/linuxchix.grrlsonly
-fcc-hook "~C .*nz-linuxchix@lists.catalyst.net.nz.*" +sgn/linuxchix.nz
-fcc-hook "~C .*volunteers@linuxchix.org.*"           +sgn/linuxchix.volunteers
-fcc-hook .*                                          +sgn/store
+fcc-hook "~f .*penny.leach@greens.org.nz.*"          +greens/Sent
+fcc-hook .*                                          +mjollnir/store
 
-alternates "(penny@catalyst\.net\.nz)|(penny@she\.geek\.nz)|(penelope\.leach@gmail\.com)|(penny@mjollnir\.org)|(penny@wadda\.org)|(penny.leach@liip\.ch)|(penny@liip\.ch)"
+alternates "(penny@she\.geek\.nz)|(penelope\.leach@gmail\.com)|(penny@mjollnir\.org)|(penny.leach@greens.org.nz)"
 
 macro compose     e ':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit-headers>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"
 macro index,pager e ':set my_editor="$editor"<enter>:set editor=sensible-editor<enter><edit>:set editor="$my_editor"<enter>' "invoke normal editor to edit message"
 
-macro index \e2 ":set from=\"penny@mjollnir.org\"\n:set record=\"~/Maildir/sgn/store/\"\n" "Switch to penny@mjollnir.org" # Note this CONFLICTS with TOFU keybinding
-macro index \e3 ":set from=\"penny@liip.ch\"\n:set record=\"~/Maildir/liip/store/\"\n" "Switch to penny.leach@liip.ch"
+macro index \e2 ":set from=\"penny@mjollnir.org\"\n:set record=\"~/Maildir/mjollnir/store/\"\n" "Switch to penny@mjollnir.org" # Note this CONFLICTS with TOFU keybinding
+macro index \e3 ":set from=\"penny.leach@greens.org.nz\"\n:set record=\"~/Maildir/greens/store/\"\n" "Switch to penny.leach@greens.org.nz"
 
 #macro index,pager A "<pipe-message>abook --add-email-quiet<return>" "add the sender address to abook"
-macro index,pager A "<pipe-message>goobook add<return>" "add the sender address to Google contacts"
+#macro index,pager A "<pipe-message>goobook add<return>" "add the sender address to Google contacts"
 
 
 bind index \es decrypt-save
@@ -110,13 +103,8 @@ bind pager ] half-down
 #bind pager \ej "<decrypt-copy>~/Maildir/catalyst/Junk<enter>"
 
 # this really does need status cues to become helpful.
-folder-hook \/sgn\/ push \e1
-folder-hook \/catalyst\/ push \e2
-folder-hook \/liip\/ push \e3
-
-# the old stuff from francois
-#set status_format="-%r-penny@catalyst.net.nz: %f [Msgs:%?M?%M/?%m%?n? New:% n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"
-#macro index \e2 ":set signature=\"~/sgn.sig\"\n:set from=\"penny@she.geek.nz\"\n:set record=\"~/Maildir/sgn/Sent/\"\n:set status_format=\"-% r-penny@she.geek.nz: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(% s/%S)-%>-(%P)---\"\n" "Switch to penny@she.geek.nz"
+folder-hook \/mjollnir\/ push \e2
+folder-hook \/greens\/ push \e3
 
 #unfuck headers
 hdr_order From Organization Resent-From Reply-To X-Mailer User-Agent Date To Cc Subject
@@ -139,26 +127,31 @@ color tilde       blue default
 color tree     red default
 
 # dealing with attachments - not quite working yet
-macro attach W <save-entry><kill-line>/home/penny/attach/
-macro attach E <save-entry><kill-line>/home/penny/attach/<enter>
+#macro attach W <save-entry><kill-line>/home/penny/attach/
+#macro attach E <save-entry><kill-line>/home/penny/attach/<enter>
 
 # put this last as it screws up the fucking syntax highlighting
-macro index \eb 'c=search'<enter><shell-escape>'mairix ' 'Enter Mairix search term'
+#macro index \eb 'c=search'<enter><shell-escape>'mairix ' 'Enter Mairix search term'
+macro index <F8> "<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter> <shell-escape>notmuch-mutt -r --prompt search<enter> <change-folder-readonly>/Users/penny/.cache/notmuch/mutt/results<enter> <enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" "notmuch: search mail"
+
+macro index <F9> "<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter> <pipe-message>notmuch-mutt -r thread<enter> <change-folder-readonly>/Users/penny/.cache/notmuch/mutt/results<enter> <enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" "notmuch: reconstruct thread"
+
 
-macro index <F8> \
-    "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch --prompt search<enter><change-folder-readonly>~/.cache/mutt_results<enter>" \
-    "search mail (using notmuch)"
+#macro index <F8> \
+    #"<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt --prompt search<enter><change-folder-readonly>~/.cache/mutt_results<enter>" \
+    #"search mail (using notmuch)"
 #macro index <F9> \ #mutt-patched only apparently
-    #"<enter-command>unset wait_key<enter><pipe-message>mutt-notmuch thread<enter><change-folder-readonly>~/.cache/mutt_results<enter><enter-command>set wait_key<enter>" \
+    #"<enter-command>unset wait_key<enter><pipe-message>notmuch-mutt thread<enter><change-folder-readonly>~/.cache/mutt_results<enter><enter-command>set wait_key<enter>" \
+    #"search and reconstruct owning thread (using notmuch)"
+#macro index <F9> \
+    #"<enter-command>unset wait_key<enter><enter-command>unignore message-id<enter><pipe-message>notmuch-mutt thread<enter><change-folder-readonly>~/.cache/mutt_results<enter><enter-command>set wait_key<enter>" \
     #"search and reconstruct owning thread (using notmuch)"
-macro index <F9> \
-    "<enter-command>unset wait_key<enter><enter-command>unignore message-id<enter><pipe-message>mutt-notmuch thread<enter><change-folder-readonly>~/.cache/mutt_results<enter><enter-command>set wait_key<enter>" \
-    "search and reconstruct owning thread (using notmuch)"
 
 
 
 set pager_index_lines=10
 #set sort_aux=last-date-received
+set sort=threads
 
 set wait_key=no
 
@@ -183,3 +176,16 @@ set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --l
 set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" 
 set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
 
+
+
+# sidebar
+set sidebar_visible=yes
+set sidebar_format="%B (%N/%S)"
+set mail_check_stats=yes #sidebar needs to check all mailboxes
+
+bind index,pager  <left>      sidebar-prev
+bind index,pager  <right>     sidebar-next
+bind index,pager  \e<return>  sidebar-open
+
+bind index,pager  \\          sidebar-toggle-visible
+