From 187b854fd74bdab9e800998d0efe91681eb1f4b3 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Wed, 15 Dec 2021 06:29:10 +0000 Subject: [PATCH] dynamically set vim path for EDITOR --- all-shells/.commonshell | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/all-shells/.commonshell b/all-shells/.commonshell index c11cc45..820f9e1 100644 --- a/all-shells/.commonshell +++ b/all-shells/.commonshell @@ -19,8 +19,8 @@ #export EDITOR="/usr/bin/emacsclient -nw -a /usr/bin/vim" #alias ec=$EDITOR -alias ec="/usr/bin/emacsclient -nw -a /usr/bin/vim" -[ -n "$(whereis vim)" ] && export EDITOR="/usr/bin/vim" +alias ec="/usr/bin/emacsclient -nw -a $(which vim)" +[ -n "$(which vim)" ] && export EDITOR="$(which vim)" #default wine prefix [ -n "$(whereis wine)" ] && export WINEPREFIX=$HOME/.wine/Games/ @@ -30,3 +30,16 @@ export PATH=$PATH:~/.local/bin [ -r /usr/bin/ruby ] && PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin" [ -d ~/.cargo ] && PATH="$PATH:$HOME/.cargo/bin" + +# wsl display settings +if [ -n "$(uname -a | grep -i 'microsoft')" ]; then + export DISPLAY=$(ip route | awk '{print $3; exit}'):0 + export LIBGL_ALWAYS_INDIRECT=1 +fi + +# acme.sh +[ -f "${HOME}/.acme.sh/acme.sh.env" ] && source ~/.acme.sh/acme.sh.env + +# Update dotfiles +(git -C ~/.dotfiles pull &) &>/dev/null +[ -d ~/.emacs.d ] && (git -C ~/.emacs.d pull &) &>/dev/null -- Gitblit v1.9.3