lib: drop builders

4 files changed, 10 insertions, 82 deletions

diff --git a/lib/README.md b/lib/README.md
index ad2d3ae..97814c5 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -1,10 +1,5 @@
 # ./lib/
 
-## builders.nix
-
-Light wrappers around functions like `nixosSystem` and
-`homeManagerConfiguration`
-
 ## nginx.nix
 
 Small helpers to avoid boilerplate in the `services.nginx` module
diff --git a/lib/builders.nix b/lib/builders.nix
deleted file mode 100644
index 3cedb59..0000000
--- a/lib/builders.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  inputs,
-  self,
-  ...
-}:
-{
-  nixosSystem =
-    {
-      nixpkgs ? inputs.nixpkgs,
-      specialArgs ? { },
-      ...
-    }@args:
-    nixpkgs.lib.nixosSystem (
-      lib.removeAttrs args [ "nixpkgs" ]
-      // {
-        specialArgs = specialArgs // {
-          inherit inputs;
-        };
-      }
-    );
-
-  darwinSystem =
-    {
-      nix-darwin ? inputs.nix-darwin or inputs.darwin,
-      specialArgs ? { },
-      ...
-    }@args:
-    nix-darwin.lib.darwinSystem (
-      lib.removeAttrs args [ "nix-darwin" ]
-      // {
-        specialArgs = specialArgs // {
-          inherit inputs;
-        };
-      }
-    );
-
-  homeManagerConfiguration =
-    {
-      extraSpecialArgs ? { },
-      ...
-    }@args:
-    inputs.home-manager.lib.homeManagerConfiguration (
-      args
-      // {
-        extraSpecialArgs = extraSpecialArgs // {
-          inherit inputs;
-        };
-      }
-    );
-
-  mkModule =
-    {
-      name,
-      type,
-      imports,
-    }@args:
-    {
-      _file = "${self.outPath}/flake.nix#${type}Modules.${name}";
-      inherit imports;
-    }
-    // lib.removeAttrs args [
-      "name"
-      "type"
-    ];
-}
diff --git a/lib/default.nix b/lib/default.nix
index 96d0a9f..8279f8f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,11 +1,9 @@
-{
-  lib,
-  inputs,
-  self,
-  ...
-}:
+{ lib }:
 
-lib.mapAttrs (_: file: import file { inherit lib inputs self; }) {
-  builders = ./builders.nix;
-  nginx = ./nginx.nix;
-}
+lib.makeExtensible (
+  final:
+
+  lib.mapAttrs (lib.const (lib.flip import { inherit lib final; })) {
+    nginx = ./nginx.nix;
+  }
+)
diff --git a/lib/nginx.nix b/lib/nginx.nix
index 80eb6ad..8b89071 100644
--- a/lib/nginx.nix
+++ b/lib/nginx.nix
@@ -1,4 +1,5 @@
-{ lib, ... }:
+{ lib, final }:
+
 {
   /**
     Create an NGINX virtualHost submodule proxying a local port