Update user.yml

main.yml

@@ -7,18 +7,23 @@
     - vars/homebrew.yml
     - vars/mas.yml
     - vars/misc.yml
+    - vars/user.yml
 
   tasks:
+    - include: tasks/sudoers.yml
+      tags: ['osx']
     - include: tasks/sublime.yml
-      tags: [sublime]
+      tags: ['sublime']
+    - include: tasks/macos.yml
+      tags: ['macos']
 
   roles:
-    - role: karlmdavis.rcm-dotfiles
-      tags: [dotfiles]
+    - role: gantsign.antigen
+      tags: ['zsh']
+    - role: geerlingguy.dotfiles
+      tags: ['dotfiles']
     - role: geerlingguy.homebrew
-      tags: [homebrew]
+      tags: ['homebrew']
     - role: geerlingguy.mas
       when: mas_installed_apps
-      tags: [macos, mas]
-    - role: ./roles/macos
-      tags: [macos]
+      tags: ['mas']

requirements.yml

@@ -1,6 +1,9 @@
 ---
-- src: 'karlmdavis.rcm-dotfiles'
+- src: 'gantsign.antigen'
+  version: '1.3.2'
+- src: 'geerlingguy.dotfiles'
+  version: '1.2.0'
 - src: 'geerlingguy.homebrew'
-  version: '3.1.0'
+  version: '2.9.0'
 - src: 'geerlingguy.mas'
   version: '1.2.0'

roles/macos/tasks/apps/vlc.yml

@@ -1,7 +0,0 @@
----
-- name: Remove VLC from the menu bar
-  osx_defaults:
-    domain: org.videolan.vlc
-    key: 'NSStatusItem Visible statusBarItem'
-    type: bool
-    value: false

roles/macos/tasks/dock.yml

@@ -1,51 +0,0 @@
----
-- name: Empty the Dock
-  shell: 'dockutil --remove all --no-restart'
-
-- name: Disable launch animation
-  osx_defaults:
-    domain: com.apple.dock
-    key: launchanim
-    type: bool
-    value: false
-
-- name: Hide open indicators
-  osx_defaults:
-    domain: com.apple.dock
-    key: show-process-indicators
-    type: bool
-    value: false
-
-- name: Hide recent apps
-  osx_defaults:
-    domain: com.apple.dock
-    key: show-recents
-    type: bool
-    value: false
-
-- name: Set the icon size of Dock items.
-  osx_defaults:
-    domain: com.apple.dock
-    key: tilesize
-    type: int
-    value: 35
-  notify:
-    - killall Dock
-
-- name: Automatically hide and show the Dock.
-  osx_defaults:
-    domain: com.apple.dock
-    key: autohide
-    type: bool
-    value: true
-  notify:
-    - killall Dock
-
-- name: Remove the autohide delay.
-  osx_defaults:
-    domain: com.apple.dock
-    key: autohide-delay
-    type: float
-    value: 0
-  notify:
-    - killall Dock

roles/macos/tasks/global.yml

@@ -1,23 +0,0 @@
-- name: Disable smart dashes
-  osx_defaults:
-    domain: NSGlobalDomain
-    key: NSAutomaticDashSubstitutionEnabled
-    type: bool
-    value: false
-
-- name: Disable press-and-hold for keys in favor of key repeat
-  osx_defaults:
-    domain: NSGlobalDomain
-    key: ApplePressAndHoldEnabled
-    type: bool
-    value: false
-
-- name: Set a blazingly fast keyboard repeat rate, and make it happen more quickly
-  osx_defaults:
-    domain: NSGlobalDomain
-    key: '{{ item.key }}'
-    type: int
-    value: '{{ item.value }}'
-  with_items:
-    - { key: InitialKeyRepeat, value: 20 }
-    - { key: KeyRepeat, value: 1 }

roles/macos/tasks/menu-bar.yml

@@ -1,21 +0,0 @@
----
-- name: Hide by default
-  osx_defaults:
-    domain: 'Apple Global Domain'
-    key: _HIHideMenuBar
-    type: bool
-    value: true
-
-- name: Show battery percentage
-  osx_defaults:
-    domain: com.apple.menuextra.battery
-    key: ShowPercent
-    type: string
-    value: yes
-
-- name: Show the current date
-  osx_defaults:
-    domain: com.apple.menuextra.clock
-    key: DateFormat
-    type: string
-    value: 'EEE d MMM  HH:mm'

roles/macos/tasks/trackpad.yml

