From 9ca9ed3ef3cd215db9a1cf1b166f3180c573c8d1 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Fri, 8 Dec 2023 09:06:43 +0100
Subject: [PATCH] pkgs/overlay.nix: Refactore overlay to a flake output
 attribute

---
 configuration/common/default.nix |  4 ----
 flake.nix                        |  7 ++++++-
 lib/flake-helper.nix             |  1 +
 pkgs/default.nix                 |  5 -----
 pkgs/overlay.nix                 | 36 ++++++++++++++++----------------
 5 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/default.nix

diff --git a/configuration/common/default.nix b/configuration/common/default.nix
index 892f0e3..0539f43 100644
--- a/configuration/common/default.nix
+++ b/configuration/common/default.nix
@@ -14,8 +14,4 @@
   ];
 
   services.fstrim.enable = true;
-
-  nixpkgs.overlays = [
-    (import ../../pkgs/overlay.nix)
-  ];
 }
diff --git a/flake.nix b/flake.nix
index 7439cf5..e17e005 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,11 +86,16 @@
       };
     } // helper.mapToColmenaHosts self.nixosConfigurations;
 
+    overlays = {
+      clerie = import ./pkgs/overlay.nix;
+      default = self.overlays.clerie;
+    };
+
     packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let
       pkgs = import nixpkgs {
         inherit system;
         overlays = [
-          (import ./pkgs/overlay.nix)
+          self.overlays.clerie
           (_: _: {
             inherit (agenix.packages.${system})
               agenix;
diff --git a/lib/flake-helper.nix b/lib/flake-helper.nix
index 6c05915..62e549a 100644
--- a/lib/flake-helper.nix
+++ b/lib/flake-helper.nix
@@ -26,6 +26,7 @@ rec {
       ../users/clerie
       ({ ... }: {
         nixpkgs.overlays = [
+          self.overlays.clerie
           (_: _: {
             inherit (agenix.packages."x86_64-linux")
               agenix;
diff --git a/pkgs/default.nix b/pkgs/default.nix
deleted file mode 100644
index ccac36f..0000000
--- a/pkgs/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-import <nixpkgs> {
-  overlays = [
-    (import ./overlay.nix)
-  ];
-}
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 743818a..8b366cb 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -1,20 +1,20 @@
-self: super: {
-  anycast_healthchecker = self.python3.pkgs.callPackage ./anycast_healthchecker {};
-  flask-excel = self.python3.pkgs.callPackage ./flask-excel {};
-  iot-data = self.python3.pkgs.callPackage ./iot-data {};
-  nixfiles-add-secret = self.callPackage ./nixfiles/nixfiles-add-secret.nix {};
-  nixfiles-auto-install = self.callPackage ./nixfiles/nixfiles-auto-install.nix {};
-  nixfiles-generate-backup-secrets = self.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};
-  nixfiles-generate-config = self.callPackage ./nixfiles/nixfiles-generate-config.nix {};
-  nixfiles-system-upgrade = self.callPackage ./nixfiles/nixfiles-system-upgrade.nix {};
-  nixfiles-updated-inputs = self.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
-  nixfiles-update-ssh-host-keys = self.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
-  nixos-firewall-tool = self.callPackage ./nixos-firewall-tool {};
-  pyexcel-xlsx = self.python3.pkgs.callPackage ./pyexcel-xlsx {};
-  pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {};
-  update-from-hydra = self.callPackage ./update-from-hydra {};
-  uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {};
-  wetter = self.python3.pkgs.callPackage ./wetter {
-    inherit (self) pkg-config libsass;
+final: prev: {
+  anycast_healthchecker = final.python3.pkgs.callPackage ./anycast_healthchecker {};
+  flask-excel = final.python3.pkgs.callPackage ./flask-excel {};
+  iot-data = final.python3.pkgs.callPackage ./iot-data {};
+  nixfiles-add-secret = final.callPackage ./nixfiles/nixfiles-add-secret.nix {};
+  nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};
+  nixfiles-generate-backup-secrets = final.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};
+  nixfiles-generate-config = final.callPackage ./nixfiles/nixfiles-generate-config.nix {};
+  nixfiles-system-upgrade = final.callPackage ./nixfiles/nixfiles-system-upgrade.nix {};
+  nixfiles-updated-inputs = final.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
+  nixfiles-update-ssh-host-keys = final.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
+  nixos-firewall-tool = final.callPackage ./nixos-firewall-tool {};
+  pyexcel-xlsx = final.python3.pkgs.callPackage ./pyexcel-xlsx {};
+  pyexcel-webio = final.python3.pkgs.callPackage ./pyexcel-webio {};
+  update-from-hydra = final.callPackage ./update-from-hydra {};
+  uptimestatus = final.python3.pkgs.callPackage ./uptimestatus {};
+  wetter = final.python3.pkgs.callPackage ./wetter {
+    inherit (final) pkg-config libsass;
   };
 }