From b2c2ec02f4bf781216fe526c1985fc9338d46a1d Mon Sep 17 00:00:00 2001
From: katherine <shmibs@shmibbles.me>
Date: Fri, 5 Oct 2018 08:14:03 -0700
Subject: fix dunst (finally!)

---
 .config/herbstluftwm/autostart     | 13 ++++++-------
 .config/herbstluftwm/mpc-status.sh |  6 +-----
 .config/herbstluftwm/panel.sh      |  2 +-
 .config/herbstluftwm/pvol.sh       |  3 ---
 README.md                          |  9 ++++++---
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index f69db5a..266b679 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -216,10 +216,9 @@ for monitor in $(hc list_monitors | cut -d: -f1) ; do
 done
 
 # run dunst with theme colours
-# pkill dunst
-# dunst -lb $bar_bg -nb $bar_bg -cb $bg_focus \
-# 	-lf $bar_fg -nf $bar_fg -cf $fg_focus \
-# 	-frame_color $bg_focus -geom "0x3-4+$(($bheight + 4))" \
-# 	-fn "$mfont $mfont_size,$jfont $jfont_size,$cfont $cfont_size,$efont $efont_size,$bkfont $bkfont_size" \
-# 	-max_icon_size 0
-#
+pkill dunst
+dunst -lb $bar_bg -nb $bar_bg -cb $bg_focus \
+	-lf $bar_fg -nf $bar_fg -cf $fg_focus \
+	-frame_color $bg_focus -geom "0x3-4+$(($bheight + 4))" \
+	-fn "$mfont $mfont_size" \
+	-max_icon_size 0
diff --git a/.config/herbstluftwm/mpc-status.sh b/.config/herbstluftwm/mpc-status.sh
index a9a1fd9..58b530f 100755
--- a/.config/herbstluftwm/mpc-status.sh
+++ b/.config/herbstluftwm/mpc-status.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# i patched dunst to clear all on SIGUSR1
-killall -SIGUSR1 dunst
-# race condition, obvs, but this should be plenty time
-
 case "$1" in
 	next)
 		mpc next
@@ -36,4 +32,4 @@ message="$(mpc current -f '##%track% %title% (%date%)\n%artist% - %album%')
 
 $(mpc status | tail -n -2 | sed -re 's/volume.*repeat/\nrepeat/' -e 's/( ){3,4}/\n/g' -e '/volume:  /d')"
 
-notify-send --icon=/tmp/mpd-icon.png "$message"
+notify-send -t 4000 -a closeme --icon=/tmp/mpd-icon.png "$message"
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index 057245a..41708a6 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -313,7 +313,7 @@ event_when() {
 	while read command; do
 		case "$command" in
 			date)
-				notify-send "$(LANG=ja_JP.UTF-8  cal)"
+				notify-send "$(LANG=ja_JP.UTF-8 cal)"
 				;;
 			mpd)
 				~/.config/herbstluftwm/mpc-status.sh
diff --git a/.config/herbstluftwm/pvol.sh b/.config/herbstluftwm/pvol.sh
index 5c7b351..a3ce9e1 100755
--- a/.config/herbstluftwm/pvol.sh
+++ b/.config/herbstluftwm/pvol.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# i patched dunst to clear all on SIGUSR1
-killall -SIGUSR1 dunst
-
 # race condition, obvs, but this is hopefully time enough
 case "$1" in
 	down)
diff --git a/README.md b/README.md
index 57411d6..8abc925 100644
--- a/README.md
+++ b/README.md
@@ -69,10 +69,13 @@ own](.config/herbstluftwm/pass.sh).
 
 ### [dunst](https://github.com/dunst-project/dunst)/[dmenu](https://bitbucket.org/melek/dmenu2)/[compton](https://github.com/chjj/compton)/[lemonbar](https://github.com/krypt-n/bar)/[nitrogen](http://projects.l3ib.org/nitrogen/)
 
-useful things all around. i forked dunst to make SIGUSR1 clear all
-notifications, which is used by
+useful things all around. i've "patched" dunst (really just a very bad hack) to
+auto clean up on-screen messages when notifications are received from
 [mpc-status.sh](.config/herbstluftwm/mpc-status.sh) and
-[pvol.sh](.config/herbstluftwm/pvol.sh).
+[pvol.sh](.config/herbstluftwm/pvol.sh), which makes things update cleanly
+in-place if a key is repeatedly pressed. hopefully this sort of functionality
+will be added properly, but the documentation is sparse and don't have the time
+to figure out how right now x-x
 
 ### [fcitx](http://fcitx-im.org)
 
-- 
cgit v1.2.3