diff --git a/home/baseline/bash.nix b/home/baseline/bash.nix
index ff5a32e..0802bf8 100644
--- a/home/baseline/bash.nix
+++ b/home/baseline/bash.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   programs.bash = {
@@ -14,7 +14,7 @@
     sessionVariables = {
       ANSIBLE_COLLECTIONS_PATH = "\${HOME}/src/";
       CLICOLOR = "1";
-      EDITOR = "${pkgs.vim}/bin/vim";
+      EDITOR = lib.getExe config.programs.nixvim.build.package;
       GIT_SSL_NO_VERIFY = "True";
       LSCOLORS = "ExGxBxDxCxEgEdxbxgxcxd";
       MAVEN_OPTS = " -Dmaven.wagon.http.ssl.insecure=true ";
diff --git a/home/baseline/shell.nix b/home/baseline/shell.nix
index c1920df..28a99af 100644
--- a/home/baseline/shell.nix
+++ b/home/baseline/shell.nix
@@ -9,7 +9,7 @@
     sessionVariables = {
       AWS_SHARED_CREDENTIALS_FILE = "/run/agenix/cache-credentials";
       CARAPACE_BRIDGES = "zsh,bash";
-      EDITOR = lib.getExe config.programs.neovim.package;
+      EDITOR = lib.mkForce (lib.getExe config.programs.nixvim.build.package);
       GOPATH = "${config.home.homeDirectory}/src/go";
       GOBIN = "${config.home.homeDirectory}/src/bin";
       LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN = "1";
diff --git a/home/baseline/vim/config.nix b/home/baseline/vim/config.nix
index ac0e6a4..aad2beb 100644
--- a/home/baseline/vim/config.nix
+++ b/home/baseline/vim/config.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   colorschemes.gruvbox.enable = true;
+  defaultEditor = true;
   globals = {
     indent_guides_enable_on_vim_startup = 1;
     nix_recommended_style = 0;
diff --git a/home/baseline/xonsh.nix b/home/baseline/xonsh.nix
index 4e5983b..5e6af51 100644
--- a/home/baseline/xonsh.nix
+++ b/home/baseline/xonsh.nix
@@ -49,7 +49,7 @@
         GOPATH = "${config.home.homeDirectory}/src/go";
         GOBIN = "${config.home.homeDirectory}/src/bin";
 
-        EDITOR = lib.getExe config.programs.neovim.package;
+        EDITOR = lib.getExe config.programs.nixvim.build.package;
       };
 
       aliases = {