diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-03 16:07:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-10 11:42:59 +0200 |
| commit | 18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c (patch) | |
| tree | b29b201f19d9b2cc3941d42405fe39b1937f635e /nixos/modules/programs | |
| parent | 927c41e2585cf4b8d7fc1e64f8f9927af710cf94 (diff) | |
| download | nixlib-18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.tar nixlib-18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.tar.gz nixlib-18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.tar.bz2 nixlib-18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.tar.lz nixlib-18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.tar.xz nixlib-18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.tar.zst nixlib-18a0cdd86416a8cbc263cfa8cb96c460a53f7b5c.zip | |
Merge #2692: Use pam_env to properly setup system-wide env
Diffstat (limited to 'nixos/modules/programs')
| -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 = |