From f4dd706b6ac6715185d2f75dc0a80037a14bd19a Mon Sep 17 00:00:00 2001
From: Yuri Zamyatin <yuri@yrz.am>
Date: Sun, 26 Oct 2025 00:11:49 +0000
Subject: [PATCH] bemenu -> wmenu

---
 arch-user/bin/menu/run-man.sh     | 6 +++---
 arch-user/bin/menu/run-pass.sh    | 2 +-
 arch-user/bin/menu/run-power.sh   | 2 +-
 arch-user/config/menu/env.sh.tmpl | 8 ++++----
 arch-user/config/sway/config.tmpl | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch-user/bin/menu/run-man.sh b/arch-user/bin/menu/run-man.sh
index 84f70c8..35b8aaf 100755
--- a/arch-user/bin/menu/run-man.sh
+++ b/arch-user/bin/menu/run-man.sh
@@ -4,9 +4,9 @@ shift
 page="$1"
 if [ -z "$page" ]; then
 	page="$(
-		man -k . | \
-		(bemenu --prompt "man" || exec ~/.local/bin/bemenu/run.sh) | \
+		apropos -s 1,8 . | \
+		(~/.local/bin/menu/vertical.sh -p "man" || exec ~/.local/bin/menu/run.sh) | \
 		sed ' s/\s\+\-.*//;s/ //g' 
-	)" 
+	)"
 fi
 exec alacritty msg create-window --class="term_float" --working-directory="$HOME" --command "man '$page' || read -n1"
diff --git a/arch-user/bin/menu/run-pass.sh b/arch-user/bin/menu/run-pass.sh
index 6f868ab..a6d1adb 100755
--- a/arch-user/bin/menu/run-pass.sh
+++ b/arch-user/bin/menu/run-pass.sh
@@ -3,7 +3,7 @@ set -e
 
 cd "$PASSWORD_STORE_DIR"
 pws="$(find -path "*/.*" -prune -o -path "*/cred/*" -name "*.gpg" -printf '%P\n' | sed 's/\.gpg$//')"
-pw="$(echo "$pws" | bemenu --prompt "pass")"
+pw="$(echo "$pws" | ~/.local/bin/menu/vertical.sh -p "pass")"
 
 case "$2" in
 	info) exec alacritty msg create-window --class="term_float" --working-directory="$HOME" --command "pass $pw | vim -";;
diff --git a/arch-user/bin/menu/run-power.sh b/arch-user/bin/menu/run-power.sh
index 4e65eb7..ac56768 100755
--- a/arch-user/bin/menu/run-power.sh
+++ b/arch-user/bin/menu/run-power.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 sure() {
-	echo yes | bemenu --prompt "sure?" || exec ~/.local/bin/bemenu/run.sh
+	echo yes | ~/.local/bin/menu/horizontal.sh -p "sure?" || exec ~/.local/bin/menu/run.sh
 }
 
 case "$1" in
diff --git a/arch-user/config/menu/env.sh.tmpl b/arch-user/config/menu/env.sh.tmpl
index b812d4b..557d0d6 100755
--- a/arch-user/config/menu/env.sh.tmpl
+++ b/arch-user/config/menu/env.sh.tmpl
@@ -3,13 +3,13 @@ export WMENU_VOPTS="\
 -i \
 -f '{{ .theme.font.name_mono }} {{ math.Add .theme.font.size_base_pt .theme.font.size_step_pt }}' \
 -n {{ .theme.color.fg }} -N {{ .theme.color.bg }}{{ math.Mul .theme.opacity.high 255 | conv.ToInt64 | printf "%02X" }} \
--m {{ .theme.color.fg_accent }} -M {{ .theme.color.bg }}{{ math.Mul .theme.opacity.high 255 | conv.ToInt64 | printf "%02X" }} \
--s {{ .theme.color.fg_accent }} -S {{ .theme.color.bg }}{{ math.Mul .theme.opacity.high 255 | conv.ToInt64 | printf "%02X" }} \
+-m {{ .theme.color.fg }} -M {{ .theme.color.bg }}{{ math.Mul .theme.opacity.high 255 | conv.ToInt64 | printf "%02X" }} \
+-s {{ .theme.color.fg }} -S {{ .theme.color.bg_accent_light }} \
 "
 export WMENU_HOPTS="\
 -i \
 -f '{{ .theme.font.name_mono }} {{ math.Add .theme.font.size_base_pt .theme.font.size_step_pt }}' \
 -n {{ .theme.color.fg }} -N {{ .theme.color.bg }} \
--m {{ .theme.color.fg_accent }} -M {{ .theme.color.bg }} \
--s {{ .theme.color.fg_accent }} -S {{ .theme.color.bg }} \
+-m {{ .theme.color.fg }} -M {{ .theme.color.bg }} \
+-s {{ .theme.color.fg }} -S {{ .theme.color.bg_accent_light }} \
 "
diff --git a/arch-user/config/sway/config.tmpl b/arch-user/config/sway/config.tmpl
index 02aa87e..0a44e79 100644
--- a/arch-user/config/sway/config.tmpl
+++ b/arch-user/config/sway/config.tmpl
@@ -191,6 +191,7 @@ bindsym --to-code {
 	XF86Calculator exec .local/bin/menu/run-calc.sh calc tui
 	# basic scripts
 	$mod+Return exec alacritty msg create-window
+	$altmod+Return exec alacritty
 	$mod+Colon exec ~/.local/bin/sway/command-mode.sh
 	$mod+Space exec ~/.local/bin/menu/run.sh
 }