Change all menus to dmenu

1 files changed, 1 insertions, 14 deletions

diff --git a/ffc b/ffc
index 2b521d2..b40ec75 100755
--- a/ffc
+++ b/ffc
@@ -17,19 +17,6 @@ while getopts "hd:u:" o; do case "${o}" in
 esac done
 #}}}
 
-#{{{ Check display server if -w or -x not provided
-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
-#}}}
-
 #{{{ Native Profiles
 if [ -f ~/.mozilla/firefox/profiles.ini ]; then
   NATIVE_PROFILES=`grep 'Path=' ~/.mozilla/firefox/profiles.ini | cut -d'.' -f2`
@@ -54,7 +41,7 @@ PROFILES="$NATIVE_PROFILES$INT$FLATPAK_PROFILES"
 #}}}
 
 #{{{ Choose Profiles
-CHOSEN=`printf "$PROFILES" | $DMENU $DEFARGS "firefox" $DMENU_ARGS`
+CHOSEN=`printf "$PROFILES" | dmenu -l 15 -p "firefox" $DMENU_ARGS`
 [ -z "$CHOSEN" ] && exit 2
 if `echo "$CHOSEN" | grep -qE ' F$'`; then
   exec flatpak run org.mozilla.Firefox -P `echo "$CHOSEN" | sed 's/ F$//'` $URL