From 140883e6a81a5244c24ea57ac5ecac6e78a5cb40 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Fri, 28 Nov 2025 19:29:16 +0200 Subject: feat(autoconfig): Export the overall nixpkgs used Right now, as a flake output, we have nixpkgs-unstable and nixpkgs-2305. Adding nixpkgs wouldn't be very useful, except for the fact that we have overlays, and exposing nixpkgs with applied overlays is actually very useful. --- autoconfig.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/autoconfig.nix b/autoconfig.nix index 48a9a8d..079f68b 100644 --- a/autoconfig.nix +++ b/autoconfig.nix @@ -20,6 +20,12 @@ let (name: _: lib.hasPrefix "nixpkgs-" name) inputs); + + package-overlays = + lib.mapAttrsToList + (name: _: (import ./overlays/${name})) + (builtins.readDir ./overlays); + in { configurations = lib.mapAttrs @@ -60,11 +66,6 @@ in { custom-packages-overlays = custom-packages sysidentity.arch; - package-overlays = - lib.mapAttrsToList - (name: _: (import ./overlays/${name})) - (builtins.readDir ./overlays); - in lib.nixosSystem { system = sysidentity.arch; @@ -86,5 +87,8 @@ in { packages = let systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ]; in - lib.genAttrs systems (system: custom-packages system // other-nixpkgs system); + lib.genAttrs systems (system: + { nixpkgs = (import nixpkgs { inherit system; overlays = package-overlays; }); } // + custom-packages system // + other-nixpkgs system); } -- cgit v1.3.1-26-gb76a