From c04ce63c35e85ea3fff2d24f21c064f71eeda2da Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Thu, 29 Dec 2022 13:45:06 +0100
Subject: [PATCH] bundles/arch-with-gui: more packages via bundle, less via
 nodefile

---
 bundles/arch-with-gui/metadata.py | 17 +++++++++++++++--
 nodes/fkusei-locutus.py           |  6 ------
 nodes/kunsi-p14s.py               | 10 ----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/bundles/arch-with-gui/metadata.py b/bundles/arch-with-gui/metadata.py
index 869a7f9..4666cca 100644
--- a/bundles/arch-with-gui/metadata.py
+++ b/bundles/arch-with-gui/metadata.py
@@ -38,9 +38,14 @@ defaults = {
             'rofi': {},
 
             # sound
+            'calf': {},
+            'easyeffects': {},
+            'lsp-plugins': {},
             'pavucontrol': {},
-            'pulseaudio': {},
-            'pulseaudio-zeroconf': {},
+            'pipewire': {},
+            'pipewire-jack': {},
+            'pipewire-pulse': {},
+            'qpwgraph': {},
 
             # window management
             'i3-wm': {},
@@ -53,6 +58,7 @@ defaults = {
 
             # Xorg
             'xf86-input-libinput': {},
+            'xf86-input-wacom': {},
             'xorg-server': {},
             'xorg-setxkbmap': {},
             'xorg-xev': {},
@@ -62,20 +68,27 @@ defaults = {
             # all them apps
             'browserpass': {},
             'browserpass-firefox': {},
+            'ffmpeg': {},
             'firefox': {},
             'gimp': {},
+            'imagemagick': {},
             'inkscape': {},
+            'kdenlive': {},
             'maim': {},
             'mosh': {},
+            'mosquitto': {},
             'mpv': {},
             'pass': {},
             'pass-otp': {},
             'pdftk': {},
             'pwgen': {},
             'qpdfview': {},
+            'samba': {},
+            'shotcut': {},
             'sipcalc': {},
             'the_silver_searcher': {},
             'tlp': {},
+            'virt-manager': {},
             'xclip': {},
             'xdotool': {}, # needed for maim window selection
         },
diff --git a/nodes/fkusei-locutus.py b/nodes/fkusei-locutus.py
index 7340a46..397e851 100644
--- a/nodes/fkusei-locutus.py
+++ b/nodes/fkusei-locutus.py
@@ -76,18 +76,12 @@ nodes['fkusei-locutus'] = {
                 # video drivers
                 'xf86-video-intel': {},
 
-                # for i3pystatus
-                'iw': {},
-                'wireless_tools': {},
-
                 # all that other random stuff one needs
                 'apachedirectorystudio': {},
                 'direnv': {},
                 'freerdp': {},
-                'mosquitto': {},
                 'sdl_ttf': {}, # for compiling testcard
                 'thermald': {},
-                'virt-manager': {},
             },
         },
         'systemd-boot': {
diff --git a/nodes/kunsi-p14s.py b/nodes/kunsi-p14s.py
index 8952f4d..3174722 100644
--- a/nodes/kunsi-p14s.py
+++ b/nodes/kunsi-p14s.py
@@ -96,25 +96,15 @@ nodes['kunsi-p14s'] = {
                 'mesa-vdpau': {},
                 'xf86-video-amdgpu': {},
 
-                # for i3pystatus
-                'iw': {},
-                'wireless_tools': {},
-
                 # all that other random stuff one needs
                 'abcde': {},
                 'apachedirectorystudio': {},
                 'claws-mail': {},
                 'claws-mail-themes': {},
                 'ferdi-bin': {},
-                'ffmpeg': {},
                 'gumbo-parser': {}, # for claws litehtml
-                'imagemagick': {},
-                'inkscape': {},
-                'mosquitto': {},
                 'perl-musicbrainz-discid': {}, # for abcde
                 'perl-webservice-musicbrainz': {}, # for abcde
-                'samba': {},
-                'xf86-input-wacom': {},
             },
         },
         'sysctl': {