diff options
author | pennae <github@quasiparticle.net> | 2021-12-05 21:45:35 +0100 |
---|---|---|
committer | pennae <github@quasiparticle.net> | 2021-12-09 01:14:16 +0100 |
commit | ed673a69dbf5f9be67183621eb0f5c1759d48299 (patch) | |
tree | c5c2aa29c87a0f517e66f805d593fc74deb6ae79 /nixos/modules/services/monitoring | |
parent | fb0e5be84331188a69b3edd31679ca6576edb75a (diff) | |
download | nixlib-ed673a69dbf5f9be67183621eb0f5c1759d48299.tar nixlib-ed673a69dbf5f9be67183621eb0f5c1759d48299.tar.gz nixlib-ed673a69dbf5f9be67183621eb0f5c1759d48299.tar.bz2 nixlib-ed673a69dbf5f9be67183621eb0f5c1759d48299.tar.lz nixlib-ed673a69dbf5f9be67183621eb0f5c1759d48299.tar.xz nixlib-ed673a69dbf5f9be67183621eb0f5c1759d48299.tar.zst nixlib-ed673a69dbf5f9be67183621eb0f5c1759d48299.zip |
treewide: add defaultText for options with simple cfg.* expression defaults
adds defaultText for options with defaults that use only literals, full config.* paths, and the cfg shortcut binding.
Diffstat (limited to 'nixos/modules/services/monitoring')
-rw-r--r-- | nixos/modules/services/monitoring/parsedmarc.nix | 6 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/uptime.nix | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index eeee04b4400c..3bf267bdf297 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -1,7 +1,8 @@ -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: let cfg = config.services.parsedmarc; + opt = options.services.parsedmarc; ini = pkgs.formats.ini {}; in { @@ -80,6 +81,9 @@ in datasource = lib.mkOption { type = lib.types.bool; default = cfg.provision.elasticsearch && config.services.grafana.enable; + defaultText = lib.literalExpression '' + config.${opt.provision.elasticsearch} && config.${options.services.grafana.enable} + ''; apply = x: x && cfg.provision.elasticsearch; description = '' Whether the automatically provisioned Elasticsearch diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix index 245badc3e44f..79b86be6cc71 100644 --- a/nixos/modules/services/monitoring/uptime.nix +++ b/nixos/modules/services/monitoring/uptime.nix @@ -1,8 +1,9 @@ -{ config, pkgs, lib, ... }: +{ config, options, pkgs, lib, ... }: let - inherit (lib) mkOption mkEnableOption mkIf mkMerge types optional; + inherit (lib) literalExpression mkOption mkEnableOption mkIf mkMerge types optional; cfg = config.services.uptime; + opt = options.services.uptime; configDir = pkgs.runCommand "config" { preferLocalBuild = true; } (if cfg.configFile != null then '' @@ -52,7 +53,10 @@ in { enableWebService = mkEnableOption "the uptime monitoring program web service"; - enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service" // { default = cfg.enableWebService; }; + enableSeparateMonitoringService = mkEnableOption "the uptime monitoring service" // { + default = cfg.enableWebService; + defaultText = literalExpression "config.${opt.enableWebService}"; + }; nodeEnv = mkOption { description = "The node environment to run in (development, production, etc.)"; |