Commit 758b846efe
Verified · cmc
Layout: unified · split
common/zsh/.zshrc +26 −8
| @@ -53,14 +53,31 @@ fi | |||
| 53 | # NVM Configuration | 53 | # NVM Configuration |
| 54 | export NVM_DIR="$HOME/.nvm" | 54 | export NVM_DIR="$HOME/.nvm" |
| 55 | NVM_SH_PATH="$BREW_PREFIX/opt/nvm/nvm.sh" | 55 | NVM_SH_PATH="$BREW_PREFIX/opt/nvm/nvm.sh" |
| 56 | if [[ -s "$NVM_SH_PATH" ]]; then | ||
| 57 | source "$NVM_SH_PATH" | ||
| 58 | fi | ||
| 59 | 56 | ||
| 60 | NVM_BASH_COMPLETION_PATH="$BREW_PREFIX/opt/nvm/etc/bash_completion.d/nvm" | 57 | _load_nvm() { |
| 61 | if [[ -s "$NVM_BASH_COMPLETION_PATH" ]]; then | 58 | unset -f nvm node npm npx |
| 62 | source "$NVM_BASH_COMPLETION_PATH" | 59 | [[ -s "$NVM_SH_PATH" ]] && source "$NVM_SH_PATH" |
| 63 | fi | 60 | } |
| 61 | |||
| 62 | nvm() { | ||
| 63 | _load_nvm | ||
| 64 | nvm "$@" | ||
| 65 | } | ||
| 66 | |||
| 67 | node() { | ||
| 68 | _load_nvm | ||
| 69 | node "$@" | ||
| 70 | } | ||
| 71 | |||
| 72 | npm() { | ||
| 73 | _load_nvm | ||
| 74 | npm "$@" | ||
| 75 | } | ||
| 76 | |||
| 77 | npx() { | ||
| 78 | _load_nvm | ||
| 79 | npx "$@" | ||
| 80 | } | ||
| 64 | 81 | ||
| 65 | # History Settings | 82 | # History Settings |
| 66 | HISTFILE=~/.histfile | 83 | HISTFILE=~/.histfile |
| @@ -77,7 +94,8 @@ setopt HIST_REDUCE_BLANKS | |||
| 77 | 94 | ||
| 78 | bindkey -e | 95 | bindkey -e |
| 79 | zstyle :compinstall filename "$HOME/.zshrc" | 96 | zstyle :compinstall filename "$HOME/.zshrc" |
| 80 | autoload -Uz compinit && compinit | 97 | autoload -Uz compinit |
| 98 | compinit -C | ||
| 81 | 99 | ||
| 82 | # p10k | 100 | # p10k |
| 83 | P10K_THEME_PATH="$BREW_PREFIX/share/powerlevel10k/powerlevel10k.zsh-theme" | 101 | P10K_THEME_PATH="$BREW_PREFIX/share/powerlevel10k/powerlevel10k.zsh-theme" |