From a52be130482851001457518b1409041042dfcc48 Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Mon, 19 Aug 2024 06:58:12 -0700
Subject: [PATCH] trying something?

---
 lib/builders.nix | 6 ++++--
 lib/default.nix  | 7 ++-----
 lib/overlay.nix  | 2 ++
 pkgs/default.nix | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 lib/overlay.nix

diff --git a/lib/builders.nix b/lib/builders.nix
index 0e4197c..d0b311f 100644
--- a/lib/builders.nix
+++ b/lib/builders.nix
@@ -9,11 +9,13 @@ let
   });
 
   lib = nixpkgs.lib;
+  libExt = import ./. lib;
 
   inherit (inputs.home-manager.lib) homeManagerConfiguration;
   inherit (lib) nixosSystem;
   inherit (lib.strings) optionalString;
   inherit (lib.attrsets) nameValuePair;
+  inherit (libExt) right;
 in
 rec {
   toPartialNixosConfig =
@@ -32,7 +34,7 @@ rec {
       });
   compileSystems =
     systems:
-    lib.right
+    right
       builtins.listToAttrs
       (map toPartialNixosConfig)
       systems;
@@ -56,7 +58,7 @@ rec {
       });
   compileHomes =
     systems:
-    lib.right
+    right
       builtins.listToAttrs
       (map toPartialHomeManagerConfig)
       systems;
diff --git a/lib/default.nix b/lib/default.nix
index 9928d95..db47759 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,7 +1,4 @@
-final: prev:
-let
-  inherit (final) isFunction;
-in
+lib:
 rec {
   # Ternary operator
   # Exaample:
@@ -12,7 +9,7 @@ rec {
   # Right-associate and chain following single-operand functions
   # Example:
   # right f g h 1 => f(g(h(1)))
-  right = f: g: tern (isFunction g)
+  right = f: g: tern (lib.isFunction g)
     (right (x: f (g (x))))
     (f (g));
 }
diff --git a/lib/overlay.nix b/lib/overlay.nix
new file mode 100644
index 0000000..fb8c50a
--- /dev/null
+++ b/lib/overlay.nix
@@ -0,0 +1,2 @@
+final: prev:
+(import ./. { lib = prev; })
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 6451d04..a9816ab 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -3,7 +3,7 @@ let
   callDefaultPackage = path: prev.callPackage path { };
 in
 {
-  lib = prev.lib.extend import ../lib;
+  lib = prev.lib.extend import ../lib/overlay.nix;
 
   wrapWine = callDefaultPackage ./wrapWine;
   writeXrandrScriptBin = callDefaultPackage ./writeXrandrScriptBin;