fixing formatting and dependencies

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'

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

tasks/pkgs/ansible.yml

@@ -1,4 +1,4 @@
 ---
 - name: append to pkgs
-  set_fact:
+  ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'ansible' ] }}"

tasks/pkgs/btop.yml

@@ -1,5 +1,4 @@
 ---
 - name: append to pkgs
-  set_fact:
+  ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'btop' ] }}"
-

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

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

tasks/pkgs/cmake.yml

@@ -1,4 +1,4 @@
 ---
 - name: append to pkgs
-  set_fact:
+  ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'cmake' ] }}"

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

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

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

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'

tasks/pkgs/editorconfig.yml

@@ -1,4 +1,4 @@
 ---
 - name: append to pkgs
-  set_fact:
+  ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'editorconfig' ] }}"

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

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'

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

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'

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

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

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

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

tasks/pkgs/pandoc.yml

@@ -1,6 +1,4 @@
 ---
 - name: append to pkgs
-  set_fact:
+  ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'pandoc' ] }}"
-  tags:
-    - package

tasks/pkgs/pipx.yml

@@ -1,6 +1,4 @@
 ---
 - name: append to pkgs
-  set_fact:
+  ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'pipx' ] }}"
-  tags:
-    - package

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

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

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

tasks/pkgs/ripgrep.yml

@@ -1,6 +1,4 @@
 ---
 - name: append to pkgs
-  set_fact:
+  ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'ripgrep' ] }}"
-  tags:
-    - packages

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

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

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

tasks/pkgs/stow.yml

@@ -1,6 +1,4 @@
 ---
 - name: append to pkgs
-  set_fact:
+  ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'stow' ] }}"
-  tags:
-    - packages

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

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