From b49fbd12bd77f379fc1bf466531dec20658f7540 Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Sun, 6 Aug 2023 22:55:00 -0500
Subject: Fully replace bemenu with tofi

---
 bm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'bm')

diff --git a/bm b/bm
index 812b743..dc02f6f 100755
--- a/bm
+++ b/bm
@@ -10,8 +10,6 @@ printhelp () {
   printf "  -l) librewolf interface\n"
   printf "  -m) mullvad-browser interface\n"
   printf "  -q) qutebrowser interface\n"
-  printf "  -x) use X11 menu (dmenu)\n"
-  printf "  -w) use Wayland menu (tofi)\n"
   printf "  -d ARG) provide menu args\n"
   printf "  -u ARG) provide URL to open\n"
   exit
@@ -52,8 +50,6 @@ while getopts "hbBcrflmqxwd:u:" o; do case "${o}" in
   m) MBC="y" ;;
   q) QBC="y" ;;
   c) CLIPB="y" ;;
-  x) ARG="$ARG-x " ;;
-  w) ARG="$ARG-w " ;;
   d) ARG="$ARG-d $OPTARG ";;
   u) URL="$OPTARG " ;;
   *) printhelp ;;
@@ -84,15 +80,15 @@ bra () {
 #}}}
 
 #{{{ Check display server if -w or -x not provided
-if [ -z "$DMENU" ]; then
-  if [ -n "$WAYLAND_DISPLAY" ]; then
-    DMENU="bemenu"
-  elif [ -n "$DISPLAY" ]; then
-    DMENU="dmenu"
-  else
-    print "Can't tell if Wayland or X; what gives?\n"
-    exit 1
-  fi
+if [ -n "$WAYLAND_DISPLAY" ]; then
+  DMENU="tofi"
+  DEFARGS="-c $HOME/.config/tofi/themes/dmenu_vertical --prompt-text"
+elif [ -n "$DISPLAY" ]; then
+  DMENU="dmenu"
+  DEFARGS=" -l 10 -p"
+else
+  print "Can't tell if Wayland or X; what gives?\n"
+  exit 1
 fi
 #}}}
 
@@ -121,7 +117,7 @@ if [ -z "$CLIPB$BRA$BSC$FDC$FFC$LWC$MBC$QBC" ]; then
   echo "$BROWSERSINSTALLED"
   [ -z "$BROWSERSINSTALLED" ] && \
     printf "No suitable browsers!\n" && exit 1
-  BROWSERSEL="$(echo "$BROWSERSINSTALLED" | $DMENU -p "Browsers" -l 10 $ARG)"
+  BROWSERSEL="$(echo "$BROWSERSINSTALLED" | $DMENU $DEFARGS $ARG)"
   [ -z "$BROWSERSEL" ] && \
     printf "No browser selected!\n" && exit 1
   case "$BROWSERSEL" in
-- 
cgit v1.2.3