diff --git a/nix-os/core.nix b/nix-os/core.nix
index b87f14f..f58b699 100644
--- a/nix-os/core.nix
+++ b/nix-os/core.nix
@@ -92,9 +92,9 @@
     };
   };
 
-  environment.variables = lib.mkIf config.programs.neovim.enable {
-    EDITOR = "${config.programs.neovim.finalPackage}/bin/nvim";
-    VISUAL = "${config.programs.neovim.finalPackage}/bin/nvim";
+  environment.variables = lib.mkIf config.programs.neovim.enable rec {
+    EDITOR = "/run/current-system/sw/bin/nvim";
+    VISUAL = EDITOR;
   };
 
   programs.steam = {