diff --git a/.Brewfile b/.Brewfile index f0370e1..136efbf 100644 --- a/.Brewfile +++ b/.Brewfile @@ -13,7 +13,6 @@ tap "tsub/s3-edit" tap "warrensbox/tap" brew "ack" brew "amazon-ecs-cli" -brew "antigen" brew "gdbm" brew "readline" brew "xz" @@ -37,13 +36,11 @@ brew "coreutils" brew "ctop" brew "erlang" brew "elixir" -brew "emacs" brew "exa" brew "expect" brew "ffmpeg" brew "ffsend" brew "findutils" -brew "fish" brew "fpp" brew "fzf" brew "gdk-pixbuf" @@ -79,10 +76,10 @@ brew "mosh" brew "most" brew "mysql" brew "mysql@5.7" -brew "n", args: ["HEAD"] brew "neovim" brew "nmap" brew "nnn" +brew "nvm" brew "openjdk" brew "pandoc" brew "pinentry-mac" @@ -94,7 +91,6 @@ brew "redis" brew "ripgrep" brew "starship" brew "speedtest-cli" -brew "stow" brew "teensy_loader_cli" brew "terraform-ls" brew "tfenv" @@ -103,8 +99,6 @@ brew "the_silver_searcher" brew "tldr" brew "tmux" brew "tmux-xpanes" -brew "tmuxinator" -brew "tmuxinator-completion", link: false brew "tree" brew "ttyrec" brew "urlview" @@ -114,7 +108,6 @@ brew "wallpaper" brew "wget" brew "yadm" brew "youtube-dl" -brew "z" brew "zsh" brew "zsh-syntax-highlighting" brew "qmk/qmk/qmk" diff --git a/.config/zsh/nvm.zsh b/.config/zsh/nvm.zsh index e6f7612..4c83e2f 100644 --- a/.config/zsh/nvm.zsh +++ b/.config/zsh/nvm.zsh @@ -1,6 +1,11 @@ export NVM_DIR="$HOME/.nvm" -[ -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 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 autoload -U add-zsh-hook load-nvmrc() {