working on cleanup and fixing a few format issues

- modifying how installs are done

tasks/pkgs/air.yml

@@ -15,7 +15,7 @@
       when:
         - air_install_method is undefined
       ansible.builtin.set_fact:
-        air_install_method: "{{ install_method if install_method in air_install_methods else air_install_methods[0] }}"
+        air_install_method: "{{ install_method if install_method in air.install_methods else air.install_methods[0] }}"
 
     - name: Set air build facts
       when:
@@ -27,6 +27,7 @@
               url: "{{ air_install_url }}@{{ air_version }}"
               bin: "{{ path_bin }}/air"
 # }}}
+# {{{ air build and install steps
     - name: Append air to pkg_go
       when:
         - air_install_method == 'source'
@@ -34,23 +35,19 @@
         - name: Clean existing air install
           when:
             - clean_install
-          loop: "{{ air_build_files }}"
-          loop_control:
-            loop_var: air_file
-          ansible.builtin.file:
-            state: absent
-            path: "{{ install_prefix }}/{{ air_file }}"
+          ansible.builtin.set_fact:
+            pkg_clean: "{{ pkg_clean + air.install_files }}"
 
         - name: Configure pkg dependencies
-          loop: "{{ air_pkg_deps }}"
+          loop: "{{ air.pkg_deps }}"
           loop_control:
-            loop_var: air_pkg_dep
-          ansible.builtin.include_tasks: "{{ air_pkg_dep }}"
+            loop_var: pkg
+          ansible.builtin.include_tasks: "pkgs/{{ pkg }}.yml"
 
         - name: Add air to install list
           ansible.builtin.set_fact:
             pkg_go: "{{ pkg_go + [air_go_pkg] }}"
-
+# }}}
     - name: Finalize air configuration
       ansible.builtin.set_fact:
         __configured: "{{ __configured | combine( { 'air': true } ) }}"

tasks/pkgs/alacritty.yml

@@ -17,7 +17,7 @@
       when:
         - alacritty_install_method is undefined
       ansible.builtin.set_fact:
-        alacritty_install_method: "{{ install_method if install_method in alacritty_install_methods else alacritty_install_methods[0] }}"
+        alacritty_install_method: "{{ install_method if install_method in alacritty.install_methods else alacritty.install_methods[0] }}"
 
     - name: Configure alacritty source install
       when:
@@ -25,20 +25,13 @@
       block:
         - name: Set alacritty build facts
           ansible.builtin.set_fact:
-            alacritty_build_deps: "{{ alacritty_build_deps[ansible_os_family] }}"
             alacritty_src_install:
+              build_deps: "{{ alacritty.build_deps[ansible_facts['os_family']] }}"
               build_flags: "{{ alacritty_cargo_build_flags }}"
-              name: "{{ alacritty_pkgname }}"
+              source_dir: "{{ alacritty.install_files.source_dir }}"
               repo: "{{ alacritty_git_repo }}"
               version: "{{ alacritty_version }}"
-              files:
-                - from: target/release/alacritty
-                  to: bin/alacritty
-                  mode: '0755'
-                - from: extra/logo/alacritty-term.svg
-                  to: share/pixmaps/Alacritty.svg
-                - from: extra/linux/Alacritty.desktop
-                  to: share/applications/Alacritty.desktop
+              files: "{{ alacritty.install_files.files }}"
 
         - name: Set alacritty install extra build deps
           when:
@@ -49,13 +42,13 @@
               when:
                 - ansible_distribution_major_version == 7
               ansible.builtin.set_fact:
-                alacritty_build_deps: "{{ alacritty_build_deps + ['xcb-util-devel', '@Development Tools'] }}"
+                alacritty_build_deps: "{{ build_deps + ['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_build_deps: "{{ build_deps + ['@Development Tools'] }}"
 
 # }}}
     - name: Append alacritty installation
@@ -65,14 +58,14 @@
             - alacritty_method == 'source'
           block:
             - name: Configure pkg dependencies
-              loop: "{{ alacritty_pkg_deps }}"
+              loop: "{{ alacritty.pkg_deps }}"
               loop_control:
-                loop_var: alacritty_pkg_dep
-              ansible.builtin.include_tasks: "{{ alacritty_pkg_dep }}"
+                loop_var: pkg
+              ansible.builtin.include_tasks: "pkgs/{{ pkg }}.yml"
 
         - name: Append build dependencies and cargo config
           ansible.builtin.set_fact:
-            pkg_sys: "{{ pkg_sys + alacritty_build_deps }}"
+            pkg_sys: "{{ pkg_sys + build_deps }}"
             pkg_cargo_build: "{{ pkg_cargo_build + [alacritty_src_install] }}"
 
     - name: Append alacritty to pkg_sys