diff --git a/.Brewfile b/.Brewfile index 136efbf..b3275fe 100644 --- a/.Brewfile +++ b/.Brewfile @@ -180,6 +180,7 @@ mas "Final Cut Pro", id: 424389933 mas "Greenshot", id: 1103915944 mas "Pixelmator", id: 407963104 mas "Sequel Ace", id: 1518036000 +mas "Tailscale", id: 1475387142 mas "Todoist", id: 585829637 mas "WireGuard", id: 1451685025 mas "Xcode", id: 497799835 diff --git a/.config/zsh/misc.zsh b/.config/zsh/misc.zsh new file mode 100644 index 0000000..a100c3b --- /dev/null +++ b/.config/zsh/misc.zsh @@ -0,0 +1 @@ +alias strip-ansi="perl -pe 's/\e\[[0-9;]*m(?:\e\[K)?//g'" diff --git a/.config/zsh/nvm.zsh b/.config/zsh/nvm.zsh index 4c83e2f..feaa3c4 100644 --- a/.config/zsh/nvm.zsh +++ b/.config/zsh/nvm.zsh @@ -1,29 +1,44 @@ export NVM_DIR="$HOME/.nvm" -# These are the ones when using curl install -[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion -# These are the homebrew ones -[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # This loads nvm -[ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion +declare -a NODE_GLOBALS=(`find $NVM_DIR/versions/node -maxdepth 3 -type l -wholename '*/bin/*' | xargs -n1 basename | sort | uniq`) -autoload -U add-zsh-hook -load-nvmrc() { - local node_version="$(nvm version)" - local nvmrc_path="$(nvm_find_nvmrc)" +NODE_GLOBALS+=("node") +NODE_GLOBALS+=("nvm") - if [ -n "$nvmrc_path" ]; then - local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")") - - if [ "$nvmrc_node_version" = "N/A" ]; then - nvm install - elif [ "$nvmrc_node_version" != "$node_version" ]; then - nvm use - fi - elif [ "$node_version" != "$(nvm version default)" ]; then - echo "Reverting to nvm default version" - nvm use default +load_nvm () { + if [ -s "$NVM_DIR/nvm.sh" ]; then + # These are the ones when using curl install + [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm + [ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion + elif [ -x "$(command -v brew)" ]; then + export NVM_PREFIX=$(brew --prefix nvm) + # These are the homebrew ones + [ -s "$NVM_PREFIX/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # This loads nvm + [ -s "$NVM_PREFIX/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion fi } -add-zsh-hook chpwd load-nvmrc -load-nvmrc + +for cmd in "${NODE_GLOBALS[@]}"; do + eval "${cmd}(){ unset -f ${NODE_GLOBALS}; load_nvm; ${cmd} \$@ }" +done + +# autoload -U add-zsh-hook +# load-nvmrc() { +# local node_version="$(nvm version)" +# local nvmrc_path="$(nvm_find_nvmrc)" + +# if [ -n "$nvmrc_path" ]; then +# local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")") + +# if [ "$nvmrc_node_version" = "N/A" ]; then +# nvm install +# elif [ "$nvmrc_node_version" != "$node_version" ]; then +# nvm use +# fi +# elif [ "$node_version" != "$(nvm version default)" ]; then +# echo "Reverting to nvm default version" +# nvm use default +# fi +# } +# add-zsh-hook chpwd load-nvmrc +# load-nvmrc diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index b009dfb..0000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -lts/*