Revert "Revert "Merge #2692: Use pam_env to properly setup system-wide env""

This reverts commit 491c088731.
2014-06-10 13:07:10 +02:00
parent 491c088731
commit 8ae659f16c
10 changed files with 73 additions and 12 deletions
@@ -19,13 +19,16 @@ in
    environment.variables =
      { LOCATE_PATH = "/var/cache/locatedb";
        NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
-        NIX_PATH =
+        PAGER = "less -R";
+        EDITOR = "nano";
+      };
+
+    environment.systemVariables =
+      { NIX_PATH =
          [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
            "nixpkgs=/etc/nixos/nixpkgs"
            "nixos-config=/etc/nixos/configuration.nix"
          ];
-        PAGER = "less -R";
-        EDITOR = "nano";
      };

    environment.profiles =