# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1561191970 14400
# Node ID 939e12400bd5226500b00390eb268efae2019e39
# Parent  47d7ef3be55319066680fd6ad7350c86428d8051# Parent  25111b904b2c7e4d8f9c101b8ce287f2ae97af9e
merge

diff --git a/local.yml b/local.yml
--- a/local.yml
+++ b/local.yml
@@ -2,6 +2,8 @@
 - name: Devbox Setup
   hosts: all
   roles:
+    - role: bootstrap
+      tags: bootstrap
     - devbox
     - user
 
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
@@ -1,5 +1,4 @@
 ---
 dependencies:
-  - bootstrap
   - repositories
   - sudo
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
@@ -1,40 +1,42 @@
 ---
 
 - name: Install base packages
-  apt: name={{item}} state=installed
-  with_items:
-    - build-essential
-    - git
-    - mercurial
-    - zsh
-    - tmux
-    - vim
-    - silversearcher-ag
-    - exuberant-ctags
-    - unattended-upgrades
   tags: packages, install
+  apt:
+    state: installed
+    name:
+      - build-essential
+      - git
+      - mercurial
+      - zsh
+      - tmux
+      - vim
+      - silversearcher-ag
+      - exuberant-ctags
+      - unattended-upgrades
 
 - name: Install GUI packages
+  tags: packages, install
   when: gui_enabled
-  apt: name={{item}} state=installed
-  with_items:
-    - lightdm
-    - rxvt-unicode-256color
-    - i3
-    - xautolock
-    - fonts-dejavu-extra
-    - fonts-opensymbol
-    - scrot
-    - vim-gtk
-    - firefox-esr
-  tags: packages, install
+  apt:
+    state: installed
+    name:
+      - lightdm
+      - rxvt-unicode-256color
+      - i3
+      - xautolock
+      - fonts-dejavu-extra
+      - fonts-opensymbol
+      - scrot
+      - vim-gtk
 
 - name: Install non-gui packages
+  tags: packages, install
   when: not gui_enabled
-  apt: name={{item}} state=installed
-  with_items:
-    - vim-nox
-  tags: packages, install
+  apt:
+    state: installed
+    name:
+      - vim-nox
 
 - name: Set default X session in lightdm
   when: gui_enabled and gui_session
@@ -44,10 +46,3 @@
     option: user-session
     value: "{{gui_session}}"
     backup: true
-
-- name: Enable and start lightdm
-  when: gui_enabled
-  service:
-    name: lightdm
-    enabled: yes
-    state: started