From fc674fe06f9e7ee0e147acb068bb79011423e8a5 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Sun, 9 Feb 2025 14:55:38 -0700 Subject: [PATCH] add a number of pkgs - putting package deps and pkgnames in vars/main.yml --- tasks/pkgs/bat.yml | 5 +++++ tasks/pkgs/broot.yml | 20 ++++++++++++++++++++ tasks/pkgs/cheat.yml | 9 +++++++++ tasks/pkgs/choose.yml | 18 ++++++++++++++++++ tasks/pkgs/curlie.yml | 4 ++++ tasks/pkgs/duf.yml | 9 +++++++++ tasks/pkgs/dust.yml | 18 ++++++++++++++++++ tasks/pkgs/fd.yml | 4 ++++ tasks/pkgs/gping.yml | 18 ++++++++++++++++++ tasks/pkgs/hyperfine.yml | 4 ++++ tasks/pkgs/jellyfin.yml | 26 -------------------------- tasks/pkgs/mcfly.yml | 18 ++++++++++++++++++ tasks/pkgs/sd.yml | 18 ++++++++++++++++++ tasks/pkgs/tldr.yml | 18 ++++++++++++++++++ tasks/pkgs/xh.yml | 18 ++++++++++++++++++ vars/main.yml | 18 ++++++++++++++++++ 16 files changed, 199 insertions(+), 26 deletions(-) create mode 100644 tasks/pkgs/bat.yml create mode 100644 tasks/pkgs/broot.yml create mode 100644 tasks/pkgs/cheat.yml create mode 100644 tasks/pkgs/choose.yml create mode 100644 tasks/pkgs/curlie.yml create mode 100644 tasks/pkgs/duf.yml create mode 100644 tasks/pkgs/dust.yml create mode 100644 tasks/pkgs/fd.yml create mode 100644 tasks/pkgs/gping.yml create mode 100644 tasks/pkgs/hyperfine.yml delete mode 100644 tasks/pkgs/jellyfin.yml create mode 100644 tasks/pkgs/mcfly.yml create mode 100644 tasks/pkgs/sd.yml create mode 100644 tasks/pkgs/tldr.yml create mode 100644 tasks/pkgs/xh.yml diff --git a/tasks/pkgs/bat.yml b/tasks/pkgs/bat.yml new file mode 100644 index 0000000..cfcbe11 --- /dev/null +++ b/tasks/pkgs/bat.yml @@ -0,0 +1,5 @@ +# vim: set filetype=yaml.ansible : +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'bat' ] }}" diff --git a/tasks/pkgs/broot.yml b/tasks/pkgs/broot.yml new file mode 100644 index 0000000..41d5341 --- /dev/null +++ b/tasks/pkgs/broot.yml @@ -0,0 +1,20 @@ +--- +- name: linux specific install + block: + - ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: pkgconfig_rust is undefined + + - name: append to syspkgs and cargopkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + pkgconfig.broot.deps[ansible_os_family] }}" + cargopkgs: "{{ cargopkgs + [ 'broot' ] }}" + + when: + - ansible_os_family != 'Darwin' + +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'broot' ] }}" + when: + - ansible_os_family == 'Darwin' diff --git a/tasks/pkgs/cheat.yml b/tasks/pkgs/cheat.yml new file mode 100644 index 0000000..096fa85 --- /dev/null +++ b/tasks/pkgs/cheat.yml @@ -0,0 +1,9 @@ +--- +- ansible.builtin.include_tasks: + file: "pkgs/go.yml" + when: + - pkgconfig_go is undefined + +- name: append to gopkgs + ansible.builtin.set_fact: + gopkgs: "{{ gopkgs + [ 'github.com/cheat/cheat/cmd/cheat@latest' ] }}" diff --git a/tasks/pkgs/choose.yml b/tasks/pkgs/choose.yml new file mode 100644 index 0000000..523f560 --- /dev/null +++ b/tasks/pkgs/choose.yml @@ -0,0 +1,18 @@ +--- +- name: linux specific + block: + - ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: + - pkgconfig_rust is undefined + - name: append to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + [ 'choose' ] }}" + when: + - ansible_os_family != 'Darwin' + +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'choose-rust' ] }}" + when: + - ansible_os_family == 'Darwin' diff --git a/tasks/pkgs/curlie.yml b/tasks/pkgs/curlie.yml new file mode 100644 index 0000000..b2196d8 --- /dev/null +++ b/tasks/pkgs/curlie.yml @@ -0,0 +1,4 @@ +--- +- name: append to gopkgs + ansible.builtin.set_fact: + gopkgs: "{{ gopkgs + [ 'github.com/rs/curlie@latest' ] }}" diff --git a/tasks/pkgs/duf.yml b/tasks/pkgs/duf.yml new file mode 100644 index 0000000..9ba19db --- /dev/null +++ b/tasks/pkgs/duf.yml @@ -0,0 +1,9 @@ +--- +- ansible.builtin.include_tasks: + file: "pkgs/go.yml" + when: + - pkgconfig_go is undefined + +- name: append to gopkgs + ansible.builtin.set_fact: + gopkgs: "{{ gopkgs + [ 'github.com/muesli/duf@latest' ] }}" diff --git a/tasks/pkgs/dust.yml b/tasks/pkgs/dust.yml new file mode 100644 index 0000000..f8ae771 --- /dev/null +++ b/tasks/pkgs/dust.yml @@ -0,0 +1,18 @@ +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'dust' ] }}" + when: + - ansible_os_family == 'Darwin' + +- name: linux specific install + block: + - ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: pkgconfig_rust is undefined + + - name: add to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + [ 'du-dust' ] }}" + when: + - ansible_os_family != 'Darwin' diff --git a/tasks/pkgs/fd.yml b/tasks/pkgs/fd.yml new file mode 100644 index 0000000..4a2d593 --- /dev/null +++ b/tasks/pkgs/fd.yml @@ -0,0 +1,4 @@ +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + pkgconfig.fd.pkg[ansible_os_family] }}" diff --git a/tasks/pkgs/gping.yml b/tasks/pkgs/gping.yml new file mode 100644 index 0000000..677b05d --- /dev/null +++ b/tasks/pkgs/gping.yml @@ -0,0 +1,18 @@ +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'gping' ] }}" + when: + - ansible_os_family == 'Darwin' + +- name: linux specific + block: + - ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: + - pkgconfig_rust is undefined + + - ansbile.builtin.set_fact: + cargopkgs: "{{ cargopkgs + [ 'gping' ] }}" + when: + - ansible_os_family != 'Darwin' diff --git a/tasks/pkgs/hyperfine.yml b/tasks/pkgs/hyperfine.yml new file mode 100644 index 0000000..6c2805c --- /dev/null +++ b/tasks/pkgs/hyperfine.yml @@ -0,0 +1,4 @@ +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'hyperfine' ] }}" diff --git a/tasks/pkgs/jellyfin.yml b/tasks/pkgs/jellyfin.yml deleted file mode 100644 index 69bdc37..0000000 --- a/tasks/pkgs/jellyfin.yml +++ /dev/null @@ -1,26 +0,0 @@ -# TODO: implement ---- -- debug: - msg: unable to install on RedHat distros - when: ansible_os_family == 'RedHat' - -- name: append to syspkgs - block: - # - ansible.builtin.tempfile: - # state: directory - # prefix: jellyfin. - # register: d_jellyfin_tmp - # - # - name: get install script - # ansible.builtin.get_url: - # url: https://repo.jellyfin.org/install-debuntu.sh - # dest: "{{ d_jellyfin_tmp.path }}/install-debuntu.sh" - # - - debug: - msg: "TODO: complete install configuration" - when: ansible_os_family == 'Debian' - -- name: append to caskpkgs - ansible.builtin.set_fact: - caskpkgs: "{{ caskpkgs + [ 'jellyfin' ] }}" - when: ansible_os_family == 'Darwin' diff --git a/tasks/pkgs/mcfly.yml b/tasks/pkgs/mcfly.yml new file mode 100644 index 0000000..3ae0c58 --- /dev/null +++ b/tasks/pkgs/mcfly.yml @@ -0,0 +1,18 @@ +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'mcfly' ] }}" + when: + - ansible_os_family == 'Darwin' + +- name: linux specific install + block: + - ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: pkgconfig_rust is undefined + + - name: add to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + [ 'mcfly' ] }}" + when: + - ansible_os_family != 'Darwin' diff --git a/tasks/pkgs/sd.yml b/tasks/pkgs/sd.yml new file mode 100644 index 0000000..7a83d1f --- /dev/null +++ b/tasks/pkgs/sd.yml @@ -0,0 +1,18 @@ +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'sd' ] }}" + when: + - ansible_os_family == 'Darwin' + +- name: linux specific install + block: + - ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: pkgconfig_rust is undefined + + - name: add to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + [ 'sd' ] }}" + when: + - ansible_os_family != 'Darwin' diff --git a/tasks/pkgs/tldr.yml b/tasks/pkgs/tldr.yml new file mode 100644 index 0000000..31d1a65 --- /dev/null +++ b/tasks/pkgs/tldr.yml @@ -0,0 +1,18 @@ +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'tlrc' ] }}" + when: + - ansible_os_family == 'Darwin' + +- name: linux specific install + block: + - ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: pkgconfig_rust is undefined + + - name: add to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + [ 'tlrc' ] }}" + when: + - ansible_os_family != 'Darwin' diff --git a/tasks/pkgs/xh.yml b/tasks/pkgs/xh.yml new file mode 100644 index 0000000..eaff598 --- /dev/null +++ b/tasks/pkgs/xh.yml @@ -0,0 +1,18 @@ +--- +- name: append to syspkgs + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + [ 'xh' ] }}" + when: + - ansible_os_family == 'Darwin' + +- name: linux specific install + block: + - ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: pkgconfig_rust is undefined + + - name: add to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + [ 'xh' ] }}" + when: + - ansible_os_family != 'Darwin' diff --git a/vars/main.yml b/vars/main.yml index 1f888b9..d92deb3 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -33,9 +33,27 @@ tappkgs: [] pkgconfig: alacritty: {} bitwarden: {} + broot: + deps: + Debian: + - build-essential + - libxcb1-dev + - libxcb-render0-dev + - libxcb-shape0-dev + - libxcb-xfixes0-dev + RedHat: + - libxcb carapace: {} clangd: {} consul: {} + fd: + pkg: + Darwin: + - fd + RedHat: + - fd-find + Debian: + - fd-find ghostty: {} git: {} go: {}