summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/guiscripts/dmhelp26
-rwxr-xr-xbin/guiscripts/locker4
-rwxr-xr-xbin/menuscripts/mhelp32
-rwxr-xr-xbin/menuscripts/mplay2
-rw-r--r--config/hyprland/hypr/binds.conf4
5 files changed, 38 insertions, 30 deletions
diff --git a/bin/guiscripts/dmhelp b/bin/guiscripts/dmhelp
deleted file mode 100755
index 6199c21..0000000
--- a/bin/guiscripts/dmhelp
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env sh
-program="${1:-$(dmenu_path | dmenu -l 4 -g 5)}"
-opfil="/tmp/dmh_options.txt"
-test -z "${program}" && exit 1
-
-if ${program} --help > "${opfil}"
-then
- option="$(\
- grep -E "^ *-[-a-Z]* " "${opfil}" \
- | tr -s ' ' \
- | sort | uniq \
- | column -l 2 -t \
- | dmenu -x -l 20 -g 1 -p "${program}" \
- | awk '{print $1}' \
- )"
-elif man $program > "${opfil}"
-then
- echo lesgo
-else
- echo "No options found for '${program}'" > /dev/stderr
- exit 1
-fi
-test -z "${option}" && exit 1
-
-rm -f "${opfil}"
-${program} ${option}
diff --git a/bin/guiscripts/locker b/bin/guiscripts/locker
index 90a1ab5..0070a86 100755
--- a/bin/guiscripts/locker
+++ b/bin/guiscripts/locker
@@ -1,6 +1,8 @@
#!/bin/sh
+which swaylock convert grim > /dev/null ||
+ exit 1
umask 077
file=/tmp/bg.png
-grim - > $file
+grim -l 0 - > $file
convert -resize 10% -resize 1000% $file $file
swaylock -i $file
diff --git a/bin/menuscripts/mhelp b/bin/menuscripts/mhelp
new file mode 100755
index 0000000..a9027ef
--- /dev/null
+++ b/bin/menuscripts/mhelp
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+OPTIONS="/tmp/dmh_options.txt"
+
+if [ "$MENUCMD" = "tofi" ]
+then
+ program="$(tofi-run --prompt-text "program: ")"
+ menucmd="tofi --width 50% --height 30% --matching-algorithm normal --prompt-text $program:"
+elif [ "$MENUCMD" = "dmenu" ]
+then
+ program="$(dmenu_path | dmenu -l 4 -g 5 -p "program:")"
+ menucmd="dmenu -l 20 -g 1 -x -i -p $program:"
+else
+ program="$(dmenu_path | fzf)"
+ menucmd="fzf"
+fi
+
+test -z "${program}" && exit 1
+
+if $program --help > "$OPTIONS"
+then
+ option="$(grep -E "^ *-[-a-Z]* " "$OPTIONS" |
+ tr -s ' ' |
+ sort |
+ uniq |
+ column -l 2 -t |
+ $menucmd |
+ awk '{print $1}')"
+
+test -z "$option" && exit 1
+
+rm -f "$OPTIONS"
+setsid $program $option
diff --git a/bin/menuscripts/mplay b/bin/menuscripts/mplay
index 4c991fa..08fcc46 100755
--- a/bin/menuscripts/mplay
+++ b/bin/menuscripts/mplay
@@ -2,7 +2,7 @@
# menu select long
if [ "$MENUCMD" = "tofi" ]
then
- menucmd="tofi --width 50% --height 30%"
+ menucmd="tofi --width 50% --height 30% --matching-algorithm normal"
elif [ "$MENUCMD" = "dmenu" ]
then
menucmd="dmenu -l 10 -g 1 -x -i"
diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf
index a84837e..cc3ebf9 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/hyprland/hypr/binds.conf
@@ -78,7 +78,7 @@ bind =, D, exec, dmdsktp
bind =, E, exec, dmemoji
bind =, F, exec, dmfm
bind =, G, exec, mpassgen
-bind =, H, exec, dmhelp
+bind =, H, exec, mhelp
bind =, I, exec, mapimg
bind =, L, exec, dmlang
bind =, M, exec, mpass
@@ -92,7 +92,7 @@ bind = $mainMod, D, exec, dmdsktp
bind = $mainMod, E, exec, dmemoji
bind = $mainMod, F, exec, dmfm
bind = $mainMod, G, exec, mpassgen
-bind = $mainMod, H, exec, dmhelp
+bind = $mainMod, H, exec, mhelp
bind = $mainMod, I, exec, mapimg
bind = $mainMod, L, exec, dmlang
bind = $mainMod, M, exec, mpass