From 13cd056669fce87829dfc3a97567f93ece6cccf7 Mon Sep 17 00:00:00 2001
From: Jake Hamilton <jake.hamilton@hey.com>
Date: Fri, 9 Sep 2022 00:16:20 -0700
Subject: [PATCH] feat(flake): export a combined overlay

---
 lib/flake/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/flake/default.nix b/lib/flake/default.nix
index 5a00908..fbec2b0 100644
--- a/lib/flake/default.nix
+++ b/lib/flake/default.nix
@@ -78,6 +78,15 @@ rec {
       modules = snowfall-lib.module.create-modules {
         overrides = (full-flake-options.modules or { });
       };
+      overlays = core-inputs.flake-utils-plus.lib.exportOverlays ({
+        inherit (user-inputs.self) pkgs;
+        inputs = user-inputs;
+      });
+
+      overlay = (final: prev:
+        snowfall-lib.attrs.merge-deep
+          (builtins.map (overlay: overlay final prev) (builtins.attrValues overlays))
+      );
 
       outputs-builder = channels:
         let
@@ -104,7 +113,7 @@ rec {
         snowfall-lib.attrs.merge-deep [ user-outputs outputs ];
 
       flake-options = custom-flake-options // {
-        inherit hosts templates;
+        inherit hosts templates overlays overlay;
         inherit (user-inputs) self;
 
         lib = snowfall-lib.internal.user-lib;
@@ -114,11 +123,6 @@ rec {
 
         channelsConfig = full-flake-options.channels-config or { };
 
-        overlays = core-inputs.flake-utils-plus.lib.exportOverlays ({
-          inherit (user-inputs.self) pkgs;
-          inputs = user-inputs;
-        });
-
         channels.nixpkgs.overlaysBuilder = snowfall-lib.overlay.create-overlays {
           overlay-package-namespace = full-flake-options.overlay-package-namespace or null;
           extra-overlays = full-flake-options.overlays or [ ];