diff --git a/home-manager/machines/crash/home.nix b/home-manager/machines/crash/home.nix
index 8d565bd..bab9b46 100644
--- a/home-manager/machines/crash/home.nix
+++ b/home-manager/machines/crash/home.nix
@@ -39,10 +39,7 @@
             nixpkgs.config.allowUnfree = true;
 
             # Machine specific configuration
-            programs.nushell.environmentVariables = {
-              VISUAL = "nvim";
-              EDITOR = "nvim";
-            };
+            services.emacs.defaultEditor = true;
           }
         )
       ];
diff --git a/home-manager/modules/programs/emacs.nix b/home-manager/modules/programs/emacs.nix
index cf61e4d..18301c8 100644
--- a/home-manager/modules/programs/emacs.nix
+++ b/home-manager/modules/programs/emacs.nix
@@ -72,4 +72,8 @@ in
         ))
       ];
   };
+  services.emacs = {
+    enable = true;
+    client.enable = true;
+  };
 }