extern/dotfiles
1
0
Fork 0
mirror of https://github.com/Lissy93/dotfiles.git synced 2024-11-21 23:13:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-orders imports, so aliases are set after Brew is added to path

Browse Source
This commit is contained in:
Alicia Sykes 2023-12-13 10:50:11 +00:00
parent 9a0db85bbe
commit faf767244b
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
config/zsh/.zshrc
View File

@ -17,33 +17,6 @@ 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
# Source all ZSH config files (if present)
if [[ -d $zsh_dir ]]; then
# Import alias files
source ${zsh_dir}/aliases/general.zsh
source ${zsh_dir}/aliases/git.zsh
source ${zsh_dir}/aliases/node-js.zsh
source ${zsh_dir}/aliases/rust.zsh
source ${zsh_dir}/aliases/flutter.zsh
source ${zsh_dir}/aliases/alias-tips.zsh
# Setup Antigen, and import plugins
source ${zsh_dir}/helpers/setup-antigen.zsh
source ${zsh_dir}/helpers/import-plugins.zsh
source ${zsh_dir}/helpers/misc-stuff.zsh
# Configure ZSH stuff
source ${zsh_dir}/lib/colors.zsh
source ${zsh_dir}/lib/cursor.zsh
source ${zsh_dir}/lib/history.zsh
source ${zsh_dir}/lib/surround.zsh
source ${zsh_dir}/lib/completion.zsh
source ${zsh_dir}/lib/term-title.zsh
source ${zsh_dir}/lib/navigation.zsh
source ${zsh_dir}/lib/expansions.zsh
source ${zsh_dir}/lib/key-bindings.zsh
fi
# Import utility functions # Import utility functions
if [[ -d $utils_dir ]]; then if [[ -d $utils_dir ]]; then
source ${utils_dir}/transfer.sh source ${utils_dir}/transfer.sh
@ -80,6 +53,35 @@ if [ "$(uname -s)" = "Darwin" ]; then
fi fi
fi fi
# Source all ZSH config files (if present)
if [[ -d $zsh_dir ]]; then
# Import alias files
source ${zsh_dir}/aliases/general.zsh
source ${zsh_dir}/aliases/git.zsh
source ${zsh_dir}/aliases/node-js.zsh
source ${zsh_dir}/aliases/rust.zsh
source ${zsh_dir}/aliases/flutter.zsh
source ${zsh_dir}/aliases/tmux.zsh
source ${zsh_dir}/aliases/alias-tips.zsh
# Setup Antigen, and import plugins
source ${zsh_dir}/helpers/setup-antigen.zsh
source ${zsh_dir}/helpers/import-plugins.zsh
source ${zsh_dir}/helpers/misc-stuff.zsh
# Configure ZSH stuff
source ${zsh_dir}/lib/colors.zsh
source ${zsh_dir}/lib/cursor.zsh
source ${zsh_dir}/lib/history.zsh
source ${zsh_dir}/lib/surround.zsh
source ${zsh_dir}/lib/completion.zsh
source ${zsh_dir}/lib/term-title.zsh
source ${zsh_dir}/lib/navigation.zsh
source ${zsh_dir}/lib/expansions.zsh
source ${zsh_dir}/lib/key-bindings.zsh
fi
# If using Pyenv, import the shell integration if availible # If using Pyenv, import the shell integration if availible
if [[ -d "$PYENV_ROOT" ]]; then if [[ -d "$PYENV_ROOT" ]]; then
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"