9 files changed, 51 insertions, 18 deletions
diff --git a/manifests/utils/development.pp b/manifests/utils/development.pp
index 3c32fb5..9f32ddb 100644
--- a/manifests/utils/development.pp
+++ b/manifests/utils/development.pp
@@ -1,20 +1,9 @@
 class nodo::utils::development {
-  # Development
-  package { [ 'debhelper',  'gitk',             'git-gui',         'subversion',        'python-stdeb',
-              'fakeroot',   'dupload',          'autotools-dev',   'dh-make',           'doxygen',
-              'tig',        'mercurial',        'exuberant-ctags', 'reportbug',         'debian-keyring',
-              'devscripts', 'pbuilder',         'build-essential', 'pnopaste-cli',      'agave',
-              'cdbs',       'dh-buildinfo',     'quilt',           'dpatch',            'dput',
-              'bzr',        'debian-goodies',   'debirf',          'xorriso',           'dh-autoreconf',
-              'unetbootin', 'git-buildpackage', 'gem2deb',         'python-setuptools', 'python-virtualenv',
-              'ditz',       'mr',               'puppet-lint',     'kpartx',            'openocd' ]:
-    ensure => installed,
-  }
-
-  # Not available
-  #package { 'bugs-everywhere']:
-  #  ensure => installed,
-  #}
-
-  include nodo::utils::storage::archive
+  include nodo::utils::development::ide
+  include nodo::utils::development::debian
+  include nodo::utils::development::git
+  include nodo::utils::development::vcs
+  include nodo::utils::development::python
+  include nodo::utils::development::puppet
+  include nodo::utils::development::system
 }
diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp
new file mode 100644
index 0000000..a7bbef2
--- /dev/null
+++ b/manifests/utils/development/debian.pp
@@ -0,0 +1,8 @@
+class nodo::utils::development::debian {
+  package { [ 'debhelper', 'python-stdeb',   'fakeroot',   'dupload',        'autotools-dev',   'dh-make',
+              'reportbug', 'debian-keyring', 'devscripts', 'pbuilder',       'build-essential', 'dh-buildinfo',
+              'quilt',     'dpatch',         'dput',       'debian-goodies', 'gem2deb',         'git-buildpackage',
+              'cdbs',      'dh-autoreconf' ]:
+    ensure => installed,
+  }
+}
diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp
new file mode 100644
index 0000000..c5b4cbc
--- /dev/null
+++ b/manifests/utils/development/git.pp
@@ -0,0 +1,5 @@
+class nodo::utils::development::git {
+  package { [ 'gitk', 'git-gui', 'tig' ]:
+    ensure => installed,
+  }
+}
diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
new file mode 100644
index 0000000..ff2686a
--- /dev/null
+++ b/manifests/utils/development/ide.pp
@@ -0,0 +1,10 @@
+class nodo::utils::development::ide {
+  package { [ 'exuberant-ctags', 'pnopaste-cli', 'ditz', 'mr', 'doxygen', 'agave' ]:
+    ensure => installed,
+  }
+
+  # Not available
+  #package { 'bugs-everywhere']:
+  #  ensure => installed,
+  #}
+}
diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
new file mode 100644
index 0000000..e916889
--- /dev/null
+++ b/manifests/utils/development/puppet.pp
@@ -0,0 +1,5 @@
+class nodo::utils::development::puppet {
+  package { [ 'puppet-lint' ]:
+    ensure => installed,
+  }
+}
diff --git a/manifests/utils/development/python.pp b/manifests/utils/development/python.pp
new file mode 100644
index 0000000..31bf422
--- /dev/null
+++ b/manifests/utils/development/python.pp
@@ -0,0 +1,5 @@
+class nodo::utils::development::python {
+  package { [ 'python-setuptools', 'python-virtualenv' ]:
+    ensure => installed,
+  }
+}
diff --git a/manifests/utils/development/system.pp b/manifests/utils/development/system.pp
new file mode 100644
index 0000000..8f8b749
--- /dev/null
+++ b/manifests/utils/development/system.pp
@@ -0,0 +1,5 @@
+class nodo::utils::development::system {
+  package { [ 'debirf', 'xorriso', 'unetbootin', 'kpartx', 'openocd' ]:
+    ensure => installed,
+  }
+}
diff --git a/manifests/utils/development/vcs.pp b/manifests/utils/development/vcs.pp
new file mode 100644
index 0000000..2787d98
--- /dev/null
+++ b/manifests/utils/development/vcs.pp
@@ -0,0 +1,5 @@
+class nodo::utils::development::vcs {
+  package { [ 'subversion', 'mercurial', 'bzr']:
+    ensure => installed,
+  }
+}
diff --git a/manifests/utils/personal/bundle.pp b/manifests/utils/personal/bundle.pp
index e8cf4b9..c5af867 100644
--- a/manifests/utils/personal/bundle.pp
+++ b/manifests/utils/personal/bundle.pp
@@ -7,4 +7,5 @@ class nodo::utils::personal::bundle {
   include nodo::utils::multimedia
   include nodo::utils::ruby
   include nodo::utils::java
+  include nodo::utils::storage::archive
 }