diff --git a/tasks/helpers/nerdfont_config.yml b/tasks/helpers/nerdfont_config.yml index 583c4bb..057043b 100644 --- a/tasks/helpers/nerdfont_config.yml +++ b/tasks/helpers/nerdfont_config.yml @@ -10,7 +10,7 @@ name: "{{ __nerdfonts[nf]['archive'] | default(nf) }}.tar.xz" links: - from: "{{ path_archive }}/nerdfonts/{{ nf }}" - to: "{{ install_prefix }}/{{ nerdfonts_install_path }}/{{ nf }}" + to: "{{ install_prefix }}/{{ nerdfonts.install_path }}/{{ nf }}" force: true - name: Append config to pkg archive diff --git a/tasks/main.yml b/tasks/main.yml index 9f95e1b..c937f69 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -66,6 +66,10 @@ ansible.builtin.include_tasks: file: "pkgs/{{ pkg }}.yml" +- name: Dump pkg_sys + debug: + var: pkg_sys + - name: Install pkg_sys list using system package manager when: - pkg_sys|length > 0 diff --git a/tasks/pkgs/broot.yml b/tasks/pkgs/broot.yml index 6b9f9e1..42988e6 100644 --- a/tasks/pkgs/broot.yml +++ b/tasks/pkgs/broot.yml @@ -71,8 +71,6 @@ - broot_imethod == 'system' block: - name: Append broot to pkg_sys - when: - - ansible_system == 'Darwin' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['broot'] }}" diff --git a/tasks/pkgs/ghostty.yml b/tasks/pkgs/ghostty.yml index 58d68de..eeba1c3 100644 --- a/tasks/pkgs/ghostty.yml +++ b/tasks/pkgs/ghostty.yml @@ -150,7 +150,7 @@ block: - name: Queue ghostty to pkg_sys ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ghostty.pkg }}" + pkg_sys: "{{ pkg_sys + [ghostty.pkg] }}" - name: Finalise ghostty configuration ansible.builtin.set_fact: diff --git a/tasks/pkgs/neovim.yml b/tasks/pkgs/neovim.yml index f18d36c..40d5404 100644 --- a/tasks/pkgs/neovim.yml +++ b/tasks/pkgs/neovim.yml @@ -17,6 +17,7 @@ git_repo: https://github.com/neovim/neovim appimage: base_url: https://github.com/neovim/neovim/releases/download + version: 0.12.1 pkgname: RedHat: neovim Debian: neovim @@ -86,7 +87,7 @@ neovim_src_install: path: "{{ d_cache.path }}/neovim" repo: "{{ neovim.git_repo }}" - version: "{{ neovim_version }}" + version: "{{ neovim.version }}" targets: build: name: "" @@ -97,9 +98,11 @@ install: name: install do_become: true + - name: Append neovim to source install list ansible.builtin.set_fact: pkg_make: "{{ pkg_make + [neovim_src_install] }}" + neovim_install: "{{ neovim_imethod }}={{ neovim_src_install }}" - name: Finalized neovim configuration ansible.builtin.set_fact: diff --git a/tasks/pkgs/nerdfonts.yml b/tasks/pkgs/nerdfonts.yml index 39c7f7f..e25dc63 100644 --- a/tasks/pkgs/nerdfonts.yml +++ b/tasks/pkgs/nerdfonts.yml @@ -228,7 +228,7 @@ - name: Finalise nerdfonts archive install ansible.builtin.set_fact: - nerdfonts_install: "{{ nerdfonts_imethod }}={{ nerdfont.install_list }}" + nerdfonts_install: "{{ nerdfonts_imethod }}={{ nerdfonts.install_list }}" - name: Set nerdfonts_configured ansible.builtin.set_fact: diff --git a/tasks/pkgs/pipx.yml b/tasks/pkgs/pipx.yml new file mode 100644 index 0000000..93eaefb --- /dev/null +++ b/tasks/pkgs/pipx.yml @@ -0,0 +1,39 @@ +# vim: set filetype=yaml.ansible : +# +## Package: pipx +## Description: a runnable venv for simpler python packaging +## Version: system +## Methods: system +## Helpers: - +--- +- name: Set pipx default facts # {{{ + ansible.builtin.set_fact: + pipx: + methods: + - system + pkgname: + RedHat: pipx + Debian: pipx +# }}} +- name: Configure pipx + when: + - "'pipx' not in __configured" + block: + - name: Set pipx install method + when: + - pipx_imethod is undefined + ansible.builtin.set_fact: + pipx_imethod: "{{ imethod if imethod in pipx.methods else pipx.methods[0] }}" + + - name: Configure pipx system install + when: + - pipx_imethod == 'system' + block: + - name: Queue pipx for system install + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + [pipx.pkgname[os_family]] }}" + pipx_install: "{{ pipx_imethod }}={{ pipx.pkgname[os_family] }}" + + - name: Finalise pipx configuration + ansible.builtin.set_fact: + __configured: "{{ __configured | combine( { 'pipx': pipx_install } ) }}" diff --git a/tasks/pkgs/ripgrep.yml b/tasks/pkgs/ripgrep.yml new file mode 100644 index 0000000..d32ef6e --- /dev/null +++ b/tasks/pkgs/ripgrep.yml @@ -0,0 +1,39 @@ +# vim: set filetype=yaml.ansible : +# +## Package: ripgrep +## Description: modern ultra fast grep +## Version: system +## Methods: system +## Helpers: - +--- +- name: Set ripgrep default facts # {{{ + ansible.builtin.set_fact: + ripgrep: + methods: + - system + pkgname: + RedHat: ripgrep + Debian: ripgrep +# }}} +- name: Configure ripgrep + when: + - "'ripgrep' not in __configured" + block: + - name: Set ripgrep install method + when: + - ripgrep_imethod is undefined + ansible.builtin.set_fact: + ripgrep_imethod: "{{ imethod if imethod in ripgrep.methods else ripgrep.methods[0] }}" + + - name: Configure ripgrep system install + when: + - ripgrep_imethod == 'system' + block: + - name: Queue ripgrep for system install + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + [ripgrep.pkgname[os_family]] }}" + ripgrep_install: "{{ ripgrep_imethod }}={{ ripgrep.pkgname[os_family] }}" + + - name: Finalise ripgrep configuration + ansible.builtin.set_fact: + __configured: "{{ __configured | combine( { 'ripgrep': ripgrep_install } ) }}" diff --git a/tasks/pkgs/zoxide.yml b/tasks/pkgs/zoxide.yml index a5c886a..9ec3f90 100644 --- a/tasks/pkgs/zoxide.yml +++ b/tasks/pkgs/zoxide.yml @@ -44,7 +44,7 @@ - name: Set zoxide cargo facts ansible.builtin.set_fact: pkg_cargo: "{{ pkg_cargo + [zoxide.cargo] }}" - zoxide_install: "{{ zoxide.imethod }}={{ zoxide.cargo }}" + zoxide_install: "{{ zoxide_imethod }}={{ zoxide.cargo }}" - name: Set zoxide_configured ansible.builtin.set_fact: