bin/lock: update

1 files changed, 40 insertions, 31 deletions

diff --git a/bin/lock b/bin/lock
index 41866a9..eee8707 100755
--- a/bin/lock
+++ b/bin/lock
@@ -11,36 +11,45 @@ wrong_color='#af005f'
 # --effect-compose '7.5%,93%;10%x-1;center;/home/robert/Pictures/gentoo-logo/gentoo-horizontal.png'
 # --effect-compose '20%,50%;5%x-1;center;/home/robert/Pictures/hexagon.png'
 # --effect-compose '30%,50%;10%x-1;center;/home/robert/Pictures/gentoo-logo/gentoo-logo.png'
-if swaylock --help 2>&1 | grep effect >/dev/null; then
-    fx_args=(
-        --screenshots
-        --timestr '%H:%M' --datestr '%F'
-        --clock
-        --effect-scale 0.5 --effect-blur 10x5 --effect-scale 2
-        --effect-vignette 0.6:0.3
-        --effect-compose '49%,50%;20%x-1;center;/home/robert/.lock.png'
-    )
+#--effect-compose '49%,50%;20%x-1;center;/home/robert/.lock.png'
+if swaylock --help 2>&1 | grep -q effect; then
+	fx_args=(
+		--screenshots
+		--effect-scale 0.5 --effect-blur 10x5 --effect-scale 2
+		--effect-vignette 0.6:0.3
+		--clock
+		--timestr '%H:%M' --datestr '%F'
+		#--grace 2 --grace-no-mouse --grace-no-touch
+	)
 fi
 
-exec swaylock -f ${fx_args[@]} \
-    --color=#000000EE \
-    --scaling=fill \
-    --font=Iosevka\ Sparkle \
-    --font-size=18 \
-    --text-color=#FFFFFFFF \
-    --text-clear-color=#FFFFFFFF \
-    --text-ver-color=#FFFFFFFF \
-    --ring-color="${main_color}EE" \
-    --ring-clear-color="${clear_color}EE" \
-    --ring-ver-color="${ver_color}EE" \
-    --ring-wrong-color="${wrong_color}EE" \
-    --key-hl-color=#FFFFFF55 \
-    --inside-color=#000000BB \
-    --inside-clear-color=#000000BB \
-    --inside-ver-color=#000000BB \
-    --inside-wrong-color="${wrong_color}BB" \
-    --ignore-empty-password \
-    --indicator-caps-lock \
-    --show-failed-attempts \
-    --hide-keyboard-layout \
-    --indicator-idle-visible
+for sh in "${HOME}"/.local/share/lock.d/*.sh; do
+	if [ -r "$sh" ]; then . "$sh" || true; fi
+done
+unset sh
+
+# shellcheck disable=SC2068
+exec swaylock \
+	--daemonize \
+	--color=#000000EE \
+	--scaling=fill \
+	--font=Iosevka\ Aile \
+	--font-size=28 \
+	--text-color=#FFFFFFFF \
+	--text-clear-color=#FFFFFFFF \
+	--text-ver-color=#FFFFFFFF \
+	--ring-color="${main_color}EE" \
+	--ring-clear-color="${clear_color}EE" \
+	--ring-ver-color="${ver_color}EE" \
+	--ring-wrong-color="${wrong_color}EE" \
+	--key-hl-color=#FFFFFF55 \
+	--inside-color=#000000BB \
+	--inside-clear-color=#000000BB \
+	--inside-ver-color=#000000BB \
+	--inside-wrong-color="${wrong_color}BB" \
+	--ignore-empty-password \
+	--indicator-caps-lock \
+	--show-failed-attempts \
+	--hide-keyboard-layout \
+	--indicator-idle-visible \
+	${fx_args[@]}