From 212ccf81438b87197b18146b839a7deddc49e6c2 Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Mon, 19 Aug 2024 06:21:38 -0700
Subject: [PATCH] flake: overlay lib

---
 lib/builders.nix | 13 +++++--------
 pkgs/default.nix |  4 +++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/builders.nix b/lib/builders.nix
index 8c890fd..618001c 100644
--- a/lib/builders.nix
+++ b/lib/builders.nix
@@ -1,8 +1,6 @@
 { nixpkgs, self, ... }@inputs:
 
 let
-  lib = nixpkgs.lib.extend (import ../lib);
-
   makePkgs = system: (import nixpkgs {
     inherit system;
 
@@ -10,8 +8,10 @@ let
     overlays = [ self.overlays.default ];
   });
 
+  lib = nixpkgs.lib.extend (import ./.);
+
   inherit (inputs.home-manager.lib) homeManagerConfiguration;
-  inherit (nixpkgs.lib) nixosSystem;
+  inherit (lib) nixosSystem;
   inherit (lib.strings) optionalString;
   inherit (lib.attrsets) nameValuePair;
 in
@@ -22,7 +22,7 @@ rec {
       hostname
       (nixosSystem {
         pkgs = makePkgs system;
-        specialArgs = { inherit inputs lib self; };
+        specialArgs = { inherit inputs self; };
 
         modules = [
           ../hosts/${hostname}/hardware-configuration.nix
@@ -48,10 +48,7 @@ rec {
       "${user}${hostStr}"
       (homeManagerConfiguration {
         pkgs = makePkgs system;
-        extraSpecialArgs = {
-          inherit inputs self;
-          lib = lib.extend (_: _: inputs.home-manager.lib);
-        };
+        extraSpecialArgs = { inherit inputs self; };
 
         modules = [
           ../hosts/${configHost}/home.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
index f5c41cf..7bfb58e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,8 +1,10 @@
 final: prev:
 let
-  callDefaultPackage = path: prev.callPackage path { };
+  callDefaultPackage = path: final.callPackage path { };
 in
 {
+  lib = prev.lib.extend import ../lib;
+
   wrapWine = callDefaultPackage ./wrapWine;
   writeXrandrScriptBin = callDefaultPackage ./writeXrandrScriptBin;
   borderlessBrowser = callDefaultPackage ./borderlessBrowser;