Added general packages

Readme.md

@@ -2,7 +2,6 @@ Missing items
 
 * Ruby gems
 * Desktop config
-* Office utilities
 * unix tools (e.g. screen)
 * Passenger
 * Google Chrome

desktop_manifest.rb

@@ -32,14 +32,16 @@ class DesktopManifest < ShadowPuppet::Manifest
 
   include ApachePuppet
   recipe :apache
-  recipe :passenger
 
   include X11Puppet
   recipe :xbindkeys
   recipe :wmii
 
   include EmailClientPuppet
   recipe :claws_mail
+
+  include OfficePuppet
+  recipe :general_office
 
   # Development
   include GeneralDevelopmentPuppet

lib/general_development_puppet.rb

@@ -1,5 +1,10 @@
 module GeneralDevelopmentPuppet
   def general_development
-    package "build-essential", :ensure => :latest
+    [
+     'build-essential',
+     'exuberant-ctags'
+     ].each do |pkg|
+      package pkg, :ensure => :latest
+    end
   end
 end

lib/office_puppet.rb

@@ -0,0 +1,22 @@
+module OfficePuppet
+  def general_office
+    [
+     'openoffice.org',
+     'acroread',
+     'cheese',
+     'cups-pdf',
+     'gnucash',
+     'inkscape',
+     'empathy',
+     'telepathy-salut',
+     'telepathy-haze',
+     'telepathy-idle',
+     'telepathy-butterfly',
+     'telepathy-gabble',
+     'scrot'
+#     'skype'
+    ].each do |pkg|
+      package pkg, :ensure => :latest
+    end
+  end
+end

lib/system_tools_puppet.rb

@@ -4,7 +4,10 @@ def system_tools
      'htop',
      'less',
      'synergy',
-     'screen'
+     'screen',
+     'bzip2',
+     'markdown',
+     'sshfs'
     ].each do |pkg|
       package pkg, :ensure => :latest
     end