diff --git a/script/lib/install.sh b/script/lib/install.sh index 9d943dc6..bb984d87 100644 --- a/script/lib/install.sh +++ b/script/lib/install.sh @@ -83,3 +83,8 @@ function install::xcode_license() { fi fi } + +# install_rosetta2 attempts to install Rosetta2, assuming on ARM-based Mac +install::install_rosetta2() { + softwareupdate --install-rosetta --agree-to-license +} diff --git a/script/lib/macos.sh b/script/lib/macos.sh index a4a0fc9b..27622b3f 100644 --- a/script/lib/macos.sh +++ b/script/lib/macos.sh @@ -209,6 +209,10 @@ EOF defaults write com.apple.systemuiserver "NSStatusItem Visible com.apple.menuextra.bluetooth" -bool true (defaults read com.apple.systemuiserver menuExtras | grep -q Bluetooth.menu) || defaults write com.apple.systemuiserver menuExtras -array-add "/System/Library/CoreServices/Menu Extras/Bluetooth.menu" + # VPN: show icon in menu bar + defaults write com.apple.systemuiserver "NSStatusItem Visible com.apple.menuextra.vpn" -bool true + (defaults read com.apple.systemuiserver menuExtras | grep -q VPN.menu) || defaults write com.apple.systemuiserver menuExtras -array-add "/System/Library/CoreServices/Menu Extras/VPN.menu" + # Time & Clock: Show date in menu bar defaults write com.apple.menuextra.clock DateFormat -string "EEE MMM d h:mm a" } @@ -289,6 +293,9 @@ function macos::setup_input_devices() { # Keyboard: touchbar Fn keys to "Show Control Strip" defaults write com.apple.touchbar.agent PresentationModeFnModes -dict fullControlStrip functionKeys functionKeys fullControlStrip + # Keyboard: default functions keys to F1, F2, etc + defaults write NSGlobalDomain com.apple.keyboard.fnState -bool true + # Increase sound quality for Bluetooth headphones/headsets defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int 40 diff --git a/script/lib/resources/Brewfile.confluent b/script/lib/resources/Brewfile.confluent index 480c4033..2e6b3327 100644 --- a/script/lib/resources/Brewfile.confluent +++ b/script/lib/resources/Brewfile.confluent @@ -36,6 +36,7 @@ brew "yapf" cask "goland" cask "google-cloud-sdk" cask "intellij-idea" +cask "microsoft-remote-desktop" cask "pycharm" cask "session-manager-plugin" cask "temurin" diff --git a/script/lib/resources/Brewfile.mac b/script/lib/resources/Brewfile.mac index 8f15bd76..d9653edc 100644 --- a/script/lib/resources/Brewfile.mac +++ b/script/lib/resources/Brewfile.mac @@ -56,11 +56,8 @@ cask "iterm2" cask "logitech-camera-settings" cask "maccy" cask "marked" -cask "microsoft-remote-desktop" -cask "selfcontrol" cask "slack" cask "spotify" -cask "steam" cask "sublime-text" cask "zoom" cask "zsa-wally" diff --git a/script/lib/resources/Brewfile.personal b/script/lib/resources/Brewfile.personal index 9cfa4321..1bbb037e 100644 --- a/script/lib/resources/Brewfile.personal +++ b/script/lib/resources/Brewfile.personal @@ -21,6 +21,7 @@ cask "sonos" cask "steam" cask "subler" cask "synology-drive" +cask "virtualbuddy" cask "vlc" cask "vmware-fusion" diff --git a/script/lib/util.sh b/script/lib/util.sh index f48f8cc3..9e9a141c 100644 --- a/script/lib/util.sh +++ b/script/lib/util.sh @@ -13,6 +13,10 @@ function util::is_mac() { [[ "$(uname -s)" = "Darwin" ]] } +function util::is_arm() { + [[ "$(uname -m)" = "arm64" ]] +} + function util::is_linux() { [[ "$(uname -s)" = "Linux" ]] } diff --git a/script/os-setup b/script/os-setup index 8c4890b8..38a49449 100755 --- a/script/os-setup +++ b/script/os-setup @@ -28,6 +28,9 @@ if util::is_mac; then # install xcode command line tools install::install_xcode + # install Rosetta 2 on ARM-based Mac + util::is_arm && install::install_rosetta2 + # MacOS customization script # shellcheck disable=SC1091 . lib/macos.sh