Extend lib to include custom util functions

flake.nix

@@ -46,15 +46,14 @@
     }:
     let
       inherit (nixpkgs) lib;
-      myLib = import ./lib/utils.nix { inherit lib; };
       overlays = import ./lib/overlays.nix { inherit nixpkgs nixpkgs-unstable nurpkgs; };
       system = "x86_64-linux";
       revision = nixpkgs.lib.mkIf (self ? rev) self.rev;
       mkISO = import ./lib/mk-iso.nix;
       mkNixOS = import ./lib/mk-nixos.nix {
-        inherit lib myLib overlays home-manager agenix disko impermanence system revision;
+        inherit lib overlays home-manager agenix disko impermanence system revision;
       };
-      mkHM = import ./lib/mk-hm.nix { inherit myLib overlays agenix home-manager system; };
+      mkHM = import ./lib/mk-hm.nix { inherit overlays agenix home-manager system; };
       forAllSystems = flake-utils.lib.eachDefaultSystem
         (system:
           let

home/modules/cli/starship.nix

@@ -1,8 +1,7 @@
-{ pkgs, lib, myLib, ... }:
+{ pkgs, lib, ... }:
 
 with builtins;
 with lib;
-with myLib;
 
 let
   isRust = path: hasSuffix ".rs" path && path != "mod.rs";

home/modules/wm/xmonad.nix

@@ -1,7 +1,6 @@
-{ pkgs, config, lib, myLib, ... }:
+{ pkgs, config, lib, ... }:
 
 with lib;
-with myLib;
 
 let
   libPath = ./xmonad-config/lib;

lib/mk-hm.nix

@@ -1,5 +1,4 @@
-{ myLib
-, overlays
+{ overlays
 , home-manager
 , agenix
 , system
@@ -8,13 +7,12 @@
 let
   pkgs = overlays system;
   isDarwin = pkgs.lib.strings.hasSuffix system "-darwin";
-  specialArgs = { inherit isDarwin myLib; };
-  homeDirectory = if isDarwin then "/Users/${username}" else "/home/${username}";
+  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

@@ -1,5 +1,4 @@
 { lib
-, myLib
 , overlays
 , home-manager
 , agenix
@@ -11,9 +10,7 @@
 
 let
   pkgs = overlays system;
-  specialArgs = {
-    inherit myLib agenix impermanence;
-  };
+  specialArgs = { inherit agenix impermanence; };
   baseConfig = _: {
     # FIXME : agenix/impermanence mixup
     age.identityPaths = [ "/persistent-system/key" ];
@@ -25,6 +22,7 @@ let
   diskoConfig = machineRoot + /disks.nix;
 in
 lib.nixosSystem {
+
   inherit system specialArgs pkgs;
 
   modules = [

lib/overlays.nix

@@ -12,13 +12,17 @@ let
   unstableOverlay = _: _: {
     unstable = import nixpkgs-unstable { inherit config system; };
   };
+  customLib = _: prev: {
+    lib = prev.lib // import ./utils.nix { inherit (prev) lib; };
+  };
 in
 import nixpkgs {
   inherit config system;
 
   overlays = [
     nurOverlay
     unstableOverlay
+    customLib
   ];
 }