@@ -1,7 +0,0 @@
----
-- name: Enable tap on click
-  osx_defaults:
-    domain: com.apple.driver.AppleBluetoothMultitouch.trackpad
-    key: Clicking
-    type: bool
-    value: true

roles/macos/tasks/universal-access.yml

@@ -1,14 +0,0 @@
----
-- name: Reduce transparency
-  osx_defaults:
-    domain: com.apple.universalaccess
-    key: reduceTransparency
-    type: bool
-    value: true
-
-- name: Reduce motion
-  osx_defaults:
-    domain: com.apple.universalaccess
-    key: reduceMotion
-    type: bool
-    value: true

roles/mkdocs/tasks/main.yml

@@ -0,0 +1,5 @@
+---
+- name: Install mkdocs
+  pip:
+    name: mkdocs
+    state: present

roles/osx/tasks/dock.yml

@@ -0,0 +1,27 @@
+---
+- name: Set the icon size of Dock items.
+  osx_defaults:
+    domain: com.apple.dock
+    key: tilesize
+    type: float
+    value: 20
+  notify:
+    - killall Dock
+
+- name: Automatically hide and show the Dock.
+  osx_defaults:
+    domain: com.apple.dock
+    key: autohide
+    type: bool
+    value: true
+  notify:
+    - killall Dock
+
+- name: Remove the autohide delay.
+  osx_defaults:
+    domain: com.apple.dock
+    key: autohide-delay
+    type: float
+    value: 0
+  notify:
+    - killall Dock

roles/osx/tasks/finder.yml

@@ -21,21 +21,3 @@
     value: false
   notify:
     - killall Finder
-
-- name: Hide the status bar
-  osx_defaults:
-    domain: com.apple.finder
-    key: ShowStatusBar
-    type: bool
-    value: false
-  notify:
-    - killall Finder
-
-- name: Hide the path bar
-  osx_defaults:
-    domain: com.apple.finder
-    key: ShowPathbar
-    type: bool
-    value: false
-  notify:
-    - killall Finder

roles/osx/tasks/main.yml

@@ -1,11 +1,6 @@
 ---
-- include: apps/vlc.yml
 - include: dock.yml
 - include: finder.yml
-- include: global.yml
 - include: keyboard.yml
-- include: menu-bar.yml
-- include: moved-from-tasks.yml
 - include: screensaver.yml
-- include: trackpad.yml
 - include: universal-access.yml

roles/osx/tasks/screensaver.yml

@@ -10,5 +10,5 @@
   osx_defaults:
     domain: com.apple.screensaver
     key: askForPasswordDelay
-    type: int
+    type: float
     value: 0

roles/osx/tasks/universal-access.yml

@@ -0,0 +1,7 @@
+---
+- name: Require a password when exiting the screen saver.
+  osx_defaults:
+    domain: com.apple.universalaccess
+    key: reduceTransparency
+    type: bool
+    value: true

tasks/macos.yml

@@ -1,4 +1,11 @@
 ---
+- name: Hide the menu bar by default
+  osx_defaults:
+    domain: 'Apple Global Domain'
+    key: _HIHideMenuBar
+    type: bool
+    value: true
+
 - name: Check for software updates daily, not just once per week
   osx_defaults:
     domain: com.apple.SoftwareUpdate
@@ -47,3 +54,10 @@
     key: QuitMenuItem
     type: boolean
     value: true
+
+- name: Kill affected applications
+  command: 'killall {{ item }}'
+  with_items:
+    - Dock
+    - Finder
+    - SystemUIServer

tasks/sudoers.yml

@@ -0,0 +1,10 @@
+---
+# Sudoers configuration (enables more convenient Vagrant usage).
+- name: Copy sudoers configuration into place.
+  copy:
+    src: files/etc/sudoers
+    dest: /etc/sudoers
+    mode: 0440
+    validate: 'visudo -cf %s'
+  become: yes
+  when: configure_sudoers

vars/dotfiles.yml

@@ -1,5 +1,13 @@
 ---
-rcm_user: opdavies
-rcm_repos:
-  - repo: 'https://github.com/opdavies/dotfiles'
-    dest: '/Users/opdavies/dotfiles'
+dotfiles_repo: "https://github.com/opdavies/dotfiles.git"
+dotfiles_repo_local_destination: "~/.dotfiles"
+dotfiles_files:
+  - .aliases
+  - .functions
+  - .gitconfig
+  - .gitignore-global
+  - .hushlogin
+  - .ideavimrc
+  - .npmrc
+  - .vimrc
+  - .zshrc

vars/homebrew.yml

@@ -1,39 +1,31 @@
 ---
 homebrew_taps:
-  - drud/ddev
-  - homebrew/cask
-  - homebrew/cask-fonts
-  - homebrew/cask-versions
+  - caskroom/cask
+  - caskroom/fonts
+  - caskroom/versions
   - homebrew/services
 
 homebrew_installed_packages:
-  - bfg
   - cairo
   - composer
-  - ddev
   - direnv
   - dnsmasq
-  - dockutil
   - drupal-code-sniffer
   - fswatch
-  - fzf
   - git-extras
   - git-flow
   - git-ftp
   - git-sh
   - htop
   - hub
-  - jq
   - lftp
   - mas
   - molecule
   - mysql
-  - npm
   - peco
   - phpmd
   - pv
   - python
-  - reattach-to-user-namespace
   - ssh-copy-id
   - tig
   - tmux
@@ -41,38 +33,39 @@ homebrew_installed_packages:
   - unison
   - watch
   - wget
-  - yarn
-  - zplug
+  - z
 
 homebrew_cask_apps:
   - alfred
   - appcleaner
+  - asciinema
   - authy
-  - avast-security
+  - avast
   - balenaetcher
-  - bartender
   - boxer
   - caffeine
   - cyberduck
   - discord
   - docker
   - dropbox
-  - figma
+  - filezilla
   - firefox
   - font-fira-code
   - font-roboto-mono
   - font-source-code-pro
   - github
   - google-chrome
+  - google-drive
   - gpgtools
   - iconjar
   - iterm2
+  - jq
   - karabiner-elements
   - keybase
   - kitematic
+  - lando
   - lastpass
   - mailplane
-  - moom
   - ngrok
   - nordvpn
   - obs
@@ -84,13 +77,11 @@ homebrew_cask_apps:
   - qlmarkdown
   - resilio-sync
   - sequel-pro
-  - sip
-  - sizzy
   - skype
   - slack
+  - spectacle
   - spotify
   - sublime-text
-  - synergy
   - textual
   - the-unarchiver
   - tunnelblick

vars/mas.yml

@@ -1,17 +1,30 @@
 mas_signin_dialog: no
 mas_installed_apps:
-  - { name: 'Airmail 4', id: 918858936 }
-  - { name: 'Bear', id: 1091189122 }
-  - { name: 'Carbonize', id: 1451177988 }
-  - { name: 'iA Writer', id: 775737590 }
-  - { name: 'iMovie', id: 408981434 }
-  - { name: 'Keynote', id: 409183694 }
-  - { name: 'LastPass', id: 926036361 }
-  - { name: 'Numbers', id: 409203825 }
-  - { name: 'Pages', id: 409201541 }
-  - { name: 'Reeder', id: 880001334 }
-  - { name: 'Slack', id: 803453959 }
-  - { name: 'Todoist', id: 585829637 }
-  - { name: 'Tweetbot 3 for Twitter', id: 1384080005 }
-  - { name: 'TweetDeck', id: 485812721 }
-  - { name: 'Xcode', id: 497799835 }
+  - name: 'Bear'
+    id: 1091189122
+  - name: 'iMovie'
+    id: 408981434
+  - name: 'Keynote'
+    id: 409183694
+  - name: 'LastPass'
+    id: 926036361
+  - name: 'Microsoft Remote Desktop'
+    id: 715768417
+  - name: 'Numbers'
+    id: 409203825
+  - name: 'Pages'
+    id: 409201541
+  - name: 'Pocket'
+    id: 568494494
+  - name: 'Reeder'
+    id: 880001334
+  - name: 'Slack'
+    id: 803453959
+  - name: 'Todoist'
+    id: 585829637
+  - name: 'Tweetbot'
+    id: 557168941
+  - name: 'TweetDeck'
+    id: 485812721
+  - name: 'Xcode'
+    id: 497799835

vars/user.yml

@@ -0,0 +1,19 @@
+users:
+  - username: opdavies
+    antigen_libraries:
+      - name: oh-my-zsh
+    antigen_bundles:
+      - name: cd-gitroot
+        url: https://github.com/mollifier/cd-gitroot
+      - name: common-aliases
+      - name: composer
+      - name: docker
+      - name: git
+      - name: github
+      - name: npm
+      - name: osx
+      - name: z
+      - name: zsh-autosuggestions
+        url: https://github.com/zsh-users/zsh-autosuggestions
+      - name: zsh-syntax-highlighting
+        url: https://github.com/zsh-users/zsh-syntax-highlighting