From f14f58f9d82e384cb106135ce9402692e8933199 Mon Sep 17 00:00:00 2001
From: spaceoden <26421479+spaceoden@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:00:03 -0800
Subject: [PATCH] feat: Remove gnome-software and plasma-discover. Add
 Warehouse to yafti system apps (#496)

---
 files/system/usr/share/ublue-os/firstboot/yafti.yml | 1 +
 recipes/common/kinoite-modules.yml                  | 3 +++
 recipes/common/silverblue-modules.yml               | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/files/system/usr/share/ublue-os/firstboot/yafti.yml b/files/system/usr/share/ublue-os/firstboot/yafti.yml
index 78341df..d30704a 100644
--- a/files/system/usr/share/ublue-os/firstboot/yafti.yml
+++ b/files/system/usr/share/ublue-os/firstboot/yafti.yml
@@ -78,6 +78,7 @@ screens:
           default: true
           packages:
             - Flatseal (Permission Manager): com.github.tchx84.Flatseal
+            - Warehouse (App Installer/Manager): io.github.flattool.Warehouse
 
   final-screen:
     source: yafti.screen.title
diff --git a/recipes/common/kinoite-modules.yml b/recipes/common/kinoite-modules.yml
index 02aed6c..4136a2d 100644
--- a/recipes/common/kinoite-modules.yml
+++ b/recipes/common/kinoite-modules.yml
@@ -8,6 +8,9 @@ modules:
       - fuse-encfs
       - krfb
       - krfb-libs
+      - plasma-discover
+      - plasma-discover-rpm-ostree
+      
       # depends on fedora-flathub-remote
       - plasma-welcome-fedora
   - type: files
diff --git a/recipes/common/silverblue-modules.yml b/recipes/common/silverblue-modules.yml
index 9b1161a..dc5c5fc 100644
--- a/recipes/common/silverblue-modules.yml
+++ b/recipes/common/silverblue-modules.yml
@@ -20,10 +20,13 @@ modules:
         - malcontent-ui-libs
         - malcontent-control
         - fedora-chromium-config-gnome
+        - gnome-software
+        - gnome-software-rpm-ostree
+        - epiphany-runtime
         - totem-video-thumbnailer
     - type: gschema-overrides
       include:
         - zz1-secureblue.gschema.override
     - type: script
       scripts:
-        - removedkmshelper.sh
\ No newline at end of file
+        - removedkmshelper.sh