working on cleanup and fixing a few format issues

- modifying how installs are done

vars/main.yml

@@ -28,6 +28,7 @@ pkg_appimage: [] # appimages to install
 pkg_archive: [] # packages installed via prebuilt archive
 pkg_cargo: [] # rust packages from cargo using `cargo install`
 pkg_cargo_build: [] # rust packages using `cargo build` before install
+pkg_clean: [] # list of files to remove before running archive and source installations
 pkg_flatpak: [] # flatpak packages to install
 pkg_go: [] # go applications
 pkg_npm: [] # npm commands
@@ -45,71 +46,14 @@ __var_to_env: {} # dict of variables to add to your env
 # Per package variables
 # {{{ air 
 air_version: latest
-air_build_files:
-  - bin/air
 air_install_url: github.com/air-verse/air
-air_pkg_deps:
-  - pkgs/go.yml
 # }}}
 # {{{ alacritty
 alacritty_version: v0.16.1
 alacritty_git_repo: https://github.com/alacritty/alacritty
 alacritty_pkgname: alacritty
-alacritty_pkg_deps:
-  - pkgs/git.yml
-  - pkgs/cargo.yml
-alacritty_build_files:
-  - bin/alacritty
-  - share/pixmaps/Alacritty.svg
-  - share/applications/Alacritty.desktop
 alacritty_cargo_build_flags:
   - --release
-alacritty_build_deps:
-  RedHat:
-    - cmake
-    - fontconfig-devel
-    - freetype-devel
-    - g++
-    - libxcb-devel
-    - libxkbcommon-devel
-    - desktop-file-utils
-  Debian:
-    - cmake
-    - g++
-    - pkg-config
-    - libfontconfig1-dev
-    - libxcb-xfixes0-dev
-    - libxkbcommon-dev
-    - python3
-    - libfreetype6-dev
-    - desktop-file-utils
-  Alpine:
-    - cmake
-    - pkgconf
-    - freetype-dev
-    - fontconfig-dev
-    - python3
-    - libxcb-dev
-    - g++
-    - libxkbcommon-dev
-    - desktop-file-utils
-  Archlinux:
-    - cmake
-    - freetype2
-    - fontconfig
-    - pkg-config
-    - make
-    - libxcb
-    - libxkbcommon
-    - python
-    - desktop-file-utils
-  FreeBSD:
-    - cmake
-    - freetype2
-    - fontconfig
-    - pkgconf
-    - python3
-    - desktop-file-utils
 # }}}
 # {{{ ansible
 ansible_install_methods:

vars/pkglist.yml

@@ -5,14 +5,85 @@
 ## Restrictions for package install methods.
 ## The first item is the default method. If only
 ## one method exists, all others are ignored.
-air_install_methods:
-  - source
-alacritty_install_methods:
-  - source
-  - system
-ansible_lint_install_methods:
-  - pipx
-  - system
+air: # {{{
+  install_methods:
+    - source
+  install_files:
+    - to: bin/air
+  pkg_deps:
+    - go
+# }}}
+alacritty: # {{{
+  install_methods:
+    - source
+    - system
+  install_files:
+    source_dir: alacritty
+    files:
+      - from: target/release/alacritty
+        to: bin/alacritty
+        mode: '0755'
+      - from: extra/logo/alacritty-term.svg
+        to: share/pixmaps/Alacritty.svg
+        mode: '0644'
+      - from: extra/linux/Alacritty.desktop
+        to: share/applications/Alacritty.desktop
+        mode: '0644'
+  pkg_deps:
+    - git
+    - cargo
+  sys_build_deps:
+    RedHat:
+      - cmake
+      - fontconfig-devel
+      - freetype-devel
+      - g++
+      - libxcb-devel
+      - libxkbcommon-devel
+      - desktop-file-utils
+    Debian:
+      - cmake
+      - g++
+      - pkg-config
+      - libfontconfig1-dev
+      - libxcb-xfixes0-dev
+      - libxkbcommon-dev
+      - python3
+      - libfreetype6-dev
+      - desktop-file-utils
+    Alpine:
+      - cmake
+      - pkgconf
+      - freetype-dev
+      - fontconfig-dev
+      - python3
+      - libxcb-dev
+      - g++
+      - libxkbcommon-dev
+      - desktop-file-utils
+    Archlinux:
+      - cmake
+      - freetype2
+      - fontconfig
+      - pkg-config
+      - make
+      - libxcb
+      - libxkbcommon
+      - python
+      - desktop-file-utils
+    FreeBSD:
+      - cmake
+      - freetype2
+      - fontconfig
+      - pkgconf
+      - python3
+      - desktop-file-utils
+# }}}
+ansible_lint: # {{{
+  install_methods:
+    - pipx
+    - system
+# }}}
 ansible_install_methods:
   - system
 ansible_ls_install_methods: