some refactoring

This commit is contained in:
cnst
2024-10-13 18:09:15 +02:00
parent 25a3fed51c
commit 084bc3b34f
125 changed files with 437 additions and 370 deletions

View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkOption;
cfg = config.modules.boot.kernel;
cfg = config.systemModules.boot.kernel;
in {
options = {
modules.boot.kernel = {
systemModules.boot.kernel = {
variant = mkOption {
type = lib.types.enum ["stable" "latest" "cachyos"];
default = "latest";
@@ -30,7 +30,7 @@ in {
extraBlacklistedModules = mkOption {
type = lib.types.listOf lib.types.str;
default = [];
description = "Additional kernel modules to blacklist.";
description = "Additional kernel systemModules to blacklist.";
};
};
};

View File

@@ -6,10 +6,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption mkMerge mkForce;
cfg = config.modules.boot.loader;
cfg = config.systemModules.boot.loader;
in {
options = {
modules.boot.loader = {
systemModules.boot.loader = {
default = {
enable = mkEnableOption "Enable default boot loader configuration.";
};
@@ -28,7 +28,7 @@ in {
assertions = [
{
assertion = !(cfg.default.enable && cfg.lanzaboote.enable);
message = "Only one of modules.boot.loader.default.enable and modules.boot.loader.lanzaboote.enable can be set to true.";
message = "Only one of systemModules.boot.loader.default.enable and systemModules.boot.loader.lanzaboote.enable can be set to true.";
}
];
}