From 308d12eccd2bfaa2a72a9842efe0997f3485bed5 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 8 Jan 2022 20:45:41 -0300
Subject: Reduce the number of installed packages

---
 manifests/utils/bundle/poweruser.pp |  2 +-
 manifests/utils/development.pp      |  4 +-
 manifests/utils/development/ide.pp  | 55 ++++++++++++++----------
 manifests/utils/interface.pp        | 41 +++++++++---------
 manifests/utils/multimedia.pp       | 83 ++++++++++++++++++++-----------------
 manifests/utils/office.pp           | 12 +++---
 manifests/utils/suckless.pp         | 14 +++++--
 7 files changed, 117 insertions(+), 94 deletions(-)

diff --git a/manifests/utils/bundle/poweruser.pp b/manifests/utils/bundle/poweruser.pp
index 4702588..468629c 100644
--- a/manifests/utils/bundle/poweruser.pp
+++ b/manifests/utils/bundle/poweruser.pp
@@ -3,7 +3,7 @@ class nodo::utils::bundle::poweruser {
   include nodo::utils::doc
   include nodo::utils::office
   include nodo::utils::office::console
-  include nodo::utils::office::gui
+  #include nodo::utils::office::gui
   include nodo::utils::interface
   include nodo::utils::development
   include nodo::utils::security
diff --git a/manifests/utils/development.pp b/manifests/utils/development.pp
index cb5b1e0..90b830d 100644
--- a/manifests/utils/development.pp
+++ b/manifests/utils/development.pp
@@ -4,6 +4,6 @@ class nodo::utils::development {
   include nodo::utils::development::git
   include nodo::utils::development::python
   include nodo::utils::development::puppet
-  include nodo::utils::development::system
-  include nodo::utils::development::web
+  #include nodo::utils::development::system
+  #include nodo::utils::development::web
 }
diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index 8212444..c5d3f3b 100644
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -4,33 +4,21 @@ class nodo::utils::development::ide (
   # In use
   package { [
     'ed',
-    'rows',
+
     'myrepos',
-    'stow',
-    'hexedit',
-    'ack-grep',
-    'markdown',
+
     'python3-sphinx',
     'python3-recommonmark',
+
+    'yamllint',
+
+    # Needed by xcal
+    'ruby-activesupport',
+
+    # Static site compilers
     'pelican',
     'hugo',
     'mkdocs',
-    'yamllint',
-    'yajl-tools',
-    'graphviz',
-    'diffoscope',
-    'dos2unix',
-    'ttyrec',
-    'ruby-activesupport', # needed by xcal
-    #'bugs-everywhere',
-    #'silversearcher-ag',
-    #'ticgit',
-    #'ticgitweb',
-    #'ditz',
-    #'pnopaste-cli',
-    #'exuberant-ctags',
-    #'doxygen',
-    #'agave',
   ]:
     ensure => $ensure,
   }
@@ -42,8 +30,33 @@ class nodo::utils::development::ide (
     ensure => present,
   }
 
+  # Not in use
+  package { [
+    'ack',
+    'yajl-tools',
+    'rows',
+    'stow',
+    'hexedit',
+    'markdown',
+    'graphviz',
+    'diffoscope',
+    'dos2unix',
+    'ttyrec',
+    'silversearcher-ag',
+    'ticgit',
+    'ticgitweb',
+    'ditz',
+    'pnopaste-cli',
+    'exuberant-ctags',
+    'doxygen',
+    'agave',
+  ]:
+    ensure => absent,
+  }
+
   # Old stuff
   package { [
+    'ack-grep',
     'mr',
     'python-sphinx',
     'python-recommonmark',
diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp
index 843f256..a6d1ac3 100644
--- a/manifests/utils/interface.pp
+++ b/manifests/utils/interface.pp
@@ -6,7 +6,6 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
     'weather-util',
     'conky',
     'conky-all',
-    'xscreensaver',
     'gpick',
     'vmg',
     'x11-apps',
@@ -22,29 +21,10 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
     'xserver-xephyr',
     'policykit-1-gnome',
     'firejail',
-    'ratpoison',
     'sm',
     'i3lock',
     'materia-gtk-theme',
     'blackbird-gtk-theme',
-    #'unagi',
-    #'xcompmgr',
-    #'compton',
-    #'xzoom',
-    #'xautomation',
-    #'gtk-theme-switch',
-    #'gtk-smooth-themes',
-    #'lxappearance',
-    #'wmctrl',
-    #'pcmanfm',
-    #'xinput',
-    #'metar',
-    #'i3',
-    #'rxvt',
-    #'thunar',
-    #'xterm',
-    #'eterm',
-    #'gnome-terminal',
   ]:
     ensure => installed,
   }
@@ -67,11 +47,30 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
     ensure => present,
   }
 
-  # Old stuff
+  # Not in use
   package { [
+    'ratpoison',
+    'xscreensaver',
     'terminology',
     'conkyforecast',
     'fluxbox',
+    'unagi',
+    'xcompmgr',
+    'compton',
+    'xzoom',
+    'xautomation',
+    'gtk-theme-switch',
+    'gtk-smooth-themes',
+    'lxappearance',
+    'wmctrl',
+    'pcmanfm',
+    'metar',
+    'i3',
+    'rxvt',
+    'thunar',
+    'xterm',
+    'eterm',
+    'gnome-terminal',
   ]:
     ensure => absent,
   }
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 3b87dc3..4f3d145 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -1,53 +1,58 @@
 # Multimedia utilities
 class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
-  # Multimedia
+  package { [
+    'pavucontrol',
+    'jhead',
+    'qrencode',
+    'scrot',
+  ]:
+    ensure => installed,
+  }
+
+  # Not in use
   package { [
     'gimp',
     'inkscape',
     'geeqie',
-    'pavucontrol',
-    'jhead',
     'xine-ui',
-    'qrencode',
     'zbar-tools',
-    'scrot',
     'vorbis-tools',
     'opus-tools',
-    #'cbrpager',
-    #'alsa-tools-gui',
-    #'v4l-utils',
-    #'gstreamer-tools',
-    #'mp3blaster',
-    #'vlc',
-    #'libasound2-plugins',
-    #'lame',
-    #'llgal',
-    #'darksnow',
-    #'ffmpeg2theora',
-    #'netpbm',
-    #'audacious',
-    #'qjackctl',
-    #'easytag',
-    #'audacity',
-    #'opencubicplayer',
-    #'picard',
-    #'gxine',
-    #'oggfwd',
-    #'totem',
-    #'faad',
-    #'gmtp',
-    #'gphotofs',
-    #'jmtpfs',
-    #'landell',
-    #'gqview',
-    #'mencoder',
-    #'tucan',
-    #'orpheus',
-    #'amarok',
-    #'moc',
-    #'cmus',
+    'cbrpager',
+    'alsa-tools-gui',
+    'v4l-utils',
+    'gstreamer-tools',
+    'mp3blaster',
+    'vlc',
+    'libasound2-plugins',
+    'lame',
+    'llgal',
+    'darksnow',
+    'ffmpeg2theora',
+    'netpbm',
+    'audacious',
+    'qjackctl',
+    'easytag',
+    'audacity',
+    'opencubicplayer',
+    'picard',
+    'gxine',
+    'oggfwd',
+    'totem',
+    'faad',
+    'gmtp',
+    'gphotofs',
+    'jmtpfs',
+    'landell',
+    'gqview',
+    'mencoder',
+    'tucan',
+    'orpheus',
+    'amarok',
+    'moc',
+    'cmus',
   ]:
-    ensure => installed,
+    ensure => absent,
   }
 
   # Flash implementation (deprecated)
diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index ceb74ab..5998db8 100644
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -4,24 +4,24 @@ class nodo::utils::office (
   package { [
     'taskwarrior',
     'timewarrior',
-    'bugwarrior',
-    'vit',
-    'tasksh',
     'python-powerline-taskwarrior',
-    'watson',
-    #'hledger',
   ]:
     ensure => present,
   }
 
   # Not in use
   package { [
+    'bugwarrior',
+    'bugs-everywhere',
+    'vit',
+    'tasksh',
+    'watson',
     'kalarm',
     'gnumeric',
     'jekyll',
-    'hledger',
     'dia',
     'calibre',
+    'hledger',
   ]:
     ensure => absent,
   }
diff --git a/manifests/utils/suckless.pp b/manifests/utils/suckless.pp
index 71de355..4cf70af 100644
--- a/manifests/utils/suckless.pp
+++ b/manifests/utils/suckless.pp
@@ -2,16 +2,22 @@ class nodo::utils::suckless (
   $ensure = 'installed',
 ) {
   package { [
-    'dwm',
     'suckless-tools',
+    'feh',
+    'sxiv',
+  ]:
+    ensure => $ensure,
+  }
+
+  # Not in use
+  package { [
+    'dwm',
     'surf',
     'xvt',
     'uzbl',
     'xxxterm',
     'stterm',
-    'feh',
-    'sxiv',
   ]:
-    ensure => $ensure,
+    ensure => absent,
   }
 }
-- 
cgit v1.2.3