From f40c333987739530f6595b92a30833e1ef9f48b9 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sun, 17 Aug 2025 17:12:48 +0300
Subject: [PATCH] Use overlay

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 flake.nix                                       |  7 ++++---
 lib/default.nix                                 |  8 --------
 lib/fetchers/default.nix                        |  7 -------
 lib/runtime/default.nix                         |  7 -------
 lib/runtime/merge/default.nix                   |  7 -------
 overlay/default.nix                             | 17 +++++++++++++++++
 .../fetchers/sshKnownHosts/default.nix          |  0
 .../runtime/merge/keyValue/default.nix          |  0
 .../runtime/merge/keyValue/key-value.sh         |  0
 9 files changed, 21 insertions(+), 32 deletions(-)
 delete mode 100644 lib/default.nix
 delete mode 100644 lib/fetchers/default.nix
 delete mode 100644 lib/runtime/default.nix
 delete mode 100644 lib/runtime/merge/default.nix
 create mode 100644 overlay/default.nix
 rename {lib => overlay}/fetchers/sshKnownHosts/default.nix (100%)
 rename {lib => overlay}/runtime/merge/keyValue/default.nix (100%)
 rename {lib => overlay}/runtime/merge/keyValue/key-value.sh (100%)

diff --git a/flake.nix b/flake.nix
index 99fcaaf..941f795 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,10 @@
 
   outputs =
     inputs:
-    (
+    {
+      overlays.default = import ./overlay;
+    }
+    // (
       let
         system = "x86_64-linux";
 
@@ -22,8 +25,6 @@
         treefmt = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
       in
       {
-        lib.${system} = import ./lib { inherit pkgs; };
-
         formatter.${system} = treefmt.config.build.wrapper;
         checks.${system}.formatting = treefmt.config.build.check inputs.self;
       }
diff --git a/lib/default.nix b/lib/default.nix
deleted file mode 100644
index f613ba1..0000000
--- a/lib/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-let
-  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
-in
-{
-  fetchers = callPackage ./fetchers { };
-  runtime = callPackage ./runtime { };
-}
diff --git a/lib/fetchers/default.nix b/lib/fetchers/default.nix
deleted file mode 100644
index 4640293..0000000
--- a/lib/fetchers/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-let
-  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
-in
-{
-  sshKnownHosts = callPackage ./sshKnownHosts { };
-}
diff --git a/lib/runtime/default.nix b/lib/runtime/default.nix
deleted file mode 100644
index 27040c2..0000000
--- a/lib/runtime/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-let
-  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
-in
-{
-  merge = callPackage ./merge { };
-}
diff --git a/lib/runtime/merge/default.nix b/lib/runtime/merge/default.nix
deleted file mode 100644
index 9324954..0000000
--- a/lib/runtime/merge/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-let
-  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
-in
-{
-  keyValue = callPackage ./keyValue { };
-}
diff --git a/overlay/default.nix b/overlay/default.nix
new file mode 100644
index 0000000..7796f48
--- /dev/null
+++ b/overlay/default.nix
@@ -0,0 +1,17 @@
+final: prev:
+let
+  callPackage = prev.lib.callPackageWith { pkgs = prev; };
+in
+{
+  lib = prev.lib.recursiveUpdate prev.lib {
+    fetchers = {
+      sshKnownHosts = callPackage ./fetchers/sshKnownHosts { };
+    };
+
+    runtime = {
+      merge = {
+        keyValue = callPackage ./runtime/merge/keyValue { };
+      };
+    };
+  };
+}
diff --git a/lib/fetchers/sshKnownHosts/default.nix b/overlay/fetchers/sshKnownHosts/default.nix
similarity index 100%
rename from lib/fetchers/sshKnownHosts/default.nix
rename to overlay/fetchers/sshKnownHosts/default.nix
diff --git a/lib/runtime/merge/keyValue/default.nix b/overlay/runtime/merge/keyValue/default.nix
similarity index 100%
rename from lib/runtime/merge/keyValue/default.nix
rename to overlay/runtime/merge/keyValue/default.nix
diff --git a/lib/runtime/merge/keyValue/key-value.sh b/overlay/runtime/merge/keyValue/key-value.sh
similarity index 100%
rename from lib/runtime/merge/keyValue/key-value.sh
rename to overlay/runtime/merge/keyValue/key-value.sh