flake.nix: Exclude build support from flake exported packages and make pkgs/pkgs.nix obsolete again

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
+    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));
+      in builtins.mapAttrs (name: value: pkgs."${name}") (self.overlays.clerie null null)
+    );
 
     inherit lib self;
 

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;
+        })
       ];
     };
 

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 {};