trial & error updates

Brewfile

@@ -3,7 +3,6 @@
 ###############################
 
 tap "AdoptOpenJDK/openjdk"
-tap "appveyor/brew"
 tap "aws/tap"
 tap "cloudflare/cloudflare"
 tap "dart-lang/dart"
@@ -51,7 +50,7 @@ brew "gnu-indent"
 brew "gnu-which"
 
 # wget with IRI support
-brew "wget", args: ["with-iri"]
+brew "wget"  #, args: ["with-iri"]
 
 # GnuPG to enable PGP-signing commits
 brew "gnupg"
@@ -68,8 +67,8 @@ brew "gmp"
 # Other useful binaries
 brew "ack"
 brew "gs"
-brew "imagemagick", args: ["with-webp"]
+brew "imagemagick"  #, args: ["with-webp"]
-brew "ffmpeg", args: ["with-libvpx"]
+brew "ffmpeg"  #, args: ["with-libvpx"]
 brew "gawk"
 brew "less"
 brew "lua"
@@ -91,8 +90,8 @@ brew "the_silver_searcher"
 brew "git"
 brew "git-lfs"
 brew "git-crypt"
+brew "gh"
 brew "hub"
-brew "github/gh/gh"
 
 # Node & NPM / NVM
 brew "node"
@@ -112,19 +111,20 @@ brew "cli53"
 brew "cloudflare/cloudflare/cloudflared"
 brew "cocoapods"
 brew "composer"
+brew "dart-lang/dart/dart"
 brew "dnsmasq"
 brew "doctl"
 brew "elixir"
 brew "erlang"
-brew "facebook/fb/fbsimctl", args: ["HEAD"]
+# brew "facebook/fb/fbsimctl", args: ["HEAD"]
 brew "geoip"
 brew "go"
 brew "goreleaser/tap/goreleaser"
 brew "govendor"
 brew "guetzli"
-brew "heroku/brew/heroku-node"
 brew "heroku/brew/heroku"
-brew "hhvm"
+brew "heroku/brew/heroku-node"
+# brew "hhvm"
 brew "htop"
 brew "httpie"
 brew "httrack"
@@ -160,7 +160,7 @@ brew "pngcheck"
 brew "pngcrush"
 brew "postgresql"
 brew "python"
-brew "python@2"
+# brew "python@2"
 brew "pyenv"
 brew "ruby"
 brew "ruby-build"
@@ -171,7 +171,6 @@ brew "sass/sass/migrator"
 brew "sass/sass/sass"
 brew "serverless"
 brew "shellcheck"
-brew "speedtest-cli"
 brew "sqlite"
 brew "sub2srt"
 brew "teamookla/speedtest/speedtest"
@@ -182,7 +181,6 @@ brew "torsocks"
 brew "travis"
 brew "twilio/brew/twilio"
 brew "typescript"
-brew "unrar"
 brew "watchman"
 brew "whois", link: true
 brew "wireguard-tools"
@@ -248,7 +246,6 @@ cask "cleanmymac"
 cask "coconutbattery"
 cask "daisydisk"
 cask "duet"
-cask "endurance"
 cask "etrecheckpro"
 cask "filebot"
 cask "geekbench"
@@ -279,18 +276,14 @@ cask "adobe-creative-cloud"
 cask "adoptopenjdk"
 cask "chromedriver"
 cask "eclipse-java"
-cask "filezilla"
 cask "github"
 cask "glyphs"
 cask "google-cloud-sdk"
 cask "imageoptim"
 cask "iterm2"
-# cask "java8"
 cask "jetbrains-toolbox"
 cask "mamp"
 cask "microsoft-office"
-cask "multipass"
-cask "ngrok"
 cask "postman"
 cask "powershell"
 cask "robo-3t"
@@ -314,8 +307,6 @@ cask "beamer"
 cask "handbrake"
 cask "iina"
 cask "plex-media-player"
-cask "pocket-casts"
-cask "spotify"
 cask "vlc"
 
 # Communication/Social
@@ -325,12 +316,6 @@ cask "slack"
 cask "whatsapp"
 cask "zoomus"
 
-# Gaming
-cask "shadow"
-cask "steam"
-cask "minecraft"
-cask "nvidia-geforce-now"
-
 # Pentesting
 cask "burp-suite"
 cask "charles"
@@ -365,7 +350,6 @@ mas "MainStage 3", id: 634159523
 mas "Motion", id: 434290957
 mas "Numbers", id: 409203825
 mas "Pages", id: 409201541
-mas "Xcode", id: 497799835
 
 # Third Party
 mas "Amphetamine", id: 937984704
@@ -376,4 +360,3 @@ mas "Shazam", id: 897118787
 mas "TweetDeck", id: 485812721
 mas "Twitter", id: 409789998
 mas "WireGuard", id: 1451685025
-mas "Wunderlist", id: 410628904

install.sh

@@ -23,6 +23,9 @@ if [ ! -e ~/.oh-my-zsh ]; then
   sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 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)"

istat/iStat Menus Settings.ismp

@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>build</key>
+	<string>1164</string>
+	<key>preferences</key>
+	<dict>
+		<key>CPU_DropdownOrderDisabled</key>
+		<string></string>
+		<key>CPU_ProcessCount</key>
+		<integer>15</integer>
+		<key>Disks_DropdownOrderDisabled</key>
+		<string>removable</string>
+		<key>Disks_HidePurgable</key>
+		<integer>1</integer>
+		<key>Disks_MenubarItems</key>
+		<array>
+			<dict>
+				<key>boot</key>
+				<true/>
+				<key>key</key>
+				<string>7C143838-9EBF-405B-A0B6-FA82B8A9D92F</string>
+				<key>name</key>
+				<string>Macintosh HD</string>
+			</dict>
+		</array>
+		<key>Disks_ProcessCount</key>
+		<integer>15</integer>
+		<key>DropdownGraphBackground</key>
+		<integer>0</integer>
+		<key>DropdownTheme-Dark</key>
+		<integer>1</integer>
+		<key>DropdownTheme-Light</key>
+		<integer>3</integer>
+		<key>FanControl_Sets</key>
+		<array>
+			<dict>
+				<key>model</key>
+				<string>MacBookPro14,2</string>
+				<key>name</key>
+				<string>Medium</string>
+				<key>speeds</key>
+				<array>
+					<dict>
+						<key>fan</key>
+						<string>F0Ac</string>
+						<key>high</key>
+						<integer>6336</integer>
+						<key>low</key>
+						<integer>1250</integer>
+						<key>percentage</key>
+						<integer>50</integer>
+						<key>speed</key>
+						<integer>3793</integer>
+					</dict>
+					<dict>
+						<key>fan</key>
+						<string>F1Ac</string>
+						<key>high</key>
+						<integer>6864</integer>
+						<key>low</key>
+						<integer>1350</integer>
+						<key>percentage</key>
+						<integer>50</integer>
+						<key>speed</key>
+						<integer>4107</integer>
+					</dict>
+				</array>
+				<key>uuid</key>
+				<string>6B58D7F2-E37C-4DBB-8F32-AFABD1BA1657</string>
+			</dict>
+			<dict>
+				<key>model</key>
+				<string>MacBookPro14,2</string>
+				<key>name</key>
+				<string>High</string>
+				<key>speeds</key>
+				<array>
+					<dict>
+						<key>fan</key>
+						<string>F0Ac</string>
+						<key>high</key>
+						<integer>6336</integer>
+						<key>low</key>
+						<integer>1250</integer>
+						<key>percentage</key>
+						<integer>100</integer>
+						<key>speed</key>
+						<integer>6336</integer>
+					</dict>
+					<dict>
+						<key>fan</key>
+						<string>F1Ac</string>
+						<key>high</key>
+						<integer>6864</integer>
+						<key>low</key>
+						<integer>1350</integer>
+						<key>percentage</key>
+						<integer>100</integer>
+						<key>speed</key>
+						<integer>6864</integer>
+					</dict>
+				</array>
+				<key>uuid</key>
+				<string>8F33FE90-EB2E-45D6-9D08-82C063BCD9CD</string>
+			</dict>
+		</array>
+		<key>Memory_AppFormat</key>
+		<integer>0</integer>
+		<key>Memory_DropdownOrderDisabled</key>
+		<string></string>
+		<key>Memory_MenubarGraphBreakdowns</key>
+		<integer>1</integer>
+		<key>Memory_MenubarMode</key>
+		<array>
+			<dict>
+				<key>key</key>
+				<string>100</string>
+				<key>uuid</key>
+				<string>9157E547-B6F1-46B0-B766-988A5EE2B5CC</string>
+			</dict>
+			<dict>
+				<key>key</key>
+				<string>6</string>
+				<key>uuid</key>
+				<string>F0C02F46-753B-42A4-9565-70AD54EA2435</string>
+			</dict>
+		</array>
+		<key>Memory_ProcessCount</key>
+		<integer>15</integer>
+		<key>Menubar-DetectedColor</key>
+		<string>1.00 1.00 1.00 0.90</string>
+		<key>MenubarGraphOpacity-Dark-Modern</key>
+		<real>0.14743457734584808</real>
+		<key>MenubarTheme</key>
+		<integer>0</integer>
+		<key>Migrated_6.0</key>
+		<true/>
+		<key>Migrated_6.22</key>
+		<true/>
+		<key>Migrated_6.5</key>
+		<true/>
+		<key>Network_DropdownOrderDisabled</key>
+		<string></string>
+		<key>Network_GraphShowBackground</key>
+		<integer>1</integer>
+		<key>Network_MenubarMode</key>
+		<array>
+			<dict>
+				<key>key</key>
+				<string>4</string>
+				<key>uuid</key>
+				<string>25A36940-66EF-49EA-8454-7A4BC218A969</string>
+			</dict>
+			<dict>
+				<key>key</key>
+				<string>1</string>
+				<key>uuid</key>
+				<string>6E6AAC74-763A-445C-86ED-C56F298CB3A4</string>
+			</dict>
+		</array>
+		<key>Network_ProcessCount</key>
+		<integer>15</integer>
+		<key>Notifications-Enabled</key>
+		<false/>
+		<key>Notifications-Items</key>
+		<array>
+			<dict>
+				<key>enabled</key>
+				<true/>
+				<key>notification-type</key>
+				<string>1</string>
+				<key>rule-type</key>
+				<string>18</string>
+				<key>uuid</key>
+				<string>5A377129-7049-452C-913B-C4150F470DDD</string>
+				<key>value</key>
+				<string>978332400</string>
+			</dict>
+			<dict>
+				<key>enabled</key>
+				<true/>
+				<key>notification-type</key>
+				<string>1</string>
+				<key>rule-type</key>
+				<string>17</string>
+				<key>uuid</key>
+				<string>899753EB-CF97-430B-8DA5-DDD40BE8EB1F</string>
+				<key>value</key>
+				<string>1.00</string>
+			</dict>
+			<dict>
+				<key>enabled</key>
+				<true/>
+				<key>notification-type</key>
+				<string>0</string>
+				<key>rule-type</key>
+				<string>14</string>
+				<key>uuid</key>
+				<string>03C999A1-5E87-4A0E-9245-20EA49B76D27</string>
+				<key>value</key>
+				<string>10.00</string>
+			</dict>
+			<dict>
+				<key>enabled</key>
+				<true/>
+				<key>notification-type</key>
+				<string>1</string>
+				<key>rule-type</key>
+				<string>20</string>
+				<key>uuid</key>
+				<string>AA659D69-C8D3-4EE9-957C-66BE6FBD8C21</string>
+				<key>value</key>
+				<string>10.00</string>
+			</dict>
+		</array>
+		<key>Sensors-Limits-Updated</key>
+		<true/>
+		<key>StatusItems-Order</key>
+		<array>
+			<integer>4</integer>
+			<integer>1</integer>
+			<integer>2</integer>
+			<integer>3</integer>
+		</array>
+		<key>Theme-SeperateStyles</key>
+		<true/>
+		<key>Time_MenubarFormat</key>
+		<array>
+			<dict>
+				<key>format</key>
+				<array>
+					<array>
+						<string>EE</string>
+						<string>' '</string>
+						<string>hh</string>
+						<string>:</string>
+						<string>mm</string>
+					</array>
+				</array>
+			</dict>
+		</array>
+	</dict>
+	<key>version</key>
+	<string>6.51</string>
+</dict>
+</plist>

