Merge pull request 'Chore: remove unused legacy endpoints' (#3418) from hsjobeki/clan-core:chores-remove-unused into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3418
This commit is contained in:
hsjobeki
2025-04-27 11:25:00 +00:00
4 changed files with 6 additions and 32 deletions

View File

@@ -158,7 +158,6 @@ in
# all exported clan modules from this clan
modules = lib.mkOption { type = lib.types.raw; };
# all inventory module schemas
moduleSchemas = lib.mkOption { type = lib.types.raw; };
inventoryFile = lib.mkOption { type = lib.types.raw; };
# The machine 'imports' generated by the inventory per machine
inventoryClass = lib.mkOption { type = lib.types.raw; };

View File

@@ -193,12 +193,6 @@ in
name: _: inventory.machines.${name}.machineClass or "nixos" == "darwin"
) (config.outputs.moduleForMachine);
moduleSchemas = clan-core.clanLib.modules.getModulesSchema {
modules = config.inventory.modules;
# TODO: make this function system agnostic
pkgs = nixpkgs.legacyPackages."x86_64-linux";
inherit clan-core;
};
inherit inventoryClass;
# TODO: unify this interface
@@ -209,7 +203,7 @@ in
inherit inventoryFile;
inventoryValuesPrios =
# Temporary workaround
builtins.removeAttrs (clan-core.clanLib.values.getPrios { options = inventory.options; })
builtins.removeAttrs (clan-core.clanLib.introspection.getPrios { options = inventory.options; })
# tags are freeformType which is not supported yet.
[ "tags" ];

View File

@@ -28,8 +28,11 @@ lib.fix (clanLib: {
test = clanLib.callLib ./test { };
# Plain imports.
values = import ./introspection { inherit lib; };
introspection = import ./introspection { inherit lib; };
jsonschema = import ./jsonschema { inherit lib; };
inherit (self.inputs.nix-select.lib) parseSelector applySelectors select;
facts = import ./facts.nix { inherit lib; };
# Passthrough from self.inputs
# TODO: Can we make these agnostic from the name of the input?
inherit (self.inputs.nix-select.lib) parseSelector applySelectors select;
})