diff --git a/home/cli.nix b/home/cli.nix
index 70d0e48..ffeb20c 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -176,7 +176,11 @@ in {
     defaultCacheTtlSsh = 300;
   };
 
-  services.emacs = { enable = true; };
+  services.emacs = {
+    enable = true;
+    defaultEditor = true;
+    startWithUserSession = true;
+  };
 
   home.file.".local" = {
     recursive = true;