From 1d927638c5427d80995d57b5fae7773f606e5e76 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sat, 28 Jun 2025 15:03:46 +0200
Subject: [PATCH] flake.nix: Exclude build support from flake exported packages
 and make pkgs/pkgs.nix obsolete again

---
 flake.nix                                       | 11 +++++++----
 flake/{overlay.nix => inputs-overlay.nix}       |  0
 flake/nixpkgs.nix                               |  3 +++
 pkgs/build-support/{default.nix => overlay.nix} |  0
 pkgs/pkgs.nix                                   |  2 --
 5 files changed, 10 insertions(+), 6 deletions(-)
 rename flake/{overlay.nix => inputs-overlay.nix} (100%)
 rename pkgs/build-support/{default.nix => overlay.nix} (100%)

diff --git a/flake.nix b/flake.nix
index 0d9d76f..42908e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,14 +135,17 @@
     };
 
     overlays = {
-      nixfilesInputs = import ./flake/overlay.nix inputs;
+      nixfilesInputs = import ./flake/inputs-overlay.nix inputs;
       clerie = import ./pkgs/overlay.nix;
+      clerie-build-support = import ./pkgs/build-support/overlay.nix;
       default = self.overlays.clerie;
     };
 
-    packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system: let
-      pkgs = localNixpkgs.${system};
-    in builtins.mapAttrs (name: value: pkgs."${name}") (import ./pkgs/pkgs.nix));
+    packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
+      let
+       pkgs = localNixpkgs.${system};
+      in builtins.mapAttrs (name: value: pkgs."${name}") (self.overlays.clerie null null)
+    );
 
     inherit lib self;
 
diff --git a/flake/overlay.nix b/flake/inputs-overlay.nix
similarity index 100%
rename from flake/overlay.nix
rename to flake/inputs-overlay.nix
diff --git a/flake/nixpkgs.nix b/flake/nixpkgs.nix
index 08d7246..1293e3a 100644
--- a/flake/nixpkgs.nix
+++ b/flake/nixpkgs.nix
@@ -10,6 +10,9 @@ let
       overlays = [
         self.overlays.nixfilesInputs
         self.overlays.clerie
+        (final: prev: {
+          clerie-build-support = self.overlays.clerie-build-support final prev;
+        })
       ];
     };
 
diff --git a/pkgs/build-support/default.nix b/pkgs/build-support/overlay.nix
similarity index 100%
rename from pkgs/build-support/default.nix
rename to pkgs/build-support/overlay.nix
diff --git a/pkgs/pkgs.nix b/pkgs/pkgs.nix
index 4e40f69..8e2c444 100644
--- a/pkgs/pkgs.nix
+++ b/pkgs/pkgs.nix
@@ -1,6 +1,4 @@
 {
-  clerie-build-support = final: prev: import ./build-support final prev;
-
   clerie-backup = final: prev: final.callPackage ./clerie-backup {};
   clerie-cleanup-branches = final: prev: final.callPackage ./clerie-update-nixfiles/clerie-cleanup-branches.nix {};
   clerie-keys = final: prev: final.callPackage ./clerie-keys {};