feat(autocofing): Expose nixpkgs inputs in packages

1 files changed, 11 insertions, 11 deletions

diff --git a/autoconfig.nix b/autoconfig.nix
index 350f2bf..48a9a8d 100644
--- a/autoconfig.nix
+++ b/autoconfig.nix
@@ -11,6 +11,15 @@ let
         (lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./packages));
     in
       packages;
+
+  other-nixpkgs = system:
+    lib.mapAttrs
+    (_: nixpkgs-special:
+      nixpkgs-special.legacyPackages.${system})
+    (lib.filterAttrs
+      (name: _:
+        lib.hasPrefix "nixpkgs-" name)
+      inputs);
 in {
   configurations =
     lib.mapAttrs
@@ -49,15 +58,6 @@ in {
           in
             lib.subtractLists excludelist includelist;
 
-        inputs-overlays =
-          lib.mapAttrs
-          (_: nixpkgs-special:
-            nixpkgs-special.legacyPackages.${sysidentity.arch})
-          (lib.filterAttrs
-            (name: _:
-              lib.hasPrefix "nixpkgs-" name)
-            inputs);
-
         custom-packages-overlays = custom-packages sysidentity.arch;
 
         package-overlays =
@@ -74,7 +74,7 @@ in {
           modules-dir
           ({ ... }: {
             networking.hostName = sysidentity.name;
-            nixpkgs.overlays = [ (_: _: inputs-overlays) (_: _: custom-packages-overlays) ] ++ package-overlays;
+            nixpkgs.overlays = [ (_: _: other-nixpkgs sysidentity.arch) (_: _: custom-packages-overlays) ] ++ package-overlays;
           })
         ]
         ++ (if lib.pathIsRegularFile ./machines/${dir}/configuration.nix
@@ -86,5 +86,5 @@ in {
   packages = let
     systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
   in
-    lib.genAttrs systems (system: custom-packages system);
+    lib.genAttrs systems (system: custom-packages system // other-nixpkgs system);
 }