Emacs should only be the default editor if it is installed.

This commit is contained in:
Kevin Baensch 2019-07-11 11:58:45 +02:00
parent 4e25317f37
commit d53a5b9571
2 changed files with 4 additions and 4 deletions

View file

@ -12,7 +12,6 @@ with lib;
};
environment.variables = mkIf (elem "etcvars" config.machine.conffiles) {
EDITOR="emacsclient -ca nano";
NIXPKGS_ALLOW_UNFREE="1";
WINEDLLOVERRIDES="winemenubuilder.exe=d";
LC_CTYPE="zh_CN.UTF-8";

View file

@ -286,9 +286,10 @@ in {
++ (optPkgs uniProgs "uniProgs")
++ (optPkgs xpkgs "xpkgs");
services.emacs = {
enable = (elem "emacs" cfg.pkgs);
install = (elem "emacs" cfg.pkgs);
services.emacs = mkIf (elem "emacs" cfg.pkgs) {
defaultEditor = true;
enable = true;
install = true;
package = emacs;
};
}