fix: Allow unfree consistently

This commit is contained in:
Jan-Bulthuis 2025-11-30 12:27:59 +01:00
parent c3014ec109
commit 3358dd324e

View File

@ -4,6 +4,10 @@ let
nixpkgs = inputs.nixpkgs; nixpkgs = inputs.nixpkgs;
lib = nixpkgs.lib; lib = nixpkgs.lib;
nixpkgs-config = {
allowUnfree = true;
};
importDir = importDir =
path: fn: path: fn:
let let
@ -49,6 +53,13 @@ let
pkgs = ( pkgs = (
import inputs.nixpkgs { import inputs.nixpkgs {
inherit system; inherit system;
config = nixpkgs-config;
}
);
stable-pkgs = (
import inputs.nixpkgs-stable {
inherit system;
config = nixpkgs-config;
} }
); );
}); });
@ -118,13 +129,22 @@ let
nixpkgs.overlays = [ overlay ] ++ inputOverlays; nixpkgs.overlays = [ overlay ] ++ inputOverlays;
}; };
nixpkgsModule =
{ ... }:
{
nixpkgs.config = nixpkgs-config;
};
nixosConfigurations = importDir "${flake}/hosts" ( nixosConfigurations = importDir "${flake}/hosts" (
attrs: attrs:
lib.mapAttrs ( lib.mapAttrs (
name: entry: name: entry:
let
pkgs-stable = systemArgs."x86_64-linux".stable-pkgs;
in
lib.nixosSystem { lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs; inherit inputs pkgs-stable;
}; };
modules = modules =
let let
@ -144,7 +164,7 @@ let
{ ... }: { ... }:
{ {
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit inputs; inherit inputs pkgs-stable;
}; };
home-manager.sharedModules = homeModules ++ homeProfiles ++ inputHomeModules; home-manager.sharedModules = homeModules ++ homeProfiles ++ inputHomeModules;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
@ -158,6 +178,7 @@ let
systemPath systemPath
overlayModule overlayModule
usersModule usersModule
nixpkgsModule
] ]
++ nixosModules ++ nixosModules
++ nixosProfiles ++ nixosProfiles