diff --git a/tasks/pkgs/air.yml b/tasks/pkgs/air.yml index c59754a..1dc2a02 100644 --- a/tasks/pkgs/air.yml +++ b/tasks/pkgs/air.yml @@ -4,5 +4,5 @@ when: pkgconfig_go not defined - name: add to gopkgs - set_fact: + ansible.builtin.set_fact: gopkgs: "{{ gopkgs + ['github.com/air-verse/air@latest'] }}" diff --git a/tasks/pkgs/ansible.yml b/tasks/pkgs/ansible.yml index f5ab41b..78f694e 100644 --- a/tasks/pkgs/ansible.yml +++ b/tasks/pkgs/ansible.yml @@ -1,4 +1,3 @@ -# Install ansible for current platform --- - name: append to pkgs set_fact: diff --git a/tasks/pkgs/buf.yml b/tasks/pkgs/buf.yml index 5d377f7..38f2d90 100644 --- a/tasks/pkgs/buf.yml +++ b/tasks/pkgs/buf.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/go.yml + when: pkgconfig_go not defined + - name: add to gopkgs set_fact: gopkgs: "{{ gopkgs + ['github.com/bufbuild/buf/cmd/buf@latest'] }}" diff --git a/tasks/pkgs/checkmake.yml b/tasks/pkgs/checkmake.yml index 56ba804..650e17e 100644 --- a/tasks/pkgs/checkmake.yml +++ b/tasks/pkgs/checkmake.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/go.yml + when: pkgconfig_go not defined + - name: add to gopkgs set_fact: gopkgs: "{{ gopkgs + ['github.com/mrtazz/checkmake/cmd/checkmake@latest'] }}" diff --git a/tasks/pkgs/cmake.yml b/tasks/pkgs/cmake.yml index 02dda2b..a49e6c1 100644 --- a/tasks/pkgs/cmake.yml +++ b/tasks/pkgs/cmake.yml @@ -2,8 +2,3 @@ - name: append to pkgs set_fact: syspkgs: "{{ syspkgs + [ 'cmake' ] }}" - tags: - - RedHat - - linux - - package - diff --git a/tasks/pkgs/cmakelang.yml b/tasks/pkgs/cmakelang.yml index 9b48335..807d5bd 100644 --- a/tasks/pkgs/cmakelang.yml +++ b/tasks/pkgs/cmakelang.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/pipx.yml + when: pkgconfig_pipx not defined + - name: add to pipxpkgs set_fact: pipxpkgs: "{{ pipxpkgs + ['cmakelang'] }}" diff --git a/tasks/pkgs/commitlint-cli.yml b/tasks/pkgs/commitlint-cli.yml index f714fee..40fe314 100644 --- a/tasks/pkgs/commitlint-cli.yml +++ b/tasks/pkgs/commitlint-cli.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/nodejs.yml + when: pkgconfig_nodejs not defined + - name: add to npmpkgs set_fact: npmpkgs: "{{ npmpkgs + ['@commitlint/cli'] }}" diff --git a/tasks/pkgs/commitlint-config-conventional.yml b/tasks/pkgs/commitlint-config-conventional.yml index b8a9952..6acd48b 100644 --- a/tasks/pkgs/commitlint-config-conventional.yml +++ b/tasks/pkgs/commitlint-config-conventional.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: pkgs/nodejs.yml + when: pkgconfig_nodejs not defined + - name: add to npmpkgs set_fact: npmpkgs: "{{ npmpkgs + ['@commitlint/config-conventional'] }}" diff --git a/tasks/pkgs/consul.yml b/tasks/pkgs/consul.yml index c0b5cbb..702b2a0 100644 --- a/tasks/pkgs/consul.yml +++ b/tasks/pkgs/consul.yml @@ -3,7 +3,7 @@ - name: ensure hashicorp repo is active ansible.builtin.include_tasks: file: "pkgs/hashicorp_repo.yml" - when: pkgconfig_hashicorp is not defined + when: pkgconfig_hashicorp not defined - name: append to syspkgs set_fact: diff --git a/tasks/pkgs/dotenv-linter.yml b/tasks/pkgs/dotenv-linter.yml index 7c2e133..6db9337 100644 --- a/tasks/pkgs/dotenv-linter.yml +++ b/tasks/pkgs/dotenv-linter.yml @@ -1,3 +1,8 @@ +--- +- ansible.builtin.include_tasks: + file: "pkgs/rust.yml" + when: pkgconfig_rust not defined + - name: add to cargopkgs ansible.builtin.set_fact: cargopkgs: "{{ cargopkgs + [ 'dotenv-linter' ] }}" diff --git a/tasks/pkgs/editorconfig.yml b/tasks/pkgs/editorconfig.yml index b5e2623..1a4b5ac 100644 --- a/tasks/pkgs/editorconfig.yml +++ b/tasks/pkgs/editorconfig.yml @@ -2,7 +2,3 @@ - name: append to pkgs set_fact: syspkgs: "{{ syspkgs + [ 'editorconfig' ] }}" - tags: - - RedHat - - linux - - package diff --git a/tasks/pkgs/eza.yml b/tasks/pkgs/eza.yml index 4bc29f5..7036f39 100644 --- a/tasks/pkgs/eza.yml +++ b/tasks/pkgs/eza.yml @@ -1,3 +1,8 @@ +--- +- 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 + [ 'eza' ] }}" diff --git a/tasks/pkgs/firefox.yml b/tasks/pkgs/firefox.yml index 5d595a0..73a84f2 100644 --- a/tasks/pkgs/firefox.yml +++ b/tasks/pkgs/firefox.yml @@ -1,14 +1,10 @@ --- - name: append to pkgs - when: ansible_os_family != 'Darwin' - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'firefox' ] }}" - tags: - - packages + when: ansible_os_family != 'Darwin' - name: append to caskpkgs - when: ansible_os_family == 'Darwin' - set_fact: + ansible.builtin.set_fact: caskpkgs: "{{ caskpkgs + [ 'firefox' ] }}" - tags: - - packages + when: ansible_os_family == 'Darwin' diff --git a/tasks/pkgs/fzf.yml b/tasks/pkgs/fzf.yml index 68e703d..111ba7c 100644 --- a/tasks/pkgs/fzf.yml +++ b/tasks/pkgs/fzf.yml @@ -1,9 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'fzf' ] }}" - tags: - - RedHat - - linux - - package - diff --git a/tasks/pkgs/ghostty.yml b/tasks/pkgs/ghostty.yml index 73d5ace..a57037c 100644 --- a/tasks/pkgs/ghostty.yml +++ b/tasks/pkgs/ghostty.yml @@ -7,7 +7,7 @@ when: pkgconfig_terrarepo is not defined - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'ghostty' ] }}" - name: no ghostty for this system @@ -19,5 +19,5 @@ - name: append ghostty to caskpkgs when: ansible_distribution == 'MacOSX' - set_fact: + ansible.builtin.set_fact: caskpkgs: "{{ caskpkgs + [ 'ghostty' ] }}" diff --git a/tasks/pkgs/git.yml b/tasks/pkgs/git.yml index 968cbc9..1f219e1 100644 --- a/tasks/pkgs/git.yml +++ b/tasks/pkgs/git.yml @@ -4,11 +4,9 @@ name: _git - ansible.builtin.set_fact: pkgconfig_git: "{{ _git | ansible.builtin.combine(pkgconfig.git) }}" -- ansible.builtin.set_fact: - pkgconfig_git: - pkgs: "{{ pkgconfig.git.pkgs[ansible_system] }}" + pkgconfig_git_pkgs: "{{ pkgconfig.git.pkgs[ansible_system] }}" - name: append to pkgs - set_fact: - syspkgs: "{{ syspkgs + pkgconfig_git.pkgs }}" + ansible.builtin.set_fact: + syspkgs: "{{ syspkgs + pkgconfig_git_pkgs }}" diff --git a/tasks/pkgs/glow.yml b/tasks/pkgs/glow.yml index b66a98c..bac7eea 100644 --- a/tasks/pkgs/glow.yml +++ b/tasks/pkgs/glow.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/charmbracelet/glow@latest'] }}" diff --git a/tasks/pkgs/go.yml b/tasks/pkgs/go.yml index a9ba397..29e5bd0 100644 --- a/tasks/pkgs/go.yml +++ b/tasks/pkgs/go.yml @@ -6,5 +6,5 @@ pkgconfig_go: "{{ _go | ansible.builtin.combine(pkgconfig.go) }}" - name: append to pkgs - set_fact: + ansible.builtin.set_fact: srcpkgs: "{{ srcpkgs + [ 'go' ] }}" diff --git a/tasks/pkgs/gopls.yml b/tasks/pkgs/gopls.yml index 5adae6c..6799237 100644 --- a/tasks/pkgs/gopls.yml +++ b/tasks/pkgs/gopls.yml @@ -1,8 +1,8 @@ --- - ansible.builtin.include_tasks: file: pkgs/go.yml - when: pkgconfig_go is not defined + when: pkgconfig_go not defined - name: add to gopkgs - set_fact: + ansible.builtin.set_fact: gopkgs: "{{ gopkgs + ['golang.org/x/tools/gopls@latest'] }}" diff --git a/tasks/pkgs/htmx-lsp.yml b/tasks/pkgs/htmx-lsp.yml index a016470..ee184d1 100644 --- a/tasks/pkgs/htmx-lsp.yml +++ b/tasks/pkgs/htmx-lsp.yml @@ -1,3 +1,8 @@ +--- +- 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 + [ 'htmx-lsp' ] }}" diff --git a/tasks/pkgs/hugo.yml b/tasks/pkgs/hugo.yml index 6d1c996..f8ab197 100644 --- a/tasks/pkgs/hugo.yml +++ b/tasks/pkgs/hugo.yml @@ -1,9 +1,4 @@ --- - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'hugo' ] }}" - tags: - - RedHat - - linux - - package - diff --git a/tasks/pkgs/jq.yml b/tasks/pkgs/jq.yml index 9a38d88..1456ad6 100644 --- a/tasks/pkgs/jq.yml +++ b/tasks/pkgs/jq.yml @@ -1,10 +1,4 @@ --- - - name: append to pkgs - set_fact: + ansible.builtin.set_fact: syspkgs: "{{ syspkgs + [ 'jq' ] }}" - tags: - - RedHat - - linux - - package - diff --git a/tasks/pkgs/lazygit.yml b/tasks/pkgs/lazygit.yml index 514fd72..4f9a735 100644 --- a/tasks/pkgs/lazygit.yml +++ b/tasks/pkgs/lazygit.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/jesseduffield/lazygit@latest'] }}" diff --git a/tasks/pkgs/markdownlint-cli.yml b/tasks/pkgs/markdownlint-cli.yml index 007522b..f99821f 100644 --- a/tasks/pkgs/markdownlint-cli.yml +++ b/tasks/pkgs/markdownlint-cli.yml @@ -1,3 +1,3 @@ - name: add to npmpkgs - set_fact: + ansible.builtin.set_fact: npmpkgs: "{{ npmpkgs + ['markdownlint-cli'] }}" diff --git a/tasks/pkgs/nodejs.yml b/tasks/pkgs/nodejs.yml index 8bcde15..1b98bec 100644 --- a/tasks/pkgs/nodejs.yml +++ b/tasks/pkgs/nodejs.yml @@ -3,14 +3,8 @@ file: nodejs.yml name: _nodejs - ansible.builtin.set_fact: - pkgconfig: - nodejs: "{{ _nodejs | ansible.builtin.combine(pkgconfig.nodejs) }}" + pkgconfig_nodejs: "{{ _nodejs | ansible.builtin.combine(pkgconfig.nodejs) }}" - name: append to pkgs set_fact: - syspkgs: "{{ syspkgs + pkgconfig.nodejs.pkgs[ansible_system] }}" - tags: - - RedHat - - linux - - package - + syspkgs: "{{ syspkgs + pkgconfig_nodejs.pkgs[ansible_system] }}"