diff --git a/flake.nix b/flake.nix index ee4859ac1..2d0e1f8aa 100644 --- a/flake.nix +++ b/flake.nix @@ -98,6 +98,7 @@ ./lib/filter-clan-core/flake-module.nix ./lib/flake-module.nix ./lib/flake-parts/clan-nixos-test.nix + ./modules/flake-module.nix ./nixosModules/clanCore/vars/flake-module.nix ./nixosModules/flake-module.nix ./pkgs/clan-cli/clan_cli/tests/flake-module.nix diff --git a/lib/default.nix b/lib/default.nix index 48f3aaebd..d84860a1f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -16,10 +16,10 @@ lib.fix ( */ callLib = file: args: import file ({ inherit lib clanLib; } // args); - evalService = clanLib.callLib ./modules/inventory/distributed-service/evalService.nix { }; + evalService = clanLib.callLib ./evalService.nix { }; # ------------------------------------ # ClanLib functions - inventory = clanLib.callLib ./modules/inventory { }; + inventory = clanLib.callLib ./inventory { }; test = clanLib.callLib ./test { }; flake-inputs = clanLib.callLib ./flake-inputs.nix { }; # Custom types diff --git a/lib/modules/inventory/distributed-service/evalService.nix b/lib/evalService.nix similarity index 100% rename from lib/modules/inventory/distributed-service/evalService.nix rename to lib/evalService.nix diff --git a/lib/flake-module.nix b/lib/flake-module.nix index 6a0de7a12..77a2f1026 100644 --- a/lib/flake-module.nix +++ b/lib/flake-module.nix @@ -10,12 +10,11 @@ in rec { # TODO: automatically generate this from the directory conventions imports = [ - ./modules/flake-module.nix ./clanTest/flake-module.nix ./introspection/flake-module.nix - ./modules/inventory/flake-module.nix ./jsonschema/flake-module.nix ./types/flake-module.nix + ./inventory/flake-module.nix ]; flake.clanLib = let diff --git a/lib/modules/inventory/default.nix b/lib/inventory/default.nix similarity index 96% rename from lib/modules/inventory/default.nix rename to lib/inventory/default.nix index 88fd45506..90f25ea44 100644 --- a/lib/modules/inventory/default.nix +++ b/lib/inventory/default.nix @@ -10,7 +10,7 @@ in inventoryModule = { _file = "clanLib.inventory.module"; imports = [ - ../inventoryClass/inventory.nix + ../../modules/inventoryClass/inventory.nix ]; _module.args = { inherit clanLib; }; }; diff --git a/lib/modules/inventory/distributed-service/all-services-wrapper.nix b/lib/inventory/distributed-service/all-services-wrapper.nix similarity index 100% rename from lib/modules/inventory/distributed-service/all-services-wrapper.nix rename to lib/inventory/distributed-service/all-services-wrapper.nix diff --git a/lib/modules/inventory/distributed-service/api-feature.nix b/lib/inventory/distributed-service/api-feature.nix similarity index 100% rename from lib/modules/inventory/distributed-service/api-feature.nix rename to lib/inventory/distributed-service/api-feature.nix diff --git a/lib/modules/inventory/distributed-service/flake-module.nix b/lib/inventory/distributed-service/flake-module.nix similarity index 100% rename from lib/modules/inventory/distributed-service/flake-module.nix rename to lib/inventory/distributed-service/flake-module.nix diff --git a/lib/modules/inventory/distributed-service/inventory-adapter.nix b/lib/inventory/distributed-service/inventory-adapter.nix similarity index 100% rename from lib/modules/inventory/distributed-service/inventory-adapter.nix rename to lib/inventory/distributed-service/inventory-adapter.nix diff --git a/lib/modules/inventory/distributed-service/service-module.nix b/lib/inventory/distributed-service/service-module.nix similarity index 100% rename from lib/modules/inventory/distributed-service/service-module.nix rename to lib/inventory/distributed-service/service-module.nix diff --git a/lib/modules/inventory/distributed-service/tests/default.nix b/lib/inventory/distributed-service/tests/default.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/default.nix rename to lib/inventory/distributed-service/tests/default.nix diff --git a/lib/modules/inventory/distributed-service/tests/exports.nix b/lib/inventory/distributed-service/tests/exports.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/exports.nix rename to lib/inventory/distributed-service/tests/exports.nix diff --git a/lib/modules/inventory/distributed-service/tests/extraModules.nix b/lib/inventory/distributed-service/tests/extraModules.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/extraModules.nix rename to lib/inventory/distributed-service/tests/extraModules.nix diff --git a/lib/modules/inventory/distributed-service/tests/import_module_spec.nix b/lib/inventory/distributed-service/tests/import_module_spec.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/import_module_spec.nix rename to lib/inventory/distributed-service/tests/import_module_spec.nix diff --git a/lib/modules/inventory/distributed-service/tests/machine_imports.nix b/lib/inventory/distributed-service/tests/machine_imports.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/machine_imports.nix rename to lib/inventory/distributed-service/tests/machine_imports.nix diff --git a/lib/modules/inventory/distributed-service/tests/oneOption.nix b/lib/inventory/distributed-service/tests/oneOption.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/oneOption.nix rename to lib/inventory/distributed-service/tests/oneOption.nix diff --git a/lib/modules/inventory/distributed-service/tests/per_instance_args.nix b/lib/inventory/distributed-service/tests/per_instance_args.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/per_instance_args.nix rename to lib/inventory/distributed-service/tests/per_instance_args.nix diff --git a/lib/modules/inventory/distributed-service/tests/per_machine_args.nix b/lib/inventory/distributed-service/tests/per_machine_args.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/per_machine_args.nix rename to lib/inventory/distributed-service/tests/per_machine_args.nix diff --git a/lib/modules/inventory/distributed-service/tests/settings.nix b/lib/inventory/distributed-service/tests/settings.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/settings.nix rename to lib/inventory/distributed-service/tests/settings.nix diff --git a/lib/modules/inventory/distributed-service/tests/specialArgs.nix b/lib/inventory/distributed-service/tests/specialArgs.nix similarity index 100% rename from lib/modules/inventory/distributed-service/tests/specialArgs.nix rename to lib/inventory/distributed-service/tests/specialArgs.nix diff --git a/lib/modules/inventory/flake-module.nix b/lib/inventory/flake-module.nix similarity index 100% rename from lib/modules/inventory/flake-module.nix rename to lib/inventory/flake-module.nix diff --git a/lib/modules/inventory/schemas/default.nix b/lib/inventory/schemas/default.nix similarity index 100% rename from lib/modules/inventory/schemas/default.nix rename to lib/inventory/schemas/default.nix diff --git a/lib/modules/clan/computed-tags.nix b/modules/clan/computed-tags.nix similarity index 100% rename from lib/modules/clan/computed-tags.nix rename to modules/clan/computed-tags.nix diff --git a/lib/modules/clan/default.nix b/modules/clan/default.nix similarity index 100% rename from lib/modules/clan/default.nix rename to modules/clan/default.nix diff --git a/lib/modules/clan/flake-module.nix b/modules/clan/flake-module.nix similarity index 100% rename from lib/modules/clan/flake-module.nix rename to modules/clan/flake-module.nix diff --git a/lib/modules/clan/interface.nix b/modules/clan/interface.nix similarity index 100% rename from lib/modules/clan/interface.nix rename to modules/clan/interface.nix diff --git a/lib/modules/clan/module.nix b/modules/clan/module.nix similarity index 100% rename from lib/modules/clan/module.nix rename to modules/clan/module.nix diff --git a/lib/modules/clan/secrets.nix b/modules/clan/secrets.nix similarity index 100% rename from lib/modules/clan/secrets.nix rename to modules/clan/secrets.nix diff --git a/lib/modules/clan/templates.nix b/modules/clan/templates.nix similarity index 100% rename from lib/modules/clan/templates.nix rename to modules/clan/templates.nix diff --git a/lib/modules/dir_test.nix b/modules/dir_test.nix similarity index 100% rename from lib/modules/dir_test.nix rename to modules/dir_test.nix diff --git a/lib/modules/eval-docs.nix b/modules/eval-docs.nix similarity index 100% rename from lib/modules/eval-docs.nix rename to modules/eval-docs.nix diff --git a/lib/modules/flake-module.nix b/modules/flake-module.nix similarity index 100% rename from lib/modules/flake-module.nix rename to modules/flake-module.nix diff --git a/lib/modules/inventoryClass/builder/default.nix b/modules/inventoryClass/builder/default.nix similarity index 100% rename from lib/modules/inventoryClass/builder/default.nix rename to modules/inventoryClass/builder/default.nix diff --git a/lib/modules/inventoryClass/builder/interface.nix b/modules/inventoryClass/builder/interface.nix similarity index 100% rename from lib/modules/inventoryClass/builder/interface.nix rename to modules/inventoryClass/builder/interface.nix diff --git a/lib/modules/inventoryClass/inventory-introspection.nix b/modules/inventoryClass/inventory-introspection.nix similarity index 100% rename from lib/modules/inventoryClass/inventory-introspection.nix rename to modules/inventoryClass/inventory-introspection.nix diff --git a/lib/modules/inventoryClass/inventory.nix b/modules/inventoryClass/inventory.nix similarity index 100% rename from lib/modules/inventoryClass/inventory.nix rename to modules/inventoryClass/inventory.nix diff --git a/lib/modules/inventoryClass/meta-interface.nix b/modules/inventoryClass/meta-interface.nix similarity index 100% rename from lib/modules/inventoryClass/meta-interface.nix rename to modules/inventoryClass/meta-interface.nix diff --git a/lib/modules/inventoryClass/roles-interface.nix b/modules/inventoryClass/roles-interface.nix similarity index 100% rename from lib/modules/inventoryClass/roles-interface.nix rename to modules/inventoryClass/roles-interface.nix diff --git a/lib/modules/inventoryClass/service-list-from-inputs.nix b/modules/inventoryClass/service-list-from-inputs.nix similarity index 100% rename from lib/modules/inventoryClass/service-list-from-inputs.nix rename to modules/inventoryClass/service-list-from-inputs.nix diff --git a/lib/modules/machineModules/forName.nix b/modules/machineModules/forName.nix similarity index 100% rename from lib/modules/machineModules/forName.nix rename to modules/machineModules/forName.nix diff --git a/lib/modules/machineModules/overridePkgs.nix b/modules/machineModules/overridePkgs.nix similarity index 100% rename from lib/modules/machineModules/overridePkgs.nix rename to modules/machineModules/overridePkgs.nix diff --git a/lib/modules/tests.nix b/modules/tests.nix similarity index 100% rename from lib/modules/tests.nix rename to modules/tests.nix