From 66eaed6e4b762f6e24761715492f2beb9fc2ec9c Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Sat, 25 Jan 2025 18:45:37 -0700 Subject: [PATCH] fixing formatting and dependencies --- tasks/pkgs/alacritty.yml | 2 +- tasks/pkgs/ansible-language-server.yml | 2 +- tasks/pkgs/ansible.yml | 2 +- tasks/pkgs/btop.yml | 3 +-- tasks/pkgs/buf.yml | 2 +- tasks/pkgs/checkmake.yml | 2 +- tasks/pkgs/cmake.yml | 2 +- tasks/pkgs/cmakelang.yml | 2 +- tasks/pkgs/commitlint-cli.yml | 2 +- tasks/pkgs/commitlint-config-conventional.yml | 2 +- tasks/pkgs/consul.yml | 4 ++-- tasks/pkgs/editorconfig.yml | 2 +- tasks/pkgs/markdownlint-cli.yml | 5 +++++ tasks/pkgs/neovide.yml | 14 ++++++-------- tasks/pkgs/neovim.yml | 8 ++++---- tasks/pkgs/nerdfonts.yml | 8 ++++---- tasks/pkgs/nodejs.yml | 2 +- tasks/pkgs/nomad.yml | 3 ++- tasks/pkgs/nushell.yml | 19 ++++++++++--------- tasks/pkgs/packer.yml | 5 +++-- tasks/pkgs/pandoc.yml | 4 +--- tasks/pkgs/pipx.yml | 4 +--- tasks/pkgs/python3-pip.yml | 9 +++------ tasks/pkgs/quobix-vacuum.yml | 7 ++++++- tasks/pkgs/revive.yml | 7 ++++++- tasks/pkgs/ripgrep.yml | 4 +--- tasks/pkgs/rust.yml | 9 +++------ tasks/pkgs/sqlfluff.yml | 7 ++++++- tasks/pkgs/starship.yml | 8 +++++++- tasks/pkgs/stow.yml | 4 +--- tasks/pkgs/tailwindcss-languageserver.yml | 7 ++++++- tasks/pkgs/templ.yml | 7 ++++++- vars/neovide.yml | 2 -- 33 files changed, 95 insertions(+), 75 deletions(-) diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml index ad1e117..dc3c9bf 100644 --- a/tasks/pkgs/alacritty.yml +++ b/tasks/pkgs/alacritty.yml @@ -19,6 +19,6 @@ srcpkgs: "{{ srcpkgs + [ 'alacritty' ] }}" - name: append alacritty to caskpkgs - set_fact: + ansible.builtin.set_fact: caskpkgs: "{{ caskpkgs + [ 'alacritty' ] }}" when: ansible_system == 'Darwin' diff --git a/tasks/pkgs/ansible-language-server.yml b/tasks/pkgs/ansible-language-server.yml index 9e8c0ec..4c3467f 100644 --- a/tasks/pkgs/ansible-language-server.yml +++ b/tasks/pkgs/ansible-language-server.yml @@ -4,5 +4,5 @@ when: pkgconfig_nodejs not defined - name: add to npmpkgs - set_fact: + ansible.builtin.set_fact: npmpkgs: "{{ npmpkgs + ['@ansible/ansible-language-server'] }}" diff --git a/tasks/pkgs/ansible.yml b/tasks/pkgs/ansible.yml index 78f694e..4ab3504 100644 --- a/tasks/pkgs/ansible.yml +++ b/tasks/pkgs/ansible.yml @@ -1,4 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'ansible' ] }}" diff --git a/tasks/pkgs/btop.yml b/tasks/pkgs/btop.yml index 571f07f..64b74b8 100644 --- a/tasks/pkgs/btop.yml +++ b/tasks/pkgs/btop.yml @@ -1,5 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'btop' ] }}" - diff --git a/tasks/pkgs/buf.yml b/tasks/pkgs/buf.yml index 38f2d90..b986fa4 100644 --- a/tasks/pkgs/buf.yml +++ b/tasks/pkgs/buf.yml @@ -4,5 +4,5 @@ when: pkgconfig_go not defined - name: add to gopkgs - set_fact: + ansible.builtin.set_fact: gopkgs: "{{ gopkgs + ['github.com/bufbuild/buf/cmd/buf@latest'] }}" diff --git a/tasks/pkgs/checkmake.yml b/tasks/pkgs/checkmake.yml index 650e17e..32fc062 100644 --- a/tasks/pkgs/checkmake.yml +++ b/tasks/pkgs/checkmake.yml @@ -4,5 +4,5 @@ when: pkgconfig_go not defined - name: add to gopkgs - set_fact: + ansible.builtin.set_fact: gopkgs: "{{ gopkgs + ['github.com/mrtazz/checkmake/cmd/checkmake@latest'] }}" diff --git a/tasks/pkgs/cmake.yml b/tasks/pkgs/cmake.yml index a49e6c1..427a720 100644 --- a/tasks/pkgs/cmake.yml +++ b/tasks/pkgs/cmake.yml @@ -1,4 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'cmake' ] }}" diff --git a/tasks/pkgs/cmakelang.yml b/tasks/pkgs/cmakelang.yml index 807d5bd..eeddb87 100644 --- a/tasks/pkgs/cmakelang.yml +++ b/tasks/pkgs/cmakelang.yml @@ -4,5 +4,5 @@ when: pkgconfig_pipx not defined - name: add to pipxpkgs - set_fact: + ansible.builtin.set_fact: pipxpkgs: "{{ pipxpkgs + ['cmakelang'] }}" diff --git a/tasks/pkgs/commitlint-cli.yml b/tasks/pkgs/commitlint-cli.yml index 40fe314..4ed454f 100644 --- a/tasks/pkgs/commitlint-cli.yml +++ b/tasks/pkgs/commitlint-cli.yml @@ -4,5 +4,5 @@ when: pkgconfig_nodejs not defined - name: add to npmpkgs - set_fact: + ansible.builtin.set_fact: npmpkgs: "{{ npmpkgs + ['@commitlint/cli'] }}" diff --git a/tasks/pkgs/commitlint-config-conventional.yml b/tasks/pkgs/commitlint-config-conventional.yml index 6acd48b..f66fb52 100644 --- a/tasks/pkgs/commitlint-config-conventional.yml +++ b/tasks/pkgs/commitlint-config-conventional.yml @@ -4,5 +4,5 @@ when: pkgconfig_nodejs not defined - name: add to npmpkgs - set_fact: + ansible.builtin.set_fact: npmpkgs: "{{ npmpkgs + ['@commitlint/config-conventional'] }}" diff --git a/tasks/pkgs/consul.yml b/tasks/pkgs/consul.yml index 702b2a0..6abb64c 100644 --- a/tasks/pkgs/consul.yml +++ b/tasks/pkgs/consul.yml @@ -6,10 +6,10 @@ when: pkgconfig_hashicorp not defined - name: append to syspkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ pkgconfig_hashicorp.consul[ansible_system] ] }}" when: ansible_system == 'Linux' -- set_fact: +- ansible.builtin.set_fact: tappkgs: "{{ tappkgs + [ pkgconfig_hashicorp.consul[ansible_system] ] }}" when: ansible_system == 'Darwin' diff --git a/tasks/pkgs/editorconfig.yml b/tasks/pkgs/editorconfig.yml index 1a4b5ac..10125ab 100644 --- a/tasks/pkgs/editorconfig.yml +++ b/tasks/pkgs/editorconfig.yml @@ -1,4 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'editorconfig' ] }}" diff --git a/tasks/pkgs/markdownlint-cli.yml b/tasks/pkgs/markdownlint-cli.yml index f99821f..6d90065 100644 --- a/tasks/pkgs/markdownlint-cli.yml +++ b/tasks/pkgs/markdownlint-cli.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/nodejs.yml + when: pkgconfig_nodejs not defined + - name: add to npmpkgs ansible.builtin.set_fact: npmpkgs: "{{ npmpkgs + ['markdownlint-cli'] }}" diff --git a/tasks/pkgs/neovide.yml b/tasks/pkgs/neovide.yml index 225a232..11d6c11 100644 --- a/tasks/pkgs/neovide.yml +++ b/tasks/pkgs/neovide.yml @@ -5,18 +5,16 @@ - ansible.builtin.set_fact: pkgconfig_neovide: "{{ _neovide | ansible.builtin.combine(pkgconfig.neovide) }}" - ansible.builtin.include_tasks: - file: "pkgs/{{ pkgdep }}.yml" - loop: "{{ pkgconfig_neovide.local_deps }}" - loop_control: - loop_var: pkgdep + file: pkgs/rust.yml + when: pkgconfig_rust not defined - name: append to pkgs - when: ansible_system == 'Linux' - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + pkgconfig_neovide.pkgdeps[ansible_os_family] }}" srcpkgs: "{{ srcpkgs + [ 'neovide' ] }}" + when: ansible_system == 'Linux' - name: append neovide to caskpkgs - when: ansible_system == 'Darwin' - set_fact: + ansible.builtin.set_fact: caskpkgs: "{{ caskpkgs + [ 'neovide' ] }}" + when: ansible_system == 'Darwin' diff --git a/tasks/pkgs/neovim.yml b/tasks/pkgs/neovim.yml index 5ebc235..a4ba687 100644 --- a/tasks/pkgs/neovim.yml +++ b/tasks/pkgs/neovim.yml @@ -6,11 +6,11 @@ pkgconfig_neovim: "{{ _neovim | ansible.builtin.combine(pkgconfig.neovim) }}" - name: append neovim to srcpkgs - when: not pkgconfig_neovim.use_syspkg - set_fact: + ansible.builtin.set_fact: srcpkgs: "{{ srcpkgs + ['neovim'] }}" + when: not pkgconfig_neovim.use_syspkg - name: append neovim to syspkgs - when: pkgconfig_neovim.use_syspkg - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + ['neovim'] }}" + when: pkgconfig_neovim.use_syspkg diff --git a/tasks/pkgs/nerdfonts.yml b/tasks/pkgs/nerdfonts.yml index 713899a..bddfd7a 100644 --- a/tasks/pkgs/nerdfonts.yml +++ b/tasks/pkgs/nerdfonts.yml @@ -6,14 +6,14 @@ pkgconfig_nerdfonts: "{{ _nerdfonts | ansible.builtin.combine(pkgconfig.nerdfons) }}" - name: append to srcpkgs - when: ansible_system == 'Linux' - set_fact: + ansible.builtin.set_fact: srcpkgs: "{{ srcpkgs + [ 'nerdfonts' ] }}" + when: ansible_system == 'Linux' - name: append to caskpkgs - when: ansible_system == 'Darwin' - set_fact: + ansible.builtin.set_fact: caskpkgs: "{{ caskpkgs + [ pkgconfig_nerdfonts[font].brew ] }}" loop: "{{ pkgconfig_nerdfonts.install }}" loop_control: loop_var: font + when: ansible_system == 'Darwin' diff --git a/tasks/pkgs/nodejs.yml b/tasks/pkgs/nodejs.yml index 1b98bec..d59f214 100644 --- a/tasks/pkgs/nodejs.yml +++ b/tasks/pkgs/nodejs.yml @@ -6,5 +6,5 @@ pkgconfig_nodejs: "{{ _nodejs | ansible.builtin.combine(pkgconfig.nodejs) }}" - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + pkgconfig_nodejs.pkgs[ansible_system] }}" diff --git a/tasks/pkgs/nomad.yml b/tasks/pkgs/nomad.yml index 5632412..0c741d4 100644 --- a/tasks/pkgs/nomad.yml +++ b/tasks/pkgs/nomad.yml @@ -2,8 +2,9 @@ - name: ensure hashicorp repo is active ansible.builtin.include_tasks: file: "pkgs/hashicorp_repo.yml" + when: pkgconfig_hashicorp not defined - name: append to pkgs - set_fact: + ansible.builtin.set_fact: tappkgs: "{{ tappkgs + [ pkgconfig.hashicorp.nomad[ansible_system] ] }}" diff --git a/tasks/pkgs/nushell.yml b/tasks/pkgs/nushell.yml index 25f7899..ba27fa9 100644 --- a/tasks/pkgs/nushell.yml +++ b/tasks/pkgs/nushell.yml @@ -3,16 +3,17 @@ file: nushell.yml name: _nushell - ansible.builtin.set_fact: - pkgconfig: - nushell: "{{ _nushell | ansible.builtin.combine(pkgconfig.nushell) }}" + pkgconfig_nushell: "{{ _nushell | ansible.builtin.combine(pkgconfig.nushell) }}" - ansible.builtin.include_tasks: - file: "pkgs/{{ dep }}.yml" - loop: "{{ pkgconfig.nushell.deps }}" - loop_control: - loop_var: dep + file: pkgs/rust.yml + when: pkgconfig_rust not defined + +- ansible.builtin.include_tasks: + file: pkgs/carapace.yml + when: pkgconfig_carapace not defined - name: append to pkgs - set_fact: - syspkgs: "{{ syspkgs + pkgsconfig.nushell.build_deps[ansible_os_family] }}" - cargopkgs: "{{ cargopkgs + pkgconfig.nushell.pkgs[ansible_os_family] + pkgconfig.nushell.pkgs_common }}" + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + pkgsconfig_nushell.build_deps[ansible_os_family] }}" + cargopkgs: "{{ cargopkgs + pkgconfig_nushell.pkgs[ansible_os_family] + pkgconfig_nushell.pkgs_common }}" diff --git a/tasks/pkgs/packer.yml b/tasks/pkgs/packer.yml index c1e7265..be51813 100644 --- a/tasks/pkgs/packer.yml +++ b/tasks/pkgs/packer.yml @@ -2,7 +2,8 @@ - name: ensure hashicorp repo is active ansible.builtin.include_tasks: file: "pkgs/hashicorp_repo.yml" + when: pkgconfig_hashicorp not defined - name: append to pkgs - set_fact: - tappkgs: "{{ tappkgs + [ pkgconfig.hashicorp.packer[ansible_system] ] }}" + ansible.builtin.set_fact: + tappkgs: "{{ tappkgs + [ pkgconfig_hashicorp.packer[ansible_system] ] }}" diff --git a/tasks/pkgs/pandoc.yml b/tasks/pkgs/pandoc.yml index 96b54ae..73bde62 100644 --- a/tasks/pkgs/pandoc.yml +++ b/tasks/pkgs/pandoc.yml @@ -1,6 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'pandoc' ] }}" - tags: - - package diff --git a/tasks/pkgs/pipx.yml b/tasks/pkgs/pipx.yml index 5b2c2c0..ee82d0f 100644 --- a/tasks/pkgs/pipx.yml +++ b/tasks/pkgs/pipx.yml @@ -1,6 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'pipx' ] }}" - tags: - - package diff --git a/tasks/pkgs/python3-pip.yml b/tasks/pkgs/python3-pip.yml index 82ca322..7b6e1d6 100644 --- a/tasks/pkgs/python3-pip.yml +++ b/tasks/pkgs/python3-pip.yml @@ -3,11 +3,8 @@ file: python3.yml name: _python3 - ansible.builtin.set_fact: - pkgconfig: - python3: "{{ _python3 | ansible.builtin.combine(pkgconfig.python3) }}" + pkgconfig_python3: "{{ _python3 | ansible.builtin.combine(pkgconfig.python3) }}" - name: append to pkgs - set_fact: - syspkgs: "{{ syspkgs + pkgconfig.python3.pkgs[ansible_system] }}" - tags: - - packages + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + pkgconfig_python3.pkgs[ansible_system] }}" diff --git a/tasks/pkgs/quobix-vacuum.yml b/tasks/pkgs/quobix-vacuum.yml index a0f65fc..5fc3cd6 100644 --- a/tasks/pkgs/quobix-vacuum.yml +++ b/tasks/pkgs/quobix-vacuum.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/nodejs.yml + when: pkgconfig_nodejs not defined + - name: add to npmpkgs - set_fact: + ansible.builtin.set_fact: npmpkgs: "{{ npmpkgs + ['@quobix/vacuum'] }}" diff --git a/tasks/pkgs/revive.yml b/tasks/pkgs/revive.yml index f8cac9a..ececb52 100644 --- a/tasks/pkgs/revive.yml +++ b/tasks/pkgs/revive.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/go.yml + when: pkgconfig_go not defined + - name: add to gopkgs - set_fact: + ansible.builtin.set_fact: gopkgs: "{{ gopkgs + ['github.com/mgechev/revive@latest'] }}" diff --git a/tasks/pkgs/ripgrep.yml b/tasks/pkgs/ripgrep.yml index 3f7d83b..0aa4a97 100644 --- a/tasks/pkgs/ripgrep.yml +++ b/tasks/pkgs/ripgrep.yml @@ -1,6 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'ripgrep' ] }}" - tags: - - packages diff --git a/tasks/pkgs/rust.yml b/tasks/pkgs/rust.yml index 3fdb0c1..fb324d9 100644 --- a/tasks/pkgs/rust.yml +++ b/tasks/pkgs/rust.yml @@ -3,11 +3,8 @@ file: rust.yml name: _rust - ansible.builtin.set_fact: - pkgconfig: - rust: "{{ _rust | ansible.builtin.combine(pkgconfig.rust) }}" + pkgconfig_rust: "{{ _rust | ansible.builtin.combine(pkgconfig.rust) }}" - name: append to pkgs - set_fact: - syspkgs: "{{ syspkgs + pkgconfig.rust.pkgs[ansible_system] }}" - tags: - - packages + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + pkgconfig_rust.pkgs[ansible_system] }}" diff --git a/tasks/pkgs/sqlfluff.yml b/tasks/pkgs/sqlfluff.yml index 0e4cba3..50d00e2 100644 --- a/tasks/pkgs/sqlfluff.yml +++ b/tasks/pkgs/sqlfluff.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/pipx.yml + when: pkgconfig_pipx not defined + - name: add to pipxpkgs - set_fact: + ansible.builtin.set_fact: pipxpkgs: "{{ pipxpkgs + ['sqlfluff'] }}" diff --git a/tasks/pkgs/starship.yml b/tasks/pkgs/starship.yml index 4810d50..c8f35ce 100644 --- a/tasks/pkgs/starship.yml +++ b/tasks/pkgs/starship.yml @@ -1,3 +1,9 @@ +--- +- name: install rust and cargo + ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: pkgconfig_rust not defined + - name: add to cargopkgs - set_fact: + ansible.builtin.set_fact: cargopkgs: "{{ cargopkgs + [ 'starship' ] }}" diff --git a/tasks/pkgs/stow.yml b/tasks/pkgs/stow.yml index 9464aca..ce7be0c 100644 --- a/tasks/pkgs/stow.yml +++ b/tasks/pkgs/stow.yml @@ -1,6 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'stow' ] }}" - tags: - - packages diff --git a/tasks/pkgs/tailwindcss-languageserver.yml b/tasks/pkgs/tailwindcss-languageserver.yml index 8ee4800..96e6414 100644 --- a/tasks/pkgs/tailwindcss-languageserver.yml +++ b/tasks/pkgs/tailwindcss-languageserver.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/nodejs.yml + when: pkgconfig_nodejs not defined + - name: add to npmpkgs - set_fact: + ansible.builtin.set_fact: npmpkgs: "{{ npmpkgs + ['@tailwindcss/language-server'] }}" diff --git a/tasks/pkgs/templ.yml b/tasks/pkgs/templ.yml index 9d18238..366135c 100644 --- a/tasks/pkgs/templ.yml +++ b/tasks/pkgs/templ.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/go.yml + when: pkgconfig_go not defined + - name: add to gopkgs - set_fact: + ansible.builtin.set_fact: gopkgs: "{{ gopkgs + ['github.com/a-h/templ/cmd/templ@latest'] }}" diff --git a/vars/neovide.yml b/vars/neovide.yml index 3c7ebff..6a03f38 100644 --- a/vars/neovide.yml +++ b/vars/neovide.yml @@ -4,8 +4,6 @@ install_prefix: /usr/local #required variables git_repo: https://github.com/neovide/neovide.git -local_deps: - - rust pkgdeps: RedHat: - fontconfig-devel