diff --git a/modules/images/debug/Dockerfile b/modules/images/debug/Dockerfile index 3781ae9a..5f037b58 100644 --- a/modules/images/debug/Dockerfile +++ b/modules/images/debug/Dockerfile @@ -16,7 +16,7 @@ RUN apk update && \ bash=5.2.15-r5 \ bind-tools=9.18.19-r0 \ bridge-utils=1.7.1-r2 \ - busybox-extras=1.36.1-r4 \ + busybox-extras=1.36.1-r5 \ conntrack-tools=1.4.7-r1 \ curl=8.4.0-r0 \ ethtool=6.2-r1 \ diff --git a/modules/playbooks/macos/roles/defaults/files/activitymonitor.defaults b/modules/playbooks/macos/roles/defaults/files/activity-monitor.defaults similarity index 100% rename from modules/playbooks/macos/roles/defaults/files/activitymonitor.defaults rename to modules/playbooks/macos/roles/defaults/files/activity-monitor.defaults diff --git a/modules/playbooks/macos/roles/defaults/files/appstore.defaults b/modules/playbooks/macos/roles/defaults/files/app-store.defaults similarity index 89% rename from modules/playbooks/macos/roles/defaults/files/appstore.defaults rename to modules/playbooks/macos/roles/defaults/files/app-store.defaults index 9b74bdbc..a0cb26a9 100755 --- a/modules/playbooks/macos/roles/defaults/files/appstore.defaults +++ b/modules/playbooks/macos/roles/defaults/files/app-store.defaults @@ -6,23 +6,23 @@ readonly domain='com.apple.SoftwareUpdate' readonly commerce_domain='com.apple.commerce' -# Enable the automatic update check +# Automatically check for updates defaults write ${domain} AutomaticCheckEnabled -bool true -# Check for software updates daily, not just once per week +# Check for software updates daily defaults write ${domain} ScheduleFrequency -int 1 # Download newly available updates in background defaults write ${domain} AutomaticDownload -int 1 +# Turn on app auto-update +defaults write ${commerce_domain} AutoUpdate -bool true + # Install System data files & security updates defaults write ${domain} CriticalUpdateInstall -int 1 # Automatically download apps purchased on other Macs defaults write ${domain} ConfigDataInstall -int 1 -# Turn on app auto-update -defaults write ${commerce_domain} AutoUpdate -bool true - # Allow the App Store to reboot machine on macOS updates defaults write ${commerce_domain} AutoUpdateRestartRequired -bool true diff --git a/modules/playbooks/macos/roles/defaults/files/general.defaults b/modules/playbooks/macos/roles/defaults/files/general.defaults index 42ad4482..7ada0628 100755 --- a/modules/playbooks/macos/roles/defaults/files/general.defaults +++ b/modules/playbooks/macos/roles/defaults/files/general.defaults @@ -61,3 +61,6 @@ if [ "$(scutil --get ComputerName)" != "${computer_name}" ]; then sudo defaults write /Library/Preferences/SystemConfiguration/com.apple.smb.server NetBIOSName -string "${computer_name}" fi + +# Disable "Click Wallpaper To Show Desktop Items" +defaults write com.apple.WindowManager EnableStandardClickToShowDesktop -bool false diff --git a/modules/playbooks/macos/roles/defaults/files/input.defaults b/modules/playbooks/macos/roles/defaults/files/keyboard.defaults similarity index 69% rename from modules/playbooks/macos/roles/defaults/files/input.defaults rename to modules/playbooks/macos/roles/defaults/files/keyboard.defaults index 638063c6..26f61aa5 100755 --- a/modules/playbooks/macos/roles/defaults/files/input.defaults +++ b/modules/playbooks/macos/roles/defaults/files/keyboard.defaults @@ -1,17 +1,5 @@ #!/usr/bin/env bash -# Enable tap-to-click for this user and for the login screen -defaults -currentHost write com.apple.AppleMultitouchTrackpad Clicking -bool true -defaults -currentHost write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true -defaults write com.apple.AppleMultitouchTrackpad Clicking -bool true -defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true - -# Disable three finger drag -defaults write com.apple.AppleMultitouchTrackpad TrackpadThreeFingerDrag -bool false -defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadThreeFingerDrag -bool false - -defaults write com.apple.AppleMultitouchTrackpad Dragging -bool false -defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Dragging -bool false # Enable "natural" (touchscreen-style) scrolling defaults write NSGlobalDomain com.apple.swipescrolldirection -bool true diff --git a/modules/playbooks/macos/roles/defaults/files/menuextra.defaults b/modules/playbooks/macos/roles/defaults/files/menu-extra.defaults similarity index 100% rename from modules/playbooks/macos/roles/defaults/files/menuextra.defaults rename to modules/playbooks/macos/roles/defaults/files/menu-extra.defaults diff --git a/modules/playbooks/macos/roles/defaults/files/screencapture.defaults b/modules/playbooks/macos/roles/defaults/files/screen-capture.defaults similarity index 100% rename from modules/playbooks/macos/roles/defaults/files/screencapture.defaults rename to modules/playbooks/macos/roles/defaults/files/screen-capture.defaults diff --git a/modules/playbooks/macos/roles/defaults/files/screensaver.defaults b/modules/playbooks/macos/roles/defaults/files/screen-saver.defaults similarity index 100% rename from modules/playbooks/macos/roles/defaults/files/screensaver.defaults rename to modules/playbooks/macos/roles/defaults/files/screen-saver.defaults diff --git a/modules/playbooks/macos/roles/defaults/files/trackpad-mouse.defaults b/modules/playbooks/macos/roles/defaults/files/trackpad-mouse.defaults new file mode 100755 index 00000000..aabff7c6 --- /dev/null +++ b/modules/playbooks/macos/roles/defaults/files/trackpad-mouse.defaults @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +# Sets trackpad & mouse speed to a reasonable number +defaults read NSGlobalDomain com.apple.trackpad.scaling -float 4.0 +defaults read NSGlobalDomain com.apple.mouse.scaling -float 4.0 + +# Enables force click and haptic feedback +defaults write NSGlobalDomain com.apple.trackpad.forceClick -bool true +defaults write com.apple.AppleMultitouchTrackpad ForceSuppressed -bool false +defaults write com.apple.AppleMultitouchTrackpad ActuateDetents -bool true +## 0: Light | 1: Medium | 2: Firm +defaults write com.apple.AppleMultitouchTrackpad FirstClickThreshold -int 0 +defaults write com.apple.AppleMultitouchTrackpad SecondClickThreshold -int 0 + +# Enable tap-to-click for this user and for the login screen +defaults -currentHost write com.apple.AppleMultitouchTrackpad Clicking -bool true +defaults -currentHost write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true +defaults write com.apple.AppleMultitouchTrackpad Clicking -bool true +defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true + +# Disable three finger drag +defaults write com.apple.AppleMultitouchTrackpad Dragging -bool false +defaults write com.apple.AppleMultitouchTrackpad TrackpadThreeFingerDrag -bool false +defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Dragging -bool false +defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadThreeFingerDrag -bool false