From edb9c4610630169229d9225b91fca0993bc3864f Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 19 Apr 2021 17:16:19 +0000
Subject: [PATCH] flake: introduce 'pkgs' overlay

Also make it the prime overlay instead of the extended 'lib'.

The reason for `pkgs` not being structured as an overlay, but simply
taking `pkgs` as an argument is to allow it to be used as a NUR package
set, if I wanted to.
---
 flake.nix        | 9 +++++++--
 pkgs/default.nix | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/default.nix

diff --git a/flake.nix b/flake.nix
index 8f74f46..c20b344 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,11 @@
             then self.rev
             else throw "Refusing to build from a dirty Git tree!";
         })
-        { nixpkgs.overlays = [ nur.overlay self.overlay ]; }
+        {
+          nixpkgs.overlays = (lib.attrValues self.overlays) ++ [
+            nur.overlay
+          ];
+        }
         home-manager.nixosModules.home-manager
         {
           home-manager.users.ambroisie = import ./home;
@@ -61,10 +65,11 @@
             ];
           };
         }) // {
-      overlay = self.overlays.lib;
+      overlay = self.overlays.pkgs;
 
       overlays = {
         lib = final: prev: { inherit lib; };
+        pkgs = final: prev: { ambroisie = import ./pkgs { pkgs = prev; }; };
       };
 
       nixosConfigurations = lib.mapAttrs buildHost {
diff --git a/pkgs/default.nix b/pkgs/default.nix
new file mode 100644
index 0000000..c78fe50
--- /dev/null
+++ b/pkgs/default.nix
@@ -0,0 +1,2 @@
+{ pkgs }:
+{ }