diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-10 13:03:44 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-10 13:03:44 +0200 |
| commit | 491c088731022463978e595956427e72db6306a9 (patch) | |
| tree | 7b72dcd17ad081d12fbf24d39b0cd4c12a0651f2 /nixos/modules/programs | |
| parent | 9265a61453f0df3a8bbaf3dc53e32c239e3bdcf9 (diff) | |
| download | nixlib-491c088731022463978e595956427e72db6306a9.tar nixlib-491c088731022463978e595956427e72db6306a9.tar.gz nixlib-491c088731022463978e595956427e72db6306a9.tar.bz2 nixlib-491c088731022463978e595956427e72db6306a9.tar.lz nixlib-491c088731022463978e595956427e72db6306a9.tar.xz nixlib-491c088731022463978e595956427e72db6306a9.tar.zst nixlib-491c088731022463978e595956427e72db6306a9.zip | |
Revert "Merge #2692: Use pam_env to properly setup system-wide env"
This reverts commit 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/environment.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index c26c962b20a6..aa9aec078342 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -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 = |