zaphyra's git: tgcNUR

refactor lib

diff --git a/flake.nix b/flake.nix
@@ -15,7 +15,10 @@
     inputs:
     (
       let
-        lib = import ./lib inputs.nixpkgs.lib inputs;
+        lib = import ./lib {
+          inherit (inputs.nixpkgs) lib;
+          inherit inputs;
+        };
         modulesTemplate =
           modules:
           modules

diff --git a/lib/default.nix b/lib/default.nix
@@ -1,8 +1,13 @@
-nixpkgsLib: inputs:
+{
+  lib,
+  inputs,
+  ...
+}:
+
 (
   let
     # read the current directorys files and pipe the result through a list of functions
-    lib = nixpkgsLib.pipe (builtins.readDir ./.) [
+    selfLib = lib.pipe (builtins.readDir ./.) [
       # convert to a list containing just the attribute names
       (builtins.attrNames)
       # drop "default.nix" from the list

@@ -11,14 +16,12 @@ nixpkgsLib: inputs:
       (builtins.map (
         name:
         import ./${name} {
-          inherit inputs;
-          self = lib;
-          lib = nixpkgsLib;
+          inherit inputs lib selfLib;
         }
       ))
       # merge list of attribute sets together
-      (nixpkgsLib.mergeAttrsList)
+      (lib.mergeAttrsList)
     ];
   in
-  lib
+  selfLib
 )

diff --git a/lib/forAllSystems.nix b/lib/forAllSystems.nix
@@ -1,4 +1,8 @@
-{ inputs, lib, ... }:
+{
+  inputs,
+  lib,
+  ...
+}:
 
 {
 

diff --git a/lib/toCamelCase.nix b/lib/toCamelCase.nix
@@ -1,4 +1,7 @@
-{ lib, ... }:
+{
+  lib,
+  ...
+}:
 
 {