Wrapping up job, update changes

diff --git a/Brewfile b/Brewfile
index 49929c13cf1b821a369aa1666df417e978d196eb..64a52babf8e0079717fdefdfbbcd118bc2cb75fc 100644 (file)
--- a/Brewfile
+++ b/Brewfile
@@ -1,23 +1,22 @@
-tap "caskroom/cask"
-tap "caskroom/versions"
+tap "caffix/amass"
 tap "homebrew/bundle"
 tap "homebrew/cask"
+tap "homebrew/cask-versions"
 tap "homebrew/core"
-brew "doctl"
+brew "bash"
 brew "expat"
 brew "ghostscript"
 brew "git"
-brew "python"
 brew "gnu-sed"
+brew "gnupg"
 brew "go"
-brew "helm"
 brew "htmldoc"
+brew "python"
 brew "imagemagick"
-brew "irssi"
 brew "jq"
-brew "kubernetes-cli"
+brew "jython"
+brew "libimobiledevice"
 brew "libxslt"
-brew "ruby"
 brew "make"
 brew "md5sha1sum"
 brew "minicom"
@@ -25,34 +24,49 @@ brew "minimodem"
 brew "mitmproxy"
 brew "ncftp"
 brew "ncurses"
+brew "nikto"
 brew "nmap"
 brew "node"
 brew "nvm"
 brew "openvpn"
 brew "python@2"
+brew "ruby"
 brew "siege"
+brew "socat"
+brew "sqlmap"
+brew "sslyze"
 brew "telnet"
-brew "vault"
+brew "tmux"
+brew "unrar"
 brew "watch"
 brew "wget"
 brew "wireguard-tools"
 brew "zeromq"
+brew "caffix/amass/amass"
+cask "010-editor"
 cask "balenaetcher"
+cask "brave-browser"
+cask "checkra1n"
 cask "docker"
+cask "dropbox"
+cask "firefox-developer-edition"
 cask "gimp"
 cask "google-chrome"
+cask "inkscape"
 cask "insomnia"
+cask "intellij-idea-ce"
 cask "java"
-cask "java11"
 cask "keybase"
-cask "kicad"
 cask "libreoffice"
-cask "minikube"
 cask "osxfuse"
 cask "owasp-zap"
 cask "postgres"
+cask "postman"
+cask "riot"
 cask "rowanj-gitx"
 cask "signal"
+cask "smartsvn"
+cask "spotify"
 cask "transmission"
 cask "tunnelblick"
 cask "veracrypt"

diff --git a/Brewfile.bak b/Brewfile.bak
new file mode 100644 (file)
index 0000000..9647ba4
--- /dev/null
+++ b/Brewfile.bak
@@ -0,0 +1,56 @@
+tap "caskroom/cask"
+tap "homebrew/cask-versions"
+tap "homebrew/bundle"
+tap "homebrew/cask"
+tap "homebrew/core"
+brew "bash"
+brew "expat"
+brew "ghostscript"
+brew "git"
+brew "python"
+brew "python@2"
+brew "gnu-sed"
+brew "go"
+brew "htmldoc"
+brew "imagemagick"
+brew "jq"
+brew "libxslt"
+brew "ruby"
+brew "make"
+brew "md5sha1sum"
+brew "minicom"
+brew "minimodem"
+brew "mitmproxy"
+brew "ncftp"
+brew "ncurses"
+brew "nmap"
+brew "node"
+brew "nvm"
+brew "openvpn"
+brew "siege"
+brew "telnet"
+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 "libreoffice"
+cask "minikube"
+cask "osxfuse"
+cask "owasp-zap"
+cask "postgres"
+cask "rowanj-gitx"
+cask "signal"
+cask "transmission"
+cask "tunnelblick"
+cask "veracrypt"
+cask "virtualbox"
+cask "virtualbox-extension-pack"
+cask "vlc"

diff --git a/dotbash_profile b/dotbash_profile
index f6562a1ba545315bafcc07d634eb0fc29fe30d17..bebd1c9aadc61a8bccbb3699e328ab56418d8feb 100644 (file)
--- a/dotbash_profile
+++ b/dotbash_profile
@@ -162,7 +162,4 @@ 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
+export BASH_SILENCE_DEPRECATION_WARNING=1

diff --git a/dotvimrc b/dotvimrc
index d7ba93678b82ddc374e8bf7a3d8ab6437ff0c7ea..d888cf6b79ff046708449ef575952a0d28487bd4 100644 (file)
--- a/dotvimrc
+++ b/dotvimrc
@@ -77,7 +77,8 @@ au BufNewFile,BufRead Podfile,*.podspec set filetype=ruby
 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 BufNewFile,BufRead *.md,*.txt,*.html setlocal textwidth=80
+au BufNewFile,BufRead *.md,*.txt setlocal nocindent
 au BufWritePost *.py call Flake8()
 
 au BufNewFile,BufRead *.dat setlocal noexpandtab