From aa98612d6c61cf35c06f7dbbffbad5fc5cdd6136 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 23 Sep 2021 21:31:32 -0500
Subject: [PATCH] Rework data structures for flatpaks to properly allow for
 different remotes

---
 roles/desktop/defaults/main.yml  | 12 ++++++++----
 roles/desktop/tasks/packages.yml |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/roles/desktop/defaults/main.yml b/roles/desktop/defaults/main.yml
index e8cedca..bbc7f9c 100644
--- a/roles/desktop/defaults/main.yml
+++ b/roles/desktop/defaults/main.yml
@@ -157,8 +157,12 @@ desktop_flatpak_remotes:
 desktop_flatpak_remotes_extra: []
 
 desktop_flatpak_packages:
-  - com.obsproject.Studio
-  - net.lutris.Lutris
-  - net.minetest.Minetest
-  - org.DolphinEmu.dolphin-emu
+  - remote: flathub
+    packages:
+      - com.obsproject.Studio
+      - net.minetest.Minetest
+      - org.DolphinEmu.dolphin-emu
+  - remote: flathub-beta
+    packages:
+      - net.lutris.Lutris
 desktop_flatpak_packages_extra: []
diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop/tasks/packages.yml
index 6597bae..c487743 100644
--- a/roles/desktop/tasks/packages.yml
+++ b/roles/desktop/tasks/packages.yml
@@ -50,4 +50,5 @@
       flatpak_remote: name="{{ item.name }}" state=present flatpakrepo_url="{{ item.url }}"
       with_items: "{{ desktop_flatpak_remotes + desktop_flatpak_remotes_extra }}"
     - name: configure installed flatpaks
-      flatpak: name="{{ desktop_flatpak_packages + desktop_flatpak_packages_extra }}"
+      flatpak: name="{{ item.packages }}" state=present remote="{{ item.remote | default('flathub', true) }}"
+      with_items: "{{ desktop_flatpak_packages + desktop_flatpak_packages_extra }}"