derped/nixos
1
0
Fork 0
Code Releases Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/etc.nix
View file

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

7
pkgs/pkgsets.nix
View file

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