move custom swaylock to lpkgs

Author: mrnossiom

home-manager/fragments/sway.nix

@@ -2,12 +2,14 @@
   config,
   lib,
   pkgs,
+  lpkgs,
 
   isDarwin,
   ...
 }:
 
 let
+  inherit (config.local) flags;
   cfg = config.local.fragment.sway;
   cfg-sway = config.wayland.windowManager.sway.config;
 
@@ -30,12 +32,13 @@ in
 
     programs.swaylock = {
       enable = true;
+      package = if !flags.onlyCached then lpkgs.swaylock else pkgs.swaylock;
       settings = {
         ignore-empty-password = true;
         show-failed-attempts = true;
 
         # relies on custom swaylock version in `overlays/patches.nix`
-        indicator-y-position = -100;
+        indicator-y-position = if !flags.onlyCached then -100 else 100;
         indicator-x-position = 100;
       };
     };
@@ -250,7 +253,7 @@ in
               sleep 1
 
               ${grim} $tmpimg
-              ${lib.getExe pkgs.swaylock} --image $tmpimg
+              ${lib.getExe config.programs.swaylock.package} --image $tmpimg
 
               rm $tmpimg
             ''}";

overlays/patches.nix

@@ -1,15 +1,4 @@
 final: prev:
 
-with final.lib;
-
 {
-  # TODO: remove once github:swaywm/swaylock#369 is merged
-  swaylock = prev.swaylock.overrideAttrs (old: {
-    src = prev.fetchFromGitHub {
-      owner = "mrnossiom";
-      repo = "swaylock";
-      rev = "1e949610081ea0788d9fba6f0d7c909d7b62e9e0";
-      hash = "sha256-3YN6n5mYB7r1Xk22AGYMusNbA6aBD6OMU3Gn9OOuS6o=";
-    };
-  });
 }

pkgs/default.nix

@@ -22,6 +22,7 @@ in
   lsr = callPackage ./lsr { };
   names = callPackage ./names.nix { };
   probe-rs-udev-rules = callPackage ./probe-rs-udev-rules.nix { };
+  swaylock = callPackage ./swaylock.nix { };
 
   # Import packages defined in foreign repositories
   inherit (agenix.packages.${system}) agenix;

pkgs/swaylock.nix

@@ -0,0 +1,15 @@
+{
+  swaylock,
+  fetchFromGitHub,
+  ...
+}:
+
+# TODO: remove once github:swaywm/swaylock#369 is merged
+swaylock.overrideAttrs (old: {
+  src = fetchFromGitHub {
+    owner = "mrnossiom";
+    repo = "swaylock";
+    rev = "1e949610081ea0788d9fba6f0d7c909d7b62e9e0";
+    hash = "sha256-3YN6n5mYB7r1Xk22AGYMusNbA6aBD6OMU3Gn9OOuS6o=";
+  };
+})