Cleanup

README.md

@@ -81,12 +81,12 @@ Change which is run with `-p {play}` flag in the `bootstrap.sh` script
 - Add SSH key to GitHub? `pbcopy < ~/.ssh/id_rsa.pub` -> [GitHub.com/settings/keys](https://github.com/settings/keys)
 - `Privoxy` not working? Check that proxy `127.0.0.1:8118` was added to HTTP and HTTPS sections in Airport and Ethernet
 - Want to remove `admin` privileges from a user?
-  - Use function `chmod_admin {username}` found in `.ap-functions` which safely implements the steps below.
+  - Use function `chmod_admin {username}` found in `.adrw-functions` which safely implements the steps below.
   - Reversible in System Preferences / Users by logging in with `admin` account and adding privileges back to another user.
   1. Find `GeneratedUID` of account with `$ dscl . -read /Users/<username> GeneratedUID`
   2. Remove from admin with `$ sudo dscl . -delete /Groups/admin GroupMembers <GeneratedUID>`
 - Hide a user profile? [Apple docs](https://support.apple.com/en-us/HT203998)
-  - Use function `mv_user` found in `.ap-functions` which safely implements the steps below.
+  - Use function `mv_user` found in `.adrw-functions` which safely implements the steps below.
   - Calling function again on a hidden user, restores user to both login and Finder.
   1. Hide from login screen `$ sudo dscl . create /Users/hiddenuser IsHidden 1`
   2. Hide home directory and share point

ansible/plays/provision/mac_core.yml

@@ -40,8 +40,8 @@
       - name: Preview
         path: /Applications/Preview.app
         pos: 8
-      - name: iTunes
-        path: /Applications/iTunes.app
+      - name: Music
+        path: /Applications/Music.app
         pos: 9
       - name: System Preferences
         path: /Applications/System Preferences.app

ansible/plays/provision/mac_second_account.yml

@@ -37,8 +37,8 @@
       - name: Preview
         path: /Applications/Preview.app
         pos: 10
-      - name: iTunes
-        path: /Applications/iTunes.app
+      - name: Music
+        path: /Applications/Music.app
         pos: 11
       - name: System Preferences
         path: /Applications/System Preferences.app

ansible/roles/automator-workflows/defaults/main.yml

@@ -1 +1 @@
-aliases__source: "source {{ home }}/.ap-aliases"
+aliases__source: "source {{ home }}/.adrw-aliases"

ansible/roles/dockutil/defaults/main.yml

@@ -14,6 +14,6 @@ default_dockitems_to_remove:
   - iBooks
   - App Store
   - News
-  - iTunes
+  - Music
 
 dockitems_to_remove:

ansible/roles/homebrew/vars/homebrew_apps_backup.yml

@@ -3,4 +3,4 @@ homebrew_apps_backup:
   # - createuserpkg
   - nextcloud
   # - synology-assistant
-  # - synology-drive
+  - synology-drive

ansible/roles/homebrew/vars/homebrew_apps_development.yml

@@ -1,15 +1,11 @@
 homebrew_apps_development:
   # - anaconda  # python ML libraries
   # - coda
-  - dash
   - docker
-  - goland
   - insomnia
-  - intellij-idea
   - jetbrains-toolbox
   # - java11 # not current enough for work purposes
   - ngrok
-  # - sqlpro-for-sqlite
   - visual-studio-code
 # Packages included in other roles
 # - atom

ansible/roles/homebrew/vars/homebrew_apps_tools.yml

@@ -10,11 +10,10 @@ homebrew_apps_tools:
   # - kdiff3
   - monitorcontrol
   - pock
-  # - protonvpn
+  - protonvpn
   - quitter
   - spectacle
   - speedtest
-  # - synology-drive
   - the-unarchiver
   - utc-menu-clock
   - viscosity

docs/image.md

@@ -10,7 +10,7 @@ See [`drduh macOS Security and Privacy Guide`](https://github.com/drduh/macOS-Se
 1. Exit Disk Utility and reinstall macOS back to Macintosh HD.
 1. Restart into Mac, create temp account, don't agree to location, siri, or diagnostics.
 1. Once through Mac setup flow and on desktop, use [custom packages](./autodmg-custom.sparsebundle) to create standard users, login to standard user account, and delete temp account.
-1. Continue setup using [`bootstrap.sh`](../bootstrap.sh) (or Manual Setup below) and install with standard account. After initial setup, use command `chmod_admin` in [`.ap-functions`](../ansible/roles/functions/files/.ap-functions) to reduce privileges back to Standard.
+1. Continue setup using [`bootstrap.sh`](../bootstrap.sh) (or Manual Setup below) and install with standard account. After initial setup, use command `chmod_admin` in [`.adrw-functions`](../ansible/roles/functions/files/.adrw-functions) to reduce privileges back to Standard.
 
 ## Manual Setup