diff --git a/home/default.nix b/home/default.nix
index db47d138..6f91f179 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,16 +2,16 @@
 
 {
   imports = [
-    ./pass
-    ./git
-    ./ssh
-    ./tui
-    ./tmux
-    ./hyprland
-    ./alacritty
-    ./firefox
-    ./zathura
-    ./emacs
+    ./pass/default.nix
+    ./git/default.nix
+    ./ssh/default.nix
+    ./tui/default.nix
+    ./tmux/default.nix
+    ./hyprland/default.nix
+    ./alacritty/default.nix
+    ./firefox/default.nix
+    ./zathura/default.nix
+    ./emacs/server.nix
   ];
   home.packages = with pkgs; [
     bitwarden
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index a58cd883..f5927155 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [ ../git ];
+  imports = [ ../git/default.nix ];
   programs.emacs.enable = true;
   home.packages = with pkgs; [
     # Emacs dependencies
diff --git a/home/emacs/server.nix b/home/emacs/server.nix
new file mode 100644
index 00000000..c984e0a1
--- /dev/null
+++ b/home/emacs/server.nix
@@ -0,0 +1,12 @@
+{ config, ... }:
+
+{
+  imports = [ ./default.nix ];
+  services.emacs = {
+    enable = true;
+    package = config.programs.emacs.package;
+    defaultEditor = true;
+    client.enable = true;
+    socketActivation.enable = true;
+  };
+}