checkpoint

3 files changed, 10 insertions, 5 deletions

diff --git a/bin/menuscripts/keyadd b/bin/menuscripts/keyadd
index 4e7949f..5a38bfb 100755
--- a/bin/menuscripts/keyadd
+++ b/bin/menuscripts/keyadd
@@ -2,7 +2,7 @@
 
 log()
 {
-	notify-send -t 1000 "keyadd" "$1" &
+	herbe "keyadd" "$1" &
 	>&2 printf '%s\n' "$1"
 }
 
@@ -55,7 +55,7 @@ then
     exit 1
 fi
 
-HOST=$(hostnamectl hostname)
+HOST="$(hostname)"
 export PASSWORD="keys/$HOST/ssh/$key_pretty"
 export SSH_ASKPASS="sshpass"
 ssh-add -q - < "$key" &&
diff --git a/bin/menuscripts/mpass b/bin/menuscripts/mpass
index 5dc2289..fb11091 100755
--- a/bin/menuscripts/mpass
+++ b/bin/menuscripts/mpass
@@ -22,7 +22,7 @@ done
 [ "$file" ] || exit 1
 
 pass show -c "$file" || exit 1
-notify-send -t 1000 "mpass" "$file"
+herbe "*mpass" "$file"
 
 [ "$WAYLAND_DISPLAY" ] && cliphist list >/dev/null && # on wayland and cliphist is running
 	cliphist list | head -n 1 | cliphist delete
diff --git a/bin/menuscripts/mpower b/bin/menuscripts/mpower
index 51b8e1d..b4b8640 100755
--- a/bin/menuscripts/mpower
+++ b/bin/menuscripts/mpower
@@ -9,5 +9,10 @@ hibernate
 EOF
 )"
 
-[ "$choice" = "firmware" ] && systemctl reboot --firmware-setup
-[ "$choice" ] && systemctl "$choice"
+case "$choice" in
+	"suspend") doas /usr/sbin/zzz ;;
+	"poweroff") doas /usr/sbin/poweroff ;;
+	"reboot"|"firmware") doas /usr/sbin/reboot ;;
+	"") exit 1 ;;
+	*) ;;
+esac