Commit 2ff7be72 authored by n0099's avatar n0099
Browse files

nixos/{vim,neovim,vscode,emacs}: prefer `environment.sessionVariables.EDITOR` 

over `environment.variables.EDITOR`

This allows `sudo systemctl edit` that using PAM login can read the proper `$EDITOR`.
parent 7d0addaf

nixos/modules/programs/neovim.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;