pkgs/lib: refactor out of util/

7 files changed, 11 insertions, 7 deletions

diff --git a/flake.nix b/flake.nix
index 53acf63..6b11dd6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,8 +59,7 @@
         overlays = [ nur.overlay self.overlays.default ];
       };
 
-      util = import ./util;
-      inherit (util pkgs.lib) importAll;
+      inherit (pkgs.local.lib) importAll;
 
       local = import ./pkgs;
     in
diff --git a/pkgs/default.nix b/pkgs/default.nix
index d595e04..82f6380 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -3,6 +3,8 @@ with prev.lib; let
   inherit (final) callPackage fetchpatch;
 in
 {
+  lib = callPackage ./lib { };
+
   btclone = callPackage ./btclone { };
   gem5 = callPackage ./gem5.nix { gem5ISA = "x86"; };
   git-aliases = callPackage ./git-aliases.nix { };
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
new file mode 100644
index 0000000..a273758
--- /dev/null
+++ b/pkgs/lib/default.nix
@@ -0,0 +1,4 @@
+{ callPackage }:
+{
+  importAll = callPackage ./importAll.nix { };
+}
diff --git a/util/importAll.nix b/pkgs/lib/importAll.nix
index cc18640..30a1dd9 100644
--- a/util/importAll.nix
+++ b/pkgs/lib/importAll.nix
@@ -1,4 +1,4 @@
-lib:
+{ lib }:
 { root, exclude ? [ ] }:
 with builtins; with lib;
 
diff --git a/sys/baseline/default.nix b/sys/baseline/default.nix
index 49b9b43..a433bb7 100644
--- a/sys/baseline/default.nix
+++ b/sys/baseline/default.nix
@@ -22,6 +22,8 @@ with lib; {
       ];
     };
 
+    lib.local = pkgs.local.lib;
+
     local.boot.impermanence.directories = [ "/var/lib/dhparams" ];
 
     nix = {
diff --git a/sys/virt/libvirt.nix b/sys/virt/libvirt.nix
index 29679ae..0f98563 100644
--- a/sys/virt/libvirt.nix
+++ b/sys/virt/libvirt.nix
@@ -2,7 +2,7 @@
 with lib; let
   cfg = config.local.virt;
 
-  inherit (import ../../util lib) importAll;
+  inherit (config.lib.local) importAll;
 
   doms = mapAttrs (_: dom: dom { inherit config lib pkgs; }) (importAll { root = ./dom; });
 in
diff --git a/util/default.nix b/util/default.nix
deleted file mode 100644
index 226c69f..0000000
--- a/util/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-lib: {
-  importAll = import ./importAll.nix lib;
-}