toki/aether
1
0
Fork 0
Code Issues Pull requests Activity

fix: resolve conflicting module options

Browse source 
Apparently you aren't allowed to define the same option in multiple
modules, even if the definitions are identical.
This commit is contained in:
Kiana Sheibani 2025-04-01 22:20:26 -04:00
parent 5965922b57
commit dedd95c442
Signed by: toki
GPG key ID: 6CB106C25E86A9F7
2 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/forgejo/options.nix
View file

@ -1,13 +1,8 @@
args@{ config, lib, ... }: args@{ config, lib, ... }:
{ {
options.aether = { imports = [ ../options.nix ];
# Referenced general options
inherit (import ../options.nix args)
domain
https
acmeEmail;
# Module-specific options options.aether = {
forgejo = { forgejo = {
subdomain = lib.mkOption { subdomain = lib.mkOption {
type = lib.types.nullOr lib.types.str; type = lib.types.nullOr lib.types.str;

28
modules/options.nix
View file

@ -1,19 +1,21 @@
{ lib, ... }: { lib, ... }:
{ {
domain = lib.mkOption { options.aether = {
type = lib.types.str; domain = lib.mkOption {
description = "The domain name the server is hosted on."; type = lib.types.str;
}; description = "The domain name the server is hosted on.";
};
https = lib.mkOption { https = lib.mkOption {
type = lib.types.boolByOr; type = lib.types.boolByOr;
default = true; default = true;
description = "Whether to force HTTPS connections for websites."; description = "Whether to force HTTPS connections for websites.";
}; };
acmeEmail = lib.mkOption { acmeEmail = lib.mkOption {
type = lib.types.nullOr lib.types.str; type = lib.types.nullOr lib.types.str;
default = null; default = null;
description = "Email address for ACME."; description = "Email address for ACME.";
};
}; };
} }