updated brew installs

Author: leocrossman

.zshrc

@@ -1,5 +1,3 @@
-zmodload zsh/zprof
-
 # Start configuration added by Zim install {{{
 #
 # User configuration sourced by interactive shells
@@ -265,11 +263,6 @@ source $ZSH/oh-my-zsh.sh
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
-# install homebrew
-if [[ $(command -v brew) == "" ]]; then
-    echo "Installing Hombrew"
-		bash $HOME/scripts/bash/dotfiles/install_brew
-fi
 
 
 # install additional dependencies
@@ -444,3 +437,8 @@ alias l.="ls -A | egrep '^\.'"
 
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+
+export PATH=/opt/homebrew/bin:$PATH
+
+alias uninstall_brew="NONINTERACTIVE=1 /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)\""

scripts/bash/dotfiles/install_brew

@@ -1,8 +1,72 @@
 #!/usr/bin/env bash
 if ! command -v brew &> /dev/null
 then
-	echo Installing brew...
-	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+  if [[ $(arch) == 'arm64' ]]
+  then
+		echo Installing Xcode Command Line Utilites...
+		xcode-select --install
+		echo Installing brew...
+		/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+		brew update
+		brew upgrade
+
+		apps=(
+				ag
+				cmake
+				coreutils
+				dockutil
+				ffmpeg
+				fasd
+				gifsicle
+				git
+				gnu-sed
+				grep
+				hub
+				httpie
+				imagemagick
+				jq
+				mackup
+				peco
+				psgrep
+				python
+				shellcheck
+				ssh-copy-id
+				svn
+				tmux
+				tree
+				neovim
+				volta
+				wget
+        nvm
+        go
+				cowsay
+				zoxide
+				python
+				tmux
+				htop
+				fzf
+				neovim
+		)
+
+
+		brew install "${apps[@]}"
+
+		python3 -m pip install --user --upgrade pynvim
+
+	  # To install useful key bindings and fuzzy completion:
+  	$(brew --prefix)/opt/fzf/install
+
+		# Git comes with diff-highlight, but isn't in the PATH
+		ln -sf "$(brew --prefix)/share/git-core/contrib/diff-highlight/diff-highlight" /usr/local/bin/diff-highlight
+
+		echo Adding to zprofile...
+    grep -qxF 'eval "$(/opt/homebrew/bin/brew shellenv)" &> /dev/null' ~/.zprofile &> /dev/null || echo 'eval "$(/opt/homebrew/bin/brew shellenv)" &> /dev/null' >> ~/.zprofile
+		# echo "export PATH=/opt/homebrew/bin:$PATH" >> ~/.zshrc
+		eval "$(/opt/homebrew/bin/brew shellenv)"
+  # TODO: add logic for adding non-mac ~/.zprofile
+
+  fi
 else
 	echo Brew already installed. Updating...
 	brew update

scripts/bash/dotfiles/setup_dependencies

@@ -5,58 +5,43 @@
 #
 # setup_dependencies
 
+# install homebrew
+if [[ $(command -v brew) == "" ]]; then
+    echo "Installing Hombrew..."
+		bash $HOME/scripts/bash/dotfiles/install_brew
+fi
+
 # permanently turn off analytics tracking
 brew analytics off
 
-# cowsay
-if ! command -v cowsay &> /dev/null
-then
-	brew install cowsay
-fi
+# # cowsay
+# if ! command -v cowsay &> /dev/null
+# then
+# 	brew install cowsay
+# fi
 
-# zoxide
-if ! command -v zoxide &> /dev/null
-then
-	brew install zoxide
-fi
+# # zoxide
+# if ! command -v zoxide &> /dev/null
+# then
+# 	brew install zoxide
+# fi
 
-# neovim
-if ! command -v nvim &> /dev/null
-then
-	brew install neovim
-fi
 
-# check if `vim-plug` is installed
-# this could be maintained with dotfiles, but better to get a current `plug.vim` file
-if [ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim ]; then
-    echo "Installing vim-plug for Neovim..."
-		sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
-       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-		echo "vim-plug for Neovim installed."
-fi
+# # if ! command -v node &> /dev/null
+# # then
 
-# install vim/neovim plugins
-if [ ! -d "$HOME/.vim/plugged" ]; then
-	echo Installing plugins...
-	nvim +'PlugInstall --sync' +qa
-	echo Plugins installed.
-fi
+# # fi
 
-# if ! command -v node &> /dev/null
+# if ! command -v python3 &> /dev/null
 # then
-
+# 	brew install python
+# 	python3 -m pip install --user --upgrade pynvim
 # fi
 
-if ! command -v python3 &> /dev/null
-then
-	brew install python
-	python3 -m pip install --user --upgrade pynvim
-fi
-
-if ! command -v tmux &> /dev/null
-then
-	brew install tmux
-fi
+# if ! command -v tmux &> /dev/null
+# then
+# 	brew install tmux
+# fi
 
 # install tpm (tmux plugin manager)
 if [ ! -d "$HOME/.tmux/plugins/tpm/" ]; then
@@ -65,10 +50,10 @@ if [ ! -d "$HOME/.tmux/plugins/tpm/" ]; then
 	echo tpm installed.
 fi
 
-if ! command -v htop &> /dev/null
-then
-	brew install htop
-fi
+# if ! command -v htop &> /dev/null
+# then
+# 	brew install htop
+# fi
 
 if ! command -v rustup &> /dev/null
 then
@@ -85,3 +70,25 @@ fi
 if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-nvm" ]; then
   git clone https://github.com/lukechilds/zsh-nvm ~/.oh-my-zsh/custom/plugins/zsh-nvm
 fi
+
+# neovim
+# if ! command -v nvim &> /dev/null
+# then
+# 	brew install neovim
+# fi
+
+# check if `vim-plug` is installed
+# this could be maintained with dotfiles, but better to get a current `plug.vim` file
+if [ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim ]; then
+    echo "Installing vim-plug for Neovim..."
+		sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
+       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+		echo "vim-plug for Neovim installed."
+fi
+
+# install vim/neovim plugins
+if [ ! -d "$HOME/.vim/plugged" ]; then
+	echo Installing plugins...
+	nvim +'PlugInstall --sync' +qa
+	echo Plugins installed.
+fi