diff --git a/env.nix b/env.nix
new file mode 100644
index 0000000..4527e3e
--- /dev/null
+++ b/env.nix
@@ -0,0 +1,8 @@
+{ config, ... }:
+
+{
+  environment.variables = {
+    EDITOR = "nvim";
+  };
+}
+
diff --git a/master.nix b/master.nix
index f74e213..a385d59 100644
--- a/master.nix
+++ b/master.nix
@@ -17,6 +17,7 @@ in
     ./packages.nix
     (import "${home-manager}/nixos")
     ./user/stormwind/master.nix
+    ./env.nix
     ./sshd.nix
     ./tailscale.nix
     ./incus.nix