adjusting variable names, fixing errors

tasks/pkgs/alacritty.yml

@@ -8,16 +8,16 @@
 ---
 - name: Set alacritty default facts # {{{
   ansible.builtin.set_fact:
-    alacritty_version: "{{ alacritty_version | default('v0.16.1') }}"
-    alacritty_build_flags: "{{ alacritty_build_flags | default( ['--release'] ) }}"
     alacritty:
+      methods:
+        - source
+        - system
+      build_flags: "{{ alacritty_build_flags | default( ['--release'] ) }}"
+      version: "{{ alacritty_version | default('v0.16.1') }}"
       pkgname:
         RedHat: alacritty
         Debian: alacritty
         Alpine: alacritty
-      install_methods:
-        - source
-        - system
       git_repo: https://github.com/alacritty/alacritty
       install_files:
         - from: target/release/alacritty
@@ -33,7 +33,7 @@
         - git
         - cargo
         - cmake
-      build_deps:
+      bds:
         RedHat:
           - fontconfig-devel
           - freetype-devel
@@ -81,33 +81,33 @@
   block:
     - name: Set alacritty install method
       when:
-        - alacritty_install_method is undefined
+        - alacritty_imethod is undefined
       block:
         - name: Configure for RedHat enterprise linux 10
           when:
             - os_family == 'RedHat'
             - ansible_distribution_major_version|int <= 10
           ansible.builtin.set_fact:
-            alacritty_install_method: source
+            alacritty_imethod: source
 
         - name: Fallback configuration for alacritty
           when:
-            - alacritty_install_method is undefined
+            - alacritty_imethod is undefined
           ansible.builtin.set_fact:
-            alacritty_install_method: "{{ install_method if install_method in alacritty.install_methods else alacritty.install_methods[0] }}"
+            alacritty_imethod: "{{ imethod if imethod in alacritty.methods else alacritty.methods[0] }}"
     - name: Configure alacritty source install # {{{
       when:
-        - alacritty_install_method == "source"
+        - alacritty_imethod == "source"
       block:
         - name: Set alacritty build facts
           ansible.builtin.set_fact:
             alacritty_src_install:
-              build_flags: "{{ alacritty_build_flags }}"
+              build_flags: "{{ alacritty.build_flags }}"
               source_dir: "{{ d_cache.path }}/alacritty"
               repo: "{{ alacritty.git_repo }}"
-              version: "{{ alacritty_version }}"
+              version: "{{ alacritty.version }}"
               files: "{{ alacritty.install_files }}"
-            alacritty_build_deps: "{{ alacritty.build_deps[os_family] }}"
+            alacritty_bds: "{{ alacritty.bds[os_family] }}"
 
         - name: Set alacritty install extra build deps
           when:
@@ -118,13 +118,13 @@
               when:
                 - ansible_distribution_major_version == 7
               ansible.builtin.set_fact:
-                alacritty_build_deps: "{{ alacritty_build_deps + ['xcb-util-devel', '@Development Tools'] }}"
+                alacritty_bds: "{{ alacritty_bds + ['xcb-util-devel', '@Development Tools'] }}"
 
             - name: Add extra dependencies for EL8
               when:
                 - ansible_distribution_major_version == 8
               ansible.builtin.set_fact:
-                alacritty_build_deps: "{{ alacritty_build_deps + ['@Development Tools'] }}"
+                alacritty_bds: "{{ alacritty_bds + ['@Development Tools'] }}"
 
         - name: Configure pkg dependencies
           loop: "{{ alacritty.pkg_deps }}"
@@ -134,17 +134,25 @@
 
         - name: Append build dependencies and cargo config
           ansible.builtin.set_fact:
-            pkg_sys: "{{ pkg_sys + alacritty_build_deps }}"
+            pkg_sys: "{{ pkg_sys + alacritty_bds }}"
             pkg_cargo_build: "{{ pkg_cargo_build + [alacritty_src_install] }}"
 
+        - name: Finalise alacritty source instal
+          ansible.builtin.set_fact:
+            cargo_install: "{{ alacritty_imethod }}={{ alacritty_src_install }}+{{ alacritty_bds }}"
+
     - name: Configure alacritty system install
       when:
-        - alacritty_install_method == 'system'
+        - alacritty_imethod == 'system'
       block:
         - name: Queue alacritty for installation
           ansible.builtin.set_fact:
             pkg_sys: "{{ pkg_sys + [ alacritty.pkgname[os_family] ] }}"
 
+        - name: Finalise alacritty system install
+          ansible.builtin.set_fact:
+            alacritty_install: "{{ alacritty_imethod }}={{ alacritty.pkgname[os_family] ]}}"
+
     - name: Complete alacritty configuration
       ansible.builtin.set_fact:
-        __configured: "{{ __configured | combine( { 'alacritty': alacritty_install_method } ) }}"
+        __configured: "{{ __configured | combine( { 'alacritty': alacritty_install } ) }}"