diff --git a/nix-os/core.nix b/nix-os/core.nix
index f76fe79..0ec595e 100644
--- a/nix-os/core.nix
+++ b/nix-os/core.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running 'nixos-help').
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   # Bootloader.
@@ -65,7 +65,6 @@
   programs.neovim = {
     enable = true;
     viAlias = true;
-    defaultEditor = true;
     configure = {
       customRC = ''
         set number
@@ -92,6 +91,11 @@
     };
   };
 
+  environment.variables = lib.mkIf config.programs.neovim.enable {
+    EDITOR = "${config.programs.neovim.finalPackage}/bin/nvim";
+    VISUAL = "${config.programs.neovim.finalPackage}/bin/nvim";
+  };
+
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;