Use overlay

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

flake.nix

@@ -22,7 +22,14 @@
         treefmt = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
       in
       {
-        lib.${system} = import ./lib { inherit pkgs; };
+        overlays =
+          let
+            lib = import ./overlay;
+          in
+          {
+            inherit lib;
+            default = lib;
+          };
 
         formatter.${system} = treefmt.config.build.wrapper;
         checks.${system}.formatting = treefmt.config.build.check inputs.self;

lib/default.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-let
-  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
-in
-{
-  fetchers = callPackage ./fetchers { };
-  runtime = callPackage ./runtime { };
-}

lib/fetchers/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-let
-  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
-in
-{
-  sshKnownHosts = callPackage ./sshKnownHosts { };
-}

lib/runtime/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-let
-  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
-in
-{
-  merge = callPackage ./merge { };
-}

lib/runtime/merge/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-let
-  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
-in
-{
-  keyValue = callPackage ./keyValue { };
-}

overlay/default.nix

@@ -0,0 +1,17 @@
+final: prev:
+let
+  callPackage = prev.lib.callPackageWith { pkgs = prev; };
+in
+{
+  lib = {
+    fetchers = prev.fetchers // {
+      sshKnownHosts = callPackage ./fetchers/sshKnownHosts { };
+    };
+
+    runtime = {
+      merge = {
+        keyValue = callPackage ./runtime/merge/keyValue { };
+      };
+    };
+  };
+}