diff --git a/configuration.nix b/configuration.nix
index f31cd05..5dd6bc8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -29,7 +29,13 @@ in
   # Enable completions by nix
   programs.fish.enable = true;
 
-  environment.shells = [ pkgs.fish ];
+  environment = {
+    shells = [ pkgs.fish ];
+    variables = {
+      EDITOR = "nvim";
+      VISUAL = "nvim";
+    };
+  };
 
   networking.hostName = "${hostname}"; # Define your hostname.
   # Pick only one of the below networking options.
diff --git a/home-manager.nix b/home-manager.nix
index d0887d5..aa3532e 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -77,8 +77,6 @@ in
       # user environment variables
       sessionVariables = {
         SSH_AUTH_SOCK = "/run/user/1000/ssh-agent.socket";
-        EDITOR = "nvim";
-        VISUAL = "nvim";
       };
     };
 
diff --git a/home-manager/config/fish/conf.d/interactive.fish b/home-manager/config/fish/conf.d/interactive.fish
index e5e421d..14ec347 100644
--- a/home-manager/config/fish/conf.d/interactive.fish
+++ b/home-manager/config/fish/conf.d/interactive.fish
@@ -34,5 +34,5 @@ set fish_color_cwd yellow
 set SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/ssh-agent.socket"
 export SSH_AUTH_SOCK
 # text editor
-set EDITOR nvim
-set VISUAL nvim
+#set EDITOR nvim
+#set VISUAL nvim