diff --git a/home/dogar/common/optional/nvim.nix b/home/dogar/common/optional/nvim.nix
index e5fc67b..95d5f21 100644
--- a/home/dogar/common/optional/nvim.nix
+++ b/home/dogar/common/optional/nvim.nix
@@ -1,13 +1,13 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-  };
+  home.packages = [ pkgs.neovim ];
 
-  # Create a symlink from ~/.config/nvim to the dotfiles directory
-  home.file.".config/nvim".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
+  home.sessionVariables.EDITOR = "nvim";
+
+  home.file = {
+    ".local/bin/vi".source = "${pkgs.neovim}/bin/nvim";
+    ".local/bin/vim".source = "${pkgs.neovim}/bin/nvim";
+    ".config/nvim".source =
+      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
+  };
 }
diff --git a/home/shahab/common/optional/nvim.nix b/home/shahab/common/optional/nvim.nix
index 68609fe..6b79b24 100644
--- a/home/shahab/common/optional/nvim.nix
+++ b/home/shahab/common/optional/nvim.nix
@@ -1,13 +1,13 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    viAlias = true;
-    vimAlias = true;
-  };
+  home.packages = [ pkgs.neovim ];
 
-  # Create a symlink from ~/.config/nvim to the dotfiles directory
-  home.file."${config.xdg.configHome}/nvim".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
+  home.sessionVariables.EDITOR = "nvim";
+
+  home.file = {
+    ".local/bin/vi".source = "${pkgs.neovim}/bin/nvim";
+    ".local/bin/vim".source = "${pkgs.neovim}/bin/nvim";
+    "${config.xdg.configHome}/nvim".source =
+      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/nix-config/dotfiles/nvim";
+  };
 }