Separate out the lock file

rywng · Feb 12, 2025 · b853d40 · b853d40
1 parent 04234fc
commit b853d40
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/.config/sway/scripts/lock.sh b/.config/sway/scripts/lock.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+playerctl stop || true
+
+bright=$(xbacklight -get)
+
+flock ~/.config/sway/locks/swayidle echo Successfully acquired lock
+
+swayidle -w \
+	timeout 5 "xbacklight -set 0" resume "xbacklight -set $bright" \
+	timeout 10 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' &
+
+idlepid=$!
+
+flock ~/.config/sway/locks/swaylock swaylock
+
+kill $idlepid
+swaymsg "output * power on"
+xbacklight -set $bright
diff --git a/.config/sway/scripts/logout.sh b/.config/sway/scripts/logout.sh
@@ -12,21 +12,7 @@ choices=("suspend" "poweroff" "reboot" "lock")
 choice=$(printf "%s\n" "${choices[@]}" | fuzzel -d --prompt "🔌: ")
 
 if test "$choice" = lock; then
-	sleep 0.3
-	# playerctl stop
-
-	bright=$(xbacklight -get)
-
-	swayidle -w \
-		timeout 5 "xbacklight -set 0" resume "xbacklight -set $bright" \
-		timeout 10 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' &
-	idlepid=$!
-
-	swaylock
-
-	kill $idlepid
-	swaymsg "output * power on"
-	xbacklight -set $bright
+	$(dirname $0)/lock.sh
 elif test -n "$choice"; then
 	systemctl $choice
 fi
diff --git a/README.md b/README.md
@@ -55,6 +55,9 @@ This list may be out-dated, check `.config/` folder for more.
 | ----------------------------- | --------------------------------------------------------------------------------------- |
 | `acpilight`                   | CLI for managing backlight                                                              |
 | `gui-apps/qt6ct`              | To configure qt themes                                                                  |
+| `gui-apps/swaybg`             | Set wallpaper for sway                                                                  |
+| `gui-apps/swayidle`           | Auto suspend and lock                                                                   |
+| `gui-apps/swaylock`           | Locking in sway                                                                         |
 | `kde-frameworks/breeze-icons` | Icons for qt                                                                            |
 | `pipewire`                    | Sound and screen sharing under Wayland                                                  |
 | `playerctld`                  | Control players, and show current playing                                               |