Rename environment.systemVariables -> environment.sessionVariables

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

+7 -7
+1 -1
nixos/modules/config/i18n.nix
··· 76 76 77 77 environment.systemPackages = [ glibcLocales ]; 78 78 79 - environment.systemVariables = 79 + environment.sessionVariables = 80 80 { LANG = config.i18n.defaultLocale; 81 81 LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; 82 82 };
+2 -2
nixos/modules/config/system-environment.nix
··· 14 14 15 15 options = { 16 16 17 - environment.systemVariables = mkOption { 17 + environment.sessionVariables = mkOption { 18 18 default = {}; 19 19 description = '' 20 20 A set of environment variables used in the global environment. ··· 48 48 '' 49 49 ${concatStringsSep "\n" ( 50 50 (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'') 51 - (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))} 51 + (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.sessionVariables) ]))))} 52 52 ''; 53 53 54 54 };
+1 -1
nixos/modules/config/timezone.nix
··· 30 30 31 31 config = { 32 32 33 - environment.systemVariables.TZDIR = "/etc/zoneinfo"; 33 + environment.sessionVariables.TZDIR = "/etc/zoneinfo"; 34 34 35 35 systemd.globalEnvironment.TZDIR = tzdir; 36 36
+1 -1
nixos/modules/programs/environment.nix
··· 23 23 EDITOR = "nano"; 24 24 }; 25 25 26 - environment.systemVariables = 26 + environment.sessionVariables = 27 27 { NIX_PATH = 28 28 [ "/nix/var/nix/profiles/per-user/root/channels/nixos" 29 29 "nixpkgs=/etc/nixos/nixpkgs"
+1 -1
nixos/modules/security/ca.nix
··· 12 12 } 13 13 ]; 14 14 15 - environment.systemVariables = 15 + environment.sessionVariables = 16 16 { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; 17 17 CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; 18 18 GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
+1 -1
nixos/modules/services/misc/nix-daemon.nix
··· 318 318 }; 319 319 320 320 # Set up the environment variables for running Nix. 321 - environment.systemVariables = cfg.envVars; 321 + environment.sessionVariables = cfg.envVars; 322 322 323 323 environment.extraInit = 324 324 ''