diff --git a/flakes/emacs/home.nix b/flakes/emacs/home.nix
index dc605e6..6e96716 100644
--- a/flakes/emacs/home.nix
+++ b/flakes/emacs/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 let
   treeSitterLibraryExtension =
     if pkgs.stdenv.hostPlatform.isDarwin then "dylib" else "so";
@@ -103,4 +103,16 @@ in
         yasnippet
       ];
   };
+
+  launchd.agents.emacs-server = {
+    enable = true;
+    config = {
+      KeepAlive = true;
+      ProgramArguments = [
+        "${config.programs.emacs.package}/bin/emacs"
+        "--fg-daemon"
+      ];
+      RunAtLoad = true;
+    };
+  };
 }