From f1a406bad861978bd51aba7938112eee596f0c3c Mon Sep 17 00:00:00 2001
From: Ben Dixon <ben@talkingquickly.co.uk>
Date: Sun, 19 May 2019 05:51:27 +0100
Subject: [PATCH] adds: tweaks

---
 ansible_osx.yml                   | 12 ++++++++----
 templates/.zshrc.j2               |  7 +++++++
 templates/vscode-settings.json.j2 |  3 ++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ansible_osx.yml b/ansible_osx.yml
index 7e4bfa9..36c24ef 100644
--- a/ansible_osx.yml
+++ b/ansible_osx.yml
@@ -36,6 +36,7 @@
         - sketch
         - slack
         - sublime-text
+        - tunnelblick
         - vagrant
         - virtualbox
         - visual-studio-code
@@ -64,6 +65,7 @@
           'libyaml',
           'mas',
           'openssl' ,
+          'pkg-config',
           'postgresql',
           'rcm',
           'readline',
@@ -75,15 +77,14 @@
           'vim',
           'watchman',
           'yarn',
-          'zsh', 
+          'zsh',
+          'zlib',
         ]
         state: present
         update_homebrew: yes
 
     - name: "Link ImageMagick6 as main version (for rmagick gem)"
-      homebrew:
-        name: imagemagick@6
-        state: linked
+      shell: brew link -f imagemagick@6
 
     - git:
         repo: https://github.com/asdf-vm/asdf.git
@@ -165,6 +166,8 @@
         source /Users/{{ lookup('env', 'USER') }}/.asdf/asdf.sh
         asdf install ruby 2.4.2
         asdf global ruby 2.4.2 
+        gem install bundler -v 1.17.3
+        gem install cocoapods
 
     - name: "Install default node"
       shell: |
@@ -172,6 +175,7 @@
         bash /Users/{{ lookup('env', 'USER') }}/.asdf/plugins/nodejs/bin/import-release-team-keyring
         asdf install nodejs 11.11.0
         asdf install nodejs 10.8.0
+        asdf install nodejs 9.11.1
         asdf global nodejs 11.11.0
 
     - name: "Install default elixir"
diff --git a/templates/.zshrc.j2 b/templates/.zshrc.j2
index 0690fb0..02cc512 100644
--- a/templates/.zshrc.j2
+++ b/templates/.zshrc.j2
@@ -7,6 +7,13 @@ export PATH=${PATH}:${ANDROID_HOME}/tools
 export PATH=${PATH}:${ANDROID_HOME}/platform-tools
 export PATH=/usr/local/opt/imagemagick@6/bin:${PATH}
 
+# For compilers to find zlib you may need to set:
+export LDFLAGS="${LDFLAGS} -L/usr/local/opt/zlib/lib"
+export CPPFLAGS="${CPPFLAGS} -I/usr/local/opt/zlib/include"
+
+# For pkg-config to find zlib you may need to set:
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH} /usr/local/opt/zlib/lib/pkgconfig"
+
 # ZSH setup
 export ZSH=$HOME/.oh-my-zsh
 ZSH_THEME="robbyrussell"
diff --git a/templates/vscode-settings.json.j2 b/templates/vscode-settings.json.j2
index 36cd841..39f94a5 100644
--- a/templates/vscode-settings.json.j2
+++ b/templates/vscode-settings.json.j2
@@ -2,5 +2,6 @@
     "ruby.intellisense": "rubyLocate",
     "ruby.codeCompletion": "rcodetools",
     "ruby.format": "rubocop",
-    "ruby.useLanguageServer": true
+    "ruby.useLanguageServer": true,
+    "editor.tabSize": 2
 }
\ No newline at end of file