From 6041117b872abcf2a77471293fd7a6bc5077b8c2 Mon Sep 17 00:00:00 2001
From: Alpha Chen <alpha.chen@gmail.com>
Date: Mon, 1 Sep 2014 16:28:17 -0700
Subject: [PATCH] [meta] Various changes/fixes for osx role

Handle ansible bug w/`with_items`:
https://github.com/ansible/ansible/issues/8055
---
 ansible/roles/osx/tasks/defaults.yml | 3 ++-
 ansible/roles/osx/tasks/homebrew.yml | 2 +-
 ansible/roles/osx/vars/main.yml      | 9 ++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ansible/roles/osx/tasks/defaults.yml b/ansible/roles/osx/tasks/defaults.yml
index 10943ae..0d97161 100644
--- a/ansible/roles/osx/tasks/defaults.yml
+++ b/ansible/roles/osx/tasks/defaults.yml
@@ -1,8 +1,9 @@
 ---
 - command: defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -int 1
   sudo: True
+- debug: var={{ defaults }}
 - command: defaults write {{ item }}
-  with_items: defaults
+  with_items: defaults | list
 - command: killall {{ item }}
   with_items:
     - Finder
diff --git a/ansible/roles/osx/tasks/homebrew.yml b/ansible/roles/osx/tasks/homebrew.yml
index a6773ca..e3e3411 100644
--- a/ansible/roles/osx/tasks/homebrew.yml
+++ b/ansible/roles/osx/tasks/homebrew.yml
@@ -1,5 +1,5 @@
 ---
 - homebrew: name={{ item }}
   with_items: formulae
-- homebrew: name=macvim install_options=override-system-vim state=upgraded
+- homebrew: name=macvim install_options=override-system-vim
 - command: brew linkapps
diff --git a/ansible/roles/osx/vars/main.yml b/ansible/roles/osx/vars/main.yml
index f6dd387..086bca3 100644
--- a/ansible/roles/osx/vars/main.yml
+++ b/ansible/roles/osx/vars/main.yml
@@ -47,7 +47,6 @@ defaults:
   - com.apple.dashboard mcx-disabled -bool true # disable dashboard
   - com.apple.desktopservices DSDontWriteNetworkStores true # don't write .DS_Store to network volumes
   - com.apple.dock autohide -bool true # automatically hide and show the dock
-  # - com.apple.dock itunes-notifications -bool true
   - com.apple.dock mineffect -string scale # minimize windows using the scale effect
   - com.apple.dock no-glass -bool true # 2D dock
   - com.apple.dock orientation -string left
@@ -61,9 +60,9 @@ defaults:
   - com.apple.finder FXEnableExtensionChangeWarning -bool false # don't ask when changing file extension
   - com.apple.finder QLEnableTextSelection -bool true # enable text selection in QuickLook
   - com.apple.finder _FXShowPosixPathInTitle -bool true # show full path in Finder
-  - com.apple.gamed Disabled -bool true
-  - com.apple.iTunes NSUserKeyEquivalents -dict-add "Target Search Field" "@F" # remap cmd+f to find in iTunes
-  - com.apple.iTunes invertStoreLinks -bool true
+  # - com.apple.gamed Disabled -bool true
+  # - com.apple.iTunes NSUserKeyEquivalents -dict-add "Target Search Field" "@F" # remap cmd+f to find in iTunes
+  # - com.apple.iTunes invertStoreLinks -bool true
   - com.apple.screencapture disable-shadow -bool true # no window shadows when capturing windows
   - com.apple.screencapture location ~/Downloads
-  - com.apple.terminal StringEncodings -array 4 # UTF-8 in Terminal
+  # - com.apple.terminal StringEncodings -array 4 # UTF-8 in Terminal