finished with a bunch more

tasks/pkgs/alacritty.yml

@@ -8,7 +8,6 @@
 # Helpers:
 #   - cargo_build
 ---
- # {{{ Configure alacritty
 - name: Start alacritty configuration
   when:
     - "'alacritty' not in __configured"
@@ -19,7 +18,7 @@
       ansible.builtin.set_fact:
         alacritty_install_method: "{{ install_method if install_method in alacritty.install_methods else alacritty.install_methods[0] }}"
 
-    - name: Configure alacritty source install
+    - name: Configure alacritty source install # {{{
       when:
         - alacritty_install_method == "source"
       block:
@@ -50,29 +49,24 @@
               ansible.builtin.set_fact:
                 alacritty_build_deps: "{{ build_deps + ['@Development Tools'] }}"
 
-# }}}
-    - name: Append alacritty installation
-      block:
-        - name: Append alacritty to pkg_cargo_build
-          when:
-            - alacritty_method == 'source'
-          block:
-            - name: Configure pkg dependencies
-              loop: "{{ alacritty.pkg_deps }}"
-              loop_control:
-                loop_var: dep
-              ansible.builtin.include_tasks: "pkgs/{{ dep }}.yml"
+        - name: Configure pkg dependencies
+          loop: "{{ alacritty.pkg_deps }}"
+          loop_control:
+            loop_var: dep
+          ansible.builtin.include_tasks: "pkgs/{{ dep }}.yml"
 
         - name: Append build dependencies and cargo config
           ansible.builtin.set_fact:
             pkg_sys: "{{ pkg_sys + alacritty_build_deps }}"
             pkg_cargo_build: "{{ pkg_cargo_build + [alacritty_src_install] }}"
-
-    - name: Append alacritty to pkg_sys
+# }}}
+    - name: Configure alacritty system install
       when:
-        - alacritty_method == 'system'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + [alacritty_pkgname] }}"
+        - alacritty_install_method == 'system'
+      block:
+        - name: Queue alacritty for installation
+          ansible.builtin.set_fact:
+            pkg_sys: "{{ pkg_sys + [alacritty_pkgname] }}"
 
     - name: Complete alacritty configuration
       ansible.builtin.set_fact:

tasks/pkgs/ansible.yml

@@ -8,7 +8,7 @@
       when:
         - ansible_install_method is undefined
       ansible.builtin.set_fact:
-        ansible_install_method: "{% if install_method in ansible_install_methods %}{{ install_method }}{% else %}{{ ansible_install_methods[0] }}{% endif %}"
+        ansible_install_method: "{{ install_method if install_method in ansible_install_methods else ansible_install_methods[0] }}"
 
     - name: Append ansible to system package manager install list
       when:

tasks/pkgs/ansible_lint.yml

@@ -30,4 +30,4 @@
 
     - name: Complete ansible_lint configuration
       ansible.builtin.set_fact:
-        __configured: "{{ __configured | combine( { 'ansible_lint': true } ) }}"
+        __configured: "{{ __configured | combine( { 'ansible_lint': ansible_lint_install_method } ) }}"

tasks/pkgs/ansible_ls.yml

@@ -8,22 +8,22 @@
       when:
         - ansible_ls_install_method is undefined
       ansible.builtin.set_fact:
-        ansible_ls_install_method: "{{ install_method if install_method in ansible_ls_install_methods else ansible_ls_install_methods[0] }}"
+        ansible_ls_install_method: "{{ install_method if install_method in ansible_ls.install_methods else ansible_ls.install_methods[0] }}"
 
-    - name: Append ansible-language-server to pkg_npm
+    - name: Configure ansible_ls source install
       when:
         - ansible_ls_install_method == 'source'
       block:
         - name: Load required installation dependencies
           loop: "{{ ansible_ls_pkg_deps }}"
           loop_control:
-            loop_var: pkgdep
-          ansible.builtin.include_tasks: "{{ pkgdep }}"
+            loop_var: dep
+          ansible.builtin.include_tasks: "pkgs/{{ dep }}.yml"
 
         - name: Append ansible ls to pkg_npm
           ansible.builtin.set_fact:
-            pkg_npm: "{{ pkg_npm + [ansible_npm_pkg] }}"
+            pkg_npm: "{{ pkg_npm + [ansible_ls.npm_pkg] }}"
 
     - name: Set ansible_ls_configured
       ansible.builtin.set_fact:
-        __configured: "{{ __configured | combine( { 'ansible_ls': true } ) }}"
+        __configured: "{{ __configured | combine( { 'ansible_ls': ansible_ls_install_method } ) }}"

