From 1745b420aafb493d19f876b2750579ce23397c4b Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 23 2023 16:12:28 +0000
Subject: [PATCH 1/2] xfce: Add essential apps from xfce-apps comps group


Use a filtered comps group to add essential apps instead of manually
listing them in the manifest.

Also add gparted to the image as it needs privileges thus it can't run
as a Flatpak.

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index 683b1b8..d9e935e 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -197,6 +197,27 @@ desktop_exclude_list:
     - NetworkManager-libreswan-gnome
     - NetworkManager-sstp-gnome
     - NetworkManager-strongswan-gnome
+  xfce-apps:
+    # Non-critical apps -> Flatpak
+    - claws-mail
+    - catfish
+    - claws-mail-plugins-archive
+    - claws-mail-plugins-att-remover
+    - claws-mail-plugins-attachwarner
+    - claws-mail-plugins-fetchinfo
+    - claws-mail-plugins-mailmbox
+    - claws-mail-plugins-newmail
+    - claws-mail-plugins-notification
+    - claws-mail-plugins-pgp
+    - claws-mail-plugins-rssyl
+    - claws-mail-plugins-smime
+    - claws-mail-plugins-spam-report
+    - claws-mail-plugins-tnef
+    - claws-mail-plugins-vcalendar
+    - geany
+    - pidgin
+    - seahorse
+    - transmission
   lxqt-desktop:
     # Incompatible with ostree for various reasons
     - dnfdragora-updater
diff --git a/comps-sync.py b/comps-sync.py
index e271b9d..17a547e 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -190,7 +190,7 @@ def main():
     desktops_comps_groups = {
         "gnome": ["gnome-desktop", "base-x"],
         "kde": ["kde-desktop"],
-        "xfce": ["xfce-desktop", "base-x"],
+        "xfce": ["xfce-desktop", "xfce-apps", "base-x"],
         "lxqt": ["lxqt-desktop", "base-x"],
         "deepin": ["deepin-desktop", "base-x"],
         "mate": ["mate-desktop", "base-x"],
diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml
index 14092fc..2673e18 100644
--- a/fedora-vauxite.yaml
+++ b/fedora-vauxite.yaml
@@ -11,13 +11,6 @@ packages:
   - fedora-release-ostree-desktop
   # Portals for Flatpak
   - xdg-desktop-portal-gtk
-  # Essential packages from @xfce-apps
-  - atril
-  - firefox
-  - galculator
-  - mousepad
-  - ristretto
-  - xarchiver
 
 repos:
   - fedora-rawhide
diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml
index 9ab5ba0..6d7b348 100644
--- a/xfce-desktop-pkgs.yaml
+++ b/xfce-desktop-pkgs.yaml
@@ -9,10 +9,14 @@ packages:
   - Thunar
   - adwaita-gtk2-theme
   - adwaita-icon-theme
+  - atril
   - blueman
   - desktop-backgrounds-compat
+  - firefox
+  - galculator
   - glx-utils
   - gnome-keyring-pam
+  - gparted
   - greybird-dark-theme
   - greybird-light-theme
   - greybird-xfce4-notifyd-theme
@@ -26,16 +30,21 @@ packages:
   - mesa-dri-drivers
   - mesa-vulkan-drivers
   - mint-y-theme
+  - mousepad
   - network-manager-applet
   - nm-connection-editor
   - plymouth-system-theme
+  - ristretto
   - thunar-archive-plugin
   - thunar-media-tags-plugin
   - thunar-volman
+  - xarchiver
   - xdg-user-dirs-gtk
   - xfce4-about
   - xfce4-appfinder
+  - xfce4-clipman-plugin
   - xfce4-datetime-plugin
+  - xfce4-dict-plugin
   - xfce4-panel
   - xfce4-panel-profiles
   - xfce4-places-plugin

From e951a75c6c80d8818cbfa719dfd61f46f4b70523 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 23 2023 16:13:11 +0000
Subject: [PATCH 2/2] xfce: Add packages from xfce-extra-plugins comps group


Plugins for the XFCE panel that should be installed by default.

---

diff --git a/comps-sync.py b/comps-sync.py
index 17a547e..89c2f75 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -190,7 +190,7 @@ def main():
     desktops_comps_groups = {
         "gnome": ["gnome-desktop", "base-x"],
         "kde": ["kde-desktop"],
-        "xfce": ["xfce-desktop", "xfce-apps", "base-x"],
+        "xfce": ["xfce-desktop", "xfce-apps", "xfce-extra-plugins", "base-x"],
         "lxqt": ["lxqt-desktop", "base-x"],
         "deepin": ["deepin-desktop", "base-x"],
         "mate": ["mate-desktop", "base-x"],
diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml
index 6d7b348..bb2b581 100644
--- a/xfce-desktop-pkgs.yaml
+++ b/xfce-desktop-pkgs.yaml
@@ -42,9 +42,18 @@ packages:
   - xdg-user-dirs-gtk
   - xfce4-about
   - xfce4-appfinder
+  - xfce4-battery-plugin
   - xfce4-clipman-plugin
+  - xfce4-cpugraph-plugin
   - xfce4-datetime-plugin
   - xfce4-dict-plugin
+  - xfce4-diskperf-plugin
+  - xfce4-eyes-plugin
+  - xfce4-fsguard-plugin
+  - xfce4-genmon-plugin
+  - xfce4-mailwatch-plugin
+  - xfce4-mount-plugin
+  - xfce4-netload-plugin
   - xfce4-panel
   - xfce4-panel-profiles
   - xfce4-places-plugin
@@ -52,11 +61,20 @@ packages:
   - xfce4-pulseaudio-plugin
   - xfce4-screensaver
   - xfce4-screenshooter-plugin
+  - xfce4-sensors-plugin
   - xfce4-session
   - xfce4-settings
+  - xfce4-systemload-plugin
   - xfce4-taskmanager
   - xfce4-terminal
+  - xfce4-time-out-plugin
+  - xfce4-verve-plugin
+  - xfce4-weather-plugin
+  - xfce4-whiskermenu-plugin
+  - xfce4-xkb-plugin
   - xfconf
+  - xfdashboard
+  - xfdashboard-themes
   - xfdesktop
   - xfwm4
   - xfwm4-themes