From f795dba46e9dbb0d42d1476363526782387d63af Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 8 Jan 2020 10:57:56 +0000
Subject: [PATCH] Update/improve locking behaviour

---
 states/sway/files/config.jinja |  7 +++----
 states/sway/files/lock         | 17 ++---------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index c05fb15..0ce972f 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -193,12 +193,11 @@ focus_on_window_activation urgent
 for_window [class="^rdesktop"] move workspace number 9; floating disable
 for_window [class="Pinentry"] floating enable
 
-{% set lockcmd = "swaylock -i {DP-1,eDP-1,HDMI-A-1}:~/Pictures/lockscreen_1080_1.png" %}
+{% set lockcmd = "swaylock -e -f -i ~/Pictures/lockscreen_1080_1.png" %}
 
-exec swayidle \
+exec swayidle -w \
 timeout 300 "{{lockcmd}}" \
-  timeout 600 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on"' \
+  timeout 600 'systemctl suspend' \
     before-sleep "{{lockcmd}}"
 
 # This keyboard has this layout on all machines:
diff --git a/states/sway/files/lock b/states/sway/files/lock
index 00ed2a8..936b955 100644
--- a/states/sway/files/lock
+++ b/states/sway/files/lock
@@ -4,18 +4,7 @@ NAG_MSG="Smartcard is still plugged in, not locking! \
 Remove now to lock."
 NOLOCK_MSG="Smartcard was not removed, did not lock!"
 
-LOCK_CMD="swaylock "
-SLEEP_CMD=":"
-{% if grains['host'] == 'magnesium' %}
-LOCK_CMD+=" -i HDMI-A-2:~/Pictures/lockscreen_1080_1.png"
-LOCK_CMD+=" -i HDMI-A-3:~/Pictures/lockscreen_1080_2.png"
-{% elif grains['host'] == 'barium' %}
-LOCK_CMD+=" -i DP-1:~/Pictures/lockscreen_1080_1.png"
-LOCK_CMD+=" -i eDP-1:~/Pictures/lockscreen_1080_1.png"
-LOCK_CMD+=" -i HDMI-A-1:~/Pictures/lockscreen_1080_1.png"
-SLEEP_CMD="systemctl suspend"
-{% endif %}
-
+LOCK_CMD="systemctl suspend"
 
 if [ $(pgrep -c lock.magnesium) -gt 1 ]; then
 	exit
@@ -38,7 +27,5 @@ else
 		done
 		pkill -f "$NAG_MSG"
 	fi
-	$LOCK_CMD &
-	sleep 10
-	$SLEEP_CMD
+	$LOCK_CMD
 fi
-- 
2.46.2