yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

set nixpkgs.pkgs for secrets generation

Browse Source 
This allows us to use the same nixpkgs instance for all machines.
This commit is contained in:
Jörg Thalheim
2024-02-06 16:47:57 +01:00
parent 8f74f257e7
commit 6646aad714
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/build-clan/default.nix
View File

@@ -30,7 +30,7 @@ let
(machineSettings.clanImports or [ ]); (machineSettings.clanImports or [ ]);
# TODO: remove default system once we have a hardware-config mechanism # TODO: remove default system once we have a hardware-config mechanism
nixosConfiguration = { system ? "x86_64-linux", name, forceSystem ? false }: nixpkgs.lib.nixosSystem { nixosConfiguration = { system ? "x86_64-linux", name, pkgs ? null }: nixpkgs.lib.nixosSystem {
modules = modules =
let let
settings = machineSettings name; settings = machineSettings name;
@@ -40,19 +40,21 @@ let
settings settings
clan-core.nixosModules.clanCore clan-core.nixosModules.clanCore
(machines.${name} or { }) (machines.${name} or { })
{ ({
clanCore.clanName = clanName; clanCore.clanName = clanName;
clanCore.clanIcon = clanIcon; clanCore.clanIcon = clanIcon;
clanCore.clanDir = directory; clanCore.clanDir = directory;
clanCore.machineName = name; clanCore.machineName = name;
nixpkgs.hostPlatform = if forceSystem then lib.mkForce system else lib.mkDefault system; nixpkgs.hostPlatform = lib.mkDefault system;
# speeds up nix commands by using the nixpkgs from the host system (especially useful in VMs) # speeds up nix commands by using the nixpkgs from the host system (especially useful in VMs)
nix.registry.nixpkgs.to = { nix.registry.nixpkgs.to = {
type = "path"; type = "path";
path = lib.mkDefault nixpkgs; path = lib.mkDefault nixpkgs;
}; };
} } // lib.optionalAttrs (pkgs != null) {
nixpkgs.pkgs = lib.mkForce pkgs;
})
]; ];
inherit specialArgs; inherit specialArgs;
}; };
@@ -75,7 +77,7 @@ let
configsPerSystem = builtins.listToAttrs configsPerSystem = builtins.listToAttrs
(builtins.map (builtins.map
(system: lib.nameValuePair system (system: lib.nameValuePair system
(lib.mapAttrs (name: _: nixosConfiguration { inherit name system; forceSystem = true; }) allMachines)) (lib.mapAttrs (name: _: nixosConfiguration { inherit name system; pkgs = nixpkgs.legacyPackages.${system}; }) allMachines))
supportedSystems); supportedSystems);
in in
{ {