From b3261cc2f3f73aa0e338cb7c8c9714c118318a00 Mon Sep 17 00:00:00 2001
From: Marco <mrckndt@riseup.net>
Date: Mon, 27 Dec 2021 15:29:29 +0100
Subject: [PATCH] package updates

---
 group_vars/silverblue.yml        |  9 ++++++---
 host_vars/chapek9.yml            |  5 -----
 host_vars/ice9.yml               |  3 +++
 host_vars/vinci.yml              | 27 +++++++++++++++++++++------
 roles/flatpak/tasks/flatpaks.yml |  2 --
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/group_vars/silverblue.yml b/group_vars/silverblue.yml
index c0773c6..1e1db9d 100644
--- a/group_vars/silverblue.yml
+++ b/group_vars/silverblue.yml
@@ -150,6 +150,9 @@ flatpak_flatpaks:
   org.gnome.FileRoller:
     state: present
     remote: fedora
+  org.gnome.Firmware:
+    state: present
+    remote: flathub
   org.gnome.font-viewer:
     state: present
     remote: fedora
@@ -191,7 +194,7 @@ rpm_ostree_base_packages:
 
 rpm_ostree_kargs:
   'rd.luks.options=discard':
-    state: present
+    state: absent
 
 rpm_ostree_layered_packages:
   ansible:
@@ -202,8 +205,6 @@ rpm_ostree_layered_packages:
     state: present
   checksec:
     state: absent
-  compsize:
-    state: present
   docker-compose:
     state: present
   fd-find:
@@ -236,6 +237,8 @@ rpm_ostree_layered_packages:
     state: present
   nmon:
     state: present
+  p7zip-plugins:
+    state: present
   ranger:
     state: present
   ripgrep:
diff --git a/host_vars/chapek9.yml b/host_vars/chapek9.yml
index cdf278b..2657839 100644
--- a/host_vars/chapek9.yml
+++ b/host_vars/chapek9.yml
@@ -14,8 +14,3 @@ rpm_ostree_kargs_overwrite:
     state: present
   'mem_sleep_default=deep':
     state: present
-
-flatpak_flatpaks_overwrite:
-  org.gnome.Firmware:
-    state: present
-    remote: flathub
diff --git a/host_vars/ice9.yml b/host_vars/ice9.yml
index 29525f7..73a8d0f 100644
--- a/host_vars/ice9.yml
+++ b/host_vars/ice9.yml
@@ -25,6 +25,9 @@ flatpak_flatpaks_overwrite:
   io.openrct2.OpenRCT2:
     state: present
     remote: flathub
+  org.gnome.Firmware:
+    state: absent
+    remote: flathub
   org.kde.kid3:
     state: present
     remote: flathub
diff --git a/host_vars/vinci.yml b/host_vars/vinci.yml
index d0c9226..c7246f6 100644
--- a/host_vars/vinci.yml
+++ b/host_vars/vinci.yml
@@ -3,20 +3,35 @@ etc_hostname: vinci
 
 etc_fstab_entries_overwrite:
   root:
-    src: UUID=f1b9b845-5f3c-4912-b729-b6e8605f0def
+    src: UUID=9296ebbe-a288-48e4-a9cd-0a80374c7c46
   home:
-    src: UUID=f1b9b845-5f3c-4912-b729-b6e8605f0def
+    src: UUID=9296ebbe-a288-48e4-a9cd-0a80374c7c46
   docker:
-    src: UUID=f1b9b845-5f3c-4912-b729-b6e8605f0def
+    src: UUID=9296ebbe-a288-48e4-a9cd-0a80374c7c46
 
 flatpak_flatpaks_overwrite:
-  org.gnome.Firmware:
-    state: present
+  com.discordapp.Discord:
+    state: absent
     remote: flathub
   com.mattermost.Desktop:
     state: present
     remote: flathub
+  com.valvesoftware.Steam:
+    state: present
+    remote: flathub
+  im.riot.Riot:
+    state: absent
+    remote: flathub
+  org.chromium.Chromium:
+    state: absent
+    remote: flathub
+  org.gnome.Evolution:
+    state: absent
+    remote: fedora
+  org.gnome.Firmware:
+    state: present
+    remote: flathub
 
 rpm_ostree_layered_packages_overwrite:
   radeontop:
-    state: present
+    state: absent
diff --git a/roles/flatpak/tasks/flatpaks.yml b/roles/flatpak/tasks/flatpaks.yml
index 5005158..3d53ca3 100644
--- a/roles/flatpak/tasks/flatpaks.yml
+++ b/roles/flatpak/tasks/flatpaks.yml
@@ -10,5 +10,3 @@
     state: "{{ item.value.state }}"
     remote: "{{ item.value.remote }}"
   loop: "{{ lookup('dict', flatpak_flatpaks, wantlist=True) }}"
-  notify:
-    - Update Flatpaks