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

This reverts commit 18a0cdd864.
2014-06-10 13:03:44 +02:00
parent 9265a61453
commit 491c088731
10 changed files with 12 additions and 73 deletions
@@ -19,16 +19,13 @@ in
    environment.variables =
      { LOCATE_PATH = "/var/cache/locatedb";
        NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
-        PAGER = "less -R";
-        EDITOR = "nano";
-      };
-
-    environment.systemVariables =
-      { NIX_PATH =
+        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 =