From 5695e26b4f0f52bacadbd9b08bba6b6b9a272d5c Mon Sep 17 00:00:00 2001
From: Ben Dixon <ben@talkingquickly.co.uk>
Date: Wed, 1 May 2019 14:34:53 +0100
Subject: [PATCH] adds: more structure

---
 ansible_osx.yml     | 25 ++-----------------------
 templates/.zshrc.j2 |  9 ++++-----
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/ansible_osx.yml b/ansible_osx.yml
index 0fc0c5f..12a67c0 100644
--- a/ansible_osx.yml
+++ b/ansible_osx.yml
@@ -28,9 +28,7 @@
         - zoomus
         - postman
         - microsoft-office
-        - amazon-workspaces
         # - # 1password # @TODO uncomment this once don't have it already installed....
-        - private-internet-access
         # - ADD FUSE and SSHFS (https://osxfuse.github.io/)
         - google-cloud-sdk
     
@@ -48,6 +46,7 @@
           'kubernetes-cli',
           'kubernetes-helm',
           'mas',
+          'redis',
           'postgresql',
           'watchman',
           'heroku',
@@ -81,18 +80,6 @@
         dest: "/Users/{{ lookup('env', 'USER') }}/.asdf"
         version: v0.7.1
 
-    # Note that MAS can only installed applications which are already in the "purchased" tab
-    # of the Mac app store. So if you're using a new app store account or you've never installed
-    # one of the below apps before, you'll need to install it from the Mac App Store app by hand
-    # the first time.
-    - name: Install apps from the Mac App Store using MAS (Assumes you're logged in etc)
-      shell: mas install {{ item }}
-      with_items:
-        - 409183694 # Keynote
-        - 1295203466 # Microsoft remote desktop
-        - 497799835 # xcode
-        - 496437906 # shush microphone manager
-
     - name: Install Addroid SDKs etc
       shell: yes | sdkmanager "{{ item }}" --sdk_root=/Users/{{ lookup('env', 'USER') }}/Library/Android/sdk
       with_items:
@@ -202,12 +189,4 @@
         src: templates/vscode-settings.json.j2
         dest: /Users/{{ lookup('env', 'USER') }}/Library/Application Support/Code/User/settings.json
         owner: "{{ lookup('env', 'USER') }}"
-        force: no
-
-    # - name: Install a global ruby and some core gems
-    #   shell: |
-    #     eval "$(rbenv init -)"
-    #     rbenv install 2.4.2
-    #     rbenv global 2.4.2
-    #     gem update --system
-    #     gem install rcodetools rubocop cocoapods rails ruby-lint
\ No newline at end of file
+        force: no
\ No newline at end of file
diff --git a/templates/.zshrc.j2 b/templates/.zshrc.j2
index bfcd759..0690fb0 100644
--- a/templates/.zshrc.j2
+++ b/templates/.zshrc.j2
@@ -9,21 +9,20 @@ export PATH=/usr/local/opt/imagemagick@6/bin:${PATH}
 
 # ZSH setup
 export ZSH=$HOME/.oh-my-zsh
-ZSH_THEME="rubbyrussel"
+ZSH_THEME="robbyrussell"
 plugins=(git kubectl)
 DISABLE_UNTRACKED_FILES_DIRTY="true"
 
 # Load personal pre oh-my-zsh init config which should be stored in ~/.zshrc.personal.before
 # E.g. setting ZSH theme etc
-
-. ~/.zshrc.personal.before
+if [ -f ~/.zshrc.personal.before ]; then . ~/.zshrc.personal.before; fi
 
 # Load Oh My Zsh
 source $ZSH/oh-my-zsh.sh
 
 # Load personal ZSH config which should be stored in ~/.zshrc.personal.after
-# Most ZSH config goes here
-. ~/.zshrc.personal.after
+# Most ZSH config e.g. aliases etc goes here
+if [ -f ~/.zshrc.personal.after ]; then . ~/.zshrc.personal.after; fi
 
 # Load asdf
 . $HOME/.asdf/asdf.sh