diff --git a/home-manager/home.nix b/home-manager/home.nix
index 760c76c..860224d 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -47,8 +47,8 @@
 
   # Platform-aware session variables
   home.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
+    EDITOR = lib.mkDefault "nvim";
+    VISUAL = lib.mkDefault "nvim";
   } // lib.optionalAttrs pkgs.stdenv.isDarwin {
     # macOS-specific environment variables
   } // lib.optionalAttrs pkgs.stdenv.isLinux {
diff --git a/home-manager/modules/doom-emacs.nix b/home-manager/modules/doom-emacs.nix
index 5971612..b035e58 100644
--- a/home-manager/modules/doom-emacs.nix
+++ b/home-manager/modules/doom-emacs.nix
@@ -61,10 +61,10 @@ in {
 
   # Emacs daemon service (optional - uncomment to enable)
   # When programs.doom-emacs.provideEmacs = true, this uses Doom Emacs
-  # services.emacs = {
-  #   enable = true;
-  #   defaultEditor = true;
-  # };
+  services.emacs = {
+    enable = true;
+    defaultEditor = true;
+  };
 
   # Ensure doom directories exist
   home.file.".local/share/nix-doom/.keep".text = "";
diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index e43ec80..5a7b015 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -10,7 +10,7 @@
     enable = true;
     viAlias = true;
     vimAlias = true;
-    defaultEditor = true;
+    defaultEditor = false;
 
     # External tools needed by plugins
     extraPackages = with pkgs; [