working on helpers

tasks/helpers/archive.yml

@@ -11,7 +11,7 @@
         - name: Ensure directory exists
           become: "{{ install_become }}"
           become_user: "{{ install_become_user }}"
-          ansible.bulitin.file:
+          ansible.builtin.file:
             state: directory
             path: "{{ pkg.extract_to }}"
             mode: "{{ pkg.mode | default('0755') }}"
@@ -20,25 +20,29 @@
 
         - name: Download archive to cache
           ansible.builtin.get_url:
-            dest: "{{ d_cache }}/{{ pkg.name }}"
+            dest: "{{ d_cache.path }}/{{ pkg.name }}"
             url: "{{ pkg.url }}"
             checksum: "{{ pkg.checksum | default(omit) }}"
             decompress: false
             mode: '0644'
 
         - name: Extract archive
+          become: "{{ install_become }}"
+          become_user: "{{ install_become_user }}"
           ansible.builtin.unarchive:
             dest: "{{ pkg.extract_to }}"
-            src: "{{ d_cache }}/{{ pkg.name }}"
+            src: "{{ d_cache.path }}/{{ pkg.name }}"
             remote_src: true
             include: "{{ pkg.include | default(omit) }}"
             exclude: "{{ pkg.exclude | default(omit) }}"
 
         - name: Symlink archive files
+          become: "{{ install_become }}"
+          become_user: "{{ install_become_user }}"
           when:
-            - pkg.bins is defined
-            - pkg.bins | length > 0
-          loop: pkg.bins
+            - pkg.links is defined
+            - pkg.links | length > 0
+          loop: "{{ pkg.links }}"
           loop_control:
             loop_var: lnk
           ansible.builtin.file:

tasks/helpers/flatpak.yml

@@ -1,9 +1,10 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Install flatpak
-  become: "{{ ext_become }}"
+  become: "{{ install_become }}"
+  become_user: "{{ install_become_user }}"
   community.general.flatpak:
-    method: "{{ pkg_method }}"
-    remote: "{{ pkg_remote }}"
-    name: "{{ pkg_name }}"
-    state: present
+    method: "{{ flatpak.method | default('system') }}"
+    remote: "{{ flatpak.remote }}"
+    name: "{{ flatpak.name }}"
+    state: "{{ flatpak.state | default('present') }}"

tasks/helpers/flatpak_remote.yml

@@ -1,10 +1,11 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add flatpak remote
-  become: "{{ ext_become }}"
+  become: "{{ install_become }}"
+  become_user: "{{ install_become_user }}"
   community.general.flatpak_remote:
-    enabled: "{{ remote_enabled }}"
-    flatpakrepo_url: "{{ remote_url }}"
-    method: "{{ remote_method }}"
-    name: "{{ remote_name }}"
-    state: "{{ remote_state }}"
+    enabled: "{{ remote.enabled | default(true) }}"
+    flatpakrepo_url: "{{ remote.url }}"
+    method: "{{ remote.method | default('system') }}"
+    name: "{{ remote.name }}"
+    state: "{{ remote.state | default('present') }}"