# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1460566333 14400
# Node ID 06adc2a14d3ea4a1dd08b40e91ea3417c25bade1
# Parent  d6d4702712f7351e16f8e7f056060d5c6ba59977
Move stuff back into single playbooks

diff --git a/roles/devbox/meta/main.yml b/roles/devbox/meta/main.yml
--- a/roles/devbox/meta/main.yml
+++ b/roles/devbox/meta/main.yml
@@ -2,11 +2,4 @@
 dependencies:
   - repositories
   - sudo
-  - git
-  - mercurial
-  - zsh
-  - ag
-  - ctags
-  - tmux
-  - vim
   - {role: firefox, when: gui.enabled}
diff --git a/roles/devbox/tasks/dist-debian.yml b/roles/devbox/tasks/dist-debian.yml
--- a/roles/devbox/tasks/dist-debian.yml
+++ b/roles/devbox/tasks/dist-debian.yml
@@ -4,6 +4,13 @@
   apt: name={{item}} state=installed
   with_items:
     - build-essential
+    - git
+    - mercurial
+    - zsh
+    - tmux
+    - vim-nox
+    - silversearcher-ag
+    - exuberant-ctags
   tags: packages, install
 
 - name: Install GUI packages
@@ -14,14 +21,9 @@
     - fonts-dejavu-extra
     - fonts-opensymbol
     - scrot
+    - vim-gtk
   tags: packages, install
 
-- name: Install Extra packages
-  apt: name={{item}} state=installed
-  with_items: "{{extra_packages}}"
-  tags: packages, install
-
-
 - name: Set default X session in lightdm
   when: gui.enabled and gui.session
   ini_file:
@@ -33,3 +35,13 @@
   notify:
   - reload lightdm
 
+- apt_repository:
+    repo: "deb http://mozilla.debian.net/ {{ansible_distribution_release}}-backports firefox-release"
+  when: ansible_distribution_release != 'NA'
+  tags: repos
+
+- apt:
+    name: firefox
+    state: latest
+  tags: packages, install
+  when: ansible_distribution_release != 'NA'