fixed remaining issues

added pipx and ripgrep back. not sure where they went in the first place
This commit is contained in:
Matthew Stobbs
2026-04-13 15:19:33 -06:00
parent 8dc427f027
commit 1eae6eb0db
9 changed files with 90 additions and 7 deletions

View File

@@ -10,7 +10,7 @@
name: "{{ __nerdfonts[nf]['archive'] | default(nf) }}.tar.xz" name: "{{ __nerdfonts[nf]['archive'] | default(nf) }}.tar.xz"
links: links:
- from: "{{ path_archive }}/nerdfonts/{{ nf }}" - from: "{{ path_archive }}/nerdfonts/{{ nf }}"
to: "{{ install_prefix }}/{{ nerdfonts_install_path }}/{{ nf }}" to: "{{ install_prefix }}/{{ nerdfonts.install_path }}/{{ nf }}"
force: true force: true
- name: Append config to pkg archive - name: Append config to pkg archive

View File

@@ -66,6 +66,10 @@
ansible.builtin.include_tasks: ansible.builtin.include_tasks:
file: "pkgs/{{ pkg }}.yml" file: "pkgs/{{ pkg }}.yml"
- name: Dump pkg_sys
debug:
var: pkg_sys
- name: Install pkg_sys list using system package manager - name: Install pkg_sys list using system package manager
when: when:
- pkg_sys|length > 0 - pkg_sys|length > 0

View File

@@ -71,8 +71,6 @@
- broot_imethod == 'system' - broot_imethod == 'system'
block: block:
- name: Append broot to pkg_sys - name: Append broot to pkg_sys
when:
- ansible_system == 'Darwin'
ansible.builtin.set_fact: ansible.builtin.set_fact:
pkg_sys: "{{ pkg_sys + ['broot'] }}" pkg_sys: "{{ pkg_sys + ['broot'] }}"

View File

@@ -150,7 +150,7 @@
block: block:
- name: Queue ghostty to pkg_sys - name: Queue ghostty to pkg_sys
ansible.builtin.set_fact: ansible.builtin.set_fact:
pkg_sys: "{{ pkg_sys + ghostty.pkg }}" pkg_sys: "{{ pkg_sys + [ghostty.pkg] }}"
- name: Finalise ghostty configuration - name: Finalise ghostty configuration
ansible.builtin.set_fact: ansible.builtin.set_fact:

View File

@@ -17,6 +17,7 @@
git_repo: https://github.com/neovim/neovim git_repo: https://github.com/neovim/neovim
appimage: appimage:
base_url: https://github.com/neovim/neovim/releases/download base_url: https://github.com/neovim/neovim/releases/download
version: 0.12.1
pkgname: pkgname:
RedHat: neovim RedHat: neovim
Debian: neovim Debian: neovim
@@ -86,7 +87,7 @@
neovim_src_install: neovim_src_install:
path: "{{ d_cache.path }}/neovim" path: "{{ d_cache.path }}/neovim"
repo: "{{ neovim.git_repo }}" repo: "{{ neovim.git_repo }}"
version: "{{ neovim_version }}" version: "{{ neovim.version }}"
targets: targets:
build: build:
name: "" name: ""
@@ -97,9 +98,11 @@
install: install:
name: install name: install
do_become: true do_become: true
- name: Append neovim to source install list - name: Append neovim to source install list
ansible.builtin.set_fact: ansible.builtin.set_fact:
pkg_make: "{{ pkg_make + [neovim_src_install] }}" pkg_make: "{{ pkg_make + [neovim_src_install] }}"
neovim_install: "{{ neovim_imethod }}={{ neovim_src_install }}"
- name: Finalized neovim configuration - name: Finalized neovim configuration
ansible.builtin.set_fact: ansible.builtin.set_fact:

View File

@@ -228,7 +228,7 @@
- name: Finalise nerdfonts archive install - name: Finalise nerdfonts archive install
ansible.builtin.set_fact: ansible.builtin.set_fact:
nerdfonts_install: "{{ nerdfonts_imethod }}={{ nerdfont.install_list }}" nerdfonts_install: "{{ nerdfonts_imethod }}={{ nerdfonts.install_list }}"
- name: Set nerdfonts_configured - name: Set nerdfonts_configured
ansible.builtin.set_fact: ansible.builtin.set_fact:

39
tasks/pkgs/pipx.yml Normal file
View File

@@ -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 } ) }}"

39
tasks/pkgs/ripgrep.yml Normal file
View File

@@ -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 } ) }}"

View File

@@ -44,7 +44,7 @@
- name: Set zoxide cargo facts - name: Set zoxide cargo facts
ansible.builtin.set_fact: ansible.builtin.set_fact:
pkg_cargo: "{{ pkg_cargo + [zoxide.cargo] }}" pkg_cargo: "{{ pkg_cargo + [zoxide.cargo] }}"
zoxide_install: "{{ zoxide.imethod }}={{ zoxide.cargo }}" zoxide_install: "{{ zoxide_imethod }}={{ zoxide.cargo }}"
- name: Set zoxide_configured - name: Set zoxide_configured
ansible.builtin.set_fact: ansible.builtin.set_fact: