Update installation scripts

.zshrc

@@ -1,8 +1,3 @@
-# Set up powerlevel10k instant prompt
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
 # Select oh-my-zsh plugins
 plugins=(
 	colored-man-pages
@@ -49,7 +44,7 @@ HB_CNF_HANDLER="$(brew --repository)/Library/Taps/homebrew/homebrew-command-not-
 
 # nvm setup
 export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 # Autosuggestions
@@ -67,7 +62,3 @@ source "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh
 
 [[ -f /usr/local/bin/kubectl ]] && source <(kubectl completion zsh)
 [[ -f /usr/local/bin/kubectl ]] && source <(kubectl completion zsh)
-
-# Load powerlevel10k theme
-[[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
-source "$(brew --prefix)/opt/powerlevel10k/powerlevel10k.zsh-theme"

README.md

@@ -16,4 +16,4 @@ Shoutout to Mathias Bynens, [his dotfiles repo](https://github.com/mathiasbynens
 
 ## Notes
 
-Tested on macOS 12.2 and 12.3
+Tested on macOS 12.2 through 14.3

scripts/brew-mas-install.sh

@@ -7,8 +7,10 @@ brew install \
   git \
   coreutils \
   curl \
+  dockutil \
   gnupg \
   grep \
+  k9s \
   mas \
   openssh \
   python \
@@ -26,7 +28,6 @@ brew install --cask \
   adobe-creative-cloud \
   airfoil \
   audio-hijack \
-  autodesk-fusion360 \
   carbon-copy-cloner \
   coconutbattery \
   devonthink \
@@ -37,14 +38,13 @@ brew install --cask \
   firefox \
   fission \
   google-chrome \
-	google-cloud-sdk \
+  google-cloud-sdk \
   google-earth-pro \
+  insomnia \
   karabiner-elements \
-  lastfm \
   loopback \
   microsoft-edge \
   netnewswire \
-  postman \
   protonvpn \
   prusaslicer \
   pycharm \
@@ -73,6 +73,21 @@ fi
 
 brew cleanup
 
+# Install or upgrade node version manager
+if [ ! -f "$HOME/.nvm" ]; then
+	export NVM_DIR="$HOME/.nvm" && (
+		git clone https://github.com/nvm-sh/nvm.git "$NVM_DIR"
+		cd "$NVM_DIR"
+		git checkout `git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1)`
+	) && \. "$NVM_DIR/nvm.sh"
+else
+	(
+		cd "$NVM_DIR"
+		git fetch --tags origin
+		git checkout `git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1)`
+	) && \. "$NVM_DIR/nvm.sh"
+fi
+
 # Install apps from the App Store using mas
 echo "Installing Mac App Store dependencies. Please log in with Apple ID when prompted."
 identifiers=(

scripts/dock.sh

@@ -8,20 +8,20 @@ dock_apps=(
 	"Firefox"
 	"Google Chrome"
 	"Microsoft Edge"
-	"Airmail"
+	"Mail"
 	"Messages"
 	"Signal"
 	"Whatsapp"
 	"Telegram"
 	"Slack"
 	"Discord"
+	"CARROTweather"
 	"Fantastical"
 	"Todoist"
 	"DEVONthink"
 	"1Password"
 	"NetNewsWire"
 	"Podcasts"
-	"CARROTweather"
 	"Spotify"
 	"Affinity Designer"
 	"Affinity Photo"
@@ -32,6 +32,7 @@ dock_apps=(
 	"PyCharm"
 	"Warp"
 	"App Store"
+	"System Settings"
 	"System Preferences"
 )
 

scripts/macos-init.sh

@@ -40,16 +40,13 @@ brew update
 brew install --cask hpedrorodrigues/tools/dockutil
 dockutil \
 	--remove Launchpad \
-	--remove Mail \
 	--remove Maps \
 	--remove FaceTime \
-	--remove Calendar \
 	--remove Contacts \
 	--remove Reminders \
 	--remove Notes \
 	--remove TV \
 	--remove Music \
-	--remove Podcasts \
 
 # Install Oh My Zsh
 if [[ -z "${ZSH}" ]]; then
@@ -64,11 +61,6 @@ dockutil --add /Applications/iTerm.app
 # Set default shell to zsh (systems older than Catalina only)
 [ ! "$SHELL" = "/bin/zsh" ] && chsh -s /bin/zsh
 
-# Install NVM and Node.js LTS
-brew install nvm
-\. "/usr/local/opt/nvm/nvm.sh"
-nvm install --lts
-
 # Install ZSH plugins
 brew install zsh-autosuggestions zsh-syntax-highlighting