diff --git a/flake.nix b/flake.nix
index 8114e4f..e16ed0c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
     # EDITOR and TERM session variables must be set in home.nix or other module
     # I set the session variable SPAWNEDITOR to this in my home.nix for convenience
     spawnEditor = if (editor == "emacsclient") then "emacsclient -c -a 'emacs'"
-                  else (if (editor == ("vim" || "nvim" || "nano")) then "$TERM -e $EDITOR" else editor);
+                  else (if ((editor == "vim") || (editor == "nvim") || (editor == "nano")) then "exec " + term + " -e " + editor else editor);
 
     # create patched nixpkgs
     nixpkgs-patched = (import nixpkgs { inherit system; }).applyPatches {
diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix
index 5c0c627..b18317d 100644
--- a/user/app/doom-emacs/doom.nix
+++ b/user/app/doom-emacs/doom.nix
@@ -61,10 +61,6 @@ in
     markdown
   ]))];
 
-  home.sessionVariables = {
-    EDITOR = "emacsclient";
-  };
-
   home.file.".emacs.d/eaf" = {
     source = "${eaf}";
     recursive = true;
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index f235152..e2f1356 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -1862,10 +1862,6 @@ in
     markdown
   ]))];
 
-  home.sessionVariables = {
-    EDITOR = "emacsclient";
-  };
-
   home.file.".emacs.d/eaf" = {
     source = "${eaf}";
     recursive = true;
diff --git a/user/shell/cli-collection.nix b/user/shell/cli-collection.nix
index b22b594..920ca39 100644
--- a/user/shell/cli-collection.nix
+++ b/user/shell/cli-collection.nix
@@ -34,6 +34,7 @@
           nmcli n on
       fi
     '')
+    vim neovim
   ];
 
   imports = [