Clean up swaylock configuration

In the process of figuring out what happened. Turns out it's a breaking change in pam management in nixos unstable. Tracking issue: NixOS/nixpkgs#157112
tomhoule · Jan 30, 2022 · 4ddc7dc · 4ddc7dc
1 parent ba061f0
commit 4ddc7dc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/hm/tom/modules/sway/config b/hm/tom/modules/sway/config
@@ -41,9 +41,9 @@ output * bg ~/.config/sway/wallpaper fill
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
 exec swayidle -w \
-     timeout 300 'swaylock -f -c 000000' \
+     timeout 300 'swaylock' \
      timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-     before-sleep 'swaylock -f -c 000000'
+     before-sleep 'swaylock'
 
 ### Input configuration
 #
@@ -106,7 +106,7 @@ seat seat0 xcursor_theme whiteglass
     bindsym XF86MonBrightnessDown exec brillo -U 10
 
     # Lock
-    bindsym $mod+Ctrl+l exec swaylock -c 010100 -i ~/.config/sway/wallpaper
+    bindsym $mod+Ctrl+l exec swaylock
 
     # Screenshots
     bindsym Print exec grim -t png -g "$(slurp)" ~/Pictures/$(date +%Y-%m-%d_%H-%m-%S).png;

diff --git a/hm/tom/modules/sway/default.nix b/hm/tom/modules/sway/default.nix
@@ -25,5 +25,6 @@ in
     '';
 
     "waybar".source = config.localHome.waybarConfigDir;
+    "swaylock/config".source = ./swaylock-config;
   };
 }
diff --git a/hm/tom/modules/sway/swaylock-config b/hm/tom/modules/sway/swaylock-config
@@ -0,0 +1,5 @@
+color=010100
+image=~/.config/sway/wallpaper
+daemonize
+show-keyboard-layout
+indicator-caps-lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,5 +25,6 @@ in @@
         '';
         "waybar".source = config.localHome.waybarConfigDir;
+        "swaylock/config".source = ./swaylock-config;
       };
     }