diff --git a/nixos/emacs.nix b/nixos/emacs.nix
index 398a6a0e..334a2b66 100644
--- a/nixos/emacs.nix
+++ b/nixos/emacs.nix
@@ -1,7 +1,7 @@
 { pkgs, config, specialArgs, ... }:
 {
   services.emacs = {
-    enable = true;
+    enable = false;
     defaultEditor = true;
     startWithUserSession = false;
     socketActivation.enable = true;
diff --git a/nixos/environment.nix b/nixos/environment.nix
index dbfb8ac8..2f8b6a8f 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -51,6 +51,7 @@ with lib;
         ROFI_SYSTEMD_TERM = "alacritty -e";
         NIXPKGS_GIT_REV = "${inputs.nixpkgs.rev}";
         NIXPKGS_SOURCE = "${inputs.nixpkgs.outPath}";
+        EDITOR = "emacsclient --alternate-editor emacs";
       };
       interactiveShellInit = ''
         vterm_printf(){