From f837fcacf416a8d195713820ac0b4b60c51a41dd Mon Sep 17 00:00:00 2001
From: Massaki Archambault <badjware@massaki.ca>
Date: Fri, 11 Oct 2019 23:36:37 -0400
Subject: [PATCH] fix swaylock

---
 files/.config/systemd/user/swayidle.service | 8 ++++----
 files/.tmux/plugins/tpm                     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/.config/systemd/user/swayidle.service b/files/.config/systemd/user/swayidle.service
index 6c1b4cf..e0cf737 100644
--- a/files/.config/systemd/user/swayidle.service
+++ b/files/.config/systemd/user/swayidle.service
@@ -6,10 +6,10 @@ PartOf=graphical-session.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/swayidle -w \
-        timeout 1200 'lock' \
-        timeout 1210 'swaymsg "output * dpms off"' \
-                resume 'swaymsg "output * dpms on"' \
-        before-sleep 'lock'
+    timeout 600 'lock' \
+    timeout 30 'if pgrep swaylock; then swaymsg "output * dpms off"; fi' \
+        resume 'if pgrep swaylock; then swaymsg "output * dpms on"; fi' \
+    before-sleep 'lock'
 
 [Install]
 WantedBy=sway-session.target
diff --git a/files/.tmux/plugins/tpm b/files/.tmux/plugins/tpm
index 42bb2bf..476f6ca 160000
--- a/files/.tmux/plugins/tpm
+++ b/files/.tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 42bb2bf48bef881be504278cf5156371b542cf81
+Subproject commit 476f6ca69922c9e67c408ae92dff0eb0ccb8ee51