diff --git a/modules/home/base/profile/default.nix b/modules/home/base/profile/default.nix
index 95857e4..8e33a60 100644
--- a/modules/home/base/profile/default.nix
+++ b/modules/home/base/profile/default.nix
@@ -1,17 +1,11 @@
-{ config, ... }:
-{
+{config, ...}: {
   config.home = {
     sessionPath = [
       "${config.home.homeDirectory}/.local/bin"
     ];
 
-    sessionVariables = rec {
+    sessionVariables = {
       HACK = "${config.home.homeDirectory}/hackin";
-
-      # TODO: remove this when neovim is installed.
-      EDITOR = "nvim";
-      VISUAL = "${EDITOR}";
-      SUDO_EDITOR = "${EDITOR}";
     };
 
     shellAbbrs = {
diff --git a/modules/home/programs/neovim/default.nix b/modules/home/programs/neovim/default.nix
index ad315b7..ab4e29e 100644
--- a/modules/home/programs/neovim/default.nix
+++ b/modules/home/programs/neovim/default.nix
@@ -14,5 +14,11 @@ in {
     home.packages = with pkgs; [
       nvim-pkg
     ];
+
+    home.sessionVariables = rec {
+      EDITOR = "nvim";
+      VISUAL = "${EDITOR}";
+      SUDO_EDITOR = "${EDITOR}";
+    };
   };
 }