diff --git a/home/baseline/xonsh.nix b/home/baseline/xonsh.nix
index 846ac4a..4e5983b 100644
--- a/home/baseline/xonsh.nix
+++ b/home/baseline/xonsh.nix
@@ -1,4 +1,9 @@
-{ pkgs, config, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   # Programs that are used in the settings file
@@ -43,6 +48,8 @@
 
         GOPATH = "${config.home.homeDirectory}/src/go";
         GOBIN = "${config.home.homeDirectory}/src/bin";
+
+        EDITOR = lib.getExe config.programs.neovim.package;
       };
 
       aliases = {