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

build-clan: move clan attribute relates modules into subfolder

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-06-24 09:52:26 +02:00
parent afc001cc54
commit 9fcbb6d688
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
lib/modules/computed-tags.nix → lib/modules/clan/computed-tags.nix
View File

8
lib/modules/interface.nix → lib/modules/clan/interface.nix
View File

@@ -90,7 +90,7 @@ in
}; };
templates = lib.mkOption { templates = lib.mkOption {
type = types.submodule { imports = [ ./templates/interface.nix ]; }; type = types.submodule { imports = [ ./templates.nix ]; };
default = { }; default = { };
description = '' description = ''
Define Clan templates. Define Clan templates.
@@ -100,7 +100,7 @@ in
inventory = lib.mkOption { inventory = lib.mkOption {
type = types.submodule { type = types.submodule {
imports = [ imports = [
(lib.modules.importApply ../inventory/build-inventory/interface.nix { inherit clanLib; }) (lib.modules.importApply ../../inventory/build-inventory/interface.nix { inherit clanLib; })
]; ];
}; };
description = '' description = ''
@@ -116,13 +116,13 @@ in
Global information about the clan. Global information about the clan.
''; '';
type = types.deferredModuleWith { type = types.deferredModuleWith {
staticModules = [ ../inventory/build-inventory/meta-interface.nix ]; staticModules = [ ../../inventory/build-inventory/meta-interface.nix ];
}; };
default = { }; default = { };
}; };
secrets = lib.mkOption { secrets = lib.mkOption {
type = types.submodule { imports = [ ./secrets/interface.nix ]; }; type = types.submodule { imports = [ ./secrets.nix ]; };
description = '' description = ''
Secrets related options such as AGE plugins required to encrypt/decrypt secrets using the CLI. Secrets related options such as AGE plugins required to encrypt/decrypt secrets using the CLI.
''; '';

4
lib/modules/module.nix → lib/modules/clan/module.nix
View File

@@ -120,7 +120,7 @@ let
moduleSystemConstructor.${machineClasses.${name}} { moduleSystemConstructor.${machineClasses.${name}} {
modules = [ modules = [
(config.outputs.moduleForMachine.${name} or { }) (config.outputs.moduleForMachine.${name} or { })
(lib.modules.importApply ./machineModules/overridePkgs.nix { (lib.modules.importApply ../machineModules/overridePkgs.nix {
pkgs = pkgsFor.${system}; pkgs = pkgsFor.${system};
}) })
]; ];
@@ -201,7 +201,7 @@ in
in in
{ {
imports = [ imports = [
(lib.modules.importApply ./machineModules/forName.nix { (lib.modules.importApply ../machineModules/forName.nix {
inherit (config.inventory) meta; inherit (config.inventory) meta;
inherit inherit
name name

0
lib/modules/secrets/interface.nix → lib/modules/clan/secrets.nix
View File

0
lib/modules/templates/interface.nix → lib/modules/clan/templates.nix
View File

6
lib/modules/default.nix
View File

@@ -9,8 +9,8 @@
{ {
flakePartsModule = { flakePartsModule = {
imports = [ imports = [
(lib.modules.importApply ./interface.nix { inherit clanLib; }) (lib.modules.importApply ./clan/interface.nix { inherit clanLib; })
./module.nix ./clan/module.nix
]; ];
}; };
@@ -68,7 +68,7 @@
imports = [ imports = [
rest rest
# implementation # implementation
./module.nix ./clan/module.nix
]; ];
}; };
in in

2
lib/modules/eval-docs.nix
View File

@@ -7,7 +7,7 @@ let
eval = lib.evalModules { eval = lib.evalModules {
class = "nixos"; class = "nixos";
modules = [ modules = [
(lib.modules.importApply ./interface.nix { inherit clanLib; }) (lib.modules.importApply ./clan/interface.nix { inherit clanLib; })
]; ];
}; };
evalDocs = pkgs.nixosOptionsDoc { evalDocs = pkgs.nixosOptionsDoc {

2
lib/modules/function-adapter.nix
View File

@@ -18,7 +18,7 @@ module:
; ;
}; };
modules = [ modules = [
(lib.modules.importApply ./interface.nix { inherit (clan-core) clanLib; }) (lib.modules.importApply ./clan/interface.nix { inherit (clan-core) clanLib; })
module module
{ {
inherit specialArgs; inherit specialArgs;

6
lib/modules/tests.nix
View File

@@ -23,7 +23,7 @@ in
let let
config = buildClan { config = buildClan {
meta.name = "test"; meta.name = "test";
imports = [ ./module.nix ]; imports = [ ./clan/module.nix ];
}; };
in in
{ {
@@ -42,7 +42,7 @@ in
outPath = ./.; outPath = ./.;
}; };
meta.name = "test"; meta.name = "test";
imports = [ ./module.nix ]; imports = [ ./clan/module.nix ];
}; };
in in
{ {
@@ -82,7 +82,7 @@ in
inventory.meta.name = "test"; inventory.meta.name = "test";
} }
./module.nix ./clan/module.nix
# Explicit output, usually defined by flake-parts # Explicit output, usually defined by flake-parts
{ options.nixosConfigurations = lib.mkOption { type = lib.types.raw; }; } { options.nixosConfigurations = lib.mkOption { type = lib.types.raw; }; }
]; ];