macos/defaults.sh

@@ -100,10 +100,6 @@ defaults write NSGlobalDomain com.apple.mouse.tapBehavior -int 1
 # Increase sound quality for Bluetooth headphones/headsets
 defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int 40
 
-# Use scroll gesture with the Ctrl (^) modifier key to zoom
-defaults write com.apple.universalaccess closeViewScrollWheelToggle -bool true
-defaults write com.apple.universalaccess HIDScrollZoomModifierMask -int 262144
-
 ###############################################################################
 # Energy saving                                                               #
 ###############################################################################

macos/macos.sh

@@ -33,9 +33,9 @@ brew update
 
 # Install all apps from the Brewfile
 brew tap homebrew/bundle
-brew bundle
+brew bundle || true
 
 # Set macOS defaults
 # Needs to be last since this will restart everything when done
 # shellcheck disable=SC1091
-source ./defaults.sh
+source ./macos/defaults.sh

zsh/.zshrc

@@ -57,6 +57,9 @@ export HOMEBREW_NO_ANALYTICS=1
 export HOMEBREW_NO_INSECURE_REDIRECT=1
 export HOMEBREW_CASK_OPTS=--require-sha
 
+# iTerm2
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+
 # uncomment to profile slow startup time
 # zprof
 # zmodload -u zsh/zprof