diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 205d2ec..82653ff 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -78,7 +78,7 @@ in {
   environment.homeBinInPath = true;
 
   environment.variables = {
-    EDITOR = "hx";
+    EDITOR = "nvim";
   };
 
   networking.firewall.trustedInterfaces = ["tailscale0"];
diff --git a/users/daniel/configs/system/nushell/env.nu b/users/daniel/configs/system/nushell/env.nu
index 0a7e689..a2e4f8a 100644
--- a/users/daniel/configs/system/nushell/env.nu
+++ b/users/daniel/configs/system/nushell/env.nu
@@ -58,7 +58,7 @@ let-env NU_PLUGIN_DIRS = [
     ($nu.config-path | path dirname | path join 'plugins')
 ]
 
-let-env EDITOR = "hx"
+let-env EDITOR = "nvim"
 
 # To add entries to PATH (on Windows you might use Path), you can use the following pattern:
 # let-env PATH = ($env.PATH | split row (char esep) | prepend '/some/path')