diff options
authorTom Ryder <tom@sanctum.geek.nz>2020-06-30 00:04:27 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-06-30 00:04:27 +1200
commit51b318a8b22244f564851466c9c2f479eb2f7c49 (patch)
parentMerge branch 'release/v9.27.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-10.0.0.tar.gz (sig)
Merge branch 'release/v10.0.0'v10.0.0
* release/v10.0.0: Filter pandoc dashes in Mutt alternative parts Adjust a couple more muttrc linebreaks Fix a comment block in muttrc Break a couple of long lines Correct a few typos Expand/refine Mutt thread display switching a bit Remove an idea I decided not to implement Add an issue
5 files changed, 33 insertions, 18 deletions
diff --git a/IDEAS.md b/IDEAS.md
index 7391b836..8bb8214c 100644
--- a/IDEAS.md
+++ b/IDEAS.md
@@ -29,4 +29,3 @@ Ideas
some point
* I'd like a Git hook that pre-fills out "Version X.Y.Z" if making an annotated
tag named `vX.Y.Z`.
-* There's no reason to limit `digraph_search.vim` to insert mode only
diff --git a/ISSUES.md b/ISSUES.md
index 5ba90368..1d4a33b9 100644
--- a/ISSUES.md
+++ b/ISSUES.md
@@ -32,3 +32,5 @@ Known issues
newlines in their names. Can it be made to?
* Highlighting the variable name in e.g. `unset -v VARNAME` works with `bash`
highlighting, but not with `sh` highlighting
+* The Markdown underline functions should count screen columns, not characters
+ or bytes
diff --git a/VERSION b/VERSION
index 2acb458c..097dc1ee 100644
@@ -1,2 +1,2 @@
-tejr dotfiles v9.27.0
-Sun, 28 Jun 2020 04:31:26 +0000
+tejr dotfiles v10.0.0
+Mon, 29 Jun 2020 12:04:25 +0000
diff --git a/mutt/filters/markdown-to-html.sh b/mutt/filters/markdown-to-html.sh
index cdba8ace..5fe28560 100644
--- a/mutt/filters/markdown-to-html.sh
+++ b/mutt/filters/markdown-to-html.sh
@@ -4,4 +4,5 @@ pandoc \
--from markdown_strict+smart \
--metadata=pagetitle:HTML \
--standalone \
- --to html4
+ --to html4 |
+sed '/[—–][—–]/{s/—/---/g;s/–/--/g}'
diff --git a/mutt/muttrc b/mutt/muttrc
index ccd88412..9165386c 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -90,9 +90,9 @@ auto_view \
unset markers
-# Created mailboxes are in Maildir format everywhere I deploy this, so may as
-# well set it in here rather than get annoyed when Mutt starts dropping mboxes
-# everywhere if I leave it out of muttrc.d/*.rc.
+# Created mailboxes are in Maildir format everywhere I deploy this, so I may as
+# well set it in here rather than get annoyed when Mutt starts dropping files
+# in mbox format everywhere if I leave it out of muttrc.d/*.rc.
set mbox_type = Maildir
@@ -147,7 +147,7 @@ set text_flowed
set reflow_wrap = 0
# When passing mail to the sendmail binary, use the "From" address I set as the
-# envelope sender, in case the local mailserver needs to do any switching or
+# envelope sender, in case the local mail server needs to do any switching or
# filtering based on that.
set use_envelope_from
@@ -167,7 +167,7 @@ set crypt_replysign
set crypt_replysignencrypted
# Use a default key for self-encrypting both sent and draft messages so that
-# they're protected but legible. This defaults to the GPG_KEYID environment
+# they're protected but legible. This defaults to the $GPG_KEYID environment
# variable, so be careful to set that lest you send useless OpenPGP headers!
# My kingdom for muttrc(5) conditionals...
@@ -191,15 +191,18 @@ url=https://keys.openpgp.org/vks/v1/by-fingerprint/$pgp_default_key
# a hook for sending or changing a message that forces a signature if it's
# encrypted but not signed. This may not suit anyone else reading.
-send-hook '~G !~g' 'push <pgp-menu>s'
-send2-hook '~G !~g' 'push <pgp-menu>s'
+send-hook '~G !~g' \
+ 'push <pgp-menu>s'
+send2-hook '~G !~g' \
+ 'push <pgp-menu>s'
# Because of the order in which opportunistic encryption is applied, we queue
# up a no-op change by opening the PGP menu and then doing nothing (pressing
# Enter), to trigger send2-hooks to run and turn signatures on if opportunistic
# encryption happens to have decided to switch encryption on.
-send-hook '!~G !~g' 'push <pgp-menu><enter>'
+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.
@@ -249,13 +252,15 @@ macro index,pager \\a \
# Janky notmuch-mutt search macro, cleaned up a little
macro index \\l '\
-<enter-command>set my_pipe_decode=$pipe_decode \
+<enter-command>set \
+ my_pipe_decode=$pipe_decode \
my_wait_key=$wait_key \
nopipe_decode \
<shell-escape>notmuch-mutt --prompt search --remove-dups<enter>\
-<enter-command>set pipe_decode=$my_pipe_decode \
+<enter-command>set \
+ pipe_decode=$my_pipe_decode \
wait_key=$my_wait_key<enter>' \
'notmuch: search mail'
@@ -268,12 +273,20 @@ macro generic,index,browser,pager \\R '\
<enter-command>echo "Reloaded $my_muttrc"<enter>' \
"Clear hooks and reload"
-# Shortcut to toggle thread display
+# I often want thread display when having to keep track of multiple
+# conversations at once with multiple people replying to one another, as is
+# regularly the case when reading mailing lists, but for my personal mail it's
+# generally nicer to sort the messages simply by date. This macro uses
+# user-defined variables to toggle $sort between "date" and "threads".
+set sort = date
set my_sort_alt = threads
macro index \\t '\
-<enter-command>set my_sort_cur = $sort<enter>\
+<enter-command>set my_sort_tmp = $sort<enter>\
<enter-command>set sort = $my_sort_alt<enter>\
-<enter-command>set my_sort_alt = $my_sort_cur<enter>' \
+<enter-command>set my_sort_alt = $my_sort_tmp<enter>\
+<enter-command>unset my_sort_tmp<enter>\
+<enter-command>set ?sort<enter>' \
"Toggle thread display"
# Set a few simple colors just for a quick visual cue of which tool I'm looking
@@ -292,6 +305,6 @@ color status \
default color22
# Load machine-specific or account-specific settings from the helper script in
-# muttrc.d, and w're done.
+# muttrc.d, and we're done.
source ~/.config/mutt/muttrc.d/src|