diff --git a/users/guanranwang/home-manager/common/home.nix b/users/guanranwang/home-manager/common/home.nix
index 0d201dc..22e7faf 100644
--- a/users/guanranwang/home-manager/common/home.nix
+++ b/users/guanranwang/home-manager/common/home.nix
@@ -41,10 +41,6 @@
       "unsetproxy" = "set -e http_proxy https_proxy all_proxy"; # fish syntax (?)
     };
     sessionVariables = {
-      # editor
-      "EDITOR" = "nvim";
-      "VISUAL" = "nvim";
-
       # misc
       "MANPAGER" = "sh -c 'col -bx | bat -l man -p'"; # man: use bat as man's pager
       "MANROFFOPT" = "-c"; # man: fix formatting issue with bat
@@ -144,6 +140,8 @@
       };
     };
 
+    # Editors
+    ### VSCode
     vscode = {
       enable = true;
       package = pkgs.vscodium; # foss
@@ -198,5 +196,30 @@
         #catppuccin.catppuccin-vsc
       ];
     };
+    ### Neovim
+    neovim = {
+      enable = true;
+      #defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+    };
+    ### Helix
+    helix = {
+      enable = true;
+      defaultEditor = true;
+      settings = {
+        theme = "tokyonight";
+        editor = {
+          cursor-shape = {
+            insert = "bar";
+            normal = "block";
+            select = "underline";
+          };
+          file-picker = {
+            hidden = false;
+          };
+        };
+      };
+    };
   };
 }
\ No newline at end of file
diff --git a/users/guanranwang/home-manager/darwin/home.nix b/users/guanranwang/home-manager/darwin/home.nix
index 3fe6c89..79659f2 100644
--- a/users/guanranwang/home-manager/darwin/home.nix
+++ b/users/guanranwang/home-manager/darwin/home.nix
@@ -30,7 +30,6 @@
 
     packages = with pkgs; [
       #fastfetch
-      neovim
 
       prismlauncher
       keka # un-archive-r