From c32829811eb2fe2f39f8da3e8d43f19166f1dfcd Mon Sep 17 00:00:00 2001
From: Raphael Werner <raphael.werner@sidion.de>
Date: Sat, 3 May 2025 11:19:38 +0200
Subject: [PATCH] Added gnome-software remove

---
 roles/silverblue/tasks/main.yml | 16 +++++++++++-----
 roles/silverblue/vars/main.yml  |  7 ++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/roles/silverblue/tasks/main.yml b/roles/silverblue/tasks/main.yml
index 7749229..b7d1a0a 100644
--- a/roles/silverblue/tasks/main.yml
+++ b/roles/silverblue/tasks/main.yml
@@ -3,6 +3,11 @@
 
 - name: "Remove and install rpm-ostree software"
   block:
+    - name: "Remove preinstalled rpm-ostree packages"
+      community.general.rpm_ostree_pkg:
+        name: "{{ silverblue_rem_packages }}"
+        state: absent
+
     - name: "Upgrade the rpm-ostree image without options, accept all defaults"
       ansible.posix.rpm_ostree_upgrade:
 
@@ -19,17 +24,18 @@
         line: >-
           [ERR] Error while removing, updating or installing software.
 
-- name: "Remove, update and install Flathub software"
+- name: "Remove and install Flathub software"
   block:
     - name: "Remove preinstalled Flatpaks"
       community.general.flatpak:
         name: "{{ silverblue_rem_flatpaks }}"
         state: absent
 
-    - name: "Update existing flatpaks"
-      community.general.flatpak:
-        name: "*"
-        state: latest
+    - name: "Add the flathub flatpak repository remote"
+      community.general.flatpak_remote:
+        name: flathub
+        state: present
+        flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
 
     - name: "Install Flatpaks"
       community.general.flatpak:
diff --git a/roles/silverblue/vars/main.yml b/roles/silverblue/vars/main.yml
index e2e7f91..061d0ac 100644
--- a/roles/silverblue/vars/main.yml
+++ b/roles/silverblue/vars/main.yml
@@ -1,8 +1,9 @@
-#SPDX-License-Identifier: MIT-0
 ---
 # vars file for fedoraSilverblue
 
 silverblue_rem_packages:
+  - gnome-software-rpm-ostree
+  - gnome-software
 
 silverblue_packages:
   - python-psutil
@@ -40,4 +41,8 @@ silverblue_flatpaks:
   - com.github.tchx84.Flatseal
   - dev.heppen.webapps
   - com.protonvpn.www
+  - org.gnome.Papers
+  - com.mattjakeman.ExtensionManager
 
+silverblue_brew:
+  - dua-cli