tasks/pkgs/bashls.yml

@@ -8,14 +8,16 @@
       when:
         - bashls_install_method is undefined
       ansible.builtin.set_fact:
-        bashls_install_method: "{{ install_method if install_method in bashls_install_methods else bashls_install_methods[0] }}"
+        bashls_install_method: "{{ install_method if install_method in bashls.install_methods else bashls.install_methods[0] }}"
 
-    - name: Append bash-language-server to pkg_npm
+    - name: Configure bashls source install
       when:
         - bashls_install_method == 'source'
-      ansible.builtin.set_fact:
-        pkg_npm: "{{ pkg_npm + [bashls_npm_pkgname] }}"
+      block:
+        - name: Append bashls to pkg_npm
+          ansible.builtin.set_fact:
+            pkg_npm: "{{ pkg_npm + [bashls.npm_pkg] }}"
 
     - name: Set bashls_configured
       ansible.builtin.set_fact:
-        __configured: "{{ __configured | combine( { 'bashls': true } ) }}"
+        __configured: "{{ __configured | combine( { 'bashls': bashls_install_method } ) }}"

tasks/pkgs/cmake.yml

@@ -1,5 +1,23 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Append cmake to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + ['cmake'] }}"
+- name: Configure cmake
+  when:
+    - "'cmake' not in __configured"
+  block:
+    - name: Set cmake install method
+      when:
+        - cmake_install_method is undefined
+      ansible.builtin.set_fact:
+        cmake_install_method: "{{ install_method if install_method in cmake.install_methods else cmake.install_methods[0] }}"
+
+    - name: Configure cmake system install
+      when:
+        - cmake_install_method == "system"
+      block:
+        - name: Append cmake to pkg_sys
+          ansible.builtin.set_fact:
+            pkg_sys: "{{ pkg_sys + ['cmake'] }}"
+
+    - name: Finalize cmake configuration
+      ansible.builtin.set_fact:
+        __configured: "{{ __configured | combine( { 'cmake': cmake_install_method } ) }}"

tasks/pkgs/direnv.yml

@@ -8,7 +8,7 @@
       when:
         - direnv_install_method is undefined
       ansible.builtin.set_fact:
-        direnv_install_method: "{{ install_method if install_method in direnv_install_methods else direnv_install_methods[0] }}"
+        direnv_install_method: "{{ install_method if install_method in direnv.install_methods else direnv.install_methods[0] }}"
 
     - name: Append direnv to pkg_sys
       when:
@@ -18,4 +18,4 @@
 
     - name: Finalize direnv configuration
       ansible.builtin.set_fact:
-        __configured: "{{ __configured | combine( { 'direnv': true } ) }}"
+        __configured: "{{ __configured | combine( { 'direnv': direnv_install_method } ) }}"

tasks/pkgs/eza.yml

@@ -1,13 +1,28 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add eza
+- name: Configure eza
   when:
-    - eza_configured is undefined
+    - "'eza' not in __configured"
   block:
-    - name: Append eza to pkg_cargo
+    - name: Set eza install method
+      when:
+        - eza_install_method is undefined
       ansible.builtin.set_fact:
-        pkg_cargo: "{{ pkg_cargo + ['eza'] }}"
+        eza_install_method: "{{ install_method if install_method in eza.install_methods else eza.install_methods[0] }}"
 
-    - name: Set eza_configured
+    - name: Configure eza source install
+      when:
+        - eza_install_method == "source"
+      block:
+        - name: Configure eza cargo facts
+          ansible.builtin.set_fact:
+            eza_cargo_install:
+              name: eza
+
+        - name: Append eza to pkg_cargo
+          ansible.builtin.set_fact:
+            pkg_cargo: "{{ pkg_cargo + [eza_cargo_install] }}"
+
+    - name: Finalized eza configuration
       ansible.builtin.set_fact:
-        eza_configured: true
+        __configured: "{{ __configured | combine( { 'eza': eza_install_method} ) }}"

tasks/pkgs/fzf.yml

