From 29f312232445b4b15ed5295735d9aaf0bb49cd7b Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Tue, 18 May 2021 23:10:21 +0300
Subject: [PATCH] fix: flake overlay

---
 flake.nix | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index 22f2245..f65389b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,38 +5,36 @@
   };
 
   outputs = { self, flakeUtils, nixpkgs }:
-    flakeUtils.lib.eachDefaultSystem (system:
-      let
-        utils = import ./utils.nix;
+    let
+      utils = import ./utils.nix;
 
-        lib = {
-          # Convert Nix expressions to HTML
-          tags = import ./tags.nix { inherit utils; };
-          # Convert Nix expressions to CSS
-          css = import ./css.nix { inherit utils; };
+      lib = {
+        # Convert Nix expressions to HTML
+        tags = import ./tags.nix { inherit utils; };
+        # Convert Nix expressions to CSS
+        css = import ./css.nix { inherit utils; };
 
-          # Various site templaters
-          templaters = {
-            # Basic templater with purecss, mobile responsive layout and supports posts
-            basic = import ./templaters/basic.nix;
-          };
+        # Various site templaters
+        templaters = {
+          # Basic templater with purecss, mobile responsive layout and supports posts
+          basic = import ./templaters/basic.nix;
         };
+      };
 
-        pkgsLib = (final: prev: {
-          htmlNix = import ./pkgs-lib.nix { pkgs = prev; utils = utils // { inherit (lib) tags css; }; };
-        });
-
-        pkgs = import nixpkgs { inherit system; overlays = [ pkgsLib ]; };
+      overlay = final: prev: {
+        htmlNix = (import ./pkgs-lib.nix { pkgs = prev; utils = utils // { inherit (lib) tags css; }; }) // lib;
+      };
+    in
+    { inherit overlay; } //
+    (flakeUtils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; };
       in
       {
         lib = lib // {
           pkgsLib = import ./pkgs-lib.nix { inherit pkgs; utils = utils // { inherit (lib) tags css; }; };
         };
 
-        overlays = {
-          inherit pkgsLib;
-        };
-
         apps = with flakeUtils.lib; {
           site = mkApp {
             drv = import ./examples/site.nix { inherit lib pkgs; };
@@ -51,5 +49,5 @@
         examples = {
           tags = import ./examples/tags.nix lib.tags;
         };
-      });
+      }));
 }