hostconfig: Try to correctly handle unfree packages

This commit is contained in:
traxys 2024-05-14 00:53:28 +02:00
parent 6d23726921
commit 2178e4a1ee
2 changed files with 20 additions and 17 deletions

View file

@ -20,5 +20,6 @@
personal-gui
gaming
];
unfreePackages = [ "warcraftlogs" ];
};
}

View file

@ -1,7 +1,6 @@
{
self,
inputs,
lib,
flakeOverlays,
...
}:
@ -21,30 +20,33 @@
user,
nixosModules,
hmModules,
...
unfreePackages ? [ ],
}:
inputs.nixpkgs.lib.nixosSystem {
inherit system;
modules = nixosModules ++ [
../nixos/configuration.nix
inputs.home-manager.nixosModules.home-manager
{
nixpkgs = {
overlays = flakeOverlays system;
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "warcraftlogs" ];
};
(
{ lib, ... }:
{
nixpkgs = {
overlays = flakeOverlays system;
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) unfreePackages;
};
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.${user} = {
imports = hmModules ++ [ inputs.fioul.homeManagerModules.default ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.${user} = {
imports = hmModules ++ [ inputs.fioul.homeManagerModules.default ];
};
extraSpecialArgs = {
flake = self;
};
};
extraSpecialArgs = {
flake = self;
};
};
}
}
)
];
};
};