diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index 0dc0e37..4525a21 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -69,7 +69,18 @@
     };
   };
 
-  services.emacs.defaultEditor = true;
+  environment.variables.EDITOR =
+    let
+      editorScript = pkgs.writeScriptBin "emacseditor" ''
+        #!${pkgs.runtimeShell}
+        if [ -z "$1" ]; then
+          exec ${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor ${pkgs.emacs}/bin/emacs
+        else
+          exec ${pkgs.emacs}/bin/emacsclient --alternate-editor ${pkgs.emacs}/bin/emacs "$@"
+        fi
+      '';
+    in
+    (lib.mkOverride 900 "${editorScript}/bin/emacseditor");
 
   programs = {
     dconf.enable = true;