diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/subsystems/utils/interface.pp | 7 | ||||
| -rw-r--r-- | manifests/subsystems/utils/laptop.pp | 4 | ||||
| -rw-r--r-- | manifests/subsystems/utils/multimedia.pp | 18 |
3 files changed, 13 insertions, 16 deletions
diff --git a/manifests/subsystems/utils/interface.pp b/manifests/subsystems/utils/interface.pp index e5f2045..e1a5ddd 100644 --- a/manifests/subsystems/utils/interface.pp +++ b/manifests/subsystems/utils/interface.pp @@ -1,15 +1,14 @@ class utils::interface { # Interface - package { [ 'awesome', 'eterm', 'fluxbox', 'gnome-terminal', 'conky', + package { [ 'awesome', 'eterm', 'weather-util', 'gnome-terminal', 'conky', 'xterm', 'bash-completion', 'tmux', 'xscreensaver', 'thunar', 'mc', 'gtk-theme-switch', 'gtk-smooth-themes', 'rxvt', 'lxappearance', - 'xtitle', 'xclip', 'pcmanfm', 'awesome-extra', 'numlockx', - 'weather-util' ]: + 'xtitle', 'xclip', 'pcmanfm', 'awesome-extra', 'numlockx' ]: ensure => installed, } # Old stuff - package { 'conkyforecast': + package { [ 'conkyforecast', 'fluxbox' ]: ensure => absent, } diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp index c6a6bd1..12ee1c8 100644 --- a/manifests/subsystems/utils/laptop.pp +++ b/manifests/subsystems/utils/laptop.pp @@ -11,13 +11,13 @@ class utils::laptop { # Common utilities for debian laptops class utils::laptop::debian { package { [ 'cpufrequtils', 'module-assistant', 'wireless-tools', - 'wpasupplicant', 'ekiga', 'gnome', + 'wpasupplicant', 'ekiga', 'mumble', 'revelation', 'arp-scan', 'usb-modeswitch', 'iw', 'wvdial', 'wavemon', 'btscanner', 'laptop-mode-tools', 'acpi-support', 'tftp', 'sharutils', 'wireshark', 'macchanger', 'weplab', 'wpagui', - 'gnokii', 'mumble' ]: + 'gnokii' ]: ensure => installed, } diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp index 7f2daa3..a61c2bf 100644 --- a/manifests/subsystems/utils/multimedia.pp +++ b/manifests/subsystems/utils/multimedia.pp @@ -7,8 +7,8 @@ class utils::multimedia::studio { } } - # CD extractors - package { [ 'ripit', 'asunder' ]: + # CD writers and extractors + package { [ 'ripit', 'asunder', 'wodim', 'genisoimage', 'dvd+rw-tools' ]: ensure => installed, } } @@ -17,26 +17,24 @@ class utils::multimedia { # Multimedia package { [ 'alsa-tools-gui', 'mp3blaster', 'alsa-utils', 'netpbm', 'gqview', 'mpg123', 'audacious', 'qjackctl', - 'gimp', 'xine-ui', 'amarok', 'wodim', - 'genisoimage', 'dvd+rw-tools', 'inkscape', 'jhead', + 'gimp', 'xine-ui', 'v4l-utils', 'inkscape', 'easytag', 'gstreamer-tools', 'vlc', 'audacity', - 'opencubicplayer', 'moc', 'cmus', 'youtube-dl', + 'opencubicplayer', 'youtube-dl', 'mencoder', 'libasound2-plugins' 'cbrpager', 'llgal', 'darksnow', 'mplayer', - 'picard', 'ffmpeg2theora', 'oggfwd', 'libasound2-plugins', - 'mencoder', 'v4l-utils' ]: + 'picard', 'ffmpeg2theora', 'oggfwd', 'jhead' ]: ensure => installed, } # Old stuff - package { 'flashplugin-nonfree': - ensure => absent, + package { [ 'flashplugin-nonfree', 'amarok', 'moc', 'cmus' ]: + ensure => purged, } # Squeeze only package { [ 'tucan', 'orpheus' ]: ensure => $::lsbdistcodename ? { 'squeeze' => installed, - default => absent, + default => purged, } } |