From a4a03ebd0fb53b46b9a67ac4a60d1ab8b2fbea0e Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Wed, 13 Dec 2023 14:00:47 -0500 Subject: [PATCH] Fix problematic zsh_local ordering --- copy.sh | 4 ++-- fake_home/.zshrc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/copy.sh b/copy.sh index 745b0db..6cc5c6c 100755 --- a/copy.sh +++ b/copy.sh @@ -73,8 +73,8 @@ fi echo -n "starship is " if ! command -v starship &> /dev/null; then echo "not installed. Installing..." -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" + 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" else echo "already installed." fi diff --git a/fake_home/.zshrc b/fake_home/.zshrc index 38f0111..4d6640f 100644 --- a/fake_home/.zshrc +++ b/fake_home/.zshrc @@ -80,6 +80,9 @@ function getdot { cd - } +source ~/.shell_aliases +source ~/.zsh_local + if which starship &> /dev/null; then eval "$(starship init zsh)" fi @@ -88,9 +91,6 @@ if test -f ~/.cargo/env; then source ~/.cargo/env fi -source ~/.shell_aliases -source ~/.zsh_local - export NVM_DIR="$HOME/.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