Rename environment.systemVariables -> environment.sessionVariables

This makes it clearer that they're part of PAM sessions.

Changed files
+7 -7
nixos
modules
+1 -1
nixos/modules/config/i18n.nix
···
environment.systemPackages = [ glibcLocales ];
-
environment.systemVariables =
{ LANG = config.i18n.defaultLocale;
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
};
···
environment.systemPackages = [ glibcLocales ];
+
environment.sessionVariables =
{ LANG = config.i18n.defaultLocale;
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
};
+2 -2
nixos/modules/config/system-environment.nix
···
options = {
-
environment.systemVariables = mkOption {
default = {};
description = ''
A set of environment variables used in the global environment.
···
''
${concatStringsSep "\n" (
(mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
-
(zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))}
'';
};
···
options = {
+
environment.sessionVariables = mkOption {
default = {};
description = ''
A set of environment variables used in the global environment.
···
''
${concatStringsSep "\n" (
(mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
+
(zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.sessionVariables) ]))))}
'';
};
+1 -1
nixos/modules/config/timezone.nix
···
config = {
-
environment.systemVariables.TZDIR = "/etc/zoneinfo";
systemd.globalEnvironment.TZDIR = tzdir;
···
config = {
+
environment.sessionVariables.TZDIR = "/etc/zoneinfo";
systemd.globalEnvironment.TZDIR = tzdir;
+1 -1
nixos/modules/programs/environment.nix
···
EDITOR = "nano";
};
-
environment.systemVariables =
{ NIX_PATH =
[ "/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixpkgs=/etc/nixos/nixpkgs"
···
EDITOR = "nano";
};
+
environment.sessionVariables =
{ NIX_PATH =
[ "/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixpkgs=/etc/nixos/nixpkgs"
+1 -1
nixos/modules/security/ca.nix
···
}
];
-
environment.systemVariables =
{ OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
···
}
];
+
environment.sessionVariables =
{ OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
+1 -1
nixos/modules/services/misc/nix-daemon.nix
···
};
# Set up the environment variables for running Nix.
-
environment.systemVariables = cfg.envVars;
environment.extraInit =
''
···
};
# Set up the environment variables for running Nix.
+
environment.sessionVariables = cfg.envVars;
environment.extraInit =
''