mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-05 08:17:01 +00:00
Code Activity

services/nix-daemon: default environmentVariables to config.nix.envVars

Browse source 
The new `services.nix-daemon.environmentVariables` seems more idiomatic
so let's gracefully deprecate `config.nix.envVars` (which was only ever
used here).
This commit is contained in:
Luke Worth 2024-07-03 10:48:00 +10:00
parent 758f62d39d
commit daba515ea4
No known key found for this signature in database
GPG key ID: 650BF91A25815385
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/services/nix-daemon.nix
View file

@ -22,7 +22,9 @@ in
services.nix-daemon.environmentVariables = mkOption { services.nix-daemon.environmentVariables = mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.str;
default = { }; default =
# See https://github.com/LnL7/nix-darwin/commit/a9e0f71c50fc9a72e22e991e323a6a7e50bfc0d7.
config.nix.envVars;
example = { example = {
AWS_CONFIG_FILE = "/etc/nix/aws/config"; AWS_CONFIG_FILE = "/etc/nix/aws/config";
AWS_SHARED_CREDENTIALS_FILE = "/etc/nix/aws/credentials"; AWS_SHARED_CREDENTIALS_FILE = "/etc/nix/aws/credentials";
@ -74,7 +76,6 @@ in
serviceConfig.EnvironmentVariables = mkMerge [ serviceConfig.EnvironmentVariables = mkMerge [
cfg.environmentVariables cfg.environmentVariables
config.nix.envVars
{ {
NIX_SSL_CERT_FILE = mkIf NIX_SSL_CERT_FILE = mkIf
(config.environment.variables ? NIX_SSL_CERT_FILE) (config.environment.variables ? NIX_SSL_CERT_FILE)