6 files changed, 45 insertions, 17 deletions
diff --git a/chaos-at-home/ch-equinox-t450s.yml b/chaos-at-home/ch-equinox-t450s.yml
index e257d512..dfe561cd 100644
--- a/chaos-at-home/ch-equinox-t450s.yml
+++ b/chaos-at-home/ch-equinox-t450s.yml
@@ -25,6 +25,7 @@
   - role: network/wireguard/base
   - role: ws/minet
   - role: ws/pipewire
+  - role: ws/flatpak
   post_tasks:
   - name: disable caps-lock
     lineinfile:
@@ -70,9 +71,3 @@
         else
           echo "Touchpad not found..."
         fi
-
-  - name: add flathub to systemd-wide flatpak remotes
-    community.general.flatpak_remote:
-      name: flathub
-      flatpakrepo_url: https://flathub.org/repo/flathub.flatpakrepo
-      state: present
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index 70cc91aa..26a0dc79 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -22,6 +22,7 @@
   - role: apt-repo/kicad6
   - role: ws/base
   - role: core/admin-users
+  - role: ws/flatpak
   post_tasks:
   - name: disable caps-lock
     lineinfile:
@@ -66,12 +67,6 @@
       masked: true
       state: stopped
 
-  - name: add flathub to systemd-wide flatpak remotes
-    community.general.flatpak_remote:
-      name: flathub
-      flatpakrepo_url: https://flathub.org/repo/flathub.flatpakrepo
-      state: present
-
   - name: install deps for c3voc/cm repo
     pip:
       name:
diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml
index 3a4927b6..322199d6 100644
--- a/inventory/host_vars/ch-equinox-t450s.yml
+++ b/inventory/host_vars/ch-equinox-t450s.yml
@@ -80,7 +80,6 @@ ws_base_extra_packages:
   - aisleriot
   - atftp
   - asciidoc
-  - audacity
   - autoconf
   - automake
   - avr-libc
@@ -123,7 +122,6 @@ ws_base_extra_packages:
   - etherwake
   - filezilla
   - flac
-  - flatpak
   - fldigi
   - flex
   - freecad
@@ -395,3 +393,8 @@ ws_minet_openwifi_connections:
     ssid: WirelessViennaAirport
 
 ws_minet_wpa_supplicant_conf: "{{ lookup('unvault', ([global_files_dir, 'chaos-at-home', 'wpa_supplicant.conf.vault'] | path_join | realpath)) }}"
+
+
+ws_flatpak_apps:
+  - name: org.tenacityaudio.Tenacity
+  - name: org.audacityteam.Audacity
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 8059162a..4c9cac0c 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -70,11 +70,11 @@ spreadspace_apt_repo_components:
 wakeonlan_interfaces:
   - enp4s0
 
+
 ws_base_extra_packages:
   - aisleriot
   - atftp
   - asciidoc
-  - audacity
   - autoconf
   - automake
   - avr-libc
@@ -117,7 +117,6 @@ ws_base_extra_packages:
   - etherwake
   - filezilla
   - flac
-  - flatpak
   - fldigi
   - flex
   - freecad
@@ -299,7 +298,6 @@ ws_base_extra_packages:
   # - virtualbox
   # - youtube-dl
 
-
 ws_base_xrandr_setup_script: |
   #!/bin/bash
 
@@ -309,3 +307,8 @@ ws_base_xrandr_setup_script: |
   xrandr --output HDMI-A-0 --mode 3840x2160 --same-as DisplayPort-0 && true
 
   exit 0
+
+
+ws_flatpak_apps:
+  - name: org.tenacityaudio.Tenacity
+  - name: org.audacityteam.Audacity
diff --git a/roles/ws/flatpak/defaults/main.yml b/roles/ws/flatpak/defaults/main.yml
new file mode 100644
index 00000000..f4d8036c
--- /dev/null
+++ b/roles/ws/flatpak/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+ws_flatpak_repositories:
+  flathub: https://flathub.org/repo/flathub.flatpakrepo
+
+ws_flatpak_apps: []
+# ws_flatpak_apps:
+#   - name: com.example.foo
+#     remote: foo
+#   - name: com.example.bar
diff --git a/roles/ws/flatpak/tasks/main.yml b/roles/ws/flatpak/tasks/main.yml
new file mode 100644
index 00000000..0fb5df9f
--- /dev/null
+++ b/roles/ws/flatpak/tasks/main.yml
@@ -0,0 +1,23 @@
+---
+- name: install flatpak
+  apt:
+    name: flatpak
+    state: present
+
+- name: add flatpak repositories to systemd-wide flatpak remotes
+  loop: "{{ ws_flatpak_repositories | dict2items }}"
+  loop_control:
+    label: "{{ item.key }}"
+  community.general.flatpak_remote:
+    name: "{{ item.key }}"
+    flatpakrepo_url: "{{ item.value }}"
+    state: present
+
+- name: install flatpak apps
+  loop: "{{ ws_flatpak_apps }}"
+  loop_control:
+    label: "{{ item.name }}"
+  community.general.flatpak:
+    name: "{{ item.name }}"
+    remote: "{{ item.remote | default(omit) }}"
+    state: present