@@ -1,5 +1,23 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Append fzf to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + ['fzf'] }}"
+- name: Configure fzf
+  when:
+    - "'fzf' not in __configured"
+  block:
+    - name: Set fzf install method
+      when:
+        - fzf_install_method is undefined
+      ansible.builtin.set_fact:
+        fzf_install_method: "{{ install_method if install_method in fzf.install_methods else fzf.install_methods[0] }}"
+
+    - name: Configure fzf system install
+      when:
+        - fzf_install_method == "system"
+      block:
+        - name: Append fzf to pkg_sys
+          ansible.builtin.set_fact:
+            pkg_sys: "{{ pkg_sys + ['fzf'] }}"
+
+    - name: Finalize fzf configuration
+      ansible.builtin.set_fact:
+        __configured: "{{ __configured | combine( { 'fzf': fzf_install_method } ) }}"

tasks/pkgs/git.yml

@@ -1,9 +1,23 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Load git config
-  ansible.builtin.include_tasks:
-    file: config/git.yml
+- name: Configure git
+  when:
+    - "'git' not in __configured"
+  block:
+    - name: Set git install method
+      when:
+        - git_install_method is undefined
+      ansible.builtin.set_fact:
+        git_install_method: "{{ install_method if install_method in git.install_methods else git.install_methods[0] }}"
 
-- name: Append git to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + git.pkgs }}"
+    - name: Configure git system install
+      when:
+        - git_install_method == "system"
+      block:
+        - name: Append git to pkg_sys
+          ansible.builtin.set_fact:
+            pkg_sys: "{{ pkg_sys + ['git'] }}"
+
+    - name: Finalize git configuration
+      ansible.builtin.set_fact:
+        __configured: "{{ __configured | combine( { 'git': git_install_method } ) }}"

tasks/pkgs/go.yml

@@ -8,7 +8,7 @@
       when:
         - go_install_method is undefined
       ansible.builtin.set_fact:
-        go_install_method: "{% if install_method in go_install_methods %}{{ install_method }}{% else %}{{ go_install_methods[0] }}{% endif %}"
+        go_install_method: "{{ install_method if install_method in go.install_methods else go.install_methods[0] }}"
 
     - name: Configure go system installation
       when:

tasks/pkgs/neovim.yml

@@ -8,26 +8,38 @@
       when:
         - neovim_install_method is undefined
       ansible.builtin.set_fact:
-        neovim_install_method: "{{ install_method if install_method in neovim_install_methods else neovim_install_methods[0] }}"
-- name: Load neovim config
-  ansible.builtin.include_tasks:
-    file: config/neovim.yml
+        neovim_install_method: "{{ install_method if install_method in neovim.install_methods else neovim.install_methods[0] }}"
 
-- name: Append neovim to pkg_appimage
-  when:
-    - neovim.method == 'appimage'
-  ansible.builtin.set_fact:
-    pkg_appimage: "{{ pkg_appimage + ['neovim'] }}"
+    - name: Configure neovim source install
+      when:
+        - neovim_install_method == "source"
+      block:
+        - name: Queue pkg build deps
+          when:
+            - neovim.build_pkgdeps is defined
+          loop: "{{ neovim.build_pkgdeps }}"
+          loop_control:
+            loop_var: dep
+          ansible.builtin.include_tasks: "pkgs/{{ dep }}.yml"
 
-- name: Append neovim to pkg_sys
-  when:
-    - neovim.method == 'sys'
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + ['neovim'] }}"
+        - name: Set helper facts
+          ansible.builtin.set_fact:
+            neovim_src_install:
+              path: "{{ d_cache.path }}/neovim"
+              repo: "{{ neovim.git_repo }}"
+              version: "{{ neovim_version }}"
+              targets:
+                - name: ""
+                  do_become: false
+                  params:
+                    CMAKE_BUILD_TYPE: Release
+                    CMAKE_EXTRA_FLAGS: "-DCMAKE_INSTALL_PREFIX={{ install_prefix }}"
+                - name: install
+                  do_become: true
+        - name: Append neovim to source install list
+          ansible.builtin.set_fact:
+            pkg_make: "{{ pkg_make + [neovim_src_install] }}"
 
-- name: Append neovim to pkg_src
-  when:
-    - neovim.method == 'src'
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + neovim.build_deps }}"
-    pkg_src: "{{ pkg_src + ['neovim'] }}"
+    - name: Finalized neovim configuration
+      ansible.builtin.set_fact:
+        __configured: "{{ __configured | combine( { 'neovim': neovim_install_method } ) }}"

tasks/pkgs/nodejs.yml

@@ -1,9 +1,27 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Load nodejs config
-  ansible.builtin.include_tasks:
-    file: config/nodejs.yml
+- name: Configure nodejs
+  when:
+    - "'nodejs' not in __configured"
+  block:
+    - name: Set nodejs install method
+      when:
+        - nodejs_install_method is undefined
+      ansible.builtin.set_fact:
+        nodejs_install_method: "{{ install_method if install_method in nodejs.install_methods else nodejs.install_methods[0] }}"
 
-- name: Append nodejs to pkg_sys
-  ansible.builtin.set_fact:
-    pkg_sys: "{{ pkg_sys + nodejs.pkgs }}"
+    - name: Configure nodejs system install
+      when:
+        - nodejs_install_method == "system"
+      block:
+        - name: Set nodejs package name
+          ansible.builtin.set_fact:
+            nodejs_pkgname: "{{ nodejs.pkgname[system] }}"
+            nodejs_deps: "{{ nodejs.pkg_deps[system] | default([]) }}"
+        - name: Append nodejs to pkg_sys
+          ansible.builtin.set_fact:
+            pkg_sys: "{{ pkg_sys + [nodejs_pkgname] + nodejs_deps }}"
+
+    - name: Finalize nodejs configuration
+      ansible.builtin.set_fact:
+        __configured: "{{ __configured | combine( { 'nodejs': nodejs_install_method } ) }}"

tasks/pkgs/npm.yml

@@ -0,0 +1,3 @@
+---
+- name: Include nodejs to satisfy npm
+  ansible.builtin.include_tasks: pkgs/nodejs.yml

tasks/pkgs/rust.yml

@@ -8,13 +8,7 @@
       when:
         - rust_install_method is undefined
       ansible.builtin.set_fact:
-        rust_install_method: "{{ install_method if install_method in rust_install_methods else rust_install_methods[0] }}"
-
-    - name: Add dependencies
-      loop: rust_pkgdeps
-      loop_control:
-        loop_var: dep
-      ansible.builtin.include_tasks: "pkgs/{{ dep }}.yml"
+        rust_install_method: "{{ install_method if install_method in rust.install_methods else rust.install_methods[0] }}"
 
     - name: Append rust to install list
       when:

tasks/pkgs/starship.yml

@@ -4,10 +4,26 @@
   when:
     - "'starship' not in __configured"
   block:
-    - name: Append starship to pkg_cargo
+    - name: Set starship install method
+      when:
+        - starship_install_method is undefined
       ansible.builtin.set_fact:
-        pkg_cargo: "{{ pkg_cargo + [{'name': 'starship', 'locked': true}] }}"
+        starship_install_method: "{{ install_method if install_method in starship.install_methods else starship.install_methods[0] }}"
 
-    - name: Finalize startship configuration
+    - name: Configure starship source install
+      when:
+        - starship_install_method == "source"
+      block:
+        - name: Set cargo build options
+          ansible.builtin.set_fact:
+            starship_cargo_install:
+              name: starship
+              locked: true
+              version: "{{ starship_version | default(omit) }}"
+        - name: Append starship to pkg_cargo
+          ansible.builtin.set_fact:
+            pkg_cargo: "{{ pkg_cargo + [{'name': 'starship', 'locked': true}] }}"
+
+    - name: Finalize starship configuration
       ansible.builtin.set_fact:
-        __configured: "{{ __configured | combine( { 'starship': true } ) }}"
+        __configured: "{{ __configured | combine( { 'starship': starship_install_method } ) }}"

tasks/pkgs/zoxide.yml

@@ -8,7 +8,7 @@
       when:
         - zoxide_install_method is undefined
       ansible.builtin.set_fact:
-        zoxide_install_method: "{{ install_method if intall_method in zoxide_install_methods else zoxide_install_methods[0] }}"
+        zoxide_install_method: "{{ install_method if install_method in zoxide.install_methods else zoxide.install_methods[0] }}"
 
     - name: Append zoxide to pkg_sys
       ansible.builtin.set_fact:
@@ -16,4 +16,4 @@
 
     - name: Set zoxide_configured
       ansible.builtin.set_fact:
-        __configured: "{{ __configured | combine( { 'zoxide': true } ) }}"
+        __configured: "{{ __configured | combine( { 'zoxide': zoxide_install_method } ) }}"

tasks/pkgs/zsh.yml

@@ -7,8 +7,8 @@
     - name: Set zsh install method
       when:
         - zsh_install_method is undefined
-      ansible.bulitin.set_fact:
-        zsh_install_method: "{{ install_method if install_method in zsh_install_methods else zsh_install_methods[0] }}"
+      ansible.builtin.set_fact:
+        zsh_install_method: "{{ install_method if install_method in zsh.install_methods else zsh.install_methods[0] }}"
 
     - name: Append zsh to pkg_sys
       when: