From 5242850fbcb4c20a647ad8cd73d8268af5a49acd Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 1 Jul 2026 18:07:52 -0400 Subject: [PATCH] missing defaults --- modules/nixos/common/hardware/fancontrol.nix | 8 +++++++- modules/nixos/server/k8s/default.nix | 18 ++++++++++++++++-- .../nixos/server/services/audiobookshelf.nix | 6 ++++-- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/modules/nixos/common/hardware/fancontrol.nix b/modules/nixos/common/hardware/fancontrol.nix index 96d3413..a32f1eb 100644 --- a/modules/nixos/common/hardware/fancontrol.nix +++ b/modules/nixos/common/hardware/fancontrol.nix @@ -10,11 +10,17 @@ in options.skyg.nixos.common.hardware.fancontrol = with lib; { enable = mkEnableOption "fancontrol"; configName = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; + example = "thinkpad"; }; }; config = lib.mkIf cfg.enable { + assertions = [{ + assertion = cfg.configName != null; # only checked when enable = true + message = "skyg.nixos.common.hardware.fancontrol: configName must be set when fancontrol is enabled"; + }]; systemd.services.fancontrol = { enable = true; description = "Fan control"; diff --git a/modules/nixos/server/k8s/default.nix b/modules/nixos/server/k8s/default.nix index dec9b67..5915071 100644 --- a/modules/nixos/server/k8s/default.nix +++ b/modules/nixos/server/k8s/default.nix @@ -16,10 +16,14 @@ in isNode = lib.mkEnableOption "Enable as node"; masterIP = lib.mkOption { - type = lib.types.str; + type = lib.types.nullOr lib.types.str; + default = null; + example = "10.0.0.1"; }; masterHostName = lib.mkOption { - type = lib.types.str; + type = lib.types.nullOr lib.types.str; + default = null; + example = "k8s-master"; }; masterAPIPort = lib.mkOption { type = lib.types.number; @@ -41,6 +45,16 @@ in ]; in lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.masterIP != null; + message = "skyg.nixos.server.k8s: masterIP must be set when k8s is enabled"; + } + { + assertion = cfg.masterHostName != null; + message = "skyg.nixos.server.k8s: masterHostName must be set when k8s is enabled"; + } + ]; # resolve master hostname networking.extraHosts = "${cfg.masterIP} ${cfg.masterHostName}"; networking.firewall.allowedUDPPorts = ports; diff --git a/modules/nixos/server/services/audiobookshelf.nix b/modules/nixos/server/services/audiobookshelf.nix index cf37ac6..09e759e 100644 --- a/modules/nixos/server/services/audiobookshelf.nix +++ b/modules/nixos/server/services/audiobookshelf.nix @@ -14,18 +14,20 @@ in { configDir = mkOption { description = "Path to Audiobookshelf config folder"; + default = "${cfg.dataDir}/config"; type = types.str; }; dataDir = mkOption { description = "Path to Audiobookshelf config and metadata inside of /var/lib."; - default = "audiobookshelf"; + default = "/var/lib/audiobookshelf"; type = types.str; }; metadataDir = mkOption { description = - "Path to Audiobookshelf config folder"; + "Path to Audiobookshelf metadata folder"; + default = "${cfg.dataDir}/metadata"; type = types.str; };