From 9b2259a60ddcf064e8f0b5a2622c085b4e535276 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Sun, 19 Dec 2021 21:58:40 -0500 Subject: feat(wpcarro/marcus): Ensure EDITOR is set to Emacs I should've done this awhile ago. I'm tired of having `nano` open in vterm instances. Change-Id: I784e4a7a3e8acba11105052b6c0fe1f6f9ac614b Reviewed-on: https://cl.tvl.fyi/c/depot/+/4512 Reviewed-by: wpcarro Tested-by: BuildkiteCI --- users/wpcarro/emacs/default.nix | 2 ++ users/wpcarro/nixos/marcus/default.nix | 7 +++++++ 2 files changed, 9 insertions(+) (limited to 'users') diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index 7114350e629a..d95f5fa27160 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -1,5 +1,7 @@ { pkgs, depot, ... }: +# TODO(wpcarro): See if it's possible to expose emacsclient on PATH, so that I +# don't need to depend on wpcarros-emacs and emacs in my NixOS configurations. let inherit (builtins) path; inherit (depot.third_party.nixpkgs) emacsPackagesGen emacs27; diff --git a/users/wpcarro/nixos/marcus/default.nix b/users/wpcarro/nixos/marcus/default.nix index 78f3527b1222..51ec2dcdc86f 100644 --- a/users/wpcarro/nixos/marcus/default.nix +++ b/users/wpcarro/nixos/marcus/default.nix @@ -94,10 +94,17 @@ in { light.enable = true; }; + environment.variables = { + EDITOR = "emacsclient"; + ALTERNATE_EDITOR = "emacs -q -nw"; + VISUAL = "emacsclient"; + }; + environment.systemPackages = with pkgs; [ alacritty dig direnv + emacs fd firefox fzf -- cgit 1.4.1