diff --git a/hosts/pinwheel/modules/emacs/default.nix b/hosts/pinwheel/modules/emacs/default.nix
index 921fef1..8e5da8c 100644
--- a/hosts/pinwheel/modules/emacs/default.nix
+++ b/hosts/pinwheel/modules/emacs/default.nix
@@ -22,6 +22,11 @@ in
       package = emacs;
     };
 
+    home.sessionVariables = {
+     EDITOR = "${e}/bin/e";
+     VISUAL = "${e}/bin/e";
+    };
+
     home.packages = [
       e
       emacs
diff --git a/hosts/pinwheel/modules/zsh/default.nix b/hosts/pinwheel/modules/zsh/default.nix
index c470590..8241c8f 100644
--- a/hosts/pinwheel/modules/zsh/default.nix
+++ b/hosts/pinwheel/modules/zsh/default.nix
@@ -40,7 +40,6 @@
       ];
 
       envExtra = lib.strings.concatStringsSep "\n" [
-        "EDITOR=vim"
         "BROWSER=firefox"
       ];