Install cargo only if pkg_cargo needs it

handlers/main.yml

@@ -19,13 +19,13 @@
 - name: Ensure go is present
   vars:
     pkg: go
-  listen: "Depend go"
+  listen: Depend go
   ansible.builtin.include_tasks:
     file: addpkg.yml
 
 - name: Ensure go path exists
   become: "{{ ext_become }}"
-  listen: "Depend go"
+  listen: Depend go
   ansible.builtin.file:
     state: directory
     mode: '0755'
@@ -46,47 +46,47 @@
 - name: Ensure pipx is installed
   vars:
     pkg: pipx
-  listen: "Depend pipx"
+  listen: Depend pipx
   ansible.builtin.include_tasks:
     file: addpkg.yml
 
 - name: Ensure pipx path exists
   become: "{{ ext_become }}"
-  listen: "Depend pipx"
+  listen: Depend pip"
   ansible.builtin.file:
     state: directory
     mode: '0755'
     path: "{{ path.pipx }}"
 
-- name: Ensure rust and cargo are installed
+# - name: Ensure rust and cargo are installed
-  vars:
+#   vars:
-    pkg: rust
+#     pkg: rust
-  listen: "Depend cargo"
+#   listen: Depend cargo
-  ansible.builtin.include_tasks:
+#   ansible.builtin.include_tasks:
-    file: addpkg.yml
+#     file: addpkg.yml
-
+#
-- name: Ensure cargo path exists
+# - name: Ensure cargo path exists
-  become: "{{ ext_become }}"
+#   become: "{{ ext_become }}"
-  listen: "Depend cargo"
+#   listen: Depend cargo
-  ansible.builtin.file:
+#   ansible.builtin.file:
-    state: directory
+#     state: directory
-    mode: '0755'
+#     mode: '0755'
-    path: "{{ path.cargo }}"
+#     path: "{{ path.cargo }}"
-
+#
-- name: Depend rust
+# - name: Depend rust
-  vars:
+#   vars:
-    pkg: rust
+#     pkg: rust
-  listen: "Depend rust"
+#   listen: "Depend rust"
-  ansible.builtin.include_tasks:
+#   ansible.builtin.include_tasks:
-    file: addpkg.yml
+#     file: addpkg.yml
-
+#
-- name: Ensure cargo path exists
+# - name: Ensure cargo path exists
-  become: "{{ ext_become }}"
+#   become: "{{ ext_become }}"
-  listen: "Depend rust"
+#   listen: "Depend rust"
-  ansible.builtin.file:
+#   ansible.builtin.file:
-    state: directory
+#     state: directory
-    mode: '0755'
+#     mode: '0755'
-    path: "{{ path.cargo }}"
+#     path: "{{ path.cargo }}"
 
 - name: Depend zig
   vars:

tasks/main.yml

@@ -99,6 +99,21 @@
 - name: Install cargo packages
   when:
     - pkg_cargo|length > 0
+  block:
+    - name: Ensure rust and cargo are installed
+      vars:
+        pkg: rust
+      ansible.builtin.include_tasks:
+        file: addpkg.yml
+
+    - name: Ensure cargo path exists
+      become: "{{ ext_become }}"
+      ansible.builtin.file:
+        state: directory
+        mode: '0755'
+        path: "{{ path.cargo }}"
+
+    - name: Install cargo packages
       loop: "{{ pkg_cargo | unique }}"
       loop_control:
         loop_var: pkg

tasks/pkgs/alacritty.yml

@@ -11,9 +11,9 @@
     - name: Append alacritty to pkg_cargo
       when:
         - alacritty.method == 'cargo'
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_sys: "{{ pkg_sys + alacritty.build_deps }}"
         pkg_cargo: "{{ pkg_cargo + [alacritty.cargo] }}"

tasks/pkgs/broot.yml

@@ -11,9 +11,9 @@
     - name: Append broot to pkg_sys and pkg_cargo
       when:
         - ansible_system == 'Linux'
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_sys: "{{ pkg_sys + broot.deps }}"
         pkg_cargo: "{{ pkg_cargo + [broot] }}"

tasks/pkgs/choose.yml

@@ -11,9 +11,9 @@
     - name: Append choose to pkg_cargo
       when:
         - ansible_system == 'Linux'
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + [choose] }}"
 

tasks/pkgs/dotenv-linter.yml

