diff --git a/flake.nix b/flake.nix
index e295586..0838cf4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -219,7 +219,11 @@
       system = "x86_64-linux";
       modules = nixosModules ++ [
         ./machines/john-endesktop/configuration.nix
-        # Minimal server - no home-manager needed
+        inputs.home-manager.nixosModules.home-manager
+        {
+          home-manager.users.johno = import ./home/home-server.nix;
+          home-manager.extraSpecialArgs = { inherit system; };
+        }
       ];
     };
 
diff --git a/home/home-server.nix b/home/home-server.nix
index e676a50..3d5004e 100644
--- a/home/home-server.nix
+++ b/home/home-server.nix
@@ -9,6 +9,7 @@
   # Minimal roles for server with development capability
   home.roles = {
     base.enable = true;
+    emacs.enable = true;
     development.enable = true;
     tmux.enable = true;
   };