Merge branch 'master' of github.com:cobraz/dotfiles into master

3 files changed, 20 insertions, 81 deletions

diff --git a/.zshrc b/.zshrc
index 20ad989..f75b9df 100644
--- a/.zshrc
+++ b/.zshrc
@@ -10,61 +10,8 @@ export ZSH="/Users/cobraz/.oh-my-zsh"
 # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
 ZSH_THEME="avit"
 
-# Set list of themes to pick from when loading at random
-# Setting this variable when ZSH_THEME=random will cause zsh to load
-# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/
-# If set to an empty array, this variable will have no effect.
-# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
-
-# Uncomment the following line to use case-sensitive completion.
-# CASE_SENSITIVE="true"
-
-# Uncomment the following line to use hyphen-insensitive completion.
-# Case-sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
-# Uncomment the following line to disable bi-weekly auto-update checks.
-# DISABLE_AUTO_UPDATE="true"
-
-# Uncomment the following line to change how often to auto-update (in days).
-# export UPDATE_ZSH_DAYS=13
-
-# Uncomment the following line to disable colors in ls.
-# DISABLE_LS_COLORS="true"
-
-# Uncomment the following line to disable auto-setting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment the following line to enable command auto-correction.
-# ENABLE_CORRECTION="true"
-
-# Uncomment the following line to display red dots whilst waiting for completion.
-# COMPLETION_WAITING_DOTS="true"
-
-# Uncomment the following line if you want to disable marking untracked files
-# under VCS as dirty. This makes repository status check for large repositories
-# much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# You can set one of the optional three formats:
-# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# or set a custom format using the strftime function format specifications,
-# see 'man strftime' for details.
-# HIST_STAMPS="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# Which plugins would you like to load?
-# Standard plugins can be found in ~/.oh-my-zsh/plugins/*
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
 plugins=(
   git
-  zsh-autosuggestions
   yarn 
   web-search 
   jsontools
@@ -140,34 +87,14 @@ echo -e "\033]6;1;bg;red;brightness;18\a"
 echo -e "\033]6;1;bg;green;brightness;26\a"
 echo -e "\033]6;1;bg;blue;brightness;33\a"
 
-alias j='jira'
-alias l='ls -l'
-export PATH="/Users/cobraz/bin:/Users/cobraz/google-cloud-sdk/bin/:$HOME/.composer/vendor/bin:~/Library/Python/2.7/bin/:$HOME/.fastlane/bin:$PATH"
+# Add VSCode to PATH
 export PATH="$PATH:/Applications/Visual Studio Code.app/Contents/Resources/app/bin"
-export PATH="$PATH:/Applications/flutter/bin"
-export NVM_DIR="$HOME/.nvm"
-export PATH="$PATH:$HOME/.bin"
-export PATH="$PATH:~/Library/Python/2.7/bin/"
+
+# Golang
 export PATH="$PATH:$GOPATH/bin"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
 
-# tabtab source for electron-forge package
-# uninstall by removing these lines or running `tabtab uninstall electron-forge`
-[[ -f /Users/cobraz/Repos/btools-upwork/node_modules/tabtab/.completions/electron-forge.zsh ]] && . /Users/cobraz/Repos/btools-upwork/node_modules/tabtab/.completions/electron-forge.zsh
-# tabtab source for serverless package
-# uninstall by removing these lines or running `tabtab uninstall serverless`
-[[ -f /Users/cobraz/.config/yarn/global/node_modules/tabtab/.completions/serverless.zsh ]] && . /Users/cobraz/.config/yarn/global/node_modules/tabtab/.completions/serverless.zsh
-# tabtab source for sls package
-# uninstall by removing these lines or running `tabtab uninstall sls`
-[[ -f /Users/cobraz/.config/yarn/global/node_modules/tabtab/.completions/sls.zsh ]] && . /Users/cobraz/.config/yarn/global/node_modules/tabtab/.completions/sls.zsh
-export PATH="$PATH:~/Library/Python/2.7/bin/"
-export PATH="$PATH:~/bin/"
-# tabtab source for slss package
-# uninstall by removing these lines or running `tabtab uninstall slss`
-[[ -f /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/slss.zsh ]] && . /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/slss.zsh
 # The next line updates PATH for Netlify's Git Credential Helper.
 if [ -f '/Users/cobraz/.netlify/helper/path.zsh.inc' ]; then source '/Users/cobraz/.netlify/helper/path.zsh.inc'; fi
-source /Users/cobraz/.phpbrew/bashrc
 
 autoload -U add-zsh-hook
 export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
diff --git a/bootstrap.sh b/bootstrap.sh
index b74c7df..cc4e24e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-# Install Oh My Zsh
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-
 source brew.sh
 source ./.vscode/vscode.sh
 
+# Install Oh My Zsh
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
+
 # Install Volta (https://volta.sh/)
 curl https://get.volta.sh | bash
diff --git a/brew.sh b/brew.sh
index 0ecb599..2da7b6b 100755
--- a/brew.sh
+++ b/brew.sh
@@ -21,7 +21,8 @@ brew install moreutils
 # Install GNU `find`, `locate`, `updatedb`, and `xargs`, `g`-prefixed.
 brew install findutils
 # Install GNU `sed`, overwriting the built-in `sed`.
-brew install gnu-sed --with-default-names
+#TODO: Replace with a way that replaced built-in
+#brew install gnu-sed --with-default-names
 # Install a modern version of Bash.
 brew install bash
 brew install bash-completion2
@@ -48,7 +49,7 @@ brew install gmp
 # Install font tools.
 brew tap bramstein/webfonttools
 brew install sfnt2woff
-brew install sfnt2woff-zopfli
+brew install sfnt2woff-zopfli 
 brew install woff2
 
 # Programming languages
@@ -72,14 +73,25 @@ brew install vbindiff
 brew install zopfli
 
 # Tooling
+brew cask install google-chrome
+brew cask install google-drive-file-stream
+brew cask install adobe-creative-cloud
 brew cask install visual-studio-code
 brew cask install iterm2
 brew cask install spotify
 brew cask install memory
 brew cask install slack
 
+# Github CLI
+brew install gh
+
+# My tools
 brew install cobraz/tools/trippl-timely
+
 brew install emacs
 
+# Quick Look Plugins (https://github.com/sindresorhus/quick-look-plugins)
+brew cask install qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv betterzipql qlimagesize webpquicklook qlvideo
+
 # Remove outdated versions from the cellar.
 brew cleanup