diff --git a/modules/nixos/programs/neovim.nix b/modules/nixos/programs/neovim.nix
index 429f032..4c0cc3b 100644
--- a/modules/nixos/programs/neovim.nix
+++ b/modules/nixos/programs/neovim.nix
@@ -10,5 +10,10 @@
     environment.systemPackages = [
       inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default
     ];
+    # Environment variables
+    environment.variables = {
+      EDITOR = "nvim";
+      VISUAL = "nvim";
+    };
   };
 }
diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix
index 0e2bbd0..a31c873 100644
--- a/modules/nixos/system/nix-settings.nix
+++ b/modules/nixos/system/nix-settings.nix
@@ -75,10 +75,6 @@
     # Optimize store automatically
     nix.settings.auto-optimise-store = lib.mkDefault true;
 
-    # Environment variables
-    environment.variables = {
-      EDITOR = "nvim";
-      VISUAL = "nvim";
-    };
+
   };
 }