up

4 files changed, 14 insertions, 12 deletions

diff --git a/.config/wayland/init.sh b/.config/wayland/init.sh
index 47fee53..d9231bc 100755
--- a/.config/wayland/init.sh
+++ b/.config/wayland/init.sh
@@ -35,6 +35,7 @@ startif() {
 	pidof "$(basename "$1")" >/dev/null || "$@" >/dev/null 2>&1 &
 }
 
+startif ydotoold
 startif dunst
 startif swaybg --image pics/wp.png &
 pgrep $mpd >/dev/null || $mpd >/dev/null 2>&1
diff --git a/.local/bin/dmotp b/.local/bin/dmotp
index 97f015f..243f48c 100755
--- a/.local/bin/dmotp
+++ b/.local/bin/dmotp
@@ -6,10 +6,10 @@ if echo "$1" | grep '^#' 2>&1; then
 fi
 
 if [ -n "$WAYLAND_DISPLAY" ]; then
-	dmenu=dmenu-wl
-	xdotool="ydotool type --file -"
+	dmenu="wmenu -i -l 15 -S $color"
+	xdotool="ydotool type --delay 15 --file -"
 elif [ -n "$DISPLAY" ]; then
-	dmenu=dmenu
+	dmenu="dmenu -i -l 15 -sb $color -shb $color"
 	xdotool="xdotool type --delay 15 --clearmodifiers --file -"
 else
 	echo "Error: No Wayland or X11 display detected" >&2
@@ -19,7 +19,7 @@ fi
 prefix=${PASSWORD_STORE_DIR-~/.local/share/pass}/otp
 rprefix=$(printf "%s" $prefix | sed 's/\//\\\//g')
 password_files=$(ls "$prefix"/*.gpg | sed 's/^'${rprefix}'\///g' | sed 's/\.gpg//g')
-password=$(printf "%s\n" "${password_files}" | "$dmenu" -i -l 15 -sb "$color" -shb "$color")
+password=$(printf "%s\n" "${password_files}" | $dmenu)
 
 [ -n "$password" ] || exit
 
diff --git a/.local/bin/dmpass b/.local/bin/dmpass
index d5b0494..affe65b 100755
--- a/.local/bin/dmpass
+++ b/.local/bin/dmpass
@@ -13,10 +13,10 @@ fi
 
 
 if [ -n "$WAYLAND_DISPLAY" ]; then
-	dmenu=dmenu-wl
-	xdotool="ydotool type --file -"
+	dmenu="wmenu -i -l 15 -S $color"
+	xdotool="ydotool type --delay 15 --file -"
 elif [ -n "$DISPLAY" ]; then
-	dmenu=dmenu
+	dmenu="dmenu -i -l 15 -sb $color -shb $color"
 	xdotool="xdotool type --delay 15 --clearmodifiers --file -"
 else
 	echo "Error: No Wayland or X11 display detected" >&2
@@ -26,7 +26,7 @@ fi
 prefix=${PASSWORD_STORE_DIR-~/.local/share/pass}
 rprefix=$(printf "%s" $prefix | sed 's/\//\\\//g')
 password_files=$(ls "$prefix"/*.gpg "$prefix"/*/*.gpg | sed 's/^'${rprefix}'\///g' | sed 's/\.gpg//g')
-password=$(printf "%s\n" "${password_files}" | "$dmenu" -i -l 15 -sb "$color" -shb "$color")
+password=$(printf "%s\n" "${password_files}" | $dmenu)
 
 [ -n "$password" ] || exit
 
diff --git a/.local/bin/linkview b/.local/bin/linkview
index d07a8a6..a61a417 100755
--- a/.local/bin/linkview
+++ b/.local/bin/linkview
@@ -18,7 +18,8 @@ my $menu = "dmenu";
 my $IMGVIEW_PATH = 'nsxiv -b -a';
 
 if (defined $ENV{WAYLAND_DISPLAY}) {
-	$menu = "wmenu -f 'BigBlueTermPlus Nerd Font 13'";
+	$menu = "wmenu -f 'BigBlueTermPlus Nerd Font 13' " .
+"-N '#1d2021' -n '#ebdbb2' -S '#cc241d' -s '#ebdbb2'";
 	$IMGVIEW_PATH = 'imv';
 }
 
@@ -41,7 +42,7 @@ use constant PROG_LIST	=> "" .
 "ytdl"					. "\n" .
 "ytdl thumbnail"		. "\n" .
 "fetch"					. "\n" .
-"nsxiv"					. "\n" .
+"img"					. "\n" .
 "zathura"				. "\n" .
 "w3m"					. "\n" .
 "browser"				. "\n" .
@@ -342,7 +343,7 @@ sub open_link
 			exit 0;
 		}
 	}
-	elsif ($a eq "nsxiv" || $a eq "zathura") {
+	elsif ($a eq "img" || $a eq "zathura") {
 		$pid = fork();
 		if (not $pid) {
 			setsid();
@@ -364,7 +365,7 @@ sub open_link
 					system(FETCH_PATH, '-q', $url);
 				}
 			}
-			if ($a eq "nsxiv") {
+			if ($a eq "img") {
 				exec($IMGVIEW_PATH . " " . $file_name);
 			}
 			else {