Utils: reorder and cleanup

3 files changed, 14 insertions, 9 deletions

diff --git a/manifests/utils/personal/debian.pp b/manifests/utils/personal/debian.pp
index ea8550a..91f6193 100644
--- a/manifests/utils/personal/debian.pp
+++ b/manifests/utils/personal/debian.pp
@@ -10,7 +10,7 @@ class nodo::utils::personal::debian {
     'libpam-mount',
     'gawk',
     'laptop-detect',
-    'mtp-tools',
+    #'mtp-tools',
   ]:
     ensure => installed,
   }
@@ -23,7 +23,7 @@ class nodo::utils::personal::debian {
     'funcoeszz',
     'detox',
   ]:
-    ensure => installed,
+    ensure => absent,
   }
 
   # Console window managers
@@ -31,7 +31,7 @@ class nodo::utils::personal::debian {
   #  'screenie',
   #  'iselect',
   #  'byobu',
-  # ]:
+  #]:
   #  ensure => installed,
   #}
 
diff --git a/manifests/utils/personal/bundle.pp b/manifests/utils/personal/poweruser.pp
index 695bfa4..db81a42 100644
--- a/manifests/utils/personal/bundle.pp
+++ b/manifests/utils/personal/poweruser.pp
@@ -1,12 +1,10 @@
-class nodo::utils::personal::bundle {
-  include nodo::utils::suckless
+# Bundle for power users
+class nodo::utils::personal::poweruser {
   include nodo::utils::office
-  include nodo::utils::printer
   include nodo::utils::interface
-  include nodo::utils::network
   include nodo::utils::development
   include nodo::utils::security
-  include nodo::utils::multimedia
-  include nodo::utils::java
+  include nodo::utils::network
   include nodo::utils::storage::archive
+  include nodo::utils::multimedia
 }
diff --git a/manifests/utils/personal/standard.pp b/manifests/utils/personal/standard.pp
new file mode 100644
index 0000000..73ad271
--- /dev/null
+++ b/manifests/utils/personal/standard.pp
@@ -0,0 +1,7 @@
+# Bundle with standard packages
+class nodo::utils::personal::pc {
+  include nodo::utils::office
+  include nodo::utils::printer
+  include nodo::utils::network
+  include nodo::utils::network::xmpp
+}