From 16dfa55df7477d710b56c449cd4edfd3cb7d365c Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Mon, 20 Jan 2020 22:02:20 +0000
Subject: [PATCH] Ensure EDITOR and similar variables work with EXWM setup

After some confusion about my `emacsclient` is currently working as
expected. Perhaps it always did. I had `emacs --daemon` in my
`~/.xsessionrc.shared` for awhile, which may have confused
`emacsclient`. Whatever happened, I'm glad it's working now.
---
 configs/shared/.config/fish/config.fish | 6 +-----
 configs/shared/.profile                 | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configs/shared/.config/fish/config.fish b/configs/shared/.config/fish/config.fish
index 2b6126461..830b4bb19 100644
--- a/configs/shared/.config/fish/config.fish
+++ b/configs/shared/.config/fish/config.fish
@@ -88,8 +88,7 @@ abbr --add p xclip -selection clipboard -o
 abbr --add cp cp_dwim
 abbr --add lorem echo "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-# TODO: Ensure this works as expect with current EXWM setup.
-abbr --add e emacsclient --no-wait --create-frame
+abbr --add e emacsclient
 
 abbr --add cat bat --theme=TwoDark
 # TODO: Support this once `fasd` works.
@@ -282,9 +281,6 @@ abbr --add el e ~/variables.zsh
 abbr --add ex e ~/.Xresources
 abbr --add em e ~/.tmux.conf
 abbr --add er e ~/Dropbox/dotfiles/README.md
-# TODO: consider DRYing this up with `e`. Unfortunately, `sudo` won't support
-# aliases.
-abbr --add en sudo ALTERNATE_EDITOR=nvim emacsclient --no-wait --create-frame /etc/nixos/configuration.nix
 
 # Couple the s* aliases to the <leader>s* kbds in vim.
 abbr --add sz source ~/.zshrc
diff --git a/configs/shared/.profile b/configs/shared/.profile
index 57f87751b..c53a0164d 100644
--- a/configs/shared/.profile
+++ b/configs/shared/.profile
@@ -22,7 +22,7 @@ fi
 export BROWSER=google-chrome-stable
 export TERMINAL=alacritty # temporary; change this back to `st`
 export VISUAL=emacsclient
-export EDITOR=$VISUAL
+export EDITOR=emacsclient
 export ALTERNATE_EDITOR=nvim
 
 # Rust integration. Keep here so programs like Emacs can read this value.