diff --git a/config/etc.nix b/config/etc.nix
index f6cd3b2..d4a2b3f 100644
--- a/config/etc.nix
+++ b/config/etc.nix
@@ -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";
diff --git a/pkgs/pkgsets.nix b/pkgs/pkgsets.nix
index a79e500..8590160 100644
--- a/pkgs/pkgsets.nix
+++ b/pkgs/pkgsets.nix
@@ -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;
   };
 }