From 4ba36f8420ef44e04276166828bdaa6a00a2d04d Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Sun, 17 Aug 2025 16:56:34 +0300 Subject: [PATCH] Use overlay Signed-off-by: Nikolaos Karaolidis --- flake.nix | 9 ++++++++- {lib => overlay}/default.nix | 4 ++-- {lib => overlay}/fetchers/default.nix | 0 {lib => overlay}/fetchers/sshKnownHosts/default.nix | 0 {lib => overlay}/runtime/default.nix | 0 {lib => overlay}/runtime/merge/default.nix | 0 {lib => overlay}/runtime/merge/keyValue/default.nix | 0 {lib => overlay}/runtime/merge/keyValue/key-value.sh | 0 8 files changed, 10 insertions(+), 3 deletions(-) rename {lib => overlay}/default.nix (54%) rename {lib => overlay}/fetchers/default.nix (100%) rename {lib => overlay}/fetchers/sshKnownHosts/default.nix (100%) rename {lib => overlay}/runtime/default.nix (100%) rename {lib => overlay}/runtime/merge/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..57fbbe2 100644 --- a/flake.nix +++ b/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; diff --git a/lib/default.nix b/overlay/default.nix similarity index 54% rename from lib/default.nix rename to overlay/default.nix index f613ba1..06b35c9 100644 --- a/lib/default.nix +++ b/overlay/default.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +final: prev: let - callPackage = pkgs.lib.callPackageWith { inherit pkgs; }; + callPackage = prev.lib.callPackageWith { pkgs = prev; }; in { fetchers = callPackage ./fetchers { }; diff --git a/lib/fetchers/default.nix b/overlay/fetchers/default.nix similarity index 100% rename from lib/fetchers/default.nix rename to overlay/fetchers/default.nix 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/default.nix b/overlay/runtime/default.nix similarity index 100% rename from lib/runtime/default.nix rename to overlay/runtime/default.nix diff --git a/lib/runtime/merge/default.nix b/overlay/runtime/merge/default.nix similarity index 100% rename from lib/runtime/merge/default.nix rename to overlay/runtime/merge/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