diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index cdb06105..b0d40ff4 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -1,13 +1,4 @@
-{ pkgs, ... }:
-
-{
-  # Emacs server service
-  services.emacs = {
-    enable = false;
-    package = pkgs.emacs28NativeComp;
-    defaultEditor = true;
-    startWithUserSession = false;
-  };
+{ pkgs, ... }: {
   home.packages = with pkgs; [
     # Emacs dependencies
     emacs28NativeComp
diff --git a/home/emacs/server.nix b/home/emacs/server.nix
new file mode 100644
index 00000000..e5ff4fec
--- /dev/null
+++ b/home/emacs/server.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  imports = [ ./default.nix ];
+  # Emacs server service
+  services.emacs = {
+    enable = true;
+    package = pkgs.emacs28NativeComp;
+    defaultEditor = true;
+    startWithUserSession = true;
+  };
+}
diff --git a/hosts/Legion/home.nix b/hosts/Legion/home.nix
index a3749bee..5b9d7d81 100644
--- a/hosts/Legion/home.nix
+++ b/hosts/Legion/home.nix
@@ -4,6 +4,7 @@
 in {
   imports = [
     shellConfig
+    ../../home/emacs/server.nix
     ../../home/git/personal.nix
     ../../home/ssh/personal.nix
     ../../home/tui
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 1ccccec1..e125beea 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -11,11 +11,11 @@ let
 in {
   imports = [
     shellConfig
+    ../../home/emacs/server.nix
     ../../home/git/work.nix
     ../../home/ssh/work.nix
     ../../home/tui
     ../../home/hyprland
-    ../../home/emacs
     ../../home/wezterm
   ];
   home = {