Merge branch 'main' of personalgit:d0zingcat/dotfiles

This commit is contained in:
d0zingcat
2024-06-03 11:19:00 +08:00

29
.zshrc
View File

@@ -1,12 +1,13 @@
export GOPATH=$HOME/.go export GOPATH=$HOME/.go
#export GOPROXY=https://goproxy.cn,direct # export GOPROXY=https://goproxy.cn,direct
export PYENV_ROOT="$HOME/.pyenv" # export PYENV_ROOT="$HOME/.pyenv"
export PNPM_HOME="$HOME/.pnpm" export PNPM_HOME="$HOME/.pnpm"
export CARGO_PATH=$HOME/.cargo export CARGO_PATH=$HOME/.cargo
export PATH="/opt/homebrew/sbin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" export PATH="/opt/homebrew/sbin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
export PATH="/home/linuxbrew/.linuxbrew/sbin:/home/linuxbrew/.linuxbrew/bin:$PATH" export PATH="/home/linuxbrew/.linuxbrew/sbin:/home/linuxbrew/.linuxbrew/bin:$PATH"
export PATH="$CARGO_PATH/bin:$GOPATH/bin:$PYENV_ROOT/shims:$PATH" # $PYENV_ROOT/shims
export PATH="$CARGO_PATH/bin:$GOPATH/bin:$PATH"
export PATH="$HOME/.local/bin:${HOME}/.krew/bin:$PATH" export PATH="$HOME/.local/bin:${HOME}/.krew/bin:$PATH"
export PATH="$PNPM_HOME:$PATH" export PATH="$PNPM_HOME:$PATH"
export PATH="$HOME/.docker/bin:$PATH" export PATH="$HOME/.docker/bin:$PATH"
@@ -239,16 +240,16 @@ alias pn='pnpm'
# >>> conda initialize >>> # >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !! # !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/Users/d0zingcat/.pyenv/versions/miniforge3-22.11.1-4/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" # __conda_setup="$('/Users/d0zingcat/.pyenv/versions/miniforge3-22.11.1-4/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then # if [ $? -eq 0 ]; then
eval "$__conda_setup" # eval "$__conda_setup"
else # else
if [ -f "/Users/d0zingcat/.pyenv/versions/miniforge3-22.11.1-4/etc/profile.d/conda.sh" ]; then # if [ -f "/Users/d0zingcat/.pyenv/versions/miniforge3-22.11.1-4/etc/profile.d/conda.sh" ]; then
. "/Users/d0zingcat/.pyenv/versions/miniforge3-22.11.1-4/etc/profile.d/conda.sh" # . "/Users/d0zingcat/.pyenv/versions/miniforge3-22.11.1-4/etc/profile.d/conda.sh"
else # else
export PATH="/Users/d0zingcat/.pyenv/versions/miniforge3-22.11.1-4/bin:$PATH" # export PATH="/Users/d0zingcat/.pyenv/versions/miniforge3-22.11.1-4/bin:$PATH"
fi # fi
fi # fi
unset __conda_setup # unset __conda_setup
# <<< conda initialize <<< # <<< conda initialize <<<