From 31aefef78042ef05b8e5b27b362f80c4ab2220f3 Mon Sep 17 00:00:00 2001
From: Michael Hunteman <michael@huntm.net>
Date: Fri, 1 Sep 2023 14:35:13 -0500
Subject: Move idle and lock to desktop config

---
 .config/sway/config  | 10 +---------
 .config/sway/desktop | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to '.config/sway')

diff --git a/.config/sway/config b/.config/sway/config
index 3880b47..af50db1 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -102,14 +102,6 @@ bindsym $mod+Shift+Print exec grim -g "$(slurp)" /tmp/$(date +'%Y%m%d_%Hh%Mm%Ss'
 bindsym $mod+n exec makoctl dismiss
 bindsym $mod+Shift+n exec makoctl dismiss -a
 
-output * bg ~/pictures/wallpaper.png fill
-exec swayidle -w \
-         timeout 300 'swaylock -f -i /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png --scaling fill' \
-         timeout 600 'swaymsg "output * dpms off"' \
-		 resume 'swaymsg "output * dpms on"'
-bindsym $mod+XF86Sleep exec swaylock -c 00000000
-bindsym $mod+F3 exec swaylock -i /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png --scaling fill
-
 set $primary #285577
 set $background #282828
 set $bar_background #1f1f1f
@@ -126,4 +118,4 @@ hide_edge_borders smart
 focus_on_window_activation urgent
 
 include "~/.config/sway/`hostname`"
-#exec startup
+exec idle
diff --git a/.config/sway/desktop b/.config/sway/desktop
index 966229e..b62bd31 100644
--- a/.config/sway/desktop
+++ b/.config/sway/desktop
@@ -7,6 +7,16 @@ input * {
 	xkb_options caps:escape
 }
 
+output * bg ~/pictures/wallpaper.png fill
+exec swayidle -w \
+         timeout 300 'swaylock -i /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png --scaling fill' \
+         timeout 600 'swaymsg "output * dpms off"' \
+		 resume 'swaymsg "output * dpms on"'
+
+# Lock
+bindsym $mod+XF86Sleep exec swaylock -c 00000000
+bindsym $mod+Pause exec swaylock -i /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png --scaling fill
+
 # Volume
 bindsym --locked XF86AudioRaiseVolume exec amixer set Master 2%+
 bindsym --locked XF86AudioLowerVolume exec amixer set Master 2%-
-- 
cgit v1.2.3