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