Merge pull request #143421 from ck3d/fix-neovim-EDITOR

nixos/neovim: Respect option defaultEditor
2021-11-01 21:14:04 +01:00
parent b07533d824 6c0804f1b0
commit 6834ca6639
1 changed files with 1 additions and 1 deletions
@@ -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;