extern/dotfiles
1
0
Fork 0
mirror of https://github.com/Lissy93/dotfiles.git synced 2025-06-30 13:39:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move ZSH app imports to .zshrc, not .zshenv

Browse Source
This commit is contained in:
Alicia Sykes
2022-11-06 23:59:18 +00:00
parent 4ef9443861
commit 3a66be5bb6
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/zsh/.zshenv
View File

@ -41,17 +41,3 @@ export ZLIB="${ZDOTDIR}/lib"
export LANG='en_GB.UTF-8'; export LANG='en_GB.UTF-8';
export LC_ALL='en_GB.UTF-8'; export LC_ALL='en_GB.UTF-8';
export PYTHONIOENCODING='UTF-8'; export PYTHONIOENCODING='UTF-8';
# Add Brew to path, if installed and on MacOS
if [ "$(uname -s)" = "Darwin" ] && [[ -d /opt/homebrew/bin ]]; then
export PATH=/opt/homebrew/bin:$PATH
fi
# And Android SDK to path, if within Library direcroty
if [ "$(uname -s)" = "Darwin" ] && [[ -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

18
config/zsh/.zshrc
View File

@ -16,6 +16,7 @@ source ${zsh_dir}/aliases/alias-tips.zsh
# Setup Antigen, and import plugins # Setup Antigen, and import plugins
source ${zsh_dir}/helpers/setup-antigen.zsh source ${zsh_dir}/helpers/setup-antigen.zsh
source ${zsh_dir}/helpers/import-plugins.zsh source ${zsh_dir}/helpers/import-plugins.zsh
source ${zsh_dir}/helpers/misc-stuff.zsh
# Configure ZSH stuff # Configure ZSH stuff
source ${zsh_dir}/lib/colors.zsh source ${zsh_dir}/lib/colors.zsh
@ -37,12 +38,23 @@ source ${utils_dir}/am-i-online.sh
source ${utils_dir}/welcome-banner.sh source ${utils_dir}/welcome-banner.sh
source ${utils_dir}/color-map.sh source ${utils_dir}/color-map.sh
# Left over tasks
source ${zsh_dir}/helpers/misc-stuff.zsh
# 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
# Add Brew to path, if installed and on MacOS
if [ "$(uname -s)" = "Darwin" ] && [[ -d /opt/homebrew/bin ]]; then
export PATH=/opt/homebrew/bin:$PATH
fi
# And Android SDK to path, if within Library direcroty
if [ "$(uname -s)" = "Darwin" ] && [[ -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
# If not running in nested shell, then show welcome message :) # If not running in nested shell, then show welcome message :)
if [[ "${SHLVL}" -lt 2 ]] && [[ -z "$SKIP_WELCOME" ]]; then if [[ "${SHLVL}" -lt 2 ]] && [[ -z "$SKIP_WELCOME" ]]; then
welcome welcome