forgot to color some dmenus

6 files changed, 22 insertions, 21 deletions

diff --git a/scripts/.local/bin/chsink b/scripts/.local/bin/chsink
index 36b5641..0ae374b 100755
--- a/scripts/.local/bin/chsink
+++ b/scripts/.local/bin/chsink
@@ -1,3 +1,2 @@
 #!/bin/sh
-pactl list sinks short | awk '{print $2}' | dmenu -l 100 | setsink
-
+pactl list sinks short | awk '{print $2}' | cdmenu -l 100 | setsink
diff --git a/scripts/.local/bin/displayselect b/scripts/.local/bin/displayselect
index f9e8062..c8f54d2 100755
--- a/scripts/.local/bin/displayselect
+++ b/scripts/.local/bin/displayselect
@@ -4,13 +4,15 @@
 # displays and lets user select one to use. User may also select "manual
 # selection" which opens arandr.
 
+dmenu=cdmenu
+
 twoscreen() { # If multi-monitor is selected and there are two screens.
 
-    mirror=$(printf "no\\nyes" | dmenu -i -p "Mirror displays?")
+    mirror=$(printf "no\\nyes" | "$dmenu" -i -p "Mirror displays?")
     # Mirror displays using native resolution of external display and a scaled
     # version for the internal display
     if [ "$mirror" = "yes" ]; then
-        external=$(echo "$screens" | dmenu -i -p "Optimize resolution for:")
+        external=$(echo "$screens" | "$dmenu" -i -p "Optimize resolution for:")
         internal=$(echo "$screens" | grep -v "$external")
 
         res_external=$(xrandr --query | sed -n "/^$external/,/\+/p" | \
@@ -31,18 +33,18 @@ twoscreen() { # If multi-monitor is selected and there are two screens.
             --scale "$scale_x"x"$scale_y"
     else
 
-        primary=$(echo "$screens" | dmenu -i -p "Select primary display:")
+        primary=$(echo "$screens" | "$dmenu" -i -p "Select primary display:")
         secondary=$(echo "$screens" | grep -v "$primary")
-        direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?")
+        direction=$(printf "left\\nright" | "$dmenu" -i -p "What side of $primary should $secondary be on?")
         xrandr --output "$primary" --auto --scale 1.0x1.0 --output "$secondary" --"$direction"-of "$primary" --auto --scale 1.0x1.0
     fi
     }
 
 morescreen() { # If multi-monitor is selected and there are more than two screens.
-	primary=$(echo "$screens" | dmenu -i -p "Select primary display:")
-	secondary=$(echo "$screens" | grep -v "$primary" | dmenu -i -p "Select secondary display:")
-	direction=$(printf "left\\nright" | dmenu -i -p "What side of $primary should $secondary be on?")
-	tertiary=$(echo "$screens" | grep -v "$primary" | grep -v "$secondary" | dmenu -i -p "Select third display:")
+	primary=$(echo "$screens" | "$dmenu" -i -p "Select primary display:")
+	secondary=$(echo "$screens" | grep -v "$primary" | "$dmenu" -i -p "Select secondary display:")
+	direction=$(printf "left\\nright" | "$dmenu" -i -p "What side of $primary should $secondary be on?")
+	tertiary=$(echo "$screens" | grep -v "$primary" | grep -v "$secondary" | "$dmenu" -i -p "Select third display:")
 	xrandr --output "$primary" --auto --output "$secondary" --"$direction"-of "$primary" --auto --output "$tertiary" --"$(printf "left\\nright" | grep -v "$direction")"-of "$primary" --auto
 	}
 
@@ -73,7 +75,7 @@ screens=$(echo "$allposs" | awk '/ connected/ {print $1}')
 	{ onescreen "$screens"; postrun; notify-send "💻 Only one screen detected." "Using it in its optimal settings...";  exit ;}
 
 # Get user choice including multi-monitor and manual selection:
-chosen=$(printf "%s\\nmulti-monitor\\nmanual selection" "$screens" | dmenu -i -p "Select display arangement:") &&
+chosen=$(printf "%s\\nmulti-monitor\\nmanual selection" "$screens" | "$dmenu" -i -p "Select display arangement:") &&
 case "$chosen" in
 	"manual selection") arandr ; exit ;;
 	"multi-monitor") multimon ;;
