From f7c32b20ace6115460c3144d1ea4286ca70fc29e Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 30 Jun 2016 22:54:44 +0100
Subject: [PATCH] Split variables into different files

---
 playbook.yml                    |  6 ++++--
 vars/dotfiles.yml               | 15 +++++++++++++++
 vars/{main.yml => homebrew.yml} | 31 +------------------------------
 vars/misc.yml                   | 11 +++++++++++
 4 files changed, 31 insertions(+), 32 deletions(-)
 create mode 100644 vars/dotfiles.yml
 rename vars/{main.yml => homebrew.yml} (56%)
 create mode 100644 vars/misc.yml

diff --git a/playbook.yml b/playbook.yml
index 79e5e3b..b8b59d7 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -2,14 +2,16 @@
 - hosts: all
 
   vars_files:
-    - vars/main.yml
+    - vars/dotfiles.yml
+    - vars/homebrew.yml
+    - vars/misc.yml
 
   tasks:
     - { include: tasks/sudoers.yml, tags: ['base', 'sudoers'] }
 
   roles:
     - { role: geerlingguy.dotfiles, tags: ['dotfiles'] }
-    - { role: geerlingguy.homebrew, tags: ['brew'] }
+    - { role: geerlingguy.homebrew, tags: ['brew', 'homebrew'] }
     - { role: dotstrap.fish, tags: ['fish'] }
     - { role: sublime, tags: ['sublime'] }
     - { role: osx, tags: ['osx'] }
diff --git a/vars/dotfiles.yml b/vars/dotfiles.yml
new file mode 100644
index 0000000..93e2def
--- /dev/null
+++ b/vars/dotfiles.yml
@@ -0,0 +1,15 @@
+---
+dotfiles_repo: "https://github.com/opdavies/dotfiles.git"
+dotfiles_repo_local_destination: "~/Code/Personal/github/dotfiles"
+dotfiles_files:
+  # - .composer/composer.json
+  # - .composer/composer.lock
+  - .config/fish/functions/ga.fish
+  - .config/fish/functions/gc.fish
+  - .config/fish/functions/gs.fish
+  - .config/fish/functions/l.fish
+  - .config/fish/functions/v.fish
+  - .gitconfig
+  - .gitignore-global
+  - .ideavimrc
+  - .vimrc
diff --git a/vars/main.yml b/vars/homebrew.yml
similarity index 56%
rename from vars/main.yml
rename to vars/homebrew.yml
index 0c6b592..ecd449d 100644
--- a/vars/main.yml
+++ b/vars/homebrew.yml
@@ -1,19 +1,4 @@
 ---
-dotfiles_repo: "https://github.com/opdavies/dotfiles.git"
-dotfiles_repo_local_destination: "~/Code/Personal/github/dotfiles"
-dotfiles_files:
-  # - .composer/composer.json
-  # - .composer/composer.lock
-  - .config/fish/functions/ga.fish
-  - .config/fish/functions/gc.fish
-  - .config/fish/functions/gs.fish
-  - .config/fish/functions/l.fish
-  - .config/fish/functions/v.fish
-  - .gitconfig
-  - .gitignore-global
-  - .ideavimrc
-  - .vimrc
-
 homebrew_taps:
   - caskroom/cask
   - caskroom/fonts
@@ -30,11 +15,10 @@ homebrew_installed_packages:
   - git-sh
   - htop
   - hub
+  - mas
   - myrepos
   - mysql
   - peco
-  # - php56
-  # - php56-xdebug
   - phpmd
   - phpunit
   - python
@@ -83,16 +67,3 @@ homebrew_cask_apps:
   - vagrant
   - virtualbox
   - vlc
-
-homebrew_upgrade_all_packages: yes
-
-ruby_install_gems:
-  - grunt
-  - jekyll
-
-nodejs_forever: false
-nodejs_npm_global_packages:
-  - name: grunt-cli
-  - name: gulp
-
-sublime_path: "~/Library/Application Support/Sublime Text 2"
diff --git a/vars/misc.yml b/vars/misc.yml
new file mode 100644
index 0000000..3b07ef2
--- /dev/null
+++ b/vars/misc.yml
@@ -0,0 +1,11 @@
+---
+ruby_install_gems:
+  - grunt
+  - jekyll
+
+nodejs_forever: false
+nodejs_npm_global_packages:
+  - name: grunt-cli
+  - name: gulp
+
+sublime_path: "~/Library/Application Support/Sublime Text 2"