playbooks/device_roles_workstation.yml

@@ -58,6 +58,7 @@
           - xserver-xephyr
         desktop_apt_debs_extra:
           - "https://zoom.us/client/latest/zoom_amd64.deb" # Zoom, proprietary shitware
+          - "https://downloads.raspberrypi.org/imager/imager_amd64.deb" # Pi imager
       tags: [ desktop, desktop-role ]
     - role: grub
       tags: [ desktop, grub ]

roles/desktop/defaults/main.yml

@@ -157,12 +157,8 @@ desktop_flatpak_remotes:
 desktop_flatpak_remotes_extra: []
 
 desktop_flatpak_packages:
-  - remote: flathub
-    packages:
   - com.obsproject.Studio
+  - net.lutris.Lutris
   - net.minetest.Minetest
   - org.DolphinEmu.dolphin-emu
-  - remote: flathub-beta
-    packages:
-      - net.lutris.Lutris
 desktop_flatpak_packages_extra: []

roles/desktop/tasks/packages.yml

@@ -29,6 +29,13 @@
       # 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
@@ -44,11 +51,3 @@
 - 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="{{ item.packages }}" state=present remote="{{ item.remote | default('flathub', true) }}"
-      with_items: "{{ desktop_flatpak_packages + desktop_flatpak_packages_extra }}"