more random touchups

Brewfile

@@ -273,7 +273,8 @@ cask "tunnelblick"
 
 # Development/Work
 cask "adobe-creative-cloud"
-cask "adoptopenjdk"
+cask "AdoptOpenJDK/openjdk/adoptopenjdk"
+cask "AdoptOpenJDK/openjdk/adoptopenjdk-jre"
 cask "chromedriver"
 cask "eclipse-java"
 cask "github"
@@ -284,6 +285,7 @@ cask "iterm2"
 cask "jetbrains-toolbox"
 cask "mamp"
 cask "microsoft-office"
+cask "ngrok"
 cask "postman"
 cask "powershell"
 cask "robo-3t"
@@ -307,6 +309,8 @@ cask "beamer"
 cask "handbrake"
 cask "iina"
 cask "plex-media-player"
+cask "pocket-casts"
+cask "spotify"
 cask "vlc"
 
 # Communication/Social
@@ -316,6 +320,12 @@ cask "slack"
 cask "whatsapp"
 cask "zoomus"
 
+# Gaming
+cask "shadow"
+cask "steam"
+cask "minecraft"
+cask "nvidia-geforce-now"
+
 # Pentesting
 cask "burp-suite"
 cask "charles"

install.sh

@@ -1,18 +1,19 @@
 #!/usr/bin/env bash
 
-set -e
-
 echo "👋  Deep breaths, everything will (probably) be fine!"
 
 # Ask for the administrator password upfront
 sudo -v
 
 # Set up symbolic links for ZSH and Git pointing to this cloned repo
-ln -sf "$HOME"/.dotfiles/zsh/.zshrc "$HOME"/.zshrc
-ln -sf "$HOME"/.dotfiles/git/.gitconfig "$HOME"/.gitconfig
-ln -sf "$HOME"/.dotfiles/git/.gitignore_global "$HOME"/.gitignore_global
-mkdir -p "$HOME"/.ssh
-ln -sf "$HOME"/.dotfiles/ssh/.ssh/config "$HOME"/.ssh/config
+ln -sf ~/.dotfiles/zsh/.zshrc ~/.zshrc
+ln -sf ~/.dotfiles/git/.gitconfig ~/.gitconfig
+ln -sf ~/.dotfiles/git/.gitignore_global ~/.gitignore_global
+mkdir -p ~/.ssh
+ln -sf ~/.dotfiles/ssh/.ssh/config ~/.ssh/config
+
+# Suppress terminal login banners
+touch ~/.hushlogin
 
 # https://github.com/ohmyzsh/ohmyzsh/issues/6835#issuecomment-390187157
 chmod 755 /usr/local/share/zsh
@@ -26,10 +27,6 @@ fi
 # Use Git submodules to get OMZ plugins
 git submodule update --init --recursive
 
-# Make ZSH the default shell environment (maybe unnecessary on Catalina?)
-# shellcheck disable=SC2230
-chsh -s "$(which zsh)"
-
 if [ "$(uname)" == "Darwin" ]; then
   # shellcheck disable=SC1091
   source ./macos/macos.sh

istat/iStat Menus Settings.ismp

@@ -8,6 +8,29 @@
 	<dict>
 		<key>CPU_DropdownOrderDisabled</key>
 		<string></string>
+		<key>CPU_MenubarGraphBreakdowns</key>
+		<integer>0</integer>
+		<key>CPU_MenubarMode</key>
+		<array>
+			<dict>
+				<key>key</key>
+				<string>100</string>
+				<key>uuid</key>
+				<string>3438CB2E-D428-4495-B786-66F1FC6F9D45</string>
+			</dict>
+			<dict>
+				<key>key</key>
+				<string>6</string>
+				<key>uuid</key>
+				<string>3D1DD3D6-B06B-4DF1-A2F5-2846A94D9723</string>
+			</dict>
+			<dict>
+				<key>key</key>
+				<string>5</string>
+				<key>uuid</key>
+				<string>B9C7FEFC-25C6-41F8-A6E3-AF4E5B589EBB</string>
+			</dict>
+		</array>
 		<key>CPU_ProcessCount</key>
 		<integer>15</integer>
 		<key>Disks_DropdownOrderDisabled</key>
