From 6c0804f1b0fce6831773f042afcab68df793ecb0 Mon Sep 17 00:00:00 2001
From: Christian Kögler <ck3d@gmx.de>
Date: Thu, 28 Oct 2021 18:51:44 +0200
Subject: nixos/neovim: Respect option defaultEditor

---
 nixos/modules/programs/neovim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix
index 97b77ae98fe..26d75caeb8d 100644
--- a/nixos/modules/programs/neovim.nix
+++ b/nixos/modules/programs/neovim.nix
@@ -139,7 +139,7 @@ in {
     environment.systemPackages = [
       cfg.finalPackage
     ];
-    environment.variables = { EDITOR = mkOverride 900 "nvim"; };
+    environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");
 
     programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {
       inherit (cfg) viAlias vimAlias;
-- 
cgit 1.4.1