From f8f327c0d8c48bc064938af300384e8327b5e9d0 Mon Sep 17 00:00:00 2001 From: "tanguy@aristotle" Date: Fri, 24 Jul 2020 21:04:41 +0200 Subject: [PATCH] Fix conda activation lagging out console init --- .zshrc | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.zshrc b/.zshrc index 692a386..28f9684 100644 --- a/.zshrc +++ b/.zshrc @@ -106,19 +106,21 @@ export LANG=en_US.UTF-8 # alias ohmyzsh="mate ~/.oh-my-zsh" # >>> conda initialize >>> +[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh # !! Contents within this block are managed by 'conda init' !! -__conda_setup="$('/usr/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" -if [ $? -eq 0 ]; then - eval "$__conda_setup" -else - if [ -f "/usr/etc/profile.d/conda.sh" ]; then - . "/usr/etc/profile.d/conda.sh" - else - export PATH="/usr/bin:$PATH" - fi -fi -unset __conda_setup +# __conda_setup="$('/usr/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +# if [ $? -eq 0 ]; then +# eval "$__conda_setup" +# else +# if [ -f "/usr/etc/profile.d/conda.sh" ]; then +# . "/usr/etc/profile.d/conda.sh" +# else +# export PATH="/usr/bin:$PATH" +# fi +# fi +# unset __conda_setup # <<< conda initialize <<< +# alias socrates="ssh root@socrates" alias almond_droplet="ssh tanguy@almond_droplet -p 22222"