diff --git a/modules/neovim.nix b/modules/neovim.nix
index ef11b6f..e4908b6 100644
--- a/modules/neovim.nix
+++ b/modules/neovim.nix
@@ -10,7 +10,7 @@
   config = {
     environment = {
       variables = {
-        EDITOR = "nvim";
+        EDITOR = "${pkgs.neovim}/bin/nvim";
       };
       defaultPackages = [
         pkgs.perl
@@ -37,6 +37,11 @@
       vimAlias = true;
       vimdiffAlias = true;
     };
-    home.packages = [pkgs.neovide];
+    home = {
+      packages = [pkgs.neovide];
+      sessionVariables = {
+        EDITOR = "${home.programs.neovim.finalPackage}/bin/nvim";
+      };
+    };
   };
 }