From ebf727ed437f496e4dc69458eec028746d1762db Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 20 Sep 2024 10:32:23 +0100
Subject: [PATCH] Swap swaylock back for swaylock-effects

Use swaylockfx wrapper to invoke as this keeps compatibility with
stylix customisations
---
 system/home/sway/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/system/home/sway/default.nix b/system/home/sway/default.nix
index cd392f1d..3fb556d8 100644
--- a/system/home/sway/default.nix
+++ b/system/home/sway/default.nix
@@ -6,6 +6,7 @@
 }:
 {
   imports = [ ./waybar/default.nix ];
+  stylix.targets.swaylock.useImage = false; # Using swaylock-effects instead
   home.packages = with pkgs; [
     ffmpeg
     grim
@@ -13,6 +14,9 @@
     wl-clipboard
     swayimg
     swaybg
+    (writeShellScriptBin "swaylockfx" ''
+      ${swaylock-effects}/bin/swaylock --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5
+    '')
     (writeShellScriptBin "protonmail-setup-bridge" ''
       pkill -9 -f protonmail-bridge
       ${protonmail-bridge}/bin/protonmail-bridge -c
@@ -21,7 +25,6 @@
   ];
   programs = {
     waybar.systemd.target = "sway-session.target";
-    swaylock.enable = true;
     fuzzel = {
       enable = true;
       settings = {
@@ -43,6 +46,10 @@
         };
       };
     };
+    swaylock = {
+      enable = true;
+      package = pkgs.swaylock-effects;
+    };
     wlogout = {
       enable = true;
       layout = [
@@ -97,7 +104,7 @@
       timeouts = [
         {
           timeout = 60 * 15; # 15 minutes
-          command = "swaylock";
+          command = "swaylockfx";
         }
       ];
     };
@@ -221,7 +228,7 @@
           "XF86MonBrightnessDown" = "exec ${config.services.avizo.package}/bin/lightctl - 5";
 
           # System utilities
-          "Mod4+Mod1+l" = "exec swaylock";
+          "Mod4+Mod1+l" = "exec swaylockfx";
           "${modifier}+z" = "exec ${config.services.mako.package}/bin/makoctl restore";
           "${modifier}+Shift+z" = "exec ${config.services.mako.package}/bin/makoctl dismiss -a";
           "${modifier}+Shift+p" = "exec ${config.programs.wlogout.package}/bin/wlogout";