diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml index fca881b..f725705 100644 --- a/tasks/pkgs/alacritty.yml +++ b/tasks/pkgs/alacritty.yml @@ -10,14 +10,16 @@ ansible.builtin.set_fact: alacritty: methods: - - source - - system + Archlinux: [system, source] + default: [source] +- name: Finalise alacritty default facts + ansible.builtin.set_fact: + alacritty: + methods: "{{ alacritty.methods[os_family] | default(alacritty.methods.default) }}" build_flags: "{{ alacritty_build_flags | default( ['--release'] ) }}" version: "{{ alacritty_version | default('0.16.1') }}" pkgname: - RedHat: alacritty - Debian: alacritty - Alpine: alacritty + Archlinux: alacritty git: repo: https://github.com/alacritty/alacritty version: "{{ alacritty_version | default('v0.16.1') }}" diff --git a/tasks/pkgs/ansible_ls.yml b/tasks/pkgs/ansible_ls.yml index 30e9e43..c7c8bb5 100644 --- a/tasks/pkgs/ansible_ls.yml +++ b/tasks/pkgs/ansible_ls.yml @@ -18,6 +18,8 @@ version: "{{ ansible_ls_version | default('latest') }}" pkg_deps: - nodejs + pkgname: + Archlinux: ansible-language-server # }}} - name: Configure ansible_ls when: @@ -29,6 +31,15 @@ ansible.builtin.set_fact: ansible_ls_imethod: "{{ imethod if imethod in ansible_ls.methods else ansible_ls.methods[0] }}" + - name: Configure ansible_ls system install + when: + - ansible_ls_imethod == 'system' + block: + - name: Queue ansible_ls system install + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + [ansible_ls.pkgname[os_family]] }}" + ansible_ls_install: "{{ ansible_ls_imethod }}={{ ansible_ls.pkgname[os_family] }}" + - name: Configure ansible_ls source install when: - ansible_ls_imethod == 'source' diff --git a/tasks/pkgs/bashls.yml b/tasks/pkgs/bashls.yml index 8dc02cb..c54527d 100644 --- a/tasks/pkgs/bashls.yml +++ b/tasks/pkgs/bashls.yml @@ -10,11 +10,18 @@ ansible.builtin.set_fact: bashls: methods: - - source + Archlinux: [system, source] + default: [source] +- name: Finalise bashls default facts + ansible.builtin.set_fact: + bashls: + methods: "{{ bashls.methods[os_family] | default(bashls.methods.default) }}" npm_pkg: name: bash-language-server global: true version: latest + pkgname: + Archlinux: bash-language-server # }}} - name: Configure bashls when: diff --git a/tasks/pkgs/cargo.yml b/tasks/pkgs/cargo.yml index eec4c19..ec58582 100644 --- a/tasks/pkgs/cargo.yml +++ b/tasks/pkgs/cargo.yml @@ -16,6 +16,7 @@ Debian: cargo Alpine: cargo FreeBSD: cargo + Archlinux: rust # }}} - name: Configure cargo when: diff --git a/tasks/pkgs/pipx.yml b/tasks/pkgs/pipx.yml index 93eaefb..e017ea5 100644 --- a/tasks/pkgs/pipx.yml +++ b/tasks/pkgs/pipx.yml @@ -14,6 +14,7 @@ pkgname: RedHat: pipx Debian: pipx + Archlinux: python-pipx # }}} - name: Configure pipx when: