more updates

overlays/betterlockscreen.nix

@@ -1,2 +0,0 @@
-# Disable dunst so that it's not attempting to reach a non-existent dunst service
-_final: prev: { betterlockscreen = prev.betterlockscreen.override { withDunst = false; }; }

overlays/bypass-paywalls-clean.nix

@@ -9,13 +9,14 @@ inputs: _final: prev: {
     in
     prev.stdenv.mkDerivation rec {
       pname = "bypass-paywalls-clean";
-      version = "3.6.6.0";
+      version = "4.0.6.0";
       src = builtins.fetchGit {
-        url = "https://gitflic.ru/magnolia1234/bpc_uploads";
+        url = "https://gitflic.ru/project/magnolia1234/bpc_uploads.git";
         # owner = "magnolia1234";
         # repo = "bpc_uploads";
-        rev = "365832a498fa58cb124e74e3836edc182178c6de";
-        sha256 = "0000000000000000000000000000000000000000000000000000";
+        ref = "main";
+        rev = "a3012f84bad9719760150832803f2ea07af8dae3";
+        # sha256 = "0000000000000000000000000000000000000000000000000000";
       };
       preferLocalBuild = true;
       allowSubstitutes = true;

overlays/default.nix

@@ -0,0 +1,16 @@
+# Return a list of all overlays
+
+inputs:
+
+let
+  lib = inputs.nixpkgs.lib;
+in
+
+lib.pipe (lib.filesystem.listFilesRecursive ./.) [
+  # Get only files ending in .nix
+  (builtins.filter (name: lib.hasSuffix ".nix" name))
+  # Remove this file
+  (builtins.filter (name: name != ./default.nix))
+  # Import each overlay file
+  (map (file: (import file) inputs))
+]

overlays/pkgs.nix

@@ -1,14 +1,15 @@
-_final: prev:
+_inputs: _final: prev:
 
 let
-  listToAttrsByField =
-    field: list:
-    builtins.listToAttrs (
-      map (v: {
-        name = v.${field};
-        value = v;
-      }) list
-    );
+  # TODO: Remove
+  # listToAttrsByField =
+  #   field: list:
+  #   builtins.listToAttrs (
+  #     map (v: {
+  #       name = v.${field};
+  #       value = v;
+  #     }) list
+  #   );
 
   listToAttrsByPnameOrName =
     list: