diff options
| -rwxr-xr-x | .local/bin/dmlog | 34 | ||||
| -rwxr-xr-x | .local/bin/linkview | 3 |
2 files changed, 31 insertions, 6 deletions
diff --git a/.local/bin/dmlog b/.local/bin/dmlog index 756d9b9..d209ee5 100755 --- a/.local/bin/dmlog +++ b/.local/bin/dmlog @@ -36,8 +36,13 @@ sub confirm for (@{+CONFIRM}) { $list .= $_ . "\n"; } + + my $menu = "dmenu -sb '$color' -shb '$color'"; + if (defined $ENV{WAYLAND_DISPLAY}) { + $menu = "wmenu -S '$color'"; + } $choice = `printf "%s" "$list" | \ - dmenu -i -p "$var?" -sb '$color' -shb '$color'`; + $menu -i -p "$var?"`; chomp $choice; if ($choice eq ${+CONFIRM}[1]) { return (1); @@ -52,12 +57,28 @@ sub action chomp $var; if ($var eq ${+LIST}[0]) { - exec(XSCREENSAVER_PATH, '-lock'); + if (defined $ENV{WAYLAND_DISPLAY}) { + exec("waylock", + "-init-color", "0x1d2021", + "-input-color", "0xd79921", + "-fail-color", "0xcc241d"); + } + else { + exec(XSCREENSAVER_PATH, '-lock'); + } } elsif ($var eq ${+LIST}[1]) { $pid = fork(); if (not $pid) { - exec(XSCREENSAVER_PATH, '-lock'); + if (defined $ENV{WAYLAND_DISPLAY}) { + exec("waylock", + "-init-color", "0x1d2021", + "-input-color", "0xd79921", + "-fail-color", "0xcc241d"); + } + else { + exec(XSCREENSAVER_PATH, '-lock'); + } } else { system( @@ -138,7 +159,12 @@ sub main for (@{+LIST}) { $list .= $_ . "\n"; } - $choice = `printf "%s" "$list" | dmenu -i -sb '$color' -shb '$color'`; + + my $menu = "dmenu -sb '$color' -shb '$color'"; + if (defined $ENV{WAYLAND_DISPLAY}) { + $menu = "wmenu -S '$color'"; + } + $choice = `printf "%s" "$list" | $menu -i`; action($choice, $color); return (0); } diff --git a/.local/bin/linkview b/.local/bin/linkview index a61a417..ec928a4 100755 --- a/.local/bin/linkview +++ b/.local/bin/linkview @@ -18,8 +18,7 @@ my $menu = "dmenu"; my $IMGVIEW_PATH = 'nsxiv -b -a'; if (defined $ENV{WAYLAND_DISPLAY}) { - $menu = "wmenu -f 'BigBlueTermPlus Nerd Font 13' " . -"-N '#1d2021' -n '#ebdbb2' -S '#cc241d' -s '#ebdbb2'"; + $menu = "wmenu"; $IMGVIEW_PATH = 'imv'; } |