home: amneesh: use overlay for standalone home-manager

Signed-off-by: Amneesh Singh <amneesh@ti.com>

home/amneesh/default.nix

@@ -16,8 +16,6 @@
   imports = [
     ./pkgs.nix
     ./nixgl.nix
-    # wayland
-    ./hyprlock.nix
     ./screen.nix
     ./wayvnc.nix
 
@@ -28,7 +26,6 @@
     ../natto/dunst.nix
     ../natto/gtk.nix
     ../natto/cursor.nix
-    # wayland
     ../natto/wayland.nix
     ../natto/hypridle.nix
     ../natto/hyprlock.nix

home/amneesh/hyprlock.nix

@@ -1,17 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
-let
-
-  standalonePam = pkgs.linux-pam.overrideAttrs (oa: {
-    postPatch = ''
-      substituteInPlace modules/module-meson.build \
-        --replace "sbindir / 'unix_chkpwd'" "'/usr/bin/unix_chkpwd'"
-    '';
-  });
-in
-{
-  programs.hyprlock.package = lib.mkForce (pkgs.hyprlock.override { pam = standalonePam; });
-}

home/default.nix

@@ -14,7 +14,7 @@ let
   ];
 
   mkPkgs =
-    system:
+    system: overlays:
     import inputs.nixpkgs {
       inherit system;
       config = {
@@ -22,7 +22,7 @@ let
         allowBroken = true;
         allowInsecure = true;
       };
-      overlays = [ self.overlays.default ];
+      overlays = overlays ++ [ self.overlays.default ];
     };
 
   extraSpecialArgs = globalArgs;
@@ -37,7 +37,7 @@ in
         { isLaptop = true; }
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux";
+      pkgs = mkPkgs "x86_64-linux" [ ];
     };
 
     natto = inputs.home-manager.lib.homeManagerConfiguration {
@@ -47,7 +47,7 @@ in
         ./common/fonts
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux";
+      pkgs = mkPkgs "x86_64-linux" [ ];
     };
 
     spark = inputs.home-manager.lib.homeManagerConfiguration {
@@ -62,7 +62,7 @@ in
         }
       ]
       ++ common;
-      pkgs = mkPkgs "aarch64-linux";
+      pkgs = mkPkgs "aarch64-linux" [ ];
     };
 
     bat = inputs.home-manager.lib.homeManagerConfiguration {
@@ -77,7 +77,7 @@ in
         }
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux";
+      pkgs = mkPkgs "x86_64-linux" [ ];
     };
 
     spin = inputs.home-manager.lib.homeManagerConfiguration {
@@ -92,7 +92,7 @@ in
         }
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux";
+      pkgs = mkPkgs "x86_64-linux" [ ];
     };
 
     kero = inputs.home-manager.lib.homeManagerConfiguration {
@@ -107,7 +107,7 @@ in
         }
       ]
       ++ common;
-      pkgs = mkPkgs "aarch64-linux";
+      pkgs = mkPkgs "aarch64-linux" [ ];
     };
 
     amneesh = inputs.home-manager.lib.homeManagerConfiguration {
@@ -116,7 +116,7 @@ in
         ./amneesh
       ]
       ++ common;
-      pkgs = mkPkgs "x86_64-linux";
+      pkgs = mkPkgs "x86_64-linux" [ (import ./overlays/standalone.nix) ];
     };
   };
 }

home/overlays/standalone.nix

@@ -0,0 +1,13 @@
+final: prev:
+let
+  pam = prev.pam.overrideAttrs (oa: {
+    postPatch = ''
+      substituteInPlace modules/module-meson.build \
+        --replace "sbindir / 'unix_chkpwd'" "'/usr/bin/unix_chkpwd'"
+    '';
+  });
+in
+{
+  hyprlock = prev.hyprlock.override { inherit pam; };
+  swaylock = prev.swaylock.override { inherit pam; };
+}