aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-20 10:54:57 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-20 10:54:57 +1200
commit1dae970cc3b4f769523ae8ebfb1cbe52d9583520 (patch)
tree751fa294b98eb4c04ecfc9f6937082e67dce9ad8
parentShow OpenPGP headers (diff)
downloaddotfiles-1dae970cc3b4f769523ae8ebfb1cbe52d9583520.tar.gz
dotfiles-1dae970cc3b4f769523ae8ebfb1cbe52d9583520.zip
Fix some spacing in Makefile
-rw-r--r--.gitignore1
-rw-r--r--Makefile23
-rw-r--r--mutt/filters/markdown-to-html.sh7
-rw-r--r--mutt/muttrc12
4 files changed, 33 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 6d38b02a..8d022b56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -185,4 +185,5 @@
/gnupg/profile.d/gnupg.sh.m4
/include/mktd.m4
/less/less
+/mutt/filters/markdown-to-html
/urxvt/ext/select
diff --git a/Makefile b/Makefile
index 3cf44ee3..fc35384b 100644
--- a/Makefile
+++ b/Makefile
@@ -279,8 +279,8 @@ GAMES = games/aaf \
games/zs
GIT_TEMPLATE_HOOKS = git/template/hooks/post-update \
- git/template/hooks/pre-commit \
- git/template/hooks/prepare-commit-msg
+ git/template/hooks/pre-commit \
+ git/template/hooks/prepare-commit-msg
all: $(BINS) \
$(GIT_TEMPLATE_HOOKS) \
@@ -302,6 +302,7 @@ clean distclean:
gnupg/profile.d/gnupg.sh \
include/mktd.m4 \
less/less \
+ mutt/filters/markdown-to-html \
urxvt/ext/select \
vim/dist/*
@@ -491,13 +492,15 @@ install-mpv:
mkdir -p -- $(XDG_CONFIG_HOME)/mpv
cp -p -- mpv/* $(XDG_CONFIG_HOME)/mpv
-install-mutt: install-gnupg install-mail
+install-mutt: install-gnupg install-mail mutt/filters/markdown-to-html
mkdir -p -- $(XDG_CONFIG_HOME)/mutt \
$(XDG_CONFIG_HOME)/mutt/muttrc.d \
$(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
+ cp -p -- mutt/filters/markdown-to-html \
+ $(HOME)/.local/share/mutt/libexec/filters
install-ncmcpp: install-mpd
mkdir -p -- $(HOME)/.ncmpcpp
@@ -507,7 +510,7 @@ install-newsboat: install-systemd
mkdir -p -- $(XDG_CONFIG_HOME)/newsboat $(XDG_DATA_HOME)/newsboat
cp -p -- newsboat/config $(XDG_CONFIG_HOME)/newsboat
-command -v systemctl >/dev/null 2>&1 \
- && mkdir -p -- $(XDG_CONFIG_HOME)/systemd/user \
+ && mkdir -p -- $(XDG_CONFIG_HOME)/systemd/user \
&& cp -p -- newsboat/systemd/user/* $(XDG_CONFIG_HOME)/systemd/user \
&& systemctl --user daemon-reload \
&& systemctl --user start reload-newsboat.timer \
@@ -563,7 +566,7 @@ install-subversion:
install-systemd:
-command -v systemctl >/dev/null 2>&1 \
- && mkdir -p -- $(XDG_CONFIG_HOME)/systemd/user \
+ && mkdir -p -- $(XDG_CONFIG_HOME)/systemd/user \
&& cp -p -- systemd/user/* $(XDG_CONFIG_HOME)/systemd/user \
&& systemctl --user daemon-reload \
@@ -623,11 +626,11 @@ install-vim-after-syntax:
install-vim-autoload:
mkdir -p -- $(VIMDIR)/autoload
cd vim && find autoload \
- -type d -exec sh -c \
- 'mkdir -p -- $(VIMDIR)/"$$1"' _ {} \; \
- -o \
- -type f -exec sh -c \
- 'cp -p -- "$$1" $(VIMDIR)/"$$1"' _ {} \;
+ -type d -exec sh -c \
+ 'mkdir -p -- $(VIMDIR)/"$$1"' _ {} \; \
+ -o \
+ -type f -exec sh -c \
+ 'cp -p -- "$$1" $(VIMDIR)/"$$1"' _ {} \;
install-vim-bundle: install-vim-config
cd vim/bundle && find */* \
diff --git a/mutt/filters/markdown-to-html.sh b/mutt/filters/markdown-to-html.sh
new file mode 100644
index 00000000..cdba8ace
--- /dev/null
+++ b/mutt/filters/markdown-to-html.sh
@@ -0,0 +1,7 @@
+printf 'text/html\n\n'
+sed 's/ $/ /;/[^ ]$/s/$/ /;s/^-- $/-- /' |
+pandoc \
+ --from markdown_strict+smart \
+ --metadata=pagetitle:HTML \
+ --standalone \
+ --to html4
diff --git a/mutt/muttrc b/mutt/muttrc
index bf4de5af..161385db 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -160,6 +160,18 @@ send-hook '!~G !~g' 'push <pgp-menu><enter>'
set autocrypt
set autocrypt_dir = ~/.local/share/mutt/autocrypt
+# Set custom filter to generate an HTML part for plain-text messages in
+# Markdown style; defaults to off, per God's will and common decency
+#
+set send_multipart_alternative_filter \
+ = ~/.local/libexec/mutt/filters/markdown-to-html
+
+# Toggle multipart sending option manually and display the new setting
+macro generic,index,browser,pager \\h '\
+<enter-command>toggle send_multipart_alternative<enter>\
+<enter-command>set ?send_multipart_alternative<enter>' \
+ 'Toggle multipart/alternative sending'
+
# Save message to whatever box Mutt guesses, without confirmation
macro index,pager S \
'<save-message><enter>' \