fix: move inits to profile
This commit is contained in:
@@ -21,19 +21,44 @@ mkdir -p "$WORKSPACE"
|
|||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
export DOTFILES=${DOTFILES:-"$HOME/.dotfiles"}
|
export DOTFILES=${DOTFILES:-"$HOME/.dotfiles"}
|
||||||
|
|
||||||
# nvm
|
# Initialise and load nvm
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
if [ -z "$NVM_DIR" ]; then
|
if [ -z "$NVM_DIR" ]; then
|
||||||
export NVM_DIR=${NVM_DIR:-"$HOME/.nvm"}
|
export NVM_DIR=${NVM_DIR:-"$HOME/.nvm"}
|
||||||
mkdir -p "$NVM_DIR"
|
mkdir -p "$NVM_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# pyenv
|
_dots_load_nvm() {
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --no-use
|
||||||
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
||||||
|
}
|
||||||
|
_dots_load_nvm
|
||||||
|
|
||||||
|
_dots_install_node() {
|
||||||
|
node_alias="$NVM_DIR/alias/lts/jod"
|
||||||
|
if [ -f "$node_alias" ]; then
|
||||||
|
VERSION=`cat $node_alias`
|
||||||
|
if [ -x `command -v nvm` ]; then
|
||||||
|
nvm install "$VERSION" > /dev/null 2>&1 & disown
|
||||||
|
fi
|
||||||
|
node_bin_path="$NVM_DIR/versions/node/$VERSION/bin"
|
||||||
|
if [[ ":$PATH:" != *":$node_bin_path:"* ]]; then
|
||||||
|
export PATH="$node_bin_path:$PATH"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
_dots_install_node
|
||||||
|
|
||||||
|
# Initialise and load pyenv
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
export PYENV_ROOT=${PYENV_ROOT:-"$HOME/.pyenv"}
|
export PYENV_ROOT=${PYENV_ROOT:-"$HOME/.pyenv"}
|
||||||
if [[ ":$PATH:" != *":$PYENV_ROOT/bin:"* ]]; then
|
if [[ ":$PATH:" != *":$PYENV_ROOT/bin:"* ]]; then
|
||||||
export PATH="$PYENV_ROOT/bin:$PATH"
|
export PATH="$PYENV_ROOT/bin:$PATH"
|
||||||
fi
|
fi
|
||||||
|
_dots_load_pyenv() {
|
||||||
|
[ -x `command -v pyenv` ] && eval "$(pyenv init --path)"
|
||||||
|
}
|
||||||
|
_dots_load_pyenv
|
||||||
|
|
||||||
# poetry
|
# poetry
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
@@ -47,3 +72,11 @@ fi
|
|||||||
if [ -f ~/.aliases ]; then
|
if [ -f ~/.aliases ]; then
|
||||||
source ~/.aliases
|
source ~/.aliases
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Load homebrew
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
_dots_load_brew() {
|
||||||
|
export HOMEBREW_NO_ANALYTICS=0
|
||||||
|
[ -x "/opt/homebrew/bin/brew" ] && eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||||
|
}
|
||||||
|
_dots_load_brew
|
||||||
|
|||||||
@@ -25,27 +25,7 @@ _dots_load_omz() {
|
|||||||
}
|
}
|
||||||
_dots_load_omz
|
_dots_load_omz
|
||||||
|
|
||||||
# Load nvm
|
# Build shell prompt
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
_dots_load_nvm() {
|
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --no-use
|
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
|
||||||
}
|
|
||||||
_dots_load_nvm
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
_dots_load_brew() {
|
|
||||||
export HOMEBREW_NO_ANALYTICS=1
|
|
||||||
[ -x "/opt/homebrew/bin/brew" ] && eval "$(/opt/homebrew/bin/brew shellenv)"
|
|
||||||
}
|
|
||||||
_dots_load_brew
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
_dots_load_pyenv() {
|
|
||||||
[ -x `command -v pyenv` ] && eval "$(pyenv init --path)"
|
|
||||||
}
|
|
||||||
_dots_load_pyenv
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
_dots_build_prompt() {
|
_dots_build_prompt() {
|
||||||
local final_prompt=""
|
local final_prompt=""
|
||||||
@@ -60,6 +40,7 @@ _dots_build_prompt() {
|
|||||||
}
|
}
|
||||||
_dots_build_prompt
|
_dots_build_prompt
|
||||||
|
|
||||||
|
# Finish bench profiling
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
if [[ -n "$ZSH_BENCH" ]]; then
|
if [[ -n "$ZSH_BENCH" ]]; then
|
||||||
zprof
|
zprof
|
||||||
|
|||||||
Reference in New Issue
Block a user