mirror of
https://github.com/Lissy93/dotfiles.git
synced 2024-11-21 23:13:09 +01:00
mac stuff
This commit is contained in:
parent
780a3a83d7
commit
68c7f32d18
@ -17,6 +17,28 @@ utils_dir="${XDG_CONFIG_HOME}/utils"
|
|||||||
# If not running interactively, don't do anything
|
# If not running interactively, don't do anything
|
||||||
[[ $- != *i* ]] && return
|
[[ $- != *i* ]] && return
|
||||||
|
|
||||||
|
# MacOS-specific services
|
||||||
|
if [ "$(uname -s)" = "Darwin" ]; then
|
||||||
|
# Add Brew to path, if it's installed
|
||||||
|
if [[ -d /opt/homebrew/bin ]]; then
|
||||||
|
export PATH=/opt/homebrew/bin:$PATH
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If using iTerm, import the shell integration if availible
|
||||||
|
if [[ -f "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh" ]]; then
|
||||||
|
source "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Append the Android SDK locations to path
|
||||||
|
if [[ -d "${HOME}/Library/Android/" ]]; then
|
||||||
|
export PATH="${HOME}/Library/Android/sdk/emulator:${PATH}"
|
||||||
|
export ANDROID_HOME="${HOME}/Library/Android/sdk"
|
||||||
|
export ANDROID_SDK_ROOT="${HOME}/Library/Android/sdk"
|
||||||
|
export ANDROID_AVD_HOME="${ANDROID_SDK_ROOT}/tools/emulator"
|
||||||
|
export NODE_BINARY="/usr/local/bin/node"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Source all ZSH config files (if present)
|
# Source all ZSH config files (if present)
|
||||||
if [[ -d $zsh_dir ]]; then
|
if [[ -d $zsh_dir ]]; then
|
||||||
# Import alias files
|
# Import alias files
|
||||||
@ -57,28 +79,6 @@ fi
|
|||||||
# Import P10k config for command prompt, run `p10k configure` or edit
|
# Import P10k config for command prompt, run `p10k configure` or edit
|
||||||
[[ ! -f ${zsh_dir}/.p10k.zsh ]] || source ${zsh_dir}/.p10k.zsh
|
[[ ! -f ${zsh_dir}/.p10k.zsh ]] || source ${zsh_dir}/.p10k.zsh
|
||||||
|
|
||||||
# MacOS-specific services
|
|
||||||
if [ "$(uname -s)" = "Darwin" ]; then
|
|
||||||
# Add Brew to path, if it's installed
|
|
||||||
if [[ -d /opt/homebrew/bin ]]; then
|
|
||||||
export PATH=/opt/homebrew/bin:$PATH
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If using iTerm, import the shell integration if availible
|
|
||||||
if [[ -f "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh" ]]; then
|
|
||||||
source "${XDG_CONFIG_HOME}/zsh/.iterm2_shell_integration.zsh"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Append the Android SDK locations to path
|
|
||||||
if [[ -d "${HOME}/Library/Android/" ]]; then
|
|
||||||
export PATH="${HOME}/Library/Android/sdk/emulator:${PATH}"
|
|
||||||
export ANDROID_HOME="${HOME}/Library/Android/sdk"
|
|
||||||
export ANDROID_SDK_ROOT="${HOME}/Library/Android/sdk"
|
|
||||||
export ANDROID_AVD_HOME="${ANDROID_SDK_ROOT}/tools/emulator"
|
|
||||||
export NODE_BINARY="/usr/local/bin/node"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If not running in nested shell, then show nice welcome message :)
|
# If not running in nested shell, then show nice welcome message :)
|
||||||
if [[ "${SHLVL}" -lt 2 ]] && [[ -z "$SKIP_WELCOME" ]]; then
|
if [[ "${SHLVL}" -lt 2 ]] && [[ -z "$SKIP_WELCOME" ]]; then
|
||||||
welcome
|
welcome
|
||||||
|
Loading…
Reference in New Issue
Block a user