Fully replace bemenu with tofi

1 files changed, 11 insertions, 15 deletions

diff --git a/qbc b/qbc
index 4cddfc5..b423141 100755
--- a/qbc
+++ b/qbc
@@ -5,32 +5,28 @@ printhelp () {
   printf "qbc: qutebrowser menu interface.\n"
   printf "  -u URL  ) pass URL to browser\n"
   printf "  -d ARGS ) pass ARGS to menu command\n"
-  printf "  -w ) use Wayland menu command (bemenu)\n"
-  printf "  -x ) use X11 menu command (dmenu)\n"
   exit
 }
 #}}}
 
 #{{{ getopts
-while getopts "hwxd:u:" o; do case "${o}" in
+while getopts "hd:u:" o; do case "${o}" in
   d) DMENU_ARGS="$OPTARG" ;;
   u) URL="$OPTARG" ;;
-  w) DMENU="bemenu" ;;
-  x) DMENU="dmenu" ;;
   *) printhelp ;;
 esac done
 #}}}
 
 #{{{ 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 15 -p"
+else
+  print "Can't tell if Wayland or X; what gives?\n"
+  exit 1
 fi
 #}}}
 
@@ -40,7 +36,7 @@ SESSIONS=`qbpm list`
 #}}}
 
 #{{{ Select Session
-CHOSEN=`printf "default\n$SESSIONS"  | $DMENU -p "qutebrowser" -l 15 $DMENU_ARGS`
+CHOSEN=`printf "default\n$SESSIONS"  | $DMENU $DEFARGS "qutebrowser" $DMENU_ARGS`
 [ -z "$CHOSEN" ] && exit 2
 if [ -n "$CHOSEN" ]; then
   if [ "$CHOSEN" = "default" ]; then