Extend lib to include custom util functions

home/modules/cli/starship.nix

@@ -1,12 +1,11 @@
-{ pkgs, lib, myLib, ... }:
+{ pkgs, lib, ... }:
 
 with builtins;
 with lib;
-with myLib;
 
 let
   isRust = path: hasSuffix ".rs" path && path != "mod.rs";
-  toogleModules = enabled: modules: mergeAll (map (mod: { "${mod}" = { disabled = !enabled; }; }) modules);
+  toogleModules = enabled: modules: my.mergeAll (map (mod: { "${mod}" = { disabled = !enabled; }; }) modules);
   starshipPackage = pkgs.unstable.starship;
   promptOrder = [
     "nix_shell"
@@ -33,7 +32,7 @@ let
   # - Get the file name, without the extension (<- name of the module)
   # - Exclude the enabled modules
   disabledModules = pipe modulesSources [
-    (filterFiles isRust)
+    (my.filterFiles isRust)
     (map (removeSuffix ".rs"))
     (subtractLists promptOrder)
     (toogleModules false)
@@ -78,7 +77,7 @@ in
     enable = true;
     enableZshIntegration = true;
     package = starshipPackage;
-    settings = mergeAll [
+    settings = my.mergeAll [
       enabledModules
       disabledModules
       starshipConfig

home/modules/wm/xmonad.nix

@@ -1,14 +1,13 @@
-{ pkgs, config, lib, myLib, ... }:
+{ pkgs, config, lib, ... }:
 
 with lib;
-with myLib;
 
 let
   libPath = ./xmonad-config/lib;
   libFiles = pipe libPath [
-    listFiles
+    my.listFiles
     (map (file: { "${file}" = libPath + "/${file}"; }))
-    mergeAll
+    my.mergeAll
   ];
 in
 {

lib/mk-hm.nix

@@ -3,16 +3,11 @@ username: { overlays, home-manager, system }:
 let
   pkgs = overlays system;
   isDarwin = pkgs.lib.strings.hasSuffix system "-darwin";
-  specialArgs = {
-    inherit isDarwin;
-    myLib = import ./utils.nix { inherit (pkgs) lib; };
-  };
+  extraSpecialArgs = { inherit isDarwin; };
   homeDirectory = if isDarwin then "/Users/${username}" else "/home/${username}";
 in
 home-manager.lib.homeManagerConfiguration {
-  inherit pkgs;
-
-  extraSpecialArgs = specialArgs;
+  inherit pkgs extraSpecialArgs;
 
   modules = [
     { home = { inherit username homeDirectory; }; }

lib/mk-nixos.nix

@@ -4,7 +4,6 @@ let
   pkgs = overlays system;
   specialArgs = {
     hmPkgs = home-manager.packages.${system};
-    myLib = import ./utils.nix { inherit (pkgs) lib; };
   };
   baseConfig = _: {
     system.configurationRevision = revision;
@@ -15,7 +14,7 @@ let
   diskoConfig = import (machineRoot + /disks.nix) { };
 in
 lib.nixosSystem {
-  inherit system specialArgs pkgs;
+  inherit lib system specialArgs pkgs;
 
   modules = [
     baseConfig

lib/overlays.nix

@@ -12,12 +12,18 @@ let
   unstableOverlay = final: prev: {
     unstable = import nixpkgs-unstable { inherit config system; };
   };
+  withCustomLib = final: prev: {
+    lib = prev.lib // {
+      my = import ./utils.nix { inherit (prev) lib; };
+    };
+  };
 in
 import nixpkgs {
   inherit config system;
 
   overlays = [
     nurOverlay
     unstableOverlay
+    withCustomLib
   ];
 }