Fix problematic zsh_local ordering
This commit is contained in:
parent
9971875597
commit
a4a03ebd0f
4
copy.sh
4
copy.sh
|
@ -73,8 +73,8 @@ fi
|
||||||
echo -n "starship is "
|
echo -n "starship is "
|
||||||
if ! command -v starship &> /dev/null; then
|
if ! command -v starship &> /dev/null; then
|
||||||
echo "not installed. Installing..."
|
echo "not installed. Installing..."
|
||||||
curl -sS https://starship.rs/install.sh | sh
|
curl -sS https://starship.rs/install.sh | sh
|
||||||
echo "Starship requires an NFont: https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip"
|
echo "Starship requires an NFont: https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip"
|
||||||
else
|
else
|
||||||
echo "already installed."
|
echo "already installed."
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -80,6 +80,9 @@ function getdot {
|
||||||
cd -
|
cd -
|
||||||
}
|
}
|
||||||
|
|
||||||
|
source ~/.shell_aliases
|
||||||
|
source ~/.zsh_local
|
||||||
|
|
||||||
if which starship &> /dev/null; then
|
if which starship &> /dev/null; then
|
||||||
eval "$(starship init zsh)"
|
eval "$(starship init zsh)"
|
||||||
fi
|
fi
|
||||||
|
@ -88,9 +91,6 @@ if test -f ~/.cargo/env; then
|
||||||
source ~/.cargo/env
|
source ~/.cargo/env
|
||||||
fi
|
fi
|
||||||
|
|
||||||
source ~/.shell_aliases
|
|
||||||
source ~/.zsh_local
|
|
||||||
|
|
||||||
export NVM_DIR="$HOME/.nvm"
|
export NVM_DIR="$HOME/.nvm"
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
|
|
Loading…
Reference in New Issue