From 1ec4bda33f5ca914c0f54d9860ae3baa745f5f10 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Tue, 21 Jan 2025 22:11:15 -0700 Subject: [PATCH] start adding other packages sources - adding sources for cargo, npm and go source packages --- tasks/build/cargo_dotenv-linter.yml | 4 ++++ tasks/build/cargo_eza.yml | 4 ++++ tasks/build/cargo_htmx-lsp.yml | 5 +++++ tasks/build/cargo_starship.yml | 5 +++++ tasks/build/go.yml | 2 +- tasks/build/{.crates.toml => go_air.yml} | 0 tasks/build/{.crates2.json => go_buf.yml} | 0 tasks/build/go_checkmake.yml | 0 tasks/build/go_glow.yml | 0 tasks/build/go_lazygit.yml | 0 tasks/build/go_revive.yml | 0 tasks/build/gopls.yml | 0 tasks/build/npm_ansible-language-server.yml | 0 tasks/build/npm_commitlint-cli.yml | 0 .../npm_commitlint-config-conventional.yml | 0 tasks/build/npm_markdown-cli.yml | 0 tasks/build/npm_quobix-vacuum.yml | 0 .../build/npm_tailwindcss-languageserver.yml | 0 tasks/build/nushell.yml | 19 +++++-------------- tasks/build/pipx_cmakelang.yml | 0 tasks/build/pipx_sqlfluff.yml | 0 tasks/build/zig.yml | 13 ++++++++++++- tasks/pkgs/Darwin/carapace.yml | 4 ++++ tasks/pkgs/RedHat/nushell.yml | 10 +++++++--- vars/carapace.yml | 3 +-- vars/go.yml | 1 + vars/main.yml | 1 + vars/nushell.yml | 18 +++++++++++++++--- vars/zig.yml | 14 ++++++++++---- 29 files changed, 75 insertions(+), 28 deletions(-) create mode 100644 tasks/build/cargo_dotenv-linter.yml create mode 100644 tasks/build/cargo_eza.yml create mode 100644 tasks/build/cargo_htmx-lsp.yml create mode 100644 tasks/build/cargo_starship.yml rename tasks/build/{.crates.toml => go_air.yml} (100%) rename tasks/build/{.crates2.json => go_buf.yml} (100%) create mode 100644 tasks/build/go_checkmake.yml create mode 100644 tasks/build/go_glow.yml create mode 100644 tasks/build/go_lazygit.yml create mode 100644 tasks/build/go_revive.yml create mode 100644 tasks/build/gopls.yml create mode 100644 tasks/build/npm_ansible-language-server.yml create mode 100644 tasks/build/npm_commitlint-cli.yml create mode 100644 tasks/build/npm_commitlint-config-conventional.yml create mode 100644 tasks/build/npm_markdown-cli.yml create mode 100644 tasks/build/npm_quobix-vacuum.yml create mode 100644 tasks/build/npm_tailwindcss-languageserver.yml create mode 100644 tasks/build/pipx_cmakelang.yml create mode 100644 tasks/build/pipx_sqlfluff.yml diff --git a/tasks/build/cargo_dotenv-linter.yml b/tasks/build/cargo_dotenv-linter.yml new file mode 100644 index 0000000..fabb4cf --- /dev/null +++ b/tasks/build/cargo_dotenv-linter.yml @@ -0,0 +1,4 @@ +--- +- name: add dotenv-linter to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + ['dotenv-linter'] }}" diff --git a/tasks/build/cargo_eza.yml b/tasks/build/cargo_eza.yml new file mode 100644 index 0000000..e828f6d --- /dev/null +++ b/tasks/build/cargo_eza.yml @@ -0,0 +1,4 @@ +--- +- name: add eza to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + ['eza'] }}" diff --git a/tasks/build/cargo_htmx-lsp.yml b/tasks/build/cargo_htmx-lsp.yml new file mode 100644 index 0000000..75f9a46 --- /dev/null +++ b/tasks/build/cargo_htmx-lsp.yml @@ -0,0 +1,5 @@ +--- +- name: add htmx-lsp to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + ['htmx-lsp'] }}" + diff --git a/tasks/build/cargo_starship.yml b/tasks/build/cargo_starship.yml new file mode 100644 index 0000000..509d7d7 --- /dev/null +++ b/tasks/build/cargo_starship.yml @@ -0,0 +1,5 @@ +--- +- name: add starship to cargopkgs + ansible.builtin.set_fact: + cargopkgs: "{{ cargopkgs + ['starship'] }}" + diff --git a/tasks/build/go.yml b/tasks/build/go.yml index 97cae1f..5a5f11d 100644 --- a/tasks/build/go.yml +++ b/tasks/build/go.yml @@ -38,7 +38,7 @@ path: "{{ _go.install_path }}" state: directory -- name: extract go package for Linux +- name: extract go package become: true ansible.builtin.unarchive: dest: "{{ _go.install_path }}" diff --git a/tasks/build/.crates.toml b/tasks/build/go_air.yml similarity index 100% rename from tasks/build/.crates.toml rename to tasks/build/go_air.yml diff --git a/tasks/build/.crates2.json b/tasks/build/go_buf.yml similarity index 100% rename from tasks/build/.crates2.json rename to tasks/build/go_buf.yml diff --git a/tasks/build/go_checkmake.yml b/tasks/build/go_checkmake.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/go_glow.yml b/tasks/build/go_glow.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/go_lazygit.yml b/tasks/build/go_lazygit.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/go_revive.yml b/tasks/build/go_revive.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/gopls.yml b/tasks/build/gopls.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/npm_ansible-language-server.yml b/tasks/build/npm_ansible-language-server.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/npm_commitlint-cli.yml b/tasks/build/npm_commitlint-cli.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/npm_commitlint-config-conventional.yml b/tasks/build/npm_commitlint-config-conventional.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/npm_markdown-cli.yml b/tasks/build/npm_markdown-cli.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/npm_quobix-vacuum.yml b/tasks/build/npm_quobix-vacuum.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/npm_tailwindcss-languageserver.yml b/tasks/build/npm_tailwindcss-languageserver.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/nushell.yml b/tasks/build/nushell.yml index 51739af..8e31d85 100644 --- a/tasks/build/nushell.yml +++ b/tasks/build/nushell.yml @@ -1,4 +1,8 @@ --- +- ansible.builtin.include_vars: + file: nushell.yml + name: _nushell + - name: install nushell via cargo become: true ansible.builtin.command: @@ -11,17 +15,4 @@ - --locked loop_control: loop_var: nuitem - loop: - - nu - - nu_plugin_inc - - nu_plugin_polars - - nu_plugin_gstat - - nu_plugin_formats - - nu_plugin_query - - nu_plugin_highlight - - nu_plugin_json_path - - nu_plugin_net - - nu_plugin_prometheus - - nu_plugin_qr_maker - - nu_plugin_rpm - - nu_plugin_semver + loop: "{{ _nushell.nu_pkgs_list }}" diff --git a/tasks/build/pipx_cmakelang.yml b/tasks/build/pipx_cmakelang.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/pipx_sqlfluff.yml b/tasks/build/pipx_sqlfluff.yml new file mode 100644 index 0000000..e69de29 diff --git a/tasks/build/zig.yml b/tasks/build/zig.yml index b4ce7c2..f00b784 100644 --- a/tasks/build/zig.yml +++ b/tasks/build/zig.yml @@ -1,7 +1,11 @@ --- +- ansible.builtin.include_vars: + file: zig.yml + name: _zig + - name: download zig archive ansible.builtin.set_fact: - zig_pkg: "zig-linux-{{ ansible_archtecture }}-{{ versions.zig }}.tar.xz" + zig_pkg: "zig-{{ _zig.sysmap[ansible_system] }}-{{ _zig.archmap[ansible_archtecture] }}-{{ _zig.version }}.tar.xz" - name: create temp path ansible.builtin.tempfile: @@ -14,3 +18,10 @@ dest: "{{ d_zig_dl_tmp.path }}/{{ zig_pkg }}" url: "{{ _zig.base_url }}/{{ zig_pkg }}" decompress: false + +- name: extract zig package + become: true + ansible.builtin.unarchive: + dest: "{{ _zig.install_path }}" + src: "{{ d_zig_dl_tmp.path }}/{{ zig_pkg }}" + remote_src: true diff --git a/tasks/pkgs/Darwin/carapace.yml b/tasks/pkgs/Darwin/carapace.yml index 4b8fa85..a71db6a 100644 --- a/tasks/pkgs/Darwin/carapace.yml +++ b/tasks/pkgs/Darwin/carapace.yml @@ -1,4 +1,8 @@ --- +- ansible.builtin.include_vars: + file: carapace.yml + name: _carapace + - name: append carapace to syspkgs set_fact: syspkgs: "{{ syspkgs + [ 'carapace' ] }}" diff --git a/tasks/pkgs/RedHat/nushell.yml b/tasks/pkgs/RedHat/nushell.yml index 3072a65..62b64c8 100644 --- a/tasks/pkgs/RedHat/nushell.yml +++ b/tasks/pkgs/RedHat/nushell.yml @@ -1,5 +1,9 @@ --- -- name: install RedHat dependencies +- ansible.builtin.include_vars: + file: nushell.yml + name: _nushell + +- name: install macOS dependencies set_fact: nushell_pkgdeps: - cargo @@ -7,8 +11,8 @@ - openssl-devel - libX11-devel nushell_altdeps: - - Linux/nushell.yml - - "{{ ansible_os_family }}/carapace.yml" + - build/nushell.yml + - "pkgs/{{ ansible_os_family }}/carapace.yml" - name: append to pkgs set_fact: diff --git a/vars/carapace.yml b/vars/carapace.yml index 25bb8a3..d37ddcf 100644 --- a/vars/carapace.yml +++ b/vars/carapace.yml @@ -1,3 +1,2 @@ --- -_carapace: - version: 1.1.1 +version: 1.1.1 diff --git a/vars/go.yml b/vars/go.yml index 2518273..c4a504e 100644 --- a/vars/go.yml +++ b/vars/go.yml @@ -2,6 +2,7 @@ version: 1.23.5 install_path: /usr/local archmap: + arm64: arm64 aarch64: arm64 x86_64: amd64 1.23.5: diff --git a/vars/main.yml b/vars/main.yml index 77622b6..eb12b33 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -4,6 +4,7 @@ packages: [] syspkgs: [] srcpkgs: [] caskpkgs: [] +cargopkgs: [] assume_missing_is_syspkg: false install_state: present full_upgrade: false diff --git a/vars/nushell.yml b/vars/nushell.yml index 3f2c102..056ca35 100644 --- a/vars/nushell.yml +++ b/vars/nushell.yml @@ -1,4 +1,16 @@ --- -_nushell: - install_prefix: /usr/local - +install_prefix: /usr/local +nu_pkgs_list: + - nu + - nu_plugin_inc + - nu_plugin_polars + - nu_plugin_gstat + - nu_plugin_formats + - nu_plugin_query + - nu_plugin_highlight + - nu_plugin_json_path + - nu_plugin_net + - nu_plugin_prometheus + - nu_plugin_qr_maker + - nu_plugin_rpm + - nu_plugin_semver diff --git a/vars/zig.yml b/vars/zig.yml index b5f59f6..a002f8d 100644 --- a/vars/zig.yml +++ b/vars/zig.yml @@ -1,5 +1,11 @@ --- -_zig: - version: 0.13.0 - install_path: /usr/local - base_url: https://ziglang.org/download +version: 0.13.0 +install_path: /usr/local +base_url: https://ziglang.org/download +sysmap: + Darwin: macos + Linux: linux +archmap: + aarch64: aarch64 + arm64: aarch64 + x86_64: x86_64