nixos/{vim,neovim,vscode,emacs}: prefer environment.sessionVariables.EDITOR over environment.variables.EDITOR (#444058)

nixos/modules/programs/neovim.nix

@@ -161,7 +161,7 @@ in
     environment.systemPackages = [
       cfg.finalPackage
     ];
-    environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
+    environment.sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
     # On most NixOS configurations /share is already included, so it includes
     # this directory as well. But  This makes sure that /share/nvim/site paths
     # from other packages will be used by neovim.

nixos/modules/programs/vim.nix

@@ -26,7 +26,7 @@ in
     ];
     environment = {
       systemPackages = [ cfg.package ];
-      variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "vim");
+      sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "vim");
       pathsToLink = [ "/share/vim-plugins" ];
     };
   };

nixos/modules/programs/vscode.nix

@@ -49,7 +49,7 @@ in
       cfg.finalPackage
     ];
 
-    environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (
+    environment.sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor (
       lib.mkOverride 900 cfg.finalPackage.meta.mainProgram
     );
 

nixos/modules/services/editors/emacs.nix

@@ -90,7 +90,7 @@ in
       editorScript
     ];
 
-    environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "emacseditor");
+    environment.sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "emacseditor");
   };
 
   meta.doc = ./emacs.md;