diff --git a/machines/nixos/compute01/extranix/default.nix b/machines/nixos/compute01/extranix/default.nix index e8be0543..95608f92 100644 --- a/machines/nixos/compute01/extranix/default.nix +++ b/machines/nixos/compute01/extranix/default.nix @@ -4,6 +4,7 @@ { lib, + meta, sources, dgn-keys, ... @@ -38,7 +39,7 @@ in "DGNum Infrastructure" = let # prefer a non-patched nixpkgs - infra-nixpkgs = (import "${hive-root}/hive.nix").meta.nixpkgs { }; + infra-nixpkgs = (import "${hive-root}/bootstrap.nix").pkgs; infra-modulesPath = "${infra-nixpkgs.path}/nixos/modules/"; in { @@ -46,7 +47,7 @@ in "modules/generic" "modules/nixos" ]; - ignored-modules = import "${infra-modulesPath}/module-list.nix" ++ [ + ignored-modules = (import "${infra-modulesPath}/module-list.nix") ++ [ "${sources.agenix}/modules/age.nix" "${sources.arkheon}/module.nix" "${sources."microvm.nix"}/nixos-modules/host" @@ -54,21 +55,16 @@ in { system.stateVersion = "25.05"; } ]; specialArgs = { - inherit sources; - lib = infra-nixpkgs.lib // { - inherit (lib) extra; - }; - modulesPath = infra-modulesPath; + inherit meta sources; + modulesPath = builtins.storePath infra-modulesPath; pkgs = infra-nixpkgs; + inherit (infra-nixpkgs) lib; name = "nodeName"; nodeMeta = { nix-modules = [ ]; admins = [ ]; adminGroups = [ ]; }; - meta = { - organization.groups.root = [ ]; - }; dgn-keys = dgn-keys // { getNodeAdmins = _: [ ]; };