From c97dfa1aa3cd246655191a346deeed318828cdfd Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Mon, 13 Apr 2026 03:03:41 -0600
Subject: [PATCH] trying to fix alacritty build

---
 tasks/helpers/cargo.yml       |  2 +-
 tasks/helpers/cargo_build.yml |  4 ++--
 tasks/main.yml                |  2 +-
 tasks/pkgs/alacritty.yml      | 14 +++++++++-----
 tasks/pkgs/yazi.yml           |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tasks/helpers/cargo.yml b/tasks/helpers/cargo.yml
index b3c388a..344b42f 100644
--- a/tasks/helpers/cargo.yml
+++ b/tasks/helpers/cargo.yml
@@ -11,7 +11,7 @@
   ansible.builtin.debug:
     var: pkg
 
-- name: Install with cargo
+- name: Install with cargo {{ pkg.name }}
   become: "{{ install_become }}"
   become_user: "{{ install_become_user }}"
   community.general.cargo:
diff --git a/tasks/helpers/cargo_build.yml b/tasks/helpers/cargo_build.yml
index bb4ff93..04b0155 100644
--- a/tasks/helpers/cargo_build.yml
+++ b/tasks/helpers/cargo_build.yml
@@ -12,7 +12,7 @@
 ##   locked: _bool_ optional, default 'false'
 ##   build_flags: _list[str]_ optional. If set, will append these to the build command
 ---
-- name: Cargo source install helper
+- name: Cargo source install helper {{ pkg.name | default(omit) }}
   block:
     - name: Fetch git repo
       vars:
@@ -32,7 +32,7 @@
         path: "{{ install_prefix }}"
         name: "{{ pkg.name }}"
         version: "{{ pkg.version }}"
-        locked: "{{ pkg.locked }}"
+        locked: "{{ pkg.locked | default(false) }}"
 
     - name: Clean existing install
       vars:
diff --git a/tasks/main.yml b/tasks/main.yml
index 6ce927d..9f95e1b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -107,7 +107,7 @@
       ansible.builtin.include_tasks: helpers/cargo.yml
 
     - name: Install cargo_build packages
-      loop: "{{ pkg_cargo_build }}"
+      loop: "{{ pkg_cargo_build | unique }}"
       loop_control:
         loop_var: pkg
       ansible.builtin.include_tasks: helpers/cargo_build.yml
diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml
index 1d61a5d..7c034e6 100644
--- a/tasks/pkgs/alacritty.yml
+++ b/tasks/pkgs/alacritty.yml
@@ -2,7 +2,7 @@
 #
 ## Package: alacritty
 ## Description: GPU accelerated terminal emulator written in rust
-## Version: v0.16.1
+## Version: 0.16.1
 ## Methods: [source, system]
 ## Helpers: cargo_build
 ---
@@ -13,12 +13,14 @@
         - source
         - system
       build_flags: "{{ alacritty_build_flags | default( ['--release'] ) }}"
-      version: "{{ alacritty_version | default('v0.16.1') }}"
+      version: "{{ alacritty_version | default('0.16.1') }}"
       pkgname:
         RedHat: alacritty
         Debian: alacritty
         Alpine: alacritty
-      git_repo: https://github.com/alacritty/alacritty
+      git:
+        repo: https://github.com/alacritty/alacritty
+        version: "{{ alacritty_version | default('v0.16.1') }}"
       install_files:
         - from: target/release/alacritty
           to: bin/alacritty
@@ -95,6 +97,7 @@
             - alacritty_imethod is undefined
           ansible.builtin.set_fact:
             alacritty_imethod: "{{ imethod if imethod in alacritty.methods else alacritty.methods[0] }}"
+
     - name: Configure alacritty source install # {{{
       when:
         - alacritty_imethod == "source"
@@ -104,9 +107,10 @@
             alacritty_src_install:
               build_flags: "{{ alacritty.build_flags }}"
               source_dir: "{{ d_cache.path }}/alacritty"
-              repo: "{{ alacritty.git_repo }}"
-              version: "{{ alacritty.version }}"
+              repo: "{{ alacritty.git.repo }}"
+              version: "{{ alacritty.git.version }}"
               files: "{{ alacritty.install_files }}"
+              name: alacritty
             alacritty_bds: "{{ alacritty.bds[os_family] }}"
 
         - name: Set alacritty install extra build deps
diff --git a/tasks/pkgs/yazi.yml b/tasks/pkgs/yazi.yml
index 6d57f6a..9b8a6d3 100644
--- a/tasks/pkgs/yazi.yml
+++ b/tasks/pkgs/yazi.yml
@@ -77,7 +77,7 @@
         - name: Append yazi to pkg_cargo_build
           ansible.builtin.set_fact:
             pkg_sys: "{{ pkg_sys + yazi.build_depends[ansible_os_family] }}"
-            pkg_cargo_build: "{{ pkg_cargo + [ yazi_src_install ] }}"
+            pkg_cargo_build: "{{ pkg_cargo_build + [ yazi_src_install ] }}"
             yazi_install: "{{ yazi_imethod }}={{ yazi_src_install }}"
 
     - name: Finalise yazi configuration