feat: use nixpkgs-lib, moar seperations

example.nix

@@ -0,0 +1,7 @@
+tags: with tags;
+html [
+  (body [
+    (p "Hello,")
+    (p "world!")
+  ])
+]

flake.lock

@@ -0,0 +1,26 @@
+{
+  "nodes": {
+    "nixpkgsLib": {
+      "locked": {
+        "lastModified": 1620519687,
+        "narHash": "sha256-+6Dd72b2CASuXm2W7KRxZIE7AOy/dj4mU28vaF+zxcs=",
+        "owner": "divnix",
+        "repo": "nixpkgs.lib",
+        "rev": "c7b6169809c5f74dd0c34f3d69e9d12ba4d448de",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgsLib": "nixpkgsLib"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -1,26 +1,24 @@
 {
-  inputs = { };
+  inputs = {
+    nixpkgsLib.url = "github:divnix/nixpkgs.lib";
+  };
 
-  outputs = { self }:
+  outputs = { self, nixpkgsLib }:
     let
-      tagsPath = ./tags.nix;
+      lib = nixpkgsLib.lib;
-      libPath = ./lib.nix;
+      tags = import ./tags.nix { format = true; inherit lib; };
-      pkgsLibPath = ./pkgs-lib.nix;
-
-      lib = import libPath;
     in
     {
       lib = {
-        inherit tagsPath libPath pkgsLibPath;
+        inherit tags;
-
-        tags = import tagsPath { format = true; inherit lib; };
-        core = lib;
       };
 
       overlays = {
         pkgsLib = (final: prev: {
-          htmlNix = import pkgsLibPath { inherit lib; pkgs = prev; };
+          htmlNix = import ./pkgs-lib.nix { inherit lib; pkgs = prev; };
         });
       };
+
+      example = import ./example.nix tags;
     };
 }

lib.nix

@@ -1,8 +0,0 @@
-let
-  inherit (builtins) isAttrs isList map;
-in
-{
-  mapAttrsToList = f: attrs: map (name: f name attrs.${name}) (builtins.attrNames attrs);
-  concatStrings = builtins.concatStringsSep "";
-  genAttrs = f: names: builtins.listToAttrs (map (n: { name = n; value = (f n); }) names);
-} // builtins

pkgs-lib.nix

@@ -1,4 +1,4 @@
-{ lib ? import ./lib.nix, pkgs }:
+{ lib, pkgs }:
 let pkgBin = name: "${pkgs.${name}}/bin/${name}"; in
 {
   mkServePathScript = path: pkgs.writeScriptBin "serve" { } ''

tags.nix

@@ -1,5 +1,7 @@
-{ format ? false, lib ? import ./lib.nix }:
+{ format ? false, lib }:
-with lib; let
+let
+  inherit (lib) concatStrings mapAttrsToList genAttrs isAttrs isList;
+
   fmt = if format then "\n  " else "";
 
   evalAttrs = attrs: concatStrings (mapAttrsToList (name: value: " ${name}=\"${value}\"") attrs);
@@ -9,7 +11,7 @@ with lib; let
     then (children: "<${name}${evalAttrs maybeAttrs}>${fmt}${evalChildren children}${fmt}</${name}>")
     else tag name { } maybeAttrs;
 
-  tags = (genAttrs tag [ "html" "head" "body" "div" "p" "a" ]);
+  tags = (genAttrs [ "html" "head" "body" "div" "p" "a" ] tag);
 in
 tags // {
   inherit tag;