From d16bcb693db18b8ab2508cef6400ce1219dac833 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Fri, 2 Aug 2024 14:25:52 -0600
Subject: pkgs/lib: refactor out of util/

---
 flake.nix                |  3 +--
 pkgs/default.nix         |  2 ++
 pkgs/lib/default.nix     |  4 ++++
 pkgs/lib/importAll.nix   | 17 +++++++++++++++++
 sys/baseline/default.nix |  2 ++
 sys/virt/libvirt.nix     |  2 +-
 util/default.nix         |  3 ---
 util/importAll.nix       | 17 -----------------
 8 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/lib/default.nix
 create mode 100644 pkgs/lib/importAll.nix
 delete mode 100644 util/default.nix
 delete mode 100644 util/importAll.nix

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/pkgs/lib/importAll.nix b/pkgs/lib/importAll.nix
new file mode 100644
index 0000000..30a1dd9
--- /dev/null
+++ b/pkgs/lib/importAll.nix
@@ -0,0 +1,17 @@
+{ lib }:
+{ root, exclude ? [ ] }:
+with builtins; with lib;
+
+# http://chriswarbo.net/projects/nixos/useful_hacks.html
+let
+  basename = removeSuffix ".nix";
+
+  isMatch = name: type: (hasSuffix ".nix" name || type == "directory")
+    && ! elem name (map basename exclude);
+
+  entry = name: _: {
+    name = basename name;
+    value = import (root + "/${name}");
+  };
+in
+mapAttrs' entry (filterAttrs isMatch (readDir root))
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;
-}
diff --git a/util/importAll.nix b/util/importAll.nix
deleted file mode 100644
index cc18640..0000000
--- a/util/importAll.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-lib:
-{ root, exclude ? [ ] }:
-with builtins; with lib;
-
-# http://chriswarbo.net/projects/nixos/useful_hacks.html
-let
-  basename = removeSuffix ".nix";
-
-  isMatch = name: type: (hasSuffix ".nix" name || type == "directory")
-    && ! elem name (map basename exclude);
-
-  entry = name: _: {
-    name = basename name;
-    value = import (root + "/${name}");
-  };
-in
-mapAttrs' entry (filterAttrs isMatch (readDir root))
-- 
cgit v1.2.3