summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/i18n.nix2
-rw-r--r--nixos/modules/config/system-environment.nix4
-rw-r--r--nixos/modules/config/timezone.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 7a7d713ef687..d3f24e280c74 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -76,7 +76,7 @@ in
 
     environment.systemPackages = [ glibcLocales ];
 
-    environment.systemVariables =
+    environment.sessionVariables =
       { LANG = config.i18n.defaultLocale;
         LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
       };
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix
index b30c4e064750..3ab32f00fd1d 100644
--- a/nixos/modules/config/system-environment.nix
+++ b/nixos/modules/config/system-environment.nix
@@ -14,7 +14,7 @@ in
 
   options = {
 
-    environment.systemVariables = mkOption {
+    environment.sessionVariables = mkOption {
       default = {};
       description = ''
         A set of environment variables used in the global environment.
@@ -48,7 +48,7 @@ in
        ''
          ${concatStringsSep "\n" (
            (mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
-             (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))}
+             (zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.sessionVariables) ]))))}
        '';
 
   };
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 4f7fc9ab262b..c85922840770 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -30,7 +30,7 @@ in
 
   config = {
 
-    environment.systemVariables.TZDIR = "/etc/zoneinfo";
+    environment.sessionVariables.TZDIR = "/etc/zoneinfo";
 
     systemd.globalEnvironment.TZDIR = tzdir;