diff --git a/scripts/.local/bin/dpass b/scripts/.local/bin/dpass
index 7227b61..e6f08e8 100755
--- a/scripts/.local/bin/dpass
+++ b/scripts/.local/bin/dpass
@@ -12,7 +12,7 @@ if [[ -n $WAYLAND_DISPLAY ]]; then
 	dmenu=dmenu-wl
 	xdotool="ydotool type --file -"
 elif [[ -n $DISPLAY ]]; then
-	dmenu=dmenu
+	dmenu=cdmenu
 	xdotool="xdotool type --clearmodifiers --file -"
 else
 	echo "Error: No Wayland or X11 display detected" >&2
@@ -29,7 +29,7 @@ password=$(printf '%s\n' "${password_files[@]}" | "$dmenu" -l 30 "$@")
 [[ -n $password ]] || exit
 
 if [[ $typeit -eq 0 ]]; then
-    action=$(printf "login\npass\ninfo" | dmenu -l 3)
+    action=$(printf "login\npass\ninfo" | "$dmenu" -l 3)
     case $action in
     login)
    	pass show "$password" | sed -n -e '/^login:/p' | awk '{print $2}' | xclip -sel c
@@ -40,10 +40,10 @@ if [[ $typeit -eq 0 ]]; then
     notify-send "Password for $password was copied to clipboard"
     ;;
     info)
-        data=$(pass show $password | sed 1d | dmenu -l 30)
-        if [[ -n "$data"  ]] 
+        data=$(pass show $password | sed 1d | "$dmenu" -l 30)
+        if [[ -n "$data"  ]]
         then
-            do_trim=$(printf 'No\nYes' | dmenu -p "Trim \"$(echo $data | awk '{print $1}')\" in front?" -l 2)
+            do_trim=$(printf 'No\nYes' | "$dmenu" -p "Trim \"$(echo $data | awk '{print $1}')\" in front?" -l 2)
             if [[ $do_trim == "Yes" ]]; then
                 data=$(echo "$data" | cut -f 2- -d ' ')
             fi
@@ -57,4 +57,3 @@ if [[ $typeit -eq 0 ]]; then
 else
 	pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool
 fi
-
diff --git a/scripts/.local/bin/maimpick b/scripts/.local/bin/maimpick
index 7125e61..c8bccd5 100755
--- a/scripts/.local/bin/maimpick
+++ b/scripts/.local/bin/maimpick
@@ -4,7 +4,9 @@
 # choose the kind of screenshot to take, including copying the image or even
 # highlighting an area to copy. scrotcucks on suicidewatch right now.
 
-case "$(printf "a selected area\\ncurrent window\\nfull screen\\na selected area (copy)\\ncurrent window (copy)\\nfull screen (copy)" | dmenu -l 6 -i -p "Screenshot which area?")" in
+dmenu=cdmenu
+
+case "$(printf "a selected area\\ncurrent window\\nfull screen\\na selected area (copy)\\ncurrent window (copy)\\nfull screen (copy)" | cdmenu -l 6 -i -p "Screenshot which area?")" in
 	"a selected area") maim -s pic-selected-"$(date '+%y%m%d-%H%M-%S').png" ;;
 	"current window") maim -i "$(xdotool getactivewindow)" pic-window-"$(date '+%y%m%d-%H%M-%S').png" ;;
 	"full screen") maim pic-full-"$(date '+%y%m%d-%H%M-%S').png" ;;
diff --git a/scripts/.local/bin/pass-askpass b/scripts/.local/bin/pass-askpass
index 6fbb003..72ac829 100755
--- a/scripts/.local/bin/pass-askpass
+++ b/scripts/.local/bin/pass-askpass
@@ -5,5 +5,4 @@ caller="$(ps -o comm= -p $(ps -o ppid= -p $$))"
 prompt="${1:-[$caller]}"
 hidden=black
 
-dmenu -p "$prompt" -nf "$hidden" -nb "$hidden"  <&-
-
+cdmenu -p "$prompt" -nf "$hidden" -nb "$hidden"  <&-
diff --git a/scripts/.local/bin/prompt b/scripts/.local/bin/prompt
index 666434f..0416be0 100755
--- a/scripts/.local/bin/prompt
+++ b/scripts/.local/bin/prompt
@@ -5,4 +5,4 @@
 # For example:
 # `./prompt "Do you want to shutdown?" "shutdown -h now"`
 
-[ "$(printf "No\\nYes" | dmenu -i -p "$1" -nb darkred -sb red -sf white -nf gray )" = "Yes" ] && $2
+[ "$(printf "No\\nYes" | cdmenu -i -p "$1" -nb darkred -sb red -sf white -nf gray )" = "Yes" ] && $2