clerie/nixfiles
1
0
Fork 0
Code Activity

flake/nixosConfigurations.nix: Handle host specific nixpkgs input again

Browse Source
This commit is contained in:
clerie
2025-06-29 17:28:38 +02:00
parent 457fa2ca6f
commit ce54f06fd0
2 changed files with 8 additions and 3 deletions

2
flake/nixosConfigurations.nix

@@ -10,8 +10,10 @@ let
group ? null, group ? null,
modules ? [], modules ? [],
}: let }: let
localNixpkgs = nixpkgs.lib.attrByPath [ "nixpkgs-${name}" ] nixpkgs inputs;
in self.lib.nixosSystem { in self.lib.nixosSystem {
system = system; system = system;
nixpkgs = localNixpkgs;
modules = modules ++ [ modules = modules ++ [
({ config, lib, ... }: { ({ config, lib, ... }: {
# Set hostname # Set hostname

9
lib/nixosSystem.nix

@@ -12,14 +12,17 @@
*/ */
{ {
system ? null, system ? null,
nixpkgs ? inputs.nixpkgs,
pkgs ? null, pkgs ? null,
modules ? [], modules ? [],
... ...
}@args: }@args:
inputs.nixpkgs.lib.nixosSystem ({ nixpkgs.lib.nixosSystem ({
system = system; system = system;
pkgs = if pkgs != null then pkgs else self.nixpkgs.${system}; pkgs = if pkgs != null then pkgs else (self.lib.mkNixpkgs {
inherit system nixpkgs;
});
modules = [ modules = [
self.nixosModules.nixfilesInputs self.nixosModules.nixfilesInputs
self.nixosModules.clerie self.nixosModules.clerie
@@ -36,4 +39,4 @@ inputs.nixpkgs.lib.nixosSystem ({
}; };
}) })
] ++ modules; ] ++ modules;
} // builtins.removeAttrs args [ "system" "pkgs" "modules" ] ) } // builtins.removeAttrs args [ "system" "nixpkgs" "pkgs" "modules" ] )