diff options
author | pennae <github@quasiparticle.net> | 2021-12-05 21:58:27 +0100 |
---|---|---|
committer | pennae <github@quasiparticle.net> | 2021-12-09 01:21:04 +0100 |
commit | e72435e6125f51a5f331080ed1862bdc86d36769 (patch) | |
tree | 69f8c218e9329deb848e5c21b842e007ccae6da4 /nixos/modules/services/misc | |
parent | ed673a69dbf5f9be67183621eb0f5c1759d48299 (diff) | |
download | nixpkgs-e72435e6125f51a5f331080ed1862bdc86d36769.tar nixpkgs-e72435e6125f51a5f331080ed1862bdc86d36769.tar.gz nixpkgs-e72435e6125f51a5f331080ed1862bdc86d36769.tar.bz2 nixpkgs-e72435e6125f51a5f331080ed1862bdc86d36769.tar.lz nixpkgs-e72435e6125f51a5f331080ed1862bdc86d36769.tar.xz nixpkgs-e72435e6125f51a5f331080ed1862bdc86d36769.tar.zst nixpkgs-e72435e6125f51a5f331080ed1862bdc86d36769.zip |
treewide: make option descriptions constants
escape interpolations in descriptions where possible, replace them with sufficiently descriptive text elsewhere. also expand cfg.* paths in descriptions.
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r-- | nixos/modules/services/misc/airsonic.nix | 5 | ||||
-rw-r--r-- | nixos/modules/services/misc/mediatomb.nix | 6 | ||||
-rw-r--r-- | nixos/modules/services/misc/subsonic.nix | 9 | ||||
-rw-r--r-- | nixos/modules/services/misc/zoneminder.nix | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index 533a3d367a3..5a5c30a4123 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -1,9 +1,10 @@ -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; let cfg = config.services.airsonic; + opt = options.services.airsonic; in { options = { @@ -78,7 +79,7 @@ in { description = '' List of paths to transcoder executables that should be accessible from Airsonic. Symlinks will be created to each executable inside - ${cfg.home}/transcoders. + ''${config.${opt.home}}/transcoders. ''; }; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 383090575b2..0227e81cfd9 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -277,13 +277,13 @@ in { user = mkOption { type = types.str; default = "mediatomb"; - description = "User account under which ${name} runs."; + description = "User account under which the service runs."; }; group = mkOption { type = types.str; default = "mediatomb"; - description = "Group account under which ${name} runs."; + description = "Group account under which the service runs."; }; port = mkOption { @@ -340,7 +340,7 @@ in { type = types.bool; default = false; description = '' - Allow ${name} to create and use its own config file inside the <literal>dataDir</literal> as + Allow the service to create and use its own config file inside the <literal>dataDir</literal> as configured by <option>services.mediatomb.dataDir</option>. Deactivated by default, the service then runs with the configuration generated from this module. Otherwise, when enabled, no service configuration is generated. Gerbera/Mediatomb then starts using diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 98b85918ad1..2dda8970dd3 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -1,8 +1,11 @@ -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; -let cfg = config.services.subsonic; in { +let + cfg = config.services.subsonic; + opt = options.services.subsonic; +in { options = { services.subsonic = { enable = mkEnableOption "Subsonic daemon"; @@ -97,7 +100,7 @@ let cfg = config.services.subsonic; in { description = '' List of paths to transcoder executables that should be accessible from Subsonic. Symlinks will be created to each executable inside - ${cfg.home}/transcoders. + ''${config.${opt.home}}/transcoders. ''; }; }; diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 378da7b8744..407742f72ad 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -171,7 +171,7 @@ in { example = "/storage/tank"; description = '' ZoneMinder can generate quite a lot of data, so in case you don't want - to use the default ${home}, you can override the path here. + to use the default ${defaultDir}, you can override the path here. ''; }; |