fixing obvious errors

tasks/main.yml

@@ -86,42 +86,42 @@
 - name: Ensure pipx is installed
   when:
     - pkg_pipx|length > 0
-  ansible.builtin.include_tasks:
-    file: pkgs/pipx.yml
+  block:
+    - name: Queue pipx install
+      ansible.builtin.include_tasks:
+        file: pkgs/pipx.yml
 
-- name: Ensure pipx path exists
-  when: pkg_pipx|length > 0
-  become: "{{ ext_become }}"
-  ansible.builtin.file:
-    state: directory
-    mode: '0755'
-    path: "{{ path.pipx }}"
+    - name: Ensure pipx path exists
+      become: "{{ install_become }}"
+      become_user: "{{ install_become_user }}"
+      ansible.builtin.file:
+        state: directory
+        mode: '0755'
+        path: "{{ path_pipx }}"
 
 - name: Ensure nodejs and npm are installed
-  when: pkg_npm|length > 0
-  vars:
-    pkg: nodejs
+  when:
+    - pkg_npm|length > 0
   ansible.builtin.include_tasks:
-    file: addpkg.yml
+    file: pkgs/nodejs.yml
 
 - name: Ensure flatpak is installed
   when:
     - pkg_flatpak is defined
     - pkg_flatpak|length > 0
-  vars:
-    pkg: flatpak
   ansible.builtin.include_tasks:
-    file: addpkg.yml
+    file: pkgs/flatpak.yml
 
 - name: Ensure appimage path exists
   when:
     - pkg_appimage is defined
     - pkg_appimage|length > 0
-  become: "{{ ext_become }}"
+  become: "{{ install_become }}"
+  become_user: "{{ install_become_user }}"
   ansible.builtin.file:
     state: directory
     mode: '0755'
-    path: "{{ path.appimage }}"
+    path: "{{ path_appimage }}"
 
 - name: Ensure archive path exists
   when:
@@ -134,13 +134,14 @@
     path: "{{ path_archive }}"
 
 - name: Depend zig
-  when: pkg_zig|length > 0
-  vars:
-    pkg: zig
+  when:
+    - pkg_zig|length > 0
   ansible.builtin.include_tasks:
-    file: addpkg.yml
+    file: pkgs/zig.yml
 
-- name: Install sys_pkgs list using system package manager
+- name: Install pkg_sys list using system package manager
+  when:
+    - pkg_sys|length > 0
   become: "{{ install_become }}"
   become_user: "{{ install_become_user }}"
   ansible.builtin.package:
@@ -152,7 +153,7 @@
     - pkg_archive|length > 0
   loop: "{{ pkg_archive }}"
   loop_control:
-    loop_var: pkg
+    loop_var: archive
   ansible.builtin.include_tasks:
     file: helpers/archive.yml
 
@@ -173,18 +174,19 @@
     - pkg_cargo|length > 0
   block:
     - name: Ensure cargo path exists
-      become: "{{ ext_become }}"
+      become: "{{ install_become }}"
+      become_user: "{{ install_become_user }}"
       ansible.builtin.file:
         state: directory
         mode: '0755'
-        path: "{{ path.cargo }}"
+        path: "{{ path_cargo }}"
 
     - name: Install cargo packages
       loop: "{{ pkg_cargo | unique }}"
       loop_control:
-        loop_var: pkg
+        loop_var: cargo
       ansible.builtin.include_tasks:
-        file: cargo.yml
+        file: helpers/cargo.yml
 
 - name: Build and install rust apps
   when:
@@ -193,16 +195,7 @@
     - name: Run cargo build and install
       loop: "{{ cargo_pkg_build }}"
       loop_control:
-        loop_var: pkg
-      vars:
-        bin_name: "{{ pkg.bin_name | default(omit) }}"
-        bin_output: "{{ pkg.bin_output | default(omit) }}"
-        cargo_build_flags: "{{ pkg.cargo_build_flags | default(omit) }}"
-        depth: "{{ pkg.depth | default(omit) }}"
-        install_files: "{{ pkg.install_files | default(omit) }}"
-        name: "{{ pkg.name | default(omit) }}"
-        recursive: "{{ pkg.recursive | default(omit) }}"
-        repo: "{{ pkg.repo | default(omit) }}"
+        loop_var: cargo_build
       ansible.builtin.include_tasks:
         file: helpers/cargo_build.yml