From 5a748113b0c037afe8efdbaf007d477e2ebacae5 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 15 Jan 2020 00:20:01 +0000
Subject: [PATCH] Move macOS tasks into the role

Further cleanup and categorisation needed.

#7
---
 main.yml                                      |  4 +--
 roles/macos/tasks/dock.yml                    |  2 +-
 roles/macos/tasks/main.yml                    |  2 ++
 roles/macos/tasks/menu-bar.yml                | 22 +++++++++++++++
 .../macos/tasks/moved-from-tasks.yml          | 27 -------------------
 roles/macos/tasks/screensaver.yml             |  2 +-
 6 files changed, 28 insertions(+), 31 deletions(-)
 create mode 100644 roles/macos/tasks/menu-bar.yml
 rename tasks/macos.yml => roles/macos/tasks/moved-from-tasks.yml (67%)

diff --git a/main.yml b/main.yml
index a8a8998..38fddbe 100644
--- a/main.yml
+++ b/main.yml
@@ -13,8 +13,6 @@
       tags: [macos]
     - include: tasks/sublime.yml
       tags: [sublime]
-    - include: tasks/macos.yml
-      tags: [macos]
 
   roles:
     - role: karlmdavis.rcm-dotfiles
@@ -24,3 +22,5 @@
     - role: geerlingguy.mas
       when: mas_installed_apps
       tags: [macos, mas]
+    - role: ./roles/macos
+      tags: [macos]
diff --git a/roles/macos/tasks/dock.yml b/roles/macos/tasks/dock.yml
index 13dc105..6c65df3 100644
--- a/roles/macos/tasks/dock.yml
+++ b/roles/macos/tasks/dock.yml
@@ -3,7 +3,7 @@
   osx_defaults:
     domain: com.apple.dock
     key: tilesize
-    type: float
+    type: int
     value: 20
   notify:
     - killall Dock
diff --git a/roles/macos/tasks/main.yml b/roles/macos/tasks/main.yml
index 319b2f4..40ca967 100644
--- a/roles/macos/tasks/main.yml
+++ b/roles/macos/tasks/main.yml
@@ -3,5 +3,7 @@
 - include: dock.yml
 - include: finder.yml
 - include: keyboard.yml
+- include: menu-bar.yml
+- include: moved-from-tasks.yml
 - include: screensaver.yml
 - include: universal-access.yml
diff --git a/roles/macos/tasks/menu-bar.yml b/roles/macos/tasks/menu-bar.yml
new file mode 100644
index 0000000..64ff7a5
--- /dev/null
+++ b/roles/macos/tasks/menu-bar.yml
@@ -0,0 +1,22 @@
+---
+- 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'
+
diff --git a/tasks/macos.yml b/roles/macos/tasks/moved-from-tasks.yml
similarity index 67%
rename from tasks/macos.yml
rename to roles/macos/tasks/moved-from-tasks.yml
index 5fa530e..eb49826 100644
--- a/tasks/macos.yml
+++ b/roles/macos/tasks/moved-from-tasks.yml
@@ -1,25 +1,4 @@
 ---
-- name: 'Menu bar: Hide by default'
-  osx_defaults:
-    domain: 'Apple Global Domain'
-    key: _HIHideMenuBar
-    type: bool
-    value: true
-
-- name: 'Menu bar: Show battery'
-  osx_defaults:
-    domain: com.apple.menuextra.battery
-    key: ShowPercent
-    type: string
-    value: yes
-
-- name: 'Menu bar: Show date'
-  osx_defaults:
-    domain: com.apple.menuextra.clock
-    key: DateFormat
-    type: string
-    value: 'EEE d MMM  HH:mm'
-
 - name: Check for software updates daily, not just once per week
   osx_defaults:
     domain: com.apple.SoftwareUpdate
@@ -69,9 +48,3 @@
     type: boolean
     value: true
 
-- name: Kill affected applications
-  command: 'killall {{ item }}'
-  with_items:
-    - Dock
-    - Finder
-    - SystemUIServer
diff --git a/roles/macos/tasks/screensaver.yml b/roles/macos/tasks/screensaver.yml
index 7938b65..842f1db 100644
--- a/roles/macos/tasks/screensaver.yml
+++ b/roles/macos/tasks/screensaver.yml
@@ -10,5 +10,5 @@
   osx_defaults:
     domain: com.apple.screensaver
     key: askForPasswordDelay
-    type: float
+    type: int
     value: 0