From d89769ce24f0b1eacb9d4b03a1c7819ab6c1c10f Mon Sep 17 00:00:00 2001
From: "Adam A.G. Shamblin" <adam.shamblin@pgi.com>
Date: Fri, 3 Jan 2020 12:39:29 -0700
Subject: [PATCH] Quick additions before moving machines...

---
 Brewfile               | 59 ++++++++++++++++++++++++++++++++++--------
 Makefile               |  3 +++
 dotbash_profile        | 14 ++++++++--
 dotvimrc               | 17 ++++++------
 thinktank-dotvim.local |  4 ---
 5 files changed, 71 insertions(+), 26 deletions(-)
 delete mode 100644 thinktank-dotvim.local

diff --git a/Brewfile b/Brewfile
index 0a475ad..49929c1 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,24 +1,61 @@
+tap "caskroom/cask"
+tap "caskroom/versions"
 tap "homebrew/bundle"
 tap "homebrew/cask"
 tap "homebrew/core"
-cask "java"
-brew "aircrack-ng"
-brew "erlang"
+brew "doctl"
+brew "expat"
+brew "ghostscript"
 brew "git"
+brew "python"
+brew "gnu-sed"
 brew "go"
+brew "helm"
+brew "htmldoc"
+brew "imagemagick"
+brew "irssi"
 brew "jq"
-brew "leveldb"
-brew "macvim"
+brew "kubernetes-cli"
+brew "libxslt"
+brew "ruby"
+brew "make"
+brew "md5sha1sum"
 brew "minicom"
+brew "minimodem"
+brew "mitmproxy"
+brew "ncftp"
+brew "ncurses"
 brew "nmap"
 brew "node"
-brew "openssl"
+brew "nvm"
 brew "openvpn"
-brew "python"
-brew "python3"
-brew "sbt"
-brew "scala"
+brew "python@2"
+brew "siege"
+brew "telnet"
+brew "vault"
+brew "watch"
 brew "wget"
+brew "wireguard-tools"
 brew "zeromq"
+cask "balenaetcher"
+cask "docker"
+cask "gimp"
+cask "google-chrome"
+cask "insomnia"
+cask "java"
+cask "java11"
+cask "keybase"
+cask "kicad"
+cask "libreoffice"
+cask "minikube"
+cask "osxfuse"
+cask "owasp-zap"
+cask "postgres"
 cask "rowanj-gitx"
-cask "postman"
+cask "signal"
+cask "transmission"
+cask "tunnelblick"
+cask "veracrypt"
+cask "virtualbox"
+cask "virtualbox-extension-pack"
+cask "vlc"
diff --git a/Makefile b/Makefile
index 6608829..9fc0521 100644
--- a/Makefile
+++ b/Makefile
@@ -13,3 +13,6 @@ build:
 	ln -s $(CURDIR)/dotvim ~/.vim
 	mkdir -p ~/env
 	mkdir -p ~/.saves
+
+brew:
+	brew bundle
diff --git a/dotbash_profile b/dotbash_profile
index 2bfb218..f6562a1 100644
--- a/dotbash_profile
+++ b/dotbash_profile
@@ -10,6 +10,9 @@ color_prompt=yes
 
 export SCRUM_DIR=~/Documents/scrum/
 
+export PATH=/usr/local/opt/gnu-sed/libexec/gnubin:$PATH
+export PATH=/usr/local/opt/make/libexec/gnubin:$PATH
+
 ##################################################
 #
 #   Bash Completion Scripts
@@ -36,14 +39,14 @@ RESET=$(tput sgr0);
 
 function prompt_char {
     if ! git rev-parse --git-dir > /dev/null 2>&1; then
-        echo '$'
+        echo '𝝺'
         return 0
     fi
 
     local GIT_BRANCH=$(git branch 2>/dev/null| sed -n '/^\*/s/^\* //p')
     echo "($GIT_BRANCH) $"
 }
-export PS1='\[$ORANGE\]\u\[$RESET\] @ \[$YELLOW\]\h\[$RESET\] in \[$GREEN\]\w\[$RESET\]\n\[$BASE2\]$(prompt_char)\[$RESET\] '
+export PS1='\[$ORANGE\]\u\[$RESET\] @ \[$YELLOW\]\h\[$RESET\] in \[$GREEN\]\w\[$RESET\]\n$(prompt_char) '
 
 ##################################################
 #
@@ -93,6 +96,8 @@ export SCALA_HOME=/usr/local/bin/scala
 export PLAY_PATH="/usr/local/play"
 export PATH=$PATH:$PLAY_PATH
 
+export SBT_CREDENTIALS=$HOME/.ivy2/.credentials
+
 ##################################################
 #
 #   Go Stuffs
@@ -156,3 +161,8 @@ complete -F _ssh_hosts ssh
 
 alias grep="grep --color=auto"
 [[ -s "$HOME/.profile" ]] && source "$HOME/.profile"
+
+export JAVA_11_HOME=$(/usr/libexec/java_home -v11)
+alias java11='export JAVA_HOME=$JAVA_11_HOME'
+
+java11
diff --git a/dotvimrc b/dotvimrc
index fe0d153..d7ba936 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -2,17 +2,16 @@ set nocompatible
 call pathogen#infect()
 
 filetype plugin indent on
-
 syntax enable
+
+let g:solarized_termcolors=256
+let g:solarized_termtrans=1
 set background=dark
+colorscheme solarized
+
 if has('gui_running')
-    colorscheme solarized 
     set colorcolumn=80
     set cursorline
-
-    if has('transparency')
-        set transparency=4
-    endif
 endif
 
 set autoindent
@@ -36,7 +35,7 @@ set switchbuf=usetab
 set mouse=a
 set ttymouse=xterm2
 set guioptions-=T
-set guifont=Menlo:h12
+set guifont=Menlo:h14
 
 map <C-t> :tabnew<cr>
 map <C-tab> :tabnext<cr>
@@ -47,7 +46,7 @@ set wildignore+=**/node_modules,**/node_modules/*,**/target,**/target/*,coverage
 let mapleader=","
 let NERDTreeRespectWildIgnore=1
 let NERDTreeShowHidden=1
-let NERDTreeIgnore=['\.pyc$', '__pycache__']
+let NERDTreeIgnore=['\.pyc$', '__pycache__', '\.swp$']
 
 let g:ale_set_loclist=0
 let g:ale_set_quickfix=1
@@ -79,7 +78,7 @@ au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx
 au BufNewFile,BufRead *.less set filetype=less
 au BufNewfile,BufRead Jenkinsfile set filetype=groovy
 au BufNewFile,BufRead *.md,*.txt setlocal textwidth=80
-"au BufWritePost *.py call Flake8()
+au BufWritePost *.py call Flake8()
 
 au BufNewFile,BufRead *.dat setlocal noexpandtab
 au BufNewFile,BufRead *.jade setlocal noexpandtab
diff --git a/thinktank-dotvim.local b/thinktank-dotvim.local
deleted file mode 100644
index 8298fd3..0000000
--- a/thinktank-dotvim.local
+++ /dev/null
@@ -1,4 +0,0 @@
-:set tabstop=2
-:set softtabstop=2
-:set shiftwidth=2
-:set noexpandtab
-- 
2.39.5