diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
| commit | 06fc1ec34dbae8bba4673475e64a8241026089f6 (patch) | |
| tree | 3e70796a291acc704ef5382f5af4866cab64e537 /nixos/modules/programs | |
| parent | 89f8af55f11b01e68cbfc6d10537413140261721 (diff) | |
| parent | ce623950ada9e1ef721760f05b9e3a14604fd764 (diff) | |
| download | nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.gz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.bz2 nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.lz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.xz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.zst nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/servers/serfdom/default.nix
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/atop.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/programs/environment.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index e457db22333b..b91bd98047ee 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -22,7 +22,7 @@ in interval = 5; }; description = '' - Parameters to be written to <filename>/etc/atoprc</filename> + Parameters to be written to <filename>/etc/atoprc</filename>. ''; }; diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 2ff1db48757d..80c3e83fe812 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -19,8 +19,8 @@ in environment.variables = { LOCATE_PATH = "/var/cache/locatedb"; NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; - PAGER = "less -R"; - EDITOR = "nano"; + PAGER = mkDefault "less -R"; + EDITOR = mkDefault "nano"; }; environment.sessionVariables = |