diff --git a/users/modules/dev/editors/emacs.nix b/users/modules/dev/editors/emacs.nix
index 2c85ffb..c553106 100644
--- a/users/modules/dev/editors/emacs.nix
+++ b/users/modules/dev/editors/emacs.nix
@@ -37,7 +37,12 @@ in {
     services.emacs = mkIf cfg.service {
       enable = true;
       inherit (cfg) package;
+      defaultEditor = true;
       startWithUserSession = "graphical";
+      client = {
+        enable = true;
+        arguments = ["-c" "-a" "${cfg.package}/bin/emacs"];
+      };
     };
 
     xdg.desktopEntries.mu4e = mkIf cfg.mu4eMime {
diff --git a/users/phundrak/home.nix b/users/phundrak/home.nix
index e58721b..8dd026b 100644
--- a/users/phundrak/home.nix
+++ b/users/phundrak/home.nix
@@ -58,7 +58,6 @@
 
     home = {
       sessionVariables = {
-        EDITOR = "${config.home.dev.editors.emacs.package}/bin/emacsclient -c -a ${config.home.dev.editors.emacs.package}/bin/emacs";
         LAUNCH_EDITOR = "${launchWithEmacsclient}/bin/launch-with-emacsclient";
         SUDO_ASKPASS = "${askpass}/bin/askpass";
         LSP_USE_PLISTS = "true";