From 819ce1a32053aeec7dc832d397328fbc906c56ae Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 7 Mar 2023 10:36:27 +0000
Subject: [PATCH] flake: move 'overlays' to 'flake/'

---
 flake.nix          |  7 +------
 flake/overlays.nix | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 flake/overlays.nix

diff --git a/flake.nix b/flake.nix
index 8453b07..427ef24 100644
--- a/flake.nix
+++ b/flake.nix
@@ -199,12 +199,7 @@
       }) // {
       inherit lib;
 
-      overlays = import ./overlays // {
-        lib = final: prev: { inherit lib; };
-        pkgs = final: prev: {
-          ambroisie = prev.recurseIntoAttrs (import ./pkgs { pkgs = prev; });
-        };
-      };
+      overlays = import ./flake/overlays.nix inputs;
 
       nixosConfigurations = lib.mapAttrs buildHost {
         aramis = "x86_64-linux";
diff --git a/flake/overlays.nix b/flake/overlays.nix
new file mode 100644
index 0000000..bb5e546
--- /dev/null
+++ b/flake/overlays.nix
@@ -0,0 +1,16 @@
+{ self, ... }:
+
+let
+  default-overlays = import "${self}/overlays";
+
+  additional-overlays = {
+    # Expose my expanded library
+    lib = final: prev: { inherit (self) lib; };
+
+    # Expose my custom packages
+    pkgs = final: prev: {
+      ambroisie = prev.recurseIntoAttrs (import "${self}/pkgs" { pkgs = prev; });
+    };
+  };
+in
+default-overlays // additional-overlays