Coding style for utilities

88 files changed, 884 insertions, 274 deletions

diff --git a/manifests/utils/android.pp b/manifests/utils/android.pp
index 8cb56c8..700f0ae 100644
--- a/manifests/utils/android.pp
+++ b/manifests/utils/android.pp
@@ -1,5 +1,9 @@
 class nodo::utils::android {
-  package { [ 'android-tools-adb', 'android-tools-fastboot', 'android-tools-fsutils' ]:
+  package { [
+    'android-tools-adb',
+    'android-tools-fastboot',
+    'android-tools-fsutils',
+  ]:
     ensure  => present,
   }
 }
diff --git a/manifests/utils/arduino.pp b/manifests/utils/arduino.pp
index 627f86a..bf83f51 100644
--- a/manifests/utils/arduino.pp
+++ b/manifests/utils/arduino.pp
@@ -1,7 +1,11 @@
 class nodo::utils::arduino(
   $ensure = 'present',
 ) {
-  package { [ 'avrdude', 'arduino', 'arduino-mk' ]:
+  package { [
+    'avrdude',
+    'arduino',
+    'arduino-mk',
+  ]:
     ensure => $ensure,
   }
 }
diff --git a/manifests/utils/astronomy.pp b/manifests/utils/astronomy.pp
index 946aaa5..a41ffe6 100644
--- a/manifests/utils/astronomy.pp
+++ b/manifests/utils/astronomy.pp
@@ -1,5 +1,7 @@
 class nodo::utils::astronomy {
-  package { 'stellarium':
+  package { [
+    'stellarium',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/base.pp b/manifests/utils/base.pp
index f7ff201..b17e574 100644
--- a/manifests/utils/base.pp
+++ b/manifests/utils/base.pp
@@ -1,13 +1,38 @@
 class nodo::utils::base {
-  package { [ 'screen',    'less',   'bzip2', 'openssl', 'lynx',         'unzip',
-              'nmap',      'telnet', 'tree',  'whois',   'dosfstools',   'dnsutils',     'secure-delete',
-              'bc',        'lsof',   'wipe',  'vrms',    'nsca-client',  'uuid-runtime',
-              'multitail', 'bash-completion', 'zsh' ]:
+  package { [
+    'screen',
+    'less',
+    'bzip2',
+    'openssl',
+    'lynx',
+    'unzip',
+    'nmap',
+    'telnet',
+    'tree',
+    'whois',
+    'dosfstools',
+    'dnsutils',
+    'secure-delete',
+    'bc',
+    'lsof',
+    'wipe',
+    'vrms',
+    'nsca-client',
+    'uuid-runtime',
+    'multitail',
+    'bash-completion',
+    'zsh',
+  ]:
     ensure => installed,
   }
 
   # Not using right now
-  package { [ 'logcheck', 'logcheck-database', 'denyhosts', 'logwatch' ]:
+  package { [
+    'logcheck',
+    'logcheck-database',
+    'denyhosts',
+    'logwatch',
+  ]:
     ensure => absent,
   }
 }
diff --git a/manifests/utils/bitcoin.pp b/manifests/utils/bitcoin.pp
index c287bbc..6a63300 100644
--- a/manifests/utils/bitcoin.pp
+++ b/manifests/utils/bitcoin.pp
@@ -1,10 +1,14 @@
 class nodo::utils::bitcoin {
-  package { 'electrum':
+  package { [
+    'electrum',
+  ]:
     ensure  => present,
   }
 
   # To be considered
-  #package { 'armory':
+  #package { [
+  #  'armory',
+  #]:
   #  ensure  => present,
   #}
 }
diff --git a/manifests/utils/browser/hardened.pp b/manifests/utils/browser/hardened.pp
index e641a71..47133e1 100644
--- a/manifests/utils/browser/hardened.pp
+++ b/manifests/utils/browser/hardened.pp
@@ -1,9 +1,9 @@
 class nodo::utils::browser::hardened {
   package { [ 
-              'torbrowser-launcher',
-              'xul-ext-requestpolicy',
-              'xul-ext-certificatepatrol',
-            ]:
+    'torbrowser-launcher',
+    'xul-ext-requestpolicy',
+    'xul-ext-certificatepatrol',
+  ]:
     ensure  => present,
   }
 }
diff --git a/manifests/utils/desktop.pp b/manifests/utils/desktop.pp
index 9001b59..0c13478 100644
--- a/manifests/utils/desktop.pp
+++ b/manifests/utils/desktop.pp
@@ -1,6 +1,8 @@
 # Common utilities for desktop
 class nodo::utils::desktop {
-  package { 'cups':
+  package { [
+    'cups',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/desktop/cinnamon.pp b/manifests/utils/desktop/cinnamon.pp
index eefcec6..613c647 100644
--- a/manifests/utils/desktop/cinnamon.pp
+++ b/manifests/utils/desktop/cinnamon.pp
@@ -1,5 +1,7 @@
 class nodo::utils::desktop::cinnamon {
-  package { 'cinnamon':
+  package { [
+    'cinnamon',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/desktop/gnome.pp b/manifests/utils/desktop/gnome.pp
index 3542f34..935555d 100644
--- a/manifests/utils/desktop/gnome.pp
+++ b/manifests/utils/desktop/gnome.pp
@@ -1,5 +1,8 @@
 class nodo::utils::desktop::gnome {
-  package { [ 'gnome', 'gnome-backgrounds' ]:
+  package { [
+    'gnome',
+    'gnome-backgrounds',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/desktop/vnc.pp b/manifests/utils/desktop/vnc.pp
index 86280ff..6f8bb99 100644
--- a/manifests/utils/desktop/vnc.pp
+++ b/manifests/utils/desktop/vnc.pp
@@ -1,5 +1,7 @@
 class nodo::utils::desktop::vnc {
-  package { 'tightvncserver':
+  package { [
+    'tightvncserver',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp
index 7b0e97f..ef2cba2 100644
--- a/manifests/utils/development/debian.pp
+++ b/manifests/utils/development/debian.pp
@@ -1,9 +1,33 @@
 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',   'apt-rdepends', 'po4a',           'vmdebootstrap',   'apt-show-versions',
-              'apt-show-source', 'apt-listchanges', 'apt-forktracer' ]:
+  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',
+    'apt-rdepends',
+    'po4a',
+    'vmdebootstrap',
+    'apt-show-versions',
+    'apt-show-source',
+    'apt-listchanges',
+    'apt-forktracer',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/development/gis.pp b/manifests/utils/development/gis.pp
index 8855166..1a3c412 100644
--- a/manifests/utils/development/gis.pp
+++ b/manifests/utils/development/gis.pp
@@ -1,5 +1,7 @@
 class nodo::utils::development::gis {
-  package { 'qgis':
+  package { [
+    'qgis'
+  ]:
     ensure  => present,
   }
 }
diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp
index b5fc5aa..7052d96 100644
--- a/manifests/utils/development/git.pp
+++ b/manifests/utils/development/git.pp
@@ -1,11 +1,22 @@
 class nodo::utils::development::git {
-  package { [ 'gitk',       'git-gui',  'tig',    'git-cola',          'legit',
-              'git-extras', 'git-flow', 'topgit', 'git-remote-gcrypt', ]:
+  package { [
+    'gitk',
+    'git-gui',
+    'tig',
+    'git-cola',
+    'legit',
+    'git-extras',
+    'git-flow',
+    'topgit',
+    'git-remote-gcrypt',
+  ]:
     ensure => installed,
   }
 
   # Newer packages
-  package { 'git-crypt':
+  package { [
+    'git-crypt',
+  ]:
     ensure => $::lsbdistcodename ? {
       'stretch' => present,
       'sid'     => present,
@@ -14,7 +25,9 @@ class nodo::utils::development::git {
   }
 
   # Wheezy only
-  package { 'git-stuff':
+  package { [
+    'git-stuff',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => present,
       default  => absent,
diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index c1cdc52..9928da5 100644
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -1,29 +1,29 @@
 class nodo::utils::development::ide {
   # In use
   package { [
-              'mr',
-              'hexedit',
-              'ack-grep',
-              'markdown',
-              'python-sphinx',
-              'pelican',
-            ]:
+    'mr',
+    'hexedit',
+    'ack-grep',
+    'markdown',
+    'python-sphinx',
+    'pelican',
+  ]:
     ensure => installed,
   }
 
   # Not in use
   package { [
-              'ttyrec',
-              'bugs-everywhere',
-              'silversearcher-ag',
-              'ticgit',
-              'ticgitweb',
-              'ditz',
-              'pnopaste-cli',
-              'exuberant-ctags',
-              'doxygen',
-              'agave',
-            ]:
+    'ttyrec',
+    'bugs-everywhere',
+    'silversearcher-ag',
+    'ticgit',
+    'ticgitweb',
+    'ditz',
+    'pnopaste-cli',
+    'exuberant-ctags',
+    'doxygen',
+    'agave',
+  ]:
     ensure => absent,
   }
 }
diff --git a/manifests/utils/development/mediawiki.pp b/manifests/utils/development/mediawiki.pp
index 5ba5b55..a92b8d5 100644
--- a/manifests/utils/development/mediawiki.pp
+++ b/manifests/utils/development/mediawiki.pp
@@ -1,5 +1,7 @@
 class nodo::utils::development::mediawiki {
-  package { 'git-mediawiki':
+  package { [
+    'git-mediawiki',
+  ]:
     ensure  => $::lsbdistcodename ? {
       'wheezy' => absent,
       default  => present,
diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
index bf26dbb..0d823a7 100644
--- a/manifests/utils/development/puppet.pp
+++ b/manifests/utils/development/puppet.pp
@@ -1,9 +1,13 @@
 class nodo::utils::development::puppet {
-  package { 'puppet-lint':
+  package { [
+    'puppet-lint',
+  ]:
     ensure => installed,
   }
 
-  package { 'ruby-hiera-puppet':
+  package { [
+    'ruby-hiera-puppet',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => present,
       default  => absent,
diff --git a/manifests/utils/development/python.pp b/manifests/utils/development/python.pp
index 6e38525..036c0ce 100644
--- a/manifests/utils/development/python.pp
+++ b/manifests/utils/development/python.pp
@@ -1,5 +1,11 @@
 class nodo::utils::development::python {
-  package { [ 'python-setuptools', 'python-virtualenv', 'python-yaml', 'python-cheetah', 'python-unidecode' ]:
+  package { [
+    'python-setuptools',
+    'python-virtualenv',
+    'python-yaml',
+    'python-cheetah',
+    'python-unidecode',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/development/reverse.pp b/manifests/utils/development/reverse.pp
index 1770b34..72cf480 100644
--- a/manifests/utils/development/reverse.pp
+++ b/manifests/utils/development/reverse.pp
@@ -1,5 +1,7 @@
 class nodo::utils::development::reverse {
-  package { 'binwalk':
+  package { [
+    'binwalk',
+  ]:
     ensure  => present,
   }
 }
diff --git a/manifests/utils/development/system.pp b/manifests/utils/development/system.pp
index e654e38..9e48a31 100644
--- a/manifests/utils/development/system.pp
+++ b/manifests/utils/development/system.pp
@@ -1,9 +1,17 @@
 class nodo::utils::development::system {
-  package { [ 'debirf', 'xorriso', 'kpartx', 'openocd', 'live-build' ]:
+  package { [
+    'debirf',
+    'xorriso',
+    'kpartx',
+    'openocd',
+    'live-build',
+  ]:
     ensure => installed,
   }
 
-  package { 'unetbootin':
+  package { [
+    'unetbootin',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => present,
       default  => absent,
diff --git a/manifests/utils/development/toolchain.pp b/manifests/utils/development/toolchain.pp
index 9abc130..ca39299 100644
--- a/manifests/utils/development/toolchain.pp
+++ b/manifests/utils/development/toolchain.pp
@@ -1,6 +1,13 @@
 class nodo::utils::development::toolchain {
-  package { [ 'emdebian-archive-keyring', 'xapt',       'pdebuild-cross', 'scratchbox2',
-              'qemu-user-static',         'multistrap', 'fakechroot' ]:
+  package { [
+    'emdebian-archive-keyring',
+    'xapt',
+    'pdebuild-cross',
+    'scratchbox2',
+    'qemu-user-static',
+    'multistrap',
+    'fakechroot',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/development/toolchain/arm.pp b/manifests/utils/development/toolchain/arm.pp
index 911f5cb..6f4334c 100644
--- a/manifests/utils/development/toolchain/arm.pp
+++ b/manifests/utils/development/toolchain/arm.pp
@@ -15,9 +15,15 @@ class nodo::utils::development::toolchain::arm(
   #  },
   #}
 
-  package { [ 'linux-libc-dev-armel-cross', 'libc6-armel-cross',         'libc6-dev-armel-cross',
-              'binutils-arm-linux-gnueabi', 'gcc-4.4-arm-linux-gnueabi', 'g++-4.4-arm-linux-gnueabi',
-              'gdb-arm-linux-gnueabi' ]:
+  package { [
+    'linux-libc-dev-armel-cross',
+    'libc6-armel-cross',
+    'libc6-dev-armel-cross',
+    'binutils-arm-linux-gnueabi',
+    'gcc-4.4-arm-linux-gnueabi',
+    'g++-4.4-arm-linux-gnueabi',
+    'gdb-arm-linux-gnueabi',
+  ]:
     ensure  => $ensure,
     require => Apt::Sources_list['emdebian.list'],
   }
diff --git a/manifests/utils/development/vcs.pp b/manifests/utils/development/vcs.pp
index 2787d98..ce24148 100644
--- a/manifests/utils/development/vcs.pp
+++ b/manifests/utils/development/vcs.pp
@@ -1,5 +1,9 @@
 class nodo::utils::development::vcs {
-  package { [ 'subversion', 'mercurial', 'bzr']:
+  package { [
+    'subversion',
+    'mercurial',
+    'bzr',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp
index 2258554..dcdc9d4 100644
--- a/manifests/utils/development/virtual.pp
+++ b/manifests/utils/development/virtual.pp
@@ -1,28 +1,40 @@
 class nodo::utils::development::virtual {
-  package { 'vagrant':
+  package { [
+    'vagrant',
+  ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => absent,
        default  => latest,
     }
   }
 
-  package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm' ]:
+  package { [
+    'virtualbox-guest-additions-iso',
+    'qemu',
+    'qemu-kvm',
+  ]:
     ensure => latest,
   }
 
   # TODO: wait for jessie release
-  #package { 'docker.io':
+  #package { [
+  #  'docker.io',
+  #]:
   #  ensure => installed,
   #}
 
   # TODO: wait for stretch release
-  #package { 'packer':
+  #package { [
+  #  'packer',
+  #]:
   #  ensure => installed,
   #}
 
   # TODO: We're not managing this package as we're favouring the
   #       wheezy-backports virtualbox which doesn't needs it.
-  #package { 'virtualbox-fuse':
+  #package { [
+  #  'virtualbox-fuse',
+  #]:
   #  ensure  => present,
   #}
 }
diff --git a/manifests/utils/development/web.pp b/manifests/utils/development/web.pp
index 1a7effe..911c634 100644
--- a/manifests/utils/development/web.pp
+++ b/manifests/utils/development/web.pp
@@ -1,5 +1,8 @@
 class nodo::utils::development::web {
-  package { [ 'apache2-utils', 'yui-compressor' ]:
+  package { [
+    'apache2-utils',
+    'yui-compressor',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/dns.pp b/manifests/utils/dns.pp
index 57bb992..01a472e 100644
--- a/manifests/utils/dns.pp
+++ b/manifests/utils/dns.pp
@@ -1,5 +1,7 @@
 class nodo::utils::dns {
-  package { 'dnstop':
+  package { [
+    'dnstop',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/firmware.pp b/manifests/utils/firmware.pp
index ccdae37..1be0540 100644
--- a/manifests/utils/firmware.pp
+++ b/manifests/utils/firmware.pp
@@ -1,5 +1,7 @@
 class nodo::utils::firmware {
-  package { 'firmware-linux':
+  package { [
+    'firmware-linux',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/firmware/iwlwifi.pp b/manifests/utils/firmware/iwlwifi.pp
index 0dd761a..4bca68d 100644
--- a/manifests/utils/firmware/iwlwifi.pp
+++ b/manifests/utils/firmware/iwlwifi.pp
@@ -1,6 +1,8 @@
 # Wireless support
 class nodo::utils::firmware::iwlwifi {
-  package { 'firmware-iwlwifi':
+  package { [
+    'firmware-iwlwifi',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/firmware/ralink.pp b/manifests/utils/firmware/ralink.pp
index 8c60eae..f22bd4c 100644
--- a/manifests/utils/firmware/ralink.pp
+++ b/manifests/utils/firmware/ralink.pp
@@ -1,5 +1,7 @@
 class nodo::utils::firmware::ralink {
-  package { 'firmware-ralink':
+  package { [
+    'firmware-ralink',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/firmware/realtek.pp b/manifests/utils/firmware/realtek.pp
index 77d916a..b310c28 100644
--- a/manifests/utils/firmware/realtek.pp
+++ b/manifests/utils/firmware/realtek.pp
@@ -1,5 +1,7 @@
 class nodo::utils::firmware::realtek {
-  package { 'firmware-realtek':
+  package { [
+    'firmware-realtek',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/firmware/tools.pp b/manifests/utils/firmware/tools.pp
index 413a593..288bd54 100644
--- a/manifests/utils/firmware/tools.pp
+++ b/manifests/utils/firmware/tools.pp
@@ -1,5 +1,9 @@
 class nodo::utils::firmware::tools {
-  package { [ 'flashrom', 'nvramtool', 'nvram-wakeup' ]:
+  package { [
+    'flashrom',
+    'nvramtool',
+    'nvram-wakeup',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/grub.pp b/manifests/utils/grub.pp
index 1d24458..3dfe8ea 100644
--- a/manifests/utils/grub.pp
+++ b/manifests/utils/grub.pp
@@ -1,5 +1,7 @@
 class nodo::utils::grub {
-  package { 'grub2':
+  package { [
+    'grub2',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/hamradio.pp b/manifests/utils/hamradio.pp
index 6915650..8b72a32 100644
--- a/manifests/utils/hamradio.pp
+++ b/manifests/utils/hamradio.pp
@@ -1,5 +1,7 @@
 class nodo::utils::hamradio {
-  package { 'aldo':
+  package { [
+    'aldo',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/http.pp b/manifests/utils/http.pp
index b2cc26a..3a39ff5 100644
--- a/manifests/utils/http.pp
+++ b/manifests/utils/http.pp
@@ -1,5 +1,7 @@
 class nodo::utils::http {
-  package { [ 'curl' ]:
+  package { [
+    'curl',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp
index d5035c2..4367627 100644
--- a/manifests/utils/interface.pp
+++ b/manifests/utils/interface.pp
@@ -1,19 +1,47 @@
 class nodo::utils::interface inherits nodo::utils::interface::console {
   # Interface
-  package { [ 'awesome',          'eterm',             'weather-util', 'gnome-terminal', 'conky',
-              'xterm',            'xscreensaver',      'thunar',       'x11-apps',       'conky-all',
-              'gtk-theme-switch', 'gtk-smooth-themes', 'rxvt',         'lxappearance',   'xdotool',
-              'xtitle',           'xclip',             'pcmanfm',      'awesome-extra',  'numlockx',
-              'metar',            'wmctrl',            'xsel',         'xinput',         'i3' ]:
+  package { [
+    'awesome',
+    'eterm',
+    'weather-util',
+    'gnome-terminal',
+    'conky',
+    'xterm',
+    'xscreensaver',
+    'thunar',
+    'x11-apps',
+    'conky-all',
+    'gtk-theme-switch',
+    'gtk-smooth-themes',
+    'rxvt',
+    'lxappearance',
+    'xdotool',
+    'xtitle',
+    'xclip',
+    'pcmanfm',
+    'awesome-extra',
+    'numlockx',
+    'metar',
+    'wmctrl',
+    'xsel',
+    'xinput',
+    'i3',
+  ]:
     ensure => installed,
   }
 
   # Fonts
-  package { [ 'xfonts-terminus', 'ttf-bitstream-vera', 'fonts-inconsolata' ]:
+  package { [
+    'xfonts-terminus',
+    'ttf-bitstream-vera',
+    'fonts-inconsolata',
+  ]:
     ensure => installed,
   }
 
-  package { 'rxvt-unicode':
+  package { [
+    'rxvt-unicode',
+  ]:
     ensure => present,
     # We need a workaround for this:
     # https://bbs.archlinux.org/viewtopic.php?id=50647
@@ -24,7 +52,9 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
     }
   }
 
-  package { "terminology":
+  package { [
+    'terminology',
+  ]:
     ensure  => $::lsbdistcodename ? {
       'wheezy' => absent,
       default  => present,
@@ -32,12 +62,17 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
   }
 
   # Old stuff
-  package { [ 'conkyforecast', 'fluxbox' ]:
+  package { [
+    'conkyforecast',
+    'fluxbox',
+  ]:
     ensure => absent,
   }
 
   # To be considered
-  #package { 'needrestart-session':
+  #package { 
+  #  'needrestart-session',
+  #]:
   #  ensure  => present,
   #}
 }
diff --git a/manifests/utils/interface/console.pp b/manifests/utils/interface/console.pp
index 7aea43b..5451952 100644
--- a/manifests/utils/interface/console.pp
+++ b/manifests/utils/interface/console.pp
@@ -1,5 +1,12 @@
 class nodo::utils::interface::console {
-  package { [ 'mc', 'tmux', 'moreutils', 'powerline', 'fonts-powerline', 'ranger' ]:
+  package { [
+    'mc',
+    'tmux',
+    'moreutils',
+    'powerline',
+    'fonts-powerline',
+    'ranger',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/java.pp b/manifests/utils/java.pp
index bb86593..ec1220f 100644
--- a/manifests/utils/java.pp
+++ b/manifests/utils/java.pp
@@ -1,10 +1,15 @@
 class nodo::utils::java {
   # Java
-  package { [ 'sun-java6-jre' ]:
+  package { [
+    'sun-java6-jre',
+  ]:
     ensure => absent,
   }
 
-  package { [ 'default-jre', 'openjdk-7-jre-headless' ]:
+  package { [
+    'default-jre',
+    'openjdk-7-jre-headless',
+  ]:
     ensure => present,
   }
 
diff --git a/manifests/utils/laptop/debian.pp b/manifests/utils/laptop/debian.pp
index 5f5c0c7..d45ec4c 100644
--- a/manifests/utils/laptop/debian.pp
+++ b/manifests/utils/laptop/debian.pp
@@ -2,15 +2,50 @@
 class nodo::utils::laptop::debian {
   include nodo::utils::storage::layer
 
-  package { [ 'cpufrequtils',  'module-assistant',  'wireless-tools',
-              'wpasupplicant', 'ekiga',             'mumble',
-              'arp-scan',      'usb-modeswitch',
-              'iw',            'wvdial',            'wavemon',
-              'btscanner',     'laptop-mode-tools', 'acpi-support',
-              'tftp',          'sharutils',         'wireshark',
-              'weplab',        'wpagui',
-              'gnokii',        'sslstrip',          'uswsusp',
-              'tcpdump',       'tshark' ]:
+  # Power management
+  package { [
+    'cpufrequtils',
+    'acpi-support',
+    'laptop-mode-tools',
+  ]:
     ensure => installed,
   }
+
+  # Wireless
+  package { [
+    'wireless-tools',
+    'wpasupplicant',
+  ]:
+    ensure => installed,
+  }
+
+  # Network layer
+  #package { [
+  #  'arp-scan',
+  #  'wavemon',
+  #  'wvdial',
+  #  'iw',
+  #  'btscanner',
+  #  'weplab',
+  #  'wireshark',
+  #  'tftp',
+  #  'tcpdump',
+  #  'tshark',
+  #  'wpagui',
+  #  'sslstrip',
+  #]:
+  #  ensure => installed,
+  #}
+
+  # Misc
+  #package { [
+  #  'module-assistant', 
+  #  'ekiga',
+  #  'mumble',
+  #  'usb-modeswitch',
+  #  'gnokii',
+  #  'sharutils', 
+  #]:
+  #  ensure => installed,
+  #}
 }
diff --git a/manifests/utils/laptop/thinkpad/battery.pp b/manifests/utils/laptop/thinkpad/battery.pp
index 9073f04..c8fdb52 100644
--- a/manifests/utils/laptop/thinkpad/battery.pp
+++ b/manifests/utils/laptop/thinkpad/battery.pp
@@ -2,11 +2,15 @@
 class nodo::utils::laptop::thinkpad::battery(
   $implementation = 'acpi-call',
 ) {
-  package { 'tlp':
+  package { [
+    'tlp',
+  ]:
     ensure => present,
   }
 
-  package { "${implementation}-dkms":
+  package { [
+    "${implementation}-dkms",
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/microcode/intel.pp b/manifests/utils/microcode/intel.pp
index b4d12bc..7e9c565 100644
--- a/manifests/utils/microcode/intel.pp
+++ b/manifests/utils/microcode/intel.pp
@@ -2,7 +2,9 @@ class nodo::utils::microcode::intel {
   # Microcode
   # See https://wiki.archlinux.org/index.php/Microcode
   #     http://en.gentoo-wiki.com/wiki/Intel_Microcode
-  package { 'intel-microcode':
+  package { [
+    'intel-microcode',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 829cd3b..c99a896 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -1,25 +1,56 @@
 # Multimedia utilities
 class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
   # Multimedia
-  package { [ 'alsa-tools-gui',  'mp3blaster',          'netpbm',
-              'audacious',       'qjackctl',
-              'gimp',            'xine-ui',             'v4l-utils',          'inkscape',
-              'easytag',         'gstreamer-tools',     'vlc',                'audacity',
-              'opencubicplayer', 'libasound2-plugins',  'lame',               'geeqie',
-              'cbrpager',        'llgal',               'darksnow',           'pavucontrol',
-              'picard',          'ffmpeg2theora',       'oggfwd',             'jhead',
-              'gxine',           'totem',               'faad',               'gmtp',
-              'gphotofs',        'jmtpfs' ]:
+  package { [
+    'alsa-tools-gui',
+    'mp3blaster',
+    'netpbm',
+    'audacious',
+    'qjackctl',
+    'gimp',
+    'xine-ui',
+    'v4l-utils',
+    'inkscape',
+    'easytag',
+    'gstreamer-tools',
+    'vlc',
+    'audacity',
+    'opencubicplayer',
+    'libasound2-plugins',
+    'lame',
+    'geeqie',
+    'cbrpager',
+    'llgal',
+    'darksnow',
+    'pavucontrol',
+    'picard',
+    'ffmpeg2theora',
+    'oggfwd',
+    'jhead',
+    'gxine',
+    'totem',
+    'faad',
+    'gmtp',
+    'gphotofs',
+    'jmtpfs',
+  ]:
     ensure => installed,
   }
 
   # Old stuff
-  package { [ 'amarok', 'moc', 'cmus' ]:
+  package { [
+    'amarok',
+    'moc',
+    'cmus',
+  ]:
     ensure => purged,
   }
 
   # Squeeze only
-  package { [ 'tucan', 'orpheus' ]:
+  package { [
+    'tucan',
+    'orpheus',
+  ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => installed,
       default   => purged,
@@ -27,7 +58,11 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
   }
 
   # Wheezy only
-  package { [ 'landell', 'gqview', 'mencoder' ]:
+  package { [
+    'landell',
+    'gqview',
+    'mencoder',
+  ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => absent,
       'wheezy'  => installed,
diff --git a/manifests/utils/multimedia/cdplayer.pp b/manifests/utils/multimedia/cdplayer.pp
index b006441..05e88ad 100644
--- a/manifests/utils/multimedia/cdplayer.pp
+++ b/manifests/utils/multimedia/cdplayer.pp
@@ -1,6 +1,10 @@
 class nodo::utils::multimedia::cdplayer {
   # CD writers and extractors
-  package { [ 'mcdp', 'cdtool', 'cd-discid' ]:
+  package { [
+    'mcdp',
+    'cdtool',
+    'cd-discid',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/multimedia/downloaders.pp b/manifests/utils/multimedia/downloaders.pp
index 26e761c..40d610f 100644
--- a/manifests/utils/multimedia/downloaders.pp
+++ b/manifests/utils/multimedia/downloaders.pp
@@ -1,6 +1,8 @@
 class nodo::utils::multimedia::downloaders {
   # Jessie onwards
-  package { 'youtube-dl':
+  package { [
+    'youtube-dl',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => absent,
       default  => present,
diff --git a/manifests/utils/multimedia/extractors.pp b/manifests/utils/multimedia/extractors.pp
index 19d3332..a3fde3c 100644
--- a/manifests/utils/multimedia/extractors.pp
+++ b/manifests/utils/multimedia/extractors.pp
@@ -1,5 +1,9 @@
 class nodo::utils::multimedia::extractors {
-  package { [ 'rar', 'unrar', 'zip' ]:
+  package { [
+    'rar',
+    'unrar',
+    'zip',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/multimedia/gnash.pp b/manifests/utils/multimedia/gnash.pp
index 3cd564f..5283534 100644
--- a/manifests/utils/multimedia/gnash.pp
+++ b/manifests/utils/multimedia/gnash.pp
@@ -1,9 +1,13 @@
 class nodo::utils::multimedia::gnash {
-  package { 'flashplugin-nonfree':
+  package { [
+    'flashplugin-nonfree',
+  ]:
     ensure => purged,
   }
 
-  package { 'browser-plugin-gnash':
+  package { [
+    'browser-plugin-gnash',
+  ]:
     ensure => present,
   }
 
diff --git a/manifests/utils/multimedia/mediacenter.pp b/manifests/utils/multimedia/mediacenter.pp
index 362e4f3..d3388b2 100644
--- a/manifests/utils/multimedia/mediacenter.pp
+++ b/manifests/utils/multimedia/mediacenter.pp
@@ -1,5 +1,10 @@
 class nodo::utils::multimedia::mediacenter {
-  package { [ 'xbmc', 'upnp-inspector', 'gupnp-tools', 'djmount' ]:
+  package { [
+    'xbmc',
+    'upnp-inspector',
+    'gupnp-tools',
+    'djmount',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp
index 04709ed..d779524 100644
--- a/manifests/utils/multimedia/minimal.pp
+++ b/manifests/utils/multimedia/minimal.pp
@@ -1,9 +1,15 @@
 class nodo::utils::multimedia::minimal {
-  package { [ 'alsa-utils', 'mpg123', 'mediainfo' ]:
+  package { [
+    'alsa-utils',
+    'mpg123',
+    'mediainfo',
+  ]:
     ensure => installed,
   }
 
-  package { 'mplayer':
+  package { [
+    'mplayer',
+  ]:
     ensure  => present,
     name    => $::lsbdistcodename ? {
       'wheezy' => 'mplayer',
diff --git a/manifests/utils/multimedia/ripper.pp b/manifests/utils/multimedia/ripper.pp
index 9fcd12f..c97908d 100644
--- a/manifests/utils/multimedia/ripper.pp
+++ b/manifests/utils/multimedia/ripper.pp
@@ -1,6 +1,16 @@
 class nodo::utils::multimedia::ripper {
   # CD writers and extractors
-  package { [ 'ripit', 'asunder', 'wodim', 'genisoimage', 'dvd+rw-tools', 'cdrskin', 'cd5', 'eject', 'cdrdao' ]:
+  package { [
+    'ripit',
+    'asunder',
+    'wodim',
+    'genisoimage',
+    'dvd+rw-tools',
+    'cdrskin',
+    'cd5',
+    'eject',
+    'cdrdao',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/multimedia/scanner.pp b/manifests/utils/multimedia/scanner.pp
index 5b5302a..abe8b64 100644
--- a/manifests/utils/multimedia/scanner.pp
+++ b/manifests/utils/multimedia/scanner.pp
@@ -1,5 +1,7 @@
 class nodo::utils::multimedia::scanner {
-  package { 'xsane':
+  package { [
+    'xsane',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp
index a0d644d..cf3a712 100644
--- a/manifests/utils/multimedia/shockwave.pp
+++ b/manifests/utils/multimedia/shockwave.pp
@@ -1,6 +1,8 @@
 class nodo::utils::multimedia::shockwave {
   # See also https://github.com/i-rinat/freshplayerplugin
-  package { 'flashplugin-nonfree':
+  package { [
+    'flashplugin-nonfree',
+  ]:
     ensure => installed ,
   }
 
diff --git a/manifests/utils/multimedia/studio.pp b/manifests/utils/multimedia/studio.pp
index 8aadf22..742cf9c 100644
--- a/manifests/utils/multimedia/studio.pp
+++ b/manifests/utils/multimedia/studio.pp
@@ -1,15 +1,29 @@
 class nodo::utils::multimedia::studio {
-  package { [ 'ardour', 'hydrogen', 'mixxx' ]:
+  package { [
+    'ardour',
+    'hydrogen',
+    'mixxx',
+  ]:
     ensure => installed,
   }
 
   # Instruments
-  package { [ 'amsynth', 'guitarix', 'rakarrack', 'tuxguitar-jack' ]:
+  package { [
+    'amsynth',
+    'guitarix',
+    'rakarrack',
+    'tuxguitar-jack',
+  ]:
     ensure => installed,
   }
 
   # LADSPA plugins
-  package { [ 'fil-plugins', 'swh-plugins', 'tap-plugins', 'invada-studio-plugins-ladspa' ]:
+  package { [
+    'fil-plugins',
+    'swh-plugins',
+    'tap-plugins',
+    'invada-studio-plugins-ladspa',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 1d9d876..ac14727 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -1,18 +1,43 @@
 class nodo::utils::network inherits nodo::utils::network::minimal {
   # Network
-  package { [ 'mutt',               'offlineimap',           
-              'newsbeuter',         'nicotine',              'sshfs',
-              'bogofilter',         'fetchmail',             'procmail',
-              'msmtp',              'mairix',                'notmuch-mutt',
-              'links',              'elinks',                'iceweasel',
-              'openvpn',            'pssh',                  'mutt-patched',
-              'pidgin',             'pidgin-encryption',     'pidgin-openpgp',
-              'pidgin-otr',         'pidgin-privacy-please', 'pidgin-plugin-pack',
-              'sslscan',            'muttprofile',           'connect-proxy',
-              'avahi-discover',     'mdns-scan',             'davfs2',
-              'surfraw',            'w3m',                   'mailplate',
-              'geoip-bin',          'ssvnc',
-              'rig',                'sup-mail' ]:
+  package { [
+    'mutt',
+    'offlineimap',
+    'newsbeuter',
+    'nicotine',
+    'sshfs',
+    'bogofilter',
+    'fetchmail',
+    'procmail',
+    'msmtp',
+    'mairix',
+    'notmuch-mutt',
+    'links',
+    'elinks',
+    'iceweasel',
+    'openvpn',
+    'pssh',
+    'mutt-patched',
+    'pidgin',
+    'pidgin-encryption',
+    'pidgin-openpgp',
+    'pidgin-otr',
+    'pidgin-privacy-please',
+    'pidgin-plugin-pack',
+    'sslscan',
+    'muttprofile',
+    'connect-proxy',
+    'avahi-discover',
+    'mdns-scan',
+    'davfs2',
+    'surfraw',
+    'w3m',
+    'mailplate',
+    'geoip-bin',
+    'ssvnc',
+    'rig',
+    'sup-mail',
+  ]:
     ensure => installed,
   }
 
@@ -24,33 +49,59 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   }
 
   # Using the addon directly
-  package { 'iceweasel-vimperator':
+  package { [
+    'iceweasel-vimperator',
+  ]:
     ensure => absent,
   }
 
   # Old packages
   # About firegpg, see http://tails.boum.org/bugs/FireGPG_may_be_unsafe/
   # About adblock plus, see http://www.theverge.com/2015/2/2/7963577/google-ads-get-through-adblock
-  package { [ 'silc', 'twinkle', 'konqueror', 'transmission', 'amule', 'epiphany-browser',
-              'bittorrent', 'bittornado', 'xul-ext-firegpg',  'xul-ext-adblock-plus' ]:
+  package { [
+    'silc',
+    'twinkle',
+    'konqueror',
+    'transmission',
+    'amule',
+    'epiphany-browser',
+    'bittorrent',
+    'bittornado',
+    'xul-ext-firegpg',
+    'xul-ext-adblock-plus',
+  ]:
     ensure => absent,
   }
 
   # Squeeze (or newer) packages
   if $::lsbdistcodename != 'lenny' {
-    package { [ 'xul-ext-monkeysphere', 'libical-parser-perl',
-                'maildir-utils',        'xul-ext-noscript',
-                'xul-ext-firebug',      'msva-perl',        'chromium-l10n' ]:
+    package { [ 
+      'xul-ext-monkeysphere',
+      'libical-parser-perl',
+      'maildir-utils',
+      'xul-ext-noscript',
+      'xul-ext-firebug',
+      'msva-perl',
+      'chromium-l10n',
+    ]:
       ensure => installed,
     }
   }
 
   # Not using right now
-  package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey', 'torchat' ]:
+  package { [
+    'xul-ext-torbutton',
+    'vidalia',
+    'xul-ext-perspectives',
+    'xul-ext-greasemonkey',
+    'torchat',
+  ]:
     ensure => absent,
   }
 
-  package { 'chromium':
+  package { [
+    'chromium',
+  ]:
     ensure  => present,
     name    => $::lsbdistcodename ? {
       'wheezy' => 'chromium-browser',
@@ -60,24 +111,37 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
 
   # Wheezy (or newer) packages
   if $::lsbdistcodename != 'squeeze' {
-    package { [ 'xul-ext-https-everywhere', 'xul-ext-refcontrol' ]:
+    package { [ 
+      'xul-ext-https-everywhere',
+      'xul-ext-refcontrol',
+    ]:
       ensure => installed,
     }
 
     # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686087
     #     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705999
-    package { [ 'xul-ext-cookie-monster', 'xul-ext-quickproxy' ]:
+    package { [
+      'xul-ext-cookie-monster',
+      'xul-ext-quickproxy',
+    ]:
       ensure => absent,
     }
   }
 
   # Jessie ownwards
-  #package { [ 'xul-ext-pentadactyl', 'xul-ext-stylish' ]:
+  #package { [
+  #  'xul-ext-pentadactyl',
+  #  'xul-ext-stylish',
+  #]:
   #  ensure => installed,
   #}
 
   # Wheezy only
-  package { [ 'gftp', 'icedtea6-plugin', 'luakit' ]:
+  package { [
+    'gftp',
+    'icedtea6-plugin',
+    'luakit',
+  ]:
     ensure => $::lsbdistcodename ? {
       'lenny' => present,
       default => absent,
@@ -85,7 +149,9 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   }
 
   # Lenny only
-  package { [ 'mozilla-firefox-adblock' ]:
+  package { [
+    'mozilla-firefox-adblock',
+  ]:
     ensure => $::lsbdistcodename ? {
       'lenny' => present,
       default => absent,
diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp
index 2bcb97c..670ffcb 100644
--- a/manifests/utils/network/analyzer.pp
+++ b/manifests/utils/network/analyzer.pp
@@ -1,9 +1,19 @@
 class nodo::utils::network::analyzer {
-  package { [ 'tshark', 'arping', 'fping', 'oping', 'tcptraceroute', 'tcpstat', 'iperf' ]:
+  package { [
+    'tshark',
+    'arping',
+    'fping',
+    'oping',
+    'tcptraceroute',
+    'tcpstat',
+    'iperf',
+  ]:
     ensure => installed,
   }
 
-  package { 'zmap':
+  package { [
+    'zmap',
+  ]:
     ensure  => $::lsbdistcodename ? {
       'squeeze' => absent,
       default   => present,
@@ -11,12 +21,17 @@ class nodo::utils::network::analyzer {
   }
 
   # https://www.linode.com/docs/networking/diagnosing-network-issues-with-mtr
-  package { 'mtr':
+  package { [
+    'mtr',
+  ]:
     ensure  => present,
   }
 
   # Not in use
-  package { [ 'heartbleeder', 'psad' ]:
+  package { [
+    'heartbleeder',
+    'psad',
+  ]:
     ensure => absent,
   }
 }
diff --git a/manifests/utils/network/irssi.pp b/manifests/utils/network/irssi.pp
index e0a94b5..ac2b59a 100644
--- a/manifests/utils/network/irssi.pp
+++ b/manifests/utils/network/irssi.pp
@@ -1,23 +1,38 @@
 class nodo::utils::network::irssi {
-  package { [ 'irssi', 'bitlbee', 'irssi-scripts' ]:
+  package { [
+    'irssi',
+    'bitlbee',
+    'irssi-scripts',
+  ]:
     ensure => installed,
   }
 
-  package { [ 'ttytter', 'libterm-readkey-perl' ]:
+  package { [
+    'ttytter',
+    'libterm-readkey-perl',
+  ]:
     ensure => present,
   }
 
-  package { 'irssi-plugin-otr':
+  package { [
+    'irssi-plugin-otr',
+  ]:
     ensure => installed,
   }
 
   # These are needed by the cap_sasl.pl irssi plugin
-  package { [ 'libcrypt-blowfish-perl', 'libcrypt-dh-perl', 'libcrypt-openssl-bignum-perl' ]:
+  package { [
+    'libcrypt-blowfish-perl',
+    'libcrypt-dh-perl',
+    'libcrypt-openssl-bignum-perl',
+  ]:
     ensure => installed,
   }
 
   # Not on wheezy
-  package { 'irssi-plugin-silc':
+  package { [
+    'irssi-plugin-silc',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => absent,
       'jessie' => absent,
diff --git a/manifests/utils/network/minimal.pp b/manifests/utils/network/minimal.pp
index 8c0145b..940c90c 100644
--- a/manifests/utils/network/minimal.pp
+++ b/manifests/utils/network/minimal.pp
@@ -2,13 +2,19 @@ class nodo::utils::network::minimal inherits nodo::utils::http {
   include nodo::utils::network::irssi
   include nodo::utils::network::torrent
 
-  package { [ 'unison', 'httrack', 'zsync' ]:
+  package { [
+    'unison',
+    'httrack',
+    'zsync',
+  ]:
     ensure => installed,
   }
 
   # For backwards compatibility
   # See addversionno unison config parameter
-  package { 'unison2.32.52':
+  package { [
+    'unison2.32.52',
+  ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => present,
       default  => absent,
diff --git a/manifests/utils/network/nfs.pp b/manifests/utils/network/nfs.pp
index 9abe38e..19072fa 100644
--- a/manifests/utils/network/nfs.pp
+++ b/manifests/utils/network/nfs.pp
@@ -1,5 +1,7 @@
 class nodo::utils::network::nfs {
-  package { 'nfs-common':
+  package { [
+    'nfs-common',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network/pppoe.pp b/manifests/utils/network/pppoe.pp
index 9d9223c..db4e085 100644
--- a/manifests/utils/network/pppoe.pp
+++ b/manifests/utils/network/pppoe.pp
@@ -1,5 +1,9 @@
 class nodo::utils::network::pppoe {
-  package { [ 'ppp', 'pppoe', 'pppoeconf' ]:
+  package { [
+    'ppp',
+    'pppoe',
+    'pppoeconf',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/network/pptp.pp b/manifests/utils/network/pptp.pp
index 1a9a25d..bdd4776 100644
--- a/manifests/utils/network/pptp.pp
+++ b/manifests/utils/network/pptp.pp
@@ -1,5 +1,7 @@
 class nodo::utils::network::pptp {
-  package { 'pptp-linux':
+  package { [
+    'pptp-linux',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network/samba.pp b/manifests/utils/network/samba.pp
index 7e19ed3..ee9fc82 100644
--- a/manifests/utils/network/samba.pp
+++ b/manifests/utils/network/samba.pp
@@ -1,5 +1,9 @@
 class nodo::utils::network::samba {
-  package { [ 'smbclient', 'cifs-utils', 'nbtscan' ]:
+  package { [
+    'smbclient',
+    'cifs-utils',
+    'nbtscan',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network/snort.pp b/manifests/utils/network/snort.pp
index 0908c58..8b14413 100644
--- a/manifests/utils/network/snort.pp
+++ b/manifests/utils/network/snort.pp
@@ -1,5 +1,7 @@
 class nodo::utils::network::snort {
-  package { 'snort':
+  package { [
+    'snort',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/network/torrent.pp b/manifests/utils/network/torrent.pp
index 154b24c..027e2b8 100644
--- a/manifests/utils/network/torrent.pp
+++ b/manifests/utils/network/torrent.pp
@@ -1,5 +1,7 @@
 class nodo::utils::network::torrent {
-  package { [ 'rtorrent' ]:
+  package { [
+    'rtorrent',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/network/wicd.pp b/manifests/utils/network/wicd.pp
index cb19af3..898e043 100644
--- a/manifests/utils/network/wicd.pp
+++ b/manifests/utils/network/wicd.pp
@@ -1,5 +1,9 @@
 class nodo::utils::network::wicd {
-  package { [ 'wicd', 'wicd-curses', 'wicd-gtk' ]:
+  package { [
+    'wicd',
+    'wicd-curses',
+    'wicd-gtk',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index 6c2b5a7..978efe8 100644
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -1,28 +1,60 @@
 class nodo::utils::office {
   # Office
-  package { [ 'vim-gtk',             'gobby',      'libreoffice',
-              'sc',                  'antiword',   'unrtf',
-              'pandoc',              'wyrd',
-              'gnucash',             'worklog',    'pdftk',
-              'fbreader',            'pdfgrep',
-              'mat',                 'evince',
-              'aewan',               'autocutsel',
-              'parcellite' ]:
+  package { [
+    'vim-gtk',
+    'gobby',
+    'libreoffice',
+    'sc',
+    'antiword',
+    'unrtf',
+    'pandoc',
+    'wyrd',
+    'gnucash',
+    'worklog',
+    'pdftk',
+    'fbreader',
+    'pdfgrep',
+    'mat',
+    'evince',
+    'aewan',
+    'autocutsel',
+    'parcellite',
+  ]:
     ensure => installed,
   }
 
   # Finance
-  package { [ 'ledger', 'clipf', 'misery' ]:
+  package { [
+    'ledger',
+    'clipf',
+    'misery',
+  ]:
     ensure  => present,
   }
 
   # LaTeX
-  package { [ 'texlive-latex-base',  'texlive-latex-recommended', 'texlive-latex-extra', 'texlive-fonts-extra', 'vim-latexsuite', 'pdfjam' ]:
+  package { [
+    'texlive-latex-base',
+    'texlive-latex-recommended',
+    'texlive-latex-extra',
+    'texlive-fonts-extra',
+    'vim-latexsuite',
+    'pdfjam',
+  ]:
     ensure => present,
   }
 
   # Not in use
-  package { [ 'kalarm', 'gnumeric', 'jekyll', 'taskwarrior', 'vit', 'hledger', 'dia', 'calibre' ]:
+  package { [
+    'kalarm',
+    'gnumeric',
+    'jekyll',
+    'taskwarrior',
+    'vit',
+    'hledger',
+    'dia',
+    'calibre',
+  ]:
     ensure  => absent,
   }
 }
diff --git a/manifests/utils/office/hp.pp b/manifests/utils/office/hp.pp
index 0ca7241..193eb46 100644
--- a/manifests/utils/office/hp.pp
+++ b/manifests/utils/office/hp.pp
@@ -1,5 +1,7 @@
 class nodo::utils::office::hp {
-  package { 'hplip-gui':
+  package { [
+    'hplip-gui',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/personal/debian.pp b/manifests/utils/personal/debian.pp
index 74e2eda..ea8550a 100644
--- a/manifests/utils/personal/debian.pp
+++ b/manifests/utils/personal/debian.pp
@@ -6,28 +6,50 @@ class nodo::utils::personal::debian {
   include nodo::utils::storage::crypto
 
   # System
-  package { [ 'libpam-mount',  'gawk',
-              'laptop-detect', 'mtp-tools' ]:
+  package { [
+    'libpam-mount',
+    'gawk',
+    'laptop-detect',
+    'mtp-tools',
+  ]:
     ensure => installed,
   }
 
   # Misc
-  package { [ 'fortunes-br', 'recode', 'p7zip-full', 'funcoeszz', 'detox' ]:
+  package { [
+    'fortunes-br',
+    'recode',
+    'p7zip-full',
+    'funcoeszz',
+    'detox',
+  ]:
     ensure => installed,
   }
 
   # Console window managers
-  #package { [ 'screenie', 'iselect', 'byobu' ]:
+  #package { [
+  #  'screenie',
+  #  'iselect',
+  #  'byobu',
+  # ]:
   #  ensure => installed,
   #}
 
   # Console interfaces
-  #package { [ 'gpm', 'fbterm', 'fbiterm' ]:
+  #package { [
+  #  'gpm',
+  #  'fbterm',
+  #  'fbiterm',
+  #]:
   #  ensure => installed,
   #}
 
   # Non-free, old, buggy or absent in newer releases
-  package { [ 'mtpfs', 'unrar', 'figlet' ]:
+  package { [
+    'mtpfs',
+    'unrar',
+    'figlet',
+  ]:
     ensure => purged,
   }
 }
diff --git a/manifests/utils/physical.pp b/manifests/utils/physical.pp
index acadaca..1ea6b13 100644
--- a/manifests/utils/physical.pp
+++ b/manifests/utils/physical.pp
@@ -1,13 +1,33 @@
 # Common utilities for physical
 class nodo::utils::physical {
-  package { [ 'nload',    'acpid',     'slurm',  'ethtool', 'parted',  'iftop',
-              'iptraf',   'htop',      'sdparm', 'iotop',   'sysstat', 'saidar',
-              'lshw',     'sg3-utils', 'nmon',   'atop',    'dcfldd',  'gdisk',
-              'powertop', 'bwm-ng' ]:
+  package { [
+    'nload',
+    'acpid',
+    'slurm',
+    'ethtool',
+    'parted',
+    'iftop',
+    'iptraf',
+    'htop',
+    'sdparm',
+    'iotop',
+    'sysstat',
+    'saidar',
+    'lshw',
+    'sg3-utils',
+    'nmon',
+    'atop',
+    'dcfldd',
+    'gdisk',
+    'powertop',
+    'bwm-ng',
+  ]:
     ensure => installed,
   }
 
-  package { 'acpi':
+  package { [
+    'acpi',
+  ]:
     ensure => $::architecture ? {
       'armv5tel' => absent,
       'armv6l'   => absent,
@@ -20,11 +40,15 @@ class nodo::utils::physical {
   # Testers / health check
   #
 
-  #package { 'memtester':
+  #package { [
+  #  'memtester',
+  #]:
   #  ensure  => present,
   #}
 
-  package { 'memtest86+':
+  package { [
+    'memtest86+',
+  ]:
     ensure => $::architecture ? {
       'amd64' => present,
        default   => absent,
diff --git a/manifests/utils/plug.pp b/manifests/utils/plug.pp
index fe28b55..86298f9 100644
--- a/manifests/utils/plug.pp
+++ b/manifests/utils/plug.pp
@@ -1,6 +1,12 @@
 # Common utilities for plug computers
 class nodo::utils::plug {
-  package { [ 'mtd-utils', 'cryptsetup', 'u-boot', 'smartmontools', 'u-boot-tools' ]:
+  package { [
+    'mtd-utils',
+    'cryptsetup',
+    'u-boot',
+    'smartmontools',
+    'u-boot-tools',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/printer.pp b/manifests/utils/printer.pp
index 25226b7..2b1875a 100644
--- a/manifests/utils/printer.pp
+++ b/manifests/utils/printer.pp
@@ -1,5 +1,11 @@
 class nodo::utils::printer {
-  package { [ 'cups-client', 'hplip', 'cups-bsd', 'printer-driver-hpcups', 'hpijs-ppds' ]:
+  package { [
+    'cups-client',
+    'hplip',
+    'cups-bsd',
+    'printer-driver-hpcups',
+    'hpijs-ppds',
+  ]:
     ensure  => present,
   }
 }
diff --git a/manifests/utils/raspberrypi.pp b/manifests/utils/raspberrypi.pp
index bd24c20..7b5fac4 100644
--- a/manifests/utils/raspberrypi.pp
+++ b/manifests/utils/raspberrypi.pp
@@ -1,5 +1,7 @@
 class nodo::utils::raspberrypi {
-  package { 'usbutils':
+  package { [
+    'usbutils',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/ruby.pp b/manifests/utils/ruby.pp
deleted file mode 100644
index 0025b6b..0000000
--- a/manifests/utils/ruby.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-class nodo::utils::ruby {
-  # Gem packages
-  package { 'capistrano':
-    ensure   => absent,
-    provider => $::lsbdistcodename ? {
-      'squeeze' => gem,
-       default  => apt,
-    },
-    require  => Package['rubygems'],
-  }
-
-  # Gem packages
-  package { 'slideshow':
-    ensure   => absent,
-    provider => gem,
-    require  => Package['rubygems'],
-  }
-
-  if !defined(Package['ruby']) {
-    package { 'ruby':
-      ensure => installed,
-    }
-  }
-
-  if !defined(Package['rubygems']) {
-    package { 'rubygems':
-      ensure  => absent,
-      require => Package['ruby'],
-    }
-  }
-
-  if !defined(Package['ruby-dev']) {
-    package { 'ruby-dev':
-      ensure  => absent,
-      require => Package['ruby'],
-    }
-  }
-
-  if !defined(Package['libgpgme-ruby1.8']) {
-    package { 'libgpgme-ruby1.8':
-      ensure  => absent,
-      require => Package['ruby'],
-    }
-  }
-}
diff --git a/manifests/utils/sdr.pp b/manifests/utils/sdr.pp
index c3be73a..443e58d 100644
--- a/manifests/utils/sdr.pp
+++ b/manifests/utils/sdr.pp
@@ -1,7 +1,12 @@
 class nodo::utils::sdr(
   $ensure = 'present',
 ) {
-  package { [ 'rtl-srd', 'airspy', 'gr-osmosdr', 'gnuradio' ]:
+  package { [
+    'rtl-srd',
+    'airspy',
+    'gr-osmosdr',
+    'gnuradio',
+  ]:
     ensure => $ensure,
   }
 }
diff --git a/manifests/utils/security.pp b/manifests/utils/security.pp
index 98f43cd..953581c 100644
--- a/manifests/utils/security.pp
+++ b/manifests/utils/security.pp
@@ -1,23 +1,46 @@
 class nodo::utils::security inherits nodo::utils::security::base {
   # Security
-  package { [ 'apg',           'gnupg-agent',   'makepasswd', 'pwgen',          'fpm2',    'encfs',
-              'signing-party', 'libnss3-tools', 'ssss',       'libgfshare-bin', 'pass',
-              'revelation',    'onetime',       'gnupg2',     'monkeysign',     'gnutls-bin' ]:
+  package { [
+    'apg',
+    'gnupg-agent',
+    'makepasswd',
+    'pwgen',
+    'fpm2',
+    'encfs',
+    'signing-party',
+    'libnss3-tools',
+    'ssss',
+    'libgfshare-bin',
+    'pass',
+    'revelation',
+    'onetime',
+    'gnupg2',
+    'monkeysign',
+    'gnutls-bin',
+  ]:
     ensure => installed,
   }
 
   # Soon :)
-  #package { 'keyringer':
+  #package { [
+  #  'keyringer',
+  #]:
   #  ensure => present,
   #}
 
   # To be evaluated
-  #package { [ 'harden', 'paperkey' ]:
+  #package { [
+  #  'harden',
+  #  'paperkey',
+  #]:
   #  ensure  => present,
   #}
 
   if $::lsbdistcodename != 'squeeze' {
-    package { [ 'kedpm', 'kedpm-gtk' ]:
+    package { [
+      'kedpm',
+      'kedpm-gtk',
+    ]:
       ensure => installed,
     }
   }
diff --git a/manifests/utils/security/apparmor.pp b/manifests/utils/security/apparmor.pp
index 022218f..527ae12 100644
--- a/manifests/utils/security/apparmor.pp
+++ b/manifests/utils/security/apparmor.pp
@@ -1,5 +1,9 @@
 class nodo::utils::security::apparmor {
-  package { [ 'apparmor', 'apparmor-profiles', 'apparmor-utils' ]:
+  package { [
+    'apparmor',
+    'apparmor-profiles',
+    'apparmor-utils',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/security/base.pp b/manifests/utils/security/base.pp
index 22edb0e..ab376ea 100644
--- a/manifests/utils/security/base.pp
+++ b/manifests/utils/security/base.pp
@@ -1,10 +1,15 @@
 class nodo::utils::security::base {
-  package { [ 'keychain', 'gnupg-curl' ]:
+  package { [
+    'keychain',
+   'gnupg-curl',
+  ]:
     ensure => present,
   }
 
   # TODO: currently just available on jessie onwards
-  #package { 'hopenpgp-tools':
+  #package { [
+  #  'hopenpgp-tools',
+  #]:
   #  ensure => present,
   #}
 }
diff --git a/manifests/utils/security/bitmask.pp b/manifests/utils/security/bitmask.pp
index 2b6d2e0..13dea90 100644
--- a/manifests/utils/security/bitmask.pp
+++ b/manifests/utils/security/bitmask.pp
@@ -5,7 +5,10 @@ class nodo::utils::security::bitmask {
     ensure  => present,
   }
 
-  package { [ 'bitmask', 'leap-keyring' ]:
+  package { [
+    'bitmask',
+    'leap-keyring',
+  ]:
     ensure  => present,
     require => Apt::Sources_list['bitmask.net.list'],
   }
diff --git a/manifests/utils/security/forensics.pp b/manifests/utils/security/forensics.pp
index f2f8744..665b1c7 100644
--- a/manifests/utils/security/forensics.pp
+++ b/manifests/utils/security/forensics.pp
@@ -1,6 +1,8 @@
 # See https://qa.debian.org/developer.php?login=forensics-devel%40lists.alioth.debian.org
 class nodo::utils::security::forensics {
-  package { [ 'lime-forensics-dkms' ]:
+  package { [
+    'lime-forensics-dkms',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/security/stego.pp b/manifests/utils/security/stego.pp
index 0ca9592..795c243 100644
--- a/manifests/utils/security/stego.pp
+++ b/manifests/utils/security/stego.pp
@@ -1,5 +1,11 @@
 class nodo::utils::security::stego {
-  package { [ 'snow', 'stegsnow', 'steghide', 'snowdrop', 'python-stepic' ]:
+  package { [
+    'snow',
+    'stegsnow',
+    'steghide',
+    'snowdrop',
+    'python-stepic',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/security/tails.pp b/manifests/utils/security/tails.pp
index 489de6c..dc3746b 100644
--- a/manifests/utils/security/tails.pp
+++ b/manifests/utils/security/tails.pp
@@ -1,5 +1,7 @@
 class nodo::utils::security::tails {
-  package { "tails-installer":
+  package { [
+    'tails-installer',
+  ]:
     ensure  => present,
   }
 }
diff --git a/manifests/utils/security/tpm.pp b/manifests/utils/security/tpm.pp
index 2cbae85..32d2576 100644
--- a/manifests/utils/security/tpm.pp
+++ b/manifests/utils/security/tpm.pp
@@ -1,5 +1,8 @@
 class nodo::utils::security::tpm {
-  package { [ 'trousers', 'tpm-tools']:
+  package { [
+    'trousers',
+    'tpm-tools',
+  ]:
     ensure  => present,
   }
 }
diff --git a/manifests/utils/storage.pp b/manifests/utils/storage.pp
index d4a40e6..7a354db 100644
--- a/manifests/utils/storage.pp
+++ b/manifests/utils/storage.pp
@@ -1,6 +1,8 @@
 # Common utilities for storage
 class nodo::utils::storage {
-  package { 'clamav':
+  package { [
+    'clamav',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/storage/archive.pp b/manifests/utils/storage/archive.pp
index e7af761..cd670dc 100644
--- a/manifests/utils/storage/archive.pp
+++ b/manifests/utils/storage/archive.pp
@@ -1,13 +1,21 @@
 class nodo::utils::storage::archive {
-  package { 'git-annex':
+  package { [
+    'git-annex',
+  ]:
     ensure => latest,
   }
 
-  package { [ 'jigdo-file', 'fdupes', 'gddrescue' ]:
+  package { [
+    'jigdo-file',
+    'fdupes',
+    'gddrescue',
+  ]:
     ensure => installed,
   }
 
-  package { 'syslinux-utils':
+  package { [
+    'syslinux-utils',
+  ]:
     ensure => $::architecture ? {
       'amd64' => present,
       'i386'  => present,
diff --git a/manifests/utils/storage/crypto.pp b/manifests/utils/storage/crypto.pp
index a683ff7..0a0d520 100644
--- a/manifests/utils/storage/crypto.pp
+++ b/manifests/utils/storage/crypto.pp
@@ -1,5 +1,8 @@
 class nodo::utils::storage::crypto {
-  package { [ 'cryptsetup', 'ecryptfs-utils' ]:
+  package { [
+    'cryptsetup',
+    'ecryptfs-utils',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/storage/iso.pp b/manifests/utils/storage/iso.pp
index 0492a1d..f271dcd 100644
--- a/manifests/utils/storage/iso.pp
+++ b/manifests/utils/storage/iso.pp
@@ -1,5 +1,7 @@
 class nodo::utils::storage::iso {
-  package { 'syslinux':
+  package { [
+    'syslinux',
+  ]:
     ensure => $::architecture ? {
       'amd64' => present,
       'i386'  => present,
diff --git a/manifests/utils/storage/layer.pp b/manifests/utils/storage/layer.pp
index a12b2d2..7951573 100644
--- a/manifests/utils/storage/layer.pp
+++ b/manifests/utils/storage/layer.pp
@@ -1,7 +1,10 @@
 class nodo::utils::storage::layer {
   include nodo::utils::storage::crypto
 
-  package { [ 'mdadm', 'lvm2' ]:
+  package { [
+    'mdadm',
+    'lvm2',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/suckless.pp b/manifests/utils/suckless.pp
index 40453ef..dc27fa0 100644
--- a/manifests/utils/suckless.pp
+++ b/manifests/utils/suckless.pp
@@ -1,5 +1,16 @@
 class nodo::utils::suckless {
-  package { [ 'dwm', 'mupdf', 'mupdf-tools', 'suckless-tools', 'surf', 'xvt', 'uzbl', 'xxxterm', 'zathura', 'stterm' ]:
+  package { [
+    'dwm',
+    'mupdf',
+    'mupdf-tools',
+    'suckless-tools',
+    'surf',
+    'xvt',
+    'uzbl',
+    'xxxterm',
+    'zathura',
+    'stterm',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/thinkpad.pp b/manifests/utils/thinkpad.pp
index d595dbc..ae25178 100644
--- a/manifests/utils/thinkpad.pp
+++ b/manifests/utils/thinkpad.pp
@@ -1,16 +1,22 @@
 class nodo::utils::thinkpad {
   # Keyboard
-  package { 'tpb':
+  package { [
+    'tpb',
+  ]:
     ensure => installed,
   }
 
   # Thinkfan
-  package { 'thinkfan':
+  package { [
+    'thinkfan',
+  ]:
     ensure => installed
   }
 
   # HDAPS
-  package { 'hdapsd':
+  package { [
+    'hdapsd',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/tor.pp b/manifests/utils/tor.pp
index f9475a3..66dc53f 100644
--- a/manifests/utils/tor.pp
+++ b/manifests/utils/tor.pp
@@ -1,5 +1,7 @@
 class nodo::utils::tor {
-  package { 'tor-arm':
+  package { [
+    'tor-arm',
+  ]:
     ensure => installed,
   }
 }
diff --git a/manifests/utils/touchpad.pp b/manifests/utils/touchpad.pp
index a5390dd..e9683f4 100644
--- a/manifests/utils/touchpad.pp
+++ b/manifests/utils/touchpad.pp
@@ -1,6 +1,8 @@
 class nodo::utils::touchpad {
   # Touchpad
-  package { 'gpointing-device-settings':
+  package { [
+    'gpointing-device-settings',
+  ]:
     ensure => present,
   }
 }
diff --git a/manifests/utils/web.pp b/manifests/utils/web.pp
index e3e0b9f..cbce7d2 100644
--- a/manifests/utils/web.pp
+++ b/manifests/utils/web.pp
@@ -1,9 +1,19 @@
 # Common utilities for web
 class nodo::utils::web inherits nodo::utils::http {
-  package { [ 'ffmpeg',  'flvtool2',             'rake',
-              'libxml2', 'libxml2-dev',          'libxslt1-dev',        'libmysqlclient-dev',
-              'g++',     'libcurl4-openssl-dev', 'apache2-prefork-dev', 'goaccess',
-              'apachetop' ]:
+  package { [
+    'ffmpeg',
+    'flvtool2',
+    'rake',
+    'libxml2',
+    'libxml2-dev',
+    'libxslt1-dev',
+    'libmysqlclient-dev',
+    'g++',
+    'libcurl4-openssl-dev',
+    'apache2-prefork-dev',
+    'goaccess',
+    'apachetop',
+  ]:
     ensure => installed,
   }
 }