matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(modules): make sure nothing is added without setting enable

Browse source
This commit is contained in:
matt1432 2025-01-04 19:02:30 -05:00
parent 4a2ad39114
commit 49dc072b81
56 changed files with 684 additions and 506 deletions

2
modules/caddy-plus/default.nix
View file

@ -92,7 +92,7 @@ self: {
}/Caddyfile";
in {
options.services.caddy.virtualHosts = mkOption {
type = types.attrsOf (types.submodule (import ./vhost-options.nix {inherit cfg;}));
type = types.attrsOf (types.submodule (import ./vhost-options.nix cfg));
};
config = mkIf cfg.enable {

2
modules/caddy-plus/sub-dir-options.nix
View file

@ -1,4 +1,4 @@
{cfg}: {
cfg: {
lib,
name,
...

4
modules/caddy-plus/sub-domain-options.nix
View file

@ -1,4 +1,4 @@
{cfg}: {
cfg: {
lib,
name,
...
@ -22,7 +22,7 @@ in {
};
subDirectories = mkOption {
type = types.attrsOf (types.submodule (import ./sub-dir-options.nix {inherit cfg;}));
type = types.attrsOf (types.submodule (import ./sub-dir-options.nix cfg));
default = {};
example = literalExpression ''
{

6
modules/caddy-plus/vhost-options.nix
View file

@ -1,4 +1,4 @@
{cfg}: {lib, ...}: let
cfg: {lib, ...}: let
inherit (lib) literalExpression mkOption types;
in {
options = {
@ -12,7 +12,7 @@ in {
};
subDomains = mkOption {
type = types.attrsOf (types.submodule (import ./sub-domain-options.nix {inherit cfg;}));
type = types.attrsOf (types.submodule (import ./sub-domain-options.nix cfg));
default = {};
example = literalExpression ''
{
@ -30,7 +30,7 @@ in {
};
subDirectories = mkOption {
type = types.attrsOf (types.submodule (import ./sub-dir-options.nix {inherit cfg;}));
type = types.attrsOf (types.submodule (import ./sub-dir-options.nix cfg));
default = {};
example = literalExpression ''
{