From 473b374f3e6e12de5c5e59aa869c938d87d36378 Mon Sep 17 00:00:00 2001 From: jason Date: Fri, 11 Jul 2025 14:51:41 -0600 Subject: use asdf; gui emacs for $EDITOR --- bash/.bashrc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 4ea5664..40d90ef 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -160,7 +160,7 @@ if [ -x /opt/homebrew/bin/brew ]; then # Enable pyenv - if [ -x /opt/homebrew/bin/pyenv ]; then + if [ -x /opt/homebrew/bin/DISALBEDpyenv ]; then # Prevent linking against system libpython when building alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew' export PYENV_ROOT="$HOME/.pyenv" @@ -206,6 +206,12 @@ alias workon=__workon alias mkvirtualenv=__mkvirtualenv # Enable asdf (virtual environments) +ASDF=`which asdf 2> /dev/null` +if [ -x "$ASDF" ]; then + export ASDF_DATA_DIR="$HOME/.asdf" + export PATH="$ASDF_DATA_DIR/shims:$PATH" + . <(asdf completion bash) +fi # This conflicts with pyenv, which i tend to prefer. # As a result this should be enabled per-project via direnv # echo ". /opt/homebrew/opt/asdf/libexec/asdf.sh" >> .envrc @@ -281,7 +287,7 @@ fi #EMACS_SERVER_SOCKET="${TMPDIR:-/tmp}/emacs$(id -u)/server" #EDITOR="emacsclient -s ${EMACS_SERVER_SOCKET}" -export EDITOR='emacsclient -nw' +export EDITOR='emacsclient -c' alias e="${EDITOR}" # History settings -- cgit v1.2.1