From 697feb0ec0669a4f5745701de8154351b4a92769 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Wed, 12 Jul 2023 02:20:03 -0500
Subject: [PATCH] Stuff

---
 common/git/config               | 2 +-
 host/desktop/sway/config        | 8 --------
 host/laptop/sway/config         | 1 -
 os/linux/bin/maybe-good-morning | 1 +
 os/linux/sway/config            | 9 +++++++++
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/common/git/config b/common/git/config
index a46b470..e1560a2 100644
--- a/common/git/config
+++ b/common/git/config
@@ -81,4 +81,4 @@
 # 	pushOption = merge_request.assign="daniel.flanagan" 
 
 [url "git@git.hq.bill.com:"]
-	insteadOf = https://git.hq.bill.com/
\ No newline at end of file
+	insteadOf = https://git.hq.bill.com/
diff --git a/host/desktop/sway/config b/host/desktop/sway/config
index 9b4beea..b6ea4a3 100644
--- a/host/desktop/sway/config
+++ b/host/desktop/sway/config
@@ -1,12 +1,4 @@
 default_border pixel 1
-exec swayidle -w \
-	timeout 540 'notify-send "Idling in 90 seconds"' \
-	timeout 570 'notify-send "Idling in 60 seconds"' \
-	timeout 600 'notify-send "Idling in 30 seconds..."' \
-	timeout 630 'swaylock -f' \
-	timeout 660 'swaymsg "output * dpms off"' \
-	resume 'swaymsg "output * dpms on" & maybe-good-morning &' \
-	before-sleep 'swaylock -f'
 
 gaps inner 10
 
diff --git a/host/laptop/sway/config b/host/laptop/sway/config
index 06b3270..71e1c36 100644
--- a/host/laptop/sway/config
+++ b/host/laptop/sway/config
@@ -1,5 +1,4 @@
 exec libinput-gestures -c ~/.config/libinput-gestures.conf
-exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 330 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 000000'
 gaps inner 0
 
 bindswitch lid:toggle exec swaylock
diff --git a/os/linux/bin/maybe-good-morning b/os/linux/bin/maybe-good-morning
index 7a11ea1..a6e9b93 100755
--- a/os/linux/bin/maybe-good-morning
+++ b/os/linux/bin/maybe-good-morning
@@ -10,6 +10,7 @@ if ! contains (date +%H) $hours
 end
 
 notify-send \
+	--expire-time=0 \
 	--urgency critical \
 	"Good morning!" \
 	"Activate this notification (click it or Super+Shift+Space) to run the script. Dismiss (Super+Ctrl+Space) to ignore." \
diff --git a/os/linux/sway/config b/os/linux/sway/config
index 9a3d0cf..3026cdc 100644
--- a/os/linux/sway/config
+++ b/os/linux/sway/config
@@ -187,6 +187,15 @@ exec mako
 exec kitty --single-instance
 exec /usr/lib/polkit-kde-authentication-agent-1
 
+exec swayidle -w \
+	timeout 540 'notify-send "Idling in 90 seconds"' \
+	timeout 570 'notify-send "Idling in 60 seconds"' \
+	timeout 600 'notify-send "Idling in 30 seconds..."' \
+	timeout 630 'swaylock -f' \
+	timeout 660 'swaymsg "output * dpms off"' \
+	resume 'swaymsg "output * dpms on" & maybe-good-morning &' \
+	before-sleep 'swaylock -f'
+
 # exec_always notify-send -a "sway" -i ~/.wallpaper "sway configuration loaded"
 
 # prevent all windows from stealing focus