fixing packages

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'] }}"

tasks/pkgs/ansible.yml

@@ -1,4 +1,3 @@
-# Install ansible for current platform
 ---
 - name: append to pkgs
   set_fact:

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'] }}"

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'] }}"

tasks/pkgs/cmake.yml

@@ -2,8 +2,3 @@
 - name: append to pkgs
   set_fact:
     syspkgs: "{{ syspkgs + [ 'cmake' ] }}"
-  tags:
-    - RedHat
-    - linux
-    - package
-

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'] }}"

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'] }}"

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'] }}"

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:

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' ] }}"

tasks/pkgs/editorconfig.yml

@@ -2,7 +2,3 @@
 - name: append to pkgs
   set_fact:
     syspkgs: "{{ syspkgs + [ 'editorconfig' ] }}"
-  tags:
-    - RedHat
-    - linux
-    - package

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' ] }}"

tasks/pkgs/firefox.yml

@@ -1,14 +1,10 @@
 ---
 - name: append to pkgs
-  when: ansible_os_family != 'Darwin'
+  ansible.builtin.set_fact:
-  set_fact:
     syspkgs: "{{ syspkgs + [ 'firefox' ] }}"
-  tags:
+  when: ansible_os_family != 'Darwin'
-    - packages
 
 - name: append to caskpkgs
-  when: ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
-  set_fact:
     caskpkgs: "{{ caskpkgs + [ 'firefox' ] }}"
-  tags:
+  when: ansible_os_family == 'Darwin'
-    - packages

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
-

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' ] }}"

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:
+  ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_git.pkgs }}"
+    syspkgs: "{{ syspkgs + pkgconfig_git_pkgs }}"
 

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'] }}"

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' ] }}"

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'] }}"

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' ] }}"

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
-

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
-

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'] }}"

tasks/pkgs/markdownlint-cli.yml

@@ -1,3 +1,3 @@
 - name: add to npmpkgs
-  set_fact:
+  ansible.builtin.set_fact:
     npmpkgs: "{{ npmpkgs + ['markdownlint-cli'] }}"

tasks/pkgs/nodejs.yml

@@ -3,14 +3,8 @@
     file: nodejs.yml
     name: _nodejs
 - ansible.builtin.set_fact:
-    pkgconfig:
+    pkgconfig_nodejs: "{{ _nodejs | ansible.builtin.combine(pkgconfig.nodejs) }}"
-      nodejs: "{{ _nodejs | ansible.builtin.combine(pkgconfig.nodejs) }}"
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig.nodejs.pkgs[ansible_system] }}"
+    syspkgs: "{{ syspkgs + pkgconfig_nodejs.pkgs[ansible_system] }}"
-  tags:
-    - RedHat
-    - linux
-    - package
-