diff --git a/.zshrc b/.zshrc index e6c18b8d0..382e84edb 100644 --- a/.zshrc +++ b/.zshrc @@ -108,3 +108,25 @@ export LANG=en_US.UTF-8 # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" + +# Herd injected PHP binary. +export PHP_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/":$PHP_INI_SCAN_DIR + +# Herd injected PHP 8.2 configuration. +export HERD_PHP_82_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/82/" + +# Herd injected PHP 8.1 configuration. +export HERD_PHP_81_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/81/" + +# Herd injected PHP 8.3 configuration. +export HERD_PHP_83_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/83/" + +# Herd injected PHP 8.0 configuration. +export HERD_PHP_80_INI_SCAN_DIR="$HOME/Library/Application Support/Herd/config/php/80/" + +# Herd injected NVM configuration +export NVM_DIR="$HOME/Library/Application Support/Herd/config/nvm" + +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + +[[ -f "/Applications/Herd.app/Contents/Resources/config/shell/zshrc.zsh" ]] && builtin source "/Applications/Herd.app/Contents/Resources/config/shell/zshrc.zsh" diff --git a/README.md b/README.md index 2812fbb28..a788ce853 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ After backing up your old Mac you may now follow these install instructions to s Your Mac is now ready to use! -> 💡 You can use a different location than `~/.dotfiles` if you want. Make sure you also update the reference in the [`.zshrc`](./.zshrc#L2) file. +> 💡 You can use a different location than `~/.dotfiles` if you want. Make sure you also update the references in the [`.zshrc`](./.zshrc#L2) and [`fresh.sh`](./fresh.sh#L20) files. ### Cleaning your old Mac (optionally) diff --git a/fresh.sh b/fresh.sh index 84e8c6c9f..74926b77a 100755 --- a/fresh.sh +++ b/fresh.sh @@ -17,7 +17,7 @@ fi # Removes .zshrc from $HOME (if it exists) and symlinks the .zshrc file from the .dotfiles rm -rf $HOME/.zshrc -ln -s .zshrc $HOME/.zshrc +ln -sw $HOME/.dotfiles/.zshrc $HOME/.zshrc # Update Homebrew recipes brew update diff --git a/path.zsh b/path.zsh index 49305d254..c40065ab7 100644 --- a/path.zsh +++ b/path.zsh @@ -5,13 +5,16 @@ add_to_path() { fi } +# Load Herd injected PHP binaries +add_to_path "/Users/driesvints/Library/Application Support/Herd/bin" + # Load dotfiles binaries add_to_path "$DOTFILES/bin" -# Load Composer tools +# Load global Composer tools add_to_path "$HOME/.composer/vendor/bin" -# Load Node global installed binaries +# Load global Node installed binaries add_to_path "$HOME/.node/bin" # Use project specific binaries before global ones