@@ -28,11 +51,13 @@
 		<key>Disks_ProcessCount</key>
 		<integer>15</integer>
 		<key>DropdownGraphBackground</key>
-		<integer>0</integer>
+		<integer>1</integer>
 		<key>DropdownTheme-Dark</key>
 		<integer>1</integer>
 		<key>DropdownTheme-Light</key>
-		<integer>3</integer>
+		<integer>2</integer>
+		<key>FanControl_Enabled</key>
+		<false/>
 		<key>FanControl_Sets</key>
 		<array>
 			<dict>
@@ -130,11 +155,13 @@
 		<key>Memory_ProcessCount</key>
 		<integer>15</integer>
 		<key>Menubar-DetectedColor</key>
-		<string>1.00 1.00 1.00 0.90</string>
+		<string>0.00 0.00 0.00 0.85</string>
 		<key>MenubarGraphOpacity-Dark-Modern</key>
 		<real>0.14743457734584808</real>
+		<key>MenubarGraphOpacity-Modern</key>
+		<real>0.34533438086509705</real>
 		<key>MenubarTheme</key>
-		<integer>0</integer>
+		<integer>1</integer>
 		<key>Migrated_6.0</key>
 		<true/>
 		<key>Migrated_6.22</key>
@@ -144,7 +171,7 @@
 		<key>Network_DropdownOrderDisabled</key>
 		<string></string>
 		<key>Network_GraphShowBackground</key>
-		<integer>1</integer>
+		<integer>0</integer>
 		<key>Network_MenubarMode</key>
 		<array>
 			<dict>
@@ -217,6 +244,8 @@
 		</array>
 		<key>Sensors-Limits-Updated</key>
 		<true/>
+		<key>Sensors_DropdownOrderDisabled</key>
+		<string></string>
 		<key>StatusItems-Order</key>
 		<array>
 			<integer>4</integer>

macos/macos.sh

@@ -21,7 +21,7 @@ if test ! "$(which brew)"; then
 fi
 
 # Fix some installation errors
-sudo chown -R $(whoami) /usr/local/share/man/man8
+sudo chown -R "$(whoami)" /usr/local/share/man/man8
 chmod u+w /usr/local/share/man/man8
 
 # Disable analytics

zsh/.zshrc

@@ -55,7 +55,7 @@ export LSCOLORS=ExFxBxDxCxegedabagacad
 # Other miscellaneous settings
 export HOMEBREW_NO_ANALYTICS=1
 export HOMEBREW_NO_INSECURE_REDIRECT=1
-export HOMEBREW_CASK_OPTS=--require-sha
+# export HOMEBREW_CASK_OPTS=--require-sha
 
 # iTerm2
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"

zsh/aliases.zsh

@@ -50,16 +50,18 @@ update() {
   NC="\033[0m"
   YELLOW="\033[0;33m"
 
+  sudo -v
+
   echo -e "${YELLOW}Updating Homebrew formulae and casks...${NC}"
   brew update
   # git -C "/usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask" fetch --unshallow
   brew upgrade
-  brew upgrade --cask
+  brew upgrade --cask --greedy
   brew cleanup
 
   echo -e "${YELLOW}Updating NPM/Yarn packages...${NC}"
-  npm install npm -g
-  npm update -g
+  npm install npm@latest --global
+  npm update --global
   yarn global upgrade
 
   echo -e "${YELLOW}Updating Ruby gems...${NC}"
@@ -70,7 +72,7 @@ update() {
 
   # https://stackoverflow.com/a/3452888
   echo -e "${YELLOW}Updating pip packages...${NC}"
-  pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip install -U
+  pip3 list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip3 install -U
 
   echo -e "${YELLOW}Updating Composer packages...${NC}"
   composer global update