diff --git a/flake.nix b/flake.nix
index 80b181f..1b4f76b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,7 +42,7 @@
             ./nixos/catppuccin.nix
             ./nixos/configuration.nix
             ./nixos/development.nix
-            #./nixos/environment.nix
+            ./nixos/environment.nix
             ./nixos/gaming.nix
             ./nixos/git.nix
             ./nixos/gui-pkgs.nix
diff --git a/nixos/environment.nix b/nixos/environment.nix
index 60db720..f072fc9 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -1,10 +1,7 @@
 { lib, ... }: {
   environment.variables = {
-    EDITOR = lib.mkDefault (if builtins.hasAttr "SSH_CONNECTION"
-    builtins.currentSystemEnvironment then
-      "nvim"
-    else
-      "code");
+    EDITOR = "nvim";
+    VISUAL = "code";
 
     # XDG settings
     XDG_CONFIG_HOME = lib.mkDefault "$HOME/.config";