@@ -5,9 +5,9 @@
     - dotenv_linter_configured is undefined
   block:
     - name: Append dotenv-linter to pkg_cargo
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['dotenv-linter'] }}"
 

tasks/pkgs/dust.yml

@@ -7,9 +7,9 @@
     - name: Append du-dust to pkg_cargo
       when:
         - ansible_system == 'Linux'
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['du-dust'] }}"
 

tasks/pkgs/eza.yml

@@ -5,9 +5,9 @@
     - eza_configured is undefined
   block:
     - name: Append eza to pkg_cargo
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['eza'] }}"
 

tasks/pkgs/gping.yml

@@ -13,9 +13,9 @@
     - name: Append gping to pkg_cargo
       when:
         - ansible_system == 'Linux'
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['gping'] }}"
 

tasks/pkgs/htmx-lsp.yml

@@ -5,8 +5,8 @@
     - htmx_lsp_configured is undefined
   block:
     - name: Append htmx-lsp to pkg_cargo
-      notify: Depend cargo
+      # notify: Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['htmx-lsp'] }}"
 

tasks/pkgs/jinja-lsp.yml

@@ -5,9 +5,9 @@
     - jinja_lsp_configured is undefined
   block:
     - name: Append jinja-lsp to pkg_cargo
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['jinja-lsp'] }}"
 

tasks/pkgs/mcfly.yml

@@ -13,8 +13,8 @@
     - name: Append mcfly to pkg_cargo
       when:
         - ansible_system == 'Linux'
-      notify: Depend cargo
+      # notify: Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['mcfly'] }}"
 

tasks/pkgs/neovide.yml

@@ -17,9 +17,9 @@
             pkg_sys: "{{ pkg_sys + neovide.deps }}"
 
         - name: Append neovide to pkg_cargo
-          notify:
+          # notify:
-            - Depend cargo
+          #   - Depend cargo
-          changed_when: true
+          # changed_when: true
           ansible.builtin.set_fact:
             pkg_cargo: "{{ pkg_cargo + [neovide] }}"
 

tasks/pkgs/nodejs.yml

@@ -1,9 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add nodejs
+# - name: Add nodejs
-  when:
+#   when:
-    - nodejs_configured is undefined
+#     - nodejs_configured is undefined
-  block:
+#   block:
 - name: Load nodejs config
   ansible.builtin.include_tasks:
     file: config/nodejs.yml

tasks/pkgs/rust.yml

@@ -1,17 +1,10 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add rust
-  when:
-    - rust_configured is undefined
-  block:
 - name: Load rust config
   ansible.builtin.include_tasks:
     file: config/rust.yml
 
-    - name: Append rust to pkgs
+- name: Install rust and cargo
-      ansible.builtin.set_fact:
+  become: true
-        pkg_sys: "{{ pkg_sys + rust.pkgs }}"
+  ansible.builtin.package:
-
+    name: "{{ rust.pkgs }}"
-    - name: Set rust_configured
-      ansible.builtin.set_fact:
-        rust_configured: true

tasks/pkgs/sd.yml

@@ -13,9 +13,9 @@
     - name: Append sd to pkg_cargo
       when:
         - ansible_system == 'Linux'
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['sd'] }}"
 

tasks/pkgs/starship.yml

@@ -5,9 +5,9 @@
     - starship_configured is undefined
   block:
     - name: Append starship to pkg_cargo
-      notify:
+      # notify:
-        - Depend cargo
+      #   - Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + [{'name': 'starship', 'locked': true}] }}"
 

tasks/pkgs/tldr.yml

@@ -13,8 +13,8 @@
     - name: Append tldr to pkg_cargo
       when:
         - ansible_system == 'Linux'
-      notify: Depend cargo
+      # notify: Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['tlrc'] }}"
 

tasks/pkgs/xh.yml

@@ -17,8 +17,8 @@
     - name: Add xh to cargopkgs
       when:
         - ansible_system == 'Linux'
-      notify: Depend cargo
+      # notify: Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + [xh] }}"
 

tasks/pkgs/yazi.yml

@@ -5,8 +5,8 @@
     - yazi_fm_configured is undefined
   block:
     - name: Append yazi-fm to pkg_cargo
-      notify: Depend cargo
+      # notify: Depend cargo
-      changed_when: true
+      # changed_when: true
       ansible.builtin.set_fact:
         pkg_cargo: "{{ pkg_cargo + ['yazi-fm', 'yazi-cli'] }}"