From 69a8036398c11691c4b3b094991f87c8f87a19a6 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 23 Sep 2021 21:22:35 -0500
Subject: [PATCH] Configure flatpak last on desktop plays

---
 roles/desktop/tasks/packages.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop/tasks/packages.yml
index 6330a4a..6597bae 100644
--- a/roles/desktop/tasks/packages.yml
+++ b/roles/desktop/tasks/packages.yml
@@ -29,13 +29,6 @@
       # Ignoring errors here is important because this task fails on package backdates
       ignore_errors: yes
   when: ansible_pkg_mgr == "apt"
-- name: configure flatpak
-  block:
-    - name: configure flatpak remotes
-      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 }}"
 - name: configure portage
   block:
       # Portage is very complex, so we sync an entire known good configuration tree
@@ -51,3 +44,10 @@
 - name: configure pip3 packages
   pip: executable=/usr/bin/pip3 state=latest name="{{ desktop_pip3_packages + desktop_pip3_packages_extra }}"
   when: ansible_os_family != "Gentoo"
+- name: configure flatpak
+  block:
+    - name: configure flatpak remotes
+      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 }}"