diff --git a/Brewfile b/Brewfile index a580a3a..b9e1355 100644 --- a/Brewfile +++ b/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" diff --git a/install.sh b/install.sh index 59005ee..756abe1 100755 --- a/install.sh +++ b/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 diff --git a/istat/iStat Menus Settings.ismp b/istat/iStat Menus Settings.ismp index 1a62335..f66a692 100644 --- a/istat/iStat Menus Settings.ismp +++ b/istat/iStat Menus Settings.ismp @@ -8,6 +8,29 @@ CPU_DropdownOrderDisabled + CPU_MenubarGraphBreakdowns + 0 + CPU_MenubarMode + + + key + 100 + uuid + 3438CB2E-D428-4495-B786-66F1FC6F9D45 + + + key + 6 + uuid + 3D1DD3D6-B06B-4DF1-A2F5-2846A94D9723 + + + key + 5 + uuid + B9C7FEFC-25C6-41F8-A6E3-AF4E5B589EBB + + CPU_ProcessCount 15 Disks_DropdownOrderDisabled @@ -28,11 +51,13 @@ Disks_ProcessCount 15 DropdownGraphBackground - 0 + 1 DropdownTheme-Dark 1 DropdownTheme-Light - 3 + 2 + FanControl_Enabled + FanControl_Sets @@ -130,11 +155,13 @@ Memory_ProcessCount 15 Menubar-DetectedColor - 1.00 1.00 1.00 0.90 + 0.00 0.00 0.00 0.85 MenubarGraphOpacity-Dark-Modern 0.14743457734584808 + MenubarGraphOpacity-Modern + 0.34533438086509705 MenubarTheme - 0 + 1 Migrated_6.0 Migrated_6.22 @@ -144,7 +171,7 @@ Network_DropdownOrderDisabled Network_GraphShowBackground - 1 + 0 Network_MenubarMode @@ -217,6 +244,8 @@ Sensors-Limits-Updated + Sensors_DropdownOrderDisabled + StatusItems-Order 4 diff --git a/iterm/Meslo LG M Regular for Powerline.ttf b/iterm/Meslo LG M Regular for Powerline.ttf new file mode 100644 index 0000000..548e2be Binary files /dev/null and b/iterm/Meslo LG M Regular for Powerline.ttf differ diff --git a/macos/macos.sh b/macos/macos.sh index 98183ce..9d5b34a 100755 --- a/macos/macos.sh +++ b/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 diff --git a/zsh/.zshrc b/zsh/.zshrc index 82dca73..e52e5aa 100644 --- a/zsh/.zshrc +++ b/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" diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index bed3f8b..d0b69ab 100644 --- a/zsh/aliases.zsh +++ b/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