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

Revert "Merge pull request 'chore(buildClan): move machineClass option into inventory.machines submodule' (#3259) from hsjobeki/clan-core:buildclan-cleanup into main"

Browse Source 
This reverts commit 325a794d12, reversing
changes made to afbae04aa6.
This commit is contained in:
Jörg Thalheim
2025-04-09 16:08:39 +02:00
parent 6f2909bf87
commit 6154b4cb3a
5 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/inventory/build-inventory/interface.nix
View File

@@ -243,19 +243,6 @@ in
options = {
inherit (metaOptionsWith name) name description icon;
machineClass = lib.mkOption {
default = "nixos";
type = types.enum [
"nixos"
"darwin"
];
description = ''
The module system that should be used to construct the machine
Set this to `darwin` for macOS machines
'';
};
tags = lib.mkOption {
description = ''
List of tags for the machine.
@@ -291,6 +278,21 @@ in
);
};
machineClass = lib.mkOption {
default = { };
type = types.attrsOf (
types.enum [
"nixos"
"darwin"
]
);
description = ''
The module system that should be used to construct the machine
Set this to `darwin` for macOS machines
'';
};
instances = lib.mkOption {
# Keep as internal until all de-/serialization issues are resolved
visible = false;
@@ -364,7 +366,6 @@ in
else
lib.warn "Inventory.instances and related features are still under development. Please use with care." v;
};
services = lib.mkOption {
description = ''
Services of the inventory.