feat: split out vars for reduced duplication

Signed-off-by: wrightbradley <[email protected]>

.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
   ##############################################################################
   ################################ YAML Checks #################################
   - repo: https://github.com/google/yamlfmt
-    rev: v0.13.0
+    rev: v0.14.0
     hooks:
       - id: yamlfmt
   - repo: https://github.com/adrienverge/yamllint

README.md

@@ -70,38 +70,8 @@ sh -c "$(curl -fsLS get.chezmoi.io)" -- init --exclude=encrypted --apply $GITHUB
 ## Task List
 
 - Hook Ansible into chezmoi bootstrap step
-- Move Homebrew package install from Ansible to chezmoi. Standardize on chezmoi.
-- Support downloading project code repos with chezmoi.
-
-## MacOS Defaults
-
-```bash
-# For Aerospace
-defaults write -g NSWindowShouldDragOnGesture -bool true
-defaults write com.apple.spaces spans-displays -bool true && killall SystemUIServer
-defaults write com.apple.dock expose-group-apps -bool true && killall Dock
-# Aersopace window drag
-defaults write -g NSWindowShouldDragOnGesture -bool true
-
-# For Keyboard
-defaults write -g InitialKeyRepeat -int 20 # normal minimum is 15 (225 ms)
-defaults write -g KeyRepeat -int 1 # normal minimum is 2 (30 ms)
-
-# For UI
-defaults write com.apple.dock "autohide" -bool "true" && killall Dock
-defaults write com.apple.dock "tilesize" -int "36" && killall Dock
-
-# For Screenshots
-mkdir -p ~/Pictures/Screenshots
-defaults write com.apple.screencapture location ~/Pictures/Screenshots
-defaults write com.apple.screencapture type jpg
-
-# Disable Smart Quotes
-defaults write NSGlobalDomain NSAutomaticQuoteSubstitutionEnabled -bool false
-# Disable Smart dashes
-defaults write NSGlobalDomain NSAutomaticDashSubstitutionEnabled -bool false
-
-```
+- Identify how to install homebrew-less casks: ATEM Mini Pro, Akai Professional
+  MPK Mini III Program Editor, MPK mini Software Manager
 
 ## Homebrew Info Gathering
 

ansible/vars/darwin-work.yml → ansible/inventory/group_vars/macos.yml

@@ -1,20 +1,6 @@
 ---
-# Setup Var Flags
-setup_aliases: true
 setup_brew: true
-setup_bash: true
-setup_color: true
-setup_fonts: true
-setup_git: true
-setup_icons: true
-setup_system: true
-setup_python: false
-setup_tmux: true
-setup_vim: true
-setup_vscode: true
 setup_zsh: true
-setup_starship: true
-setup_nvim: true
 
 # Set to 'true' to configure the Dock via dockutil.
 configure_dock: true
@@ -26,7 +12,6 @@ dockitems_remove:
   - FaceTime
   - Freeform
   - Launchpad
-  - Mail
   - Maps
   - Messages
   - Music
@@ -40,26 +25,28 @@ dockitems_remove:
   - Safari
   - TV
 dockitems_persist:
-  - name: 'Google Chrome'
-    path: '/Applications/Google Chrome.app/'
+  - name: 'Brave'
+    path: '/Applications/Brave.app/'
     pos: 1
   - name: 'Alacritty'
     path: '/Applications/Alacritty.app/'
     pos: 2
   - name: 'Slack'
     path: '/Applications/Slack.app/'
     pos: 3
+  - name: 'Mail'
+    path: '/Applications/Mail.app/'
+    pos: 4
 
 homebrew_installed_packages:
   - agg
-  - ankitpokhrel/jira-cli/jira-cli
   - ansible
   - ansible-lint
   - ant
-  - aqua
+  - aquaproj/aqua/aqua
   - aquasecurity/trivy/trivy
-  - argo
   - argocd
+  - arping
   - asciinema
   - asdf
   - asitop
@@ -74,26 +61,26 @@ homebrew_installed_packages:
   - bash
   - bash-completion
   - bat
+  - bottom
   - bzip2
   - cdk8s
   - charmbracelet/tap/freeze
   - chart-testing
   - checkov
   - chezmoi
-  - cirruslabs/cli/tart
   - cli53
   - cmctl
   - codespell
-  - colima
   - colordiff
   - container-diff
   - cookiecutter
   - coreutils
   - cosign
+  - csvlens
   - cue
   - curl
-  - dasel
   - cypher-shell
+  - dasel
   - derailed/popeye/popeye
   - detect-secrets
   - direnv
@@ -106,6 +93,7 @@ homebrew_installed_packages:
   - dockutil
   - dos2unix
   - dotenv-linter
+  - dust
   - eksctl
   - entr
   - eslint
@@ -114,10 +102,10 @@ homebrew_installed_packages:
   - faas-cli
   - fairwindsops/tap/nova
   - fairwindsops/tap/polaris
+  - fastfetch
   - fd
   - ffmpeg
-  - flake8
-  # - fluxcd/tap/flux
+  - ffmpegthumbnailer
   - fzf
   - gh
   - ghq
@@ -133,7 +121,6 @@ homebrew_installed_packages:
   - gnu-sed
   - gnupg
   - gnutls
-  - go
   - go-jsonnet
   - goreleaser/tap/goreleaser
   - gradle
@@ -156,9 +143,7 @@ homebrew_installed_packages:
   - jsonnet-bundler
   - k2tf
   - k3d
-  - k3sup
   - k9s
-  - keymapp
   - krew
   - kube-linter
   - kube-ps1
@@ -171,7 +156,9 @@ homebrew_installed_packages:
   - kwok
   - lazygit
   - libfido2
+  - libheif
   - libpq
+  - libxml2
   - lindell/multi-gitter/multi-gitter
   - logcli
   - luarocks
@@ -181,12 +168,11 @@ homebrew_installed_packages:
   - mike-engel/jwt-cli/jwt-cli
   - mimirtool
   - minikube
+  - miniscruff/changie/changie
   - mise
-  - mosh
   - mtr
   - mysql-client
   - ncurses
-  - neofetch
   - neomutt
   - neovim
   - nmap
@@ -200,7 +186,6 @@ homebrew_installed_packages:
   - ossp-uuid
   - osx-cpu-temp
   - oven-sh/bun/bun
-  - packer
   - pandoc
   - parallel
   - pdm
@@ -218,12 +203,12 @@ homebrew_installed_packages:
   - pwgen
   - pyenv
   - pyenv-virtualenv
-  - pyyaml
   - readline
   - rename
   - ripgrep
   - rsync
   - ruby
+  - ruff
   - rust
   - rye
   - screen
@@ -238,7 +223,6 @@ homebrew_installed_packages:
   - starship
   - stern
   - stylua
-  - tcl-tk
   - tenv
   # - terraform
   # - terraform-docs
@@ -247,18 +231,15 @@ homebrew_installed_packages:
   - tflint
   - tfsec
   - theden/gcopy/gcopy
-  - tilt-dev/tap/tilt
   - tlrc
   - tmux
+  - tokei
   - tree
   - trippy
-  - trivy
   - updatecli
   - usage
   - uv
   - vale
-  - vcluster
-  - veeso/termscp/termscp
   - velero
   - vhs
   - vim
@@ -271,21 +252,21 @@ homebrew_installed_packages:
   - yamllint
   - yapf
   - yarn
+  - yazi
   - ykman
   - ykpers
   - yq
+  - yubico-piv-tool
   - yubikey-personalization
   - zlib
   - zoxide
   - zsh
   - zsh-vi-mode
 
 homebrew_taps:
-  - ankitpokhrel/jira-cli
   - aquasecurity/trivy
   - aws/tap
   - charmbracelet/tap
-  - cirruslabs/cli
   - derailed/popeye
   - fairwindsops/tap
   - goreleaser/tap
@@ -295,16 +276,18 @@ homebrew_taps:
   - norwoodj/tap
   - oven-sh/bun
   - theden/gcopy
-  - tilt-dev/tap
   - updatecli/updatecli
   - veeso/termscp
   - weaveworks/tap
+  - name: miniscruff/changie
+    url: 'https://github.com/miniscruff/changie'
 
-# TODO: add yubikey, propresenter, logitech, atem mini apps
 homebrew_cask_appdir: /Applications
 homebrew_cask_apps:
   - alacritty
+  - betterdisplay
   - brave-browser
+  - deskpad
   - elgato-camera-hub
   - elgato-control-center
   - elgato-stream-deck
@@ -319,18 +302,26 @@ homebrew_cask_apps:
   - google-chrome
   - google-cloud-sdk
   - hiddenbar
+  - homerow
   - iterm2
   - keycastr
   - keymapp
-  - kitty
   - logi-options-plus
+  # - logitech-g-hub # There is an issue with install. Download link here: https://download01.logi.com/web/ftp/pub/techsupport/gaming/lghub_installer.zip
+  - maccy
+  - neohtop
   - nikitabobko/tap/aerospace
   - obs
   - obsidian
+  - rancher
   - slack
   - syncthing
-  - vlc
+  - tad
+  - topnotch
   - visual-studio-code
+  - vlc
+  - yubico-authenticator
+  - yubico-yubikey-manager
   - zoom
 
 mas_installed_apps: []

ansible/inventory/host_vars/macos_personal.yml

@@ -0,0 +1,48 @@
+---
+personal_homebrew_installed_packages:
+  - argo
+  - bitwarden-cli
+  - cilium-cli
+  - cirruslabs/cli/tart
+  - fluxcd/tap/flux
+  - k3sup
+  - mosh
+  - packer
+  - tilt-dev/tap/tilt
+  - vcluster
+  - veeso/termscp/termscp
+  - xorriso
+  - yt-dlp
+  # - zen-browser
+
+personal_homebrew_taps:
+  - cirruslabs/cli
+  - tilt-dev/tap
+  # - zen-browser/browser
+
+personal_homebrew_cask_apps:
+  - authy
+  - backblaze
+  - balenaetcher
+  - blackhole-2ch
+  - discord
+  - disk-inventory-x
+  - handbrake
+  - mullvad-browser
+  - mullvadvpn
+  - propresenter
+  - raspberry-pi-imager
+  - rustdesk
+  - signal
+  - spotify
+
+personal_mas_installed_apps:
+  # - { id: 441258766, name: 'Magnet (2.6.0)' }
+  - {id: 1193539993, name: 'Brother iPrint&Scan (12.0.3)'}
+  - {id: 1319778037, name: 'iStat Menus (6.73)'}
+  - {id: 1352778147, name: 'Bitwarden (1.29.1)'}
+  - {id: 1444383602, name: 'Goodnotes (6.5.10)'}
+  - {id: 472790630, name: 'Bible Study (7.16.15)'}
+  - {id: 682658836, name: 'GarageBand (10.4.4)'}
+  - {id: 775737590, name: 'iA Writer (7.2.6)'}
+  - {id: 408981434, name: 'iMovie (10.4.2)'}

ansible/inventory/host_vars/macos_work.yml

@@ -0,0 +1,13 @@
+---
+work_homebrew_installed_packages:
+  - ankitpokhrel/jira-cli/jira-cli
+  - colima
+
+work_homebrew_taps:
+  - ankitpokhrel/jira-cli
+
+work_homebrew_cask_apps:
+  - amazon-chime
+  - microsoft-teams
+
+work_mas_installed_apps: []