resolve merge conflict
This commit is contained in:
5
.zshrc
5
.zshrc
@@ -89,7 +89,10 @@ source $ZSH/oh-my-zsh.sh
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
export PATH="/usr/local/cuda-12.4/bin:$PATH"
|
||||
export PATH="/home/suppl/.local/bin:$PATH"
|
||||
|
||||
export LD_LIBRARY_PATH="/usr/local/cuda-12.4/lib64:$LD_LIBRARY_PATH"
|
||||
export PYENV_ROOT="$HOME/.pyenv"
|
||||
[[ -d "$PYENV_ROOT/bin" ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
||||
eval "$(pyenv init -)"
|
||||
@@ -105,4 +108,4 @@ eval "$(zoxide init --cmd cd zsh)"
|
||||
|
||||
# dedup env vars
|
||||
dedup_env_var PATH
|
||||
dedup_env_var LD_LIBRARY_PATH
|
||||
dedup_env_var LD_LIBRARY_PATH
|
||||
|
||||
Reference in New Issue
Block a user