finished with a bunch more

tasks/main.yml

@@ -76,23 +76,20 @@
 - name: Install go if required
   when:
     - pkg_go|length > 0
-  ansible.builtin.include_tasks:
-    file: pkgs/go.yml
+  ansible.builtin.include_tasks: pkgs/go.yml
 
 - name: Install rust and cargo if required
   when:
     - pkg_cargo|length > 0 or
       pkg_cargo_build|length > 0
-  ansible.builtin.include_tasks:
-    file: pkgs/rust.yml
+  ansible.builtin.include_tasks: pkgs/rust.yml
 
 - name: Ensure pipx is installed
   when:
     - pkg_pipx|length > 0
   block:
     - name: Queue pipx install
-      ansible.builtin.include_tasks:
-        file: pkgs/pipx.yml
+      ansible.builtin.include_tasks: pkgs/pipx.yml
 
     - name: Ensure pipx path exists
       become: "{{ install_become }}"
@@ -105,15 +102,13 @@
 - name: Ensure nodejs and npm are installed
   when:
     - pkg_npm|length > 0
-  ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
+  ansible.builtin.include_tasks: pkgs/nodejs.yml
 
 - name: Ensure flatpak is installed
   when:
     - pkg_flatpak is defined
     - pkg_flatpak|length > 0
-  ansible.builtin.include_tasks:
-    file: pkgs/flatpak.yml
+  ansible.builtin.include_tasks: pkgs/flatpak.yml
 
 - name: Ensure appimage path exists
   when:
@@ -139,8 +134,7 @@
 - name: Depend zig
   when:
     - pkg_zig|length > 0
-  ansible.builtin.include_tasks:
-    file: pkgs/zig.yml
+  ansible.builtin.include_tasks: pkgs/zig.yml
 
 - name: Install pkg_sys list using system package manager
   when:
@@ -157,50 +151,34 @@
   loop: "{{ pkg_archive }}"
   loop_control:
     loop_var: archive
-  ansible.builtin.include_tasks:
-    file: helpers/archive.yml
+  ansible.builtin.include_tasks: helpers/archive.yml
 
 - name: Linux specific tasks
   when:
     - system == 'Linux'
-  ansible.builtin.include_tasks:
-    file: linux.yml
+  ansible.builtin.include_tasks: linux.yml
 
 - name: MacOS specific tasks
   when:
     - distribution == 'MacOSX'
-  ansible.builtin.include_tasks:
-    file: macos.yml
+  ansible.builtin.include_tasks: macos.yml
 
 - name: Install cargo packages
   when:
-    - pkg_cargo|length > 0
+    - pkg_cargo|length > 0 or
+      pkg_cargo_build|length > 0
   block:
-    - name: Ensure cargo path exists
-      become: "{{ install_become }}"
-      become_user: "{{ install_become_user }}"
-      ansible.builtin.file:
-        state: directory
-        mode: '0755'
-        path: "{{ path_cargo }}"
-
     - name: Install cargo packages
       loop: "{{ pkg_cargo | unique }}"
       loop_control:
-        loop_var: cargo
-      ansible.builtin.include_tasks:
-        file: helpers/cargo.yml
+        loop_var: pkg
+      ansible.builtin.include_tasks: helpers/cargo.yml
 
-- name: Build and install rust apps
-  when:
-    - pkg_cargo_build|length > 0
-  block:
-    - name: Run cargo build and install
-      loop: "{{ cargo_pkg_build }}"
+    - name: Install cargo_build packages
+      loop: "{{ pkg_cargo_build }}"
       loop_control:
-        loop_var: cargo_build
-      ansible.builtin.include_tasks:
-        file: helpers/cargo_build.yml
+        loop_var: pkg
+      ansible.builtin.include_tasks: helpers/cargo_build.yml
 
 - name: Install go packages
   when:
@@ -210,8 +188,7 @@
       loop: "{{ pkg_go }}"
       loop_control:
         loop_var: pkg
-      ansible.builtin.include_tasks:
-        file: helpers/go_install.yml
+      ansible.builtin.include_tasks: helpers/go_install.yml
 
 - name: Install local npm packages
   when:
@@ -219,8 +196,7 @@
   loop: "{{ pkg_npm | unique }}"
   loop_control:
     loop_var: pkg
-  ansible.builtin.include_tasks:
-    file: npm.yml
+  ansible.builtin.include_tasks: helpers/npm.yml
 
 - name: Install python pipx packages for user
   when:
@@ -228,14 +204,16 @@
   loop: "{{ pkg_pipx | unique }}"
   loop_control:
     loop_var: pkg
-  ansible.builtin.include_tasks:
-    file: pipx.yml
+  ansible.builtin.include_tasks: helpers/pipx.yml
 
-- name: Build and install source packages
+- name: Build and install make packages
   when:
-    - pkg_src|length > 0
-  loop: "{{ pkg_src | unique }}"
+    - pkg_make|length > 0
+  loop: "{{ pkg_make | unique }}"
   loop_control:
     loop_var: pkg
-  ansible.builtin.include_tasks:
-    file: "src/{{ pkg }}.yml"
+  ansible.builtin.include_tasks: helpers/make.yml
+
+- name: Dump __configured
+  ansible.builtin.debug:
+    var: __configured