about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authormarkuskowa <markus.kowalewski@gmail.com>2021-11-01 21:14:04 +0100
committerGitHub <noreply@github.com>2021-11-01 21:14:04 +0100
commit6834ca6639ac0f4d94c5f0af42ccc23021eaadfd (patch)
treec6df9a729e29c8bc7e97bcafb5990813185cde64 /nixos/modules
parentb07533d82457de4e3e5a0969ebe6323fa6d6550f (diff)
parent6c0804f1b0fce6831773f042afcab68df793ecb0 (diff)
Merge pull request #143421 from ck3d/fix-neovim-EDITOR
nixos/neovim: Respect option defaultEditor
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/programs/neovim.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix
index 97b77ae98fe25..26d75caeb8def 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;