Chore: init settings submdule, move clanDir into settings submodule
This commit is contained in:
@@ -80,7 +80,10 @@ let
|
||||
(
|
||||
{
|
||||
# Settings
|
||||
clan.core.clanDir = directory;
|
||||
clan.core.settings = {
|
||||
inherit directory;
|
||||
};
|
||||
# clan.core.settings.directory = directory;
|
||||
# Inherited from clan wide settings
|
||||
# TODO: remove these
|
||||
clan.core.name = config.inventory.meta.name;
|
||||
|
||||
@@ -23,7 +23,7 @@ let
|
||||
modules = [
|
||||
baseModule
|
||||
{
|
||||
clan.core.clanDir = clan-core;
|
||||
clan.core.settings.directory = clan-core;
|
||||
}
|
||||
clan-core.nixosModules.clanCore
|
||||
] ++ modules;
|
||||
@@ -75,7 +75,7 @@ let
|
||||
baseModule
|
||||
clan-core.nixosModules.clanCore
|
||||
{
|
||||
clan.core.clanDir = clan-core;
|
||||
clan.core.settings.directory = clan-core;
|
||||
}
|
||||
# Role interface
|
||||
(module + "/roles/${role}.nix")
|
||||
|
||||
Reference in New Issue
Block a user