more package fixes

tasks/pkgs/air.yml

@@ -1,7 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add to go_pkgs
+- name: Add to pkg_go
   notify:
     - Depend go
   ansible.builtin.set_fact:
-    go_pkgs: "{{ go_pkgs + [air] }}"
+    pkg_go: "{{ pkg_go + [air] }}"

tasks/pkgs/alacritty.yml

@@ -15,4 +15,4 @@
   when:
     - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + alacritty.cask }}"
+    pkg_cask: "{{ pkg_cask + alacritty.cask }}"

tasks/pkgs/ansible-language-server.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['@ansible/ansible-language-server'] }}"
+    pkg_npm: "{{ pkg_npm + ['@ansible/ansible-language-server'] }}"

tasks/pkgs/ansible.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'ansible' ] }}"
+    pkg_sys: "{{ pkg_sys + ['ansible'] }}"

tasks/pkgs/bashls.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + [ 'bash-language-server' ] }}"
+    pkg_npm: "{{ pkg_npm + ['bash-language-server'] }}"

tasks/pkgs/bitwarden.yml

@@ -1,18 +1,20 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Append to flatpkgs
+- name: Append to pkg_flatpak
   when:
     - bitwarden.method == 'flatpak'
+  notify:
+    - Depend flatpak
   ansible.builtin.set_fact:
     pkg_flatpak: "{{ pkg_flatpak + [bitwarden.pkg] }}"
 
-- name: Append to srcpkgs
+- name: Append to pkg_appimage
   when:
     - bitwarden.method == 'appimage'
   ansible.builtin.set_fact:
     pkg_appimage: "{{ pkg_appimage + [bitwarden.pkg] }}"
 
-- name: Append to caskpkgs
+- name: Append to pkg_cask
   when:
     - bitwarden.method == 'brew'
   ansible.builtin.set_fact:

tasks/pkgs/blender.yml

@@ -1,11 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Append to pkgs
+- name: Append to pkg_sys
+  when:
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + ['blender'] }}"
-  when: ansible_os_family != 'Darwin'
 
-- name: Append to caskpkgs
+- name: Append to pkg_cask
+  when:
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
     pkg_cask: "{{ pkg_cask + ['blender'] }}"
-  when: ansible_os_family == 'Darwin'

tasks/pkgs/broot.yml

@@ -2,13 +2,13 @@
 ---
 - name: Append to pkg_sys and pkg_cargo
   when:
-    - ansible_os_family != 'Darwin'
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + broot.deps }}"
     pkg_cargo: "{{ pkg_cargo + [broot] }}"
 
 - name: Append to pkg_sys
   when:
-    - ansible_os_family == 'Darwin'
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + ['broot'] }}"

tasks/pkgs/btop.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Append to pkgs
+- name: Append to pkg_ssys
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + ['btop'] }}"

tasks/pkgs/buf.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/go.yml
-  when: pkgconfig_go is undefined
-
-- name: add to gopkgs
+- name: Add to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + ['github.com/bufbuild/buf/cmd/buf@latest'] }}"
+    pkg_go: "{{ pkg_go + ['github.com/bufbuild/buf/cmd/buf@latest'] }}"

tasks/pkgs/bufls.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/go.yml
-  when: pkgconfig_go is undefined
-
-- name: add to gopkgs
+- name: Add to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + [ 'github.com/bufbuild/buf-language-server/cmd/bufls@latest' ] }}"
+    pkg_go: "{{ pkg_go + ['github.com/bufbuild/buf-language-server/cmd/bufls@latest'] }}"

tasks/pkgs/cheat.yml

@@ -1,10 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: "pkgs/go.yml"
-  when:
-    - pkgconfig_go is undefined
-
-- name: append to gopkgs
+- name: Append to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + [ 'github.com/cheat/cheat/cmd/cheat@latest' ] }}"
+    pkg_go: "{{ pkg_go + ['github.com/cheat/cheat/cmd/cheat@latest'] }}"

tasks/pkgs/checkmake.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/go.yml
-  when: pkgconfig_go is undefined
-
-- name: add to gopkgs
+- name: Add to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + ['github.com/mrtazz/checkmake/cmd/checkmake@latest'] }}"
+    pkg_go: "{{ pkg_go + ['github.com/mrtazz/checkmake/cmd/checkmake@latest'] }}"

tasks/pkgs/choose.yml

@@ -2,12 +2,14 @@
 ---
 - name: Append to cargopkgs
   when:
-    - ansible_os_family != 'Darwin'
+    - ansible_system == 'Linux'
+  notify:
+    - Depend cargo
   ansible.builtin.set_fact:
     pkg_cargo: "{{ pkg_cargo + [choose] }}"
 
 - name: Append to pkg_sys
   when:
-    - ansible_os_family == 'Darwin'
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + ['choose-rust'] }}"

tasks/pkgs/cmake.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'cmake' ] }}"
+    pkg_sys: "{{ pkg_sys + ['cmake'] }}"

tasks/pkgs/cmakelang.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/pipx.yml
-  when: pipx is undefined
-
-- name: add to pipxpkgs
+- name: Add to pkg_pipx
+  notify:
+    - Depend pipx
   ansible.builtin.set_fact:
-    pipxpkgs: "{{ pipxpkgs + ['cmakelang'] }}"
+    pkg_pipx: "{{ pkg_pipx + ['cmakelang'] }}"

tasks/pkgs/commitlint-cli.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['@commitlint/cli'] }}"
+    pkg_npm: "{{ pkg_npm + ['@commitlint/cli'] }}"

tasks/pkgs/commitlint-config-conventional.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['@commitlint/config-conventional'] }}"
+    pkg_npm: "{{ pkg_npm + ['@commitlint/config-conventional'] }}"

tasks/pkgs/consul.yml

@@ -3,11 +3,15 @@
 - name: Append to pkg_sys
   when:
     - ansible_system == 'Linux'
+  notify:
+    - Depend hashicorp repo
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + consul.pkgs }}"
 
 - name: Append to pkg_tap
   when:
     - ansible_system == 'Darwin'
+  notify:
+    - Depend hashicorp repo
   ansible.builtin.set_fact:
     pkg_tap: "{{ pkg_tap + consul.pkgs }}"

tasks/pkgs/cssls.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['vscode-langservers-extracted'] }}"
+    pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}"

tasks/pkgs/curlie.yml

@@ -1,5 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to gopkgs
+- name: Append to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + [ 'github.com/rs/curlie@latest' ] }}"
+    pkg_go: "{{ pkg_go + ['github.com/rs/curlie@latest'] }}"

tasks/pkgs/dbeaver.yml

@@ -1,15 +1,15 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/flatpak.yml
-  when: flatpkak is undefined
-
-- name: append to flatpkgs
+- name: Append to pkg_flatpak
+  when:
+    - ansible_system == 'Linux'
+  notify:
+    - Depend flatpak
   ansible.builtin.set_fact:
-    flatpkgs: "{{ flatpkgs + [ 'io.dbeaver.DBeaverCommunity' ] }}"
-  when: ansible_os_family != 'Darwin'
+    pkg_flatpak: "{{ pkg_flatpak + ['io.dbeaver.DBeaverCommunity'] }}"
 
-- name: append to caskpkgs
+- name: Append to pkg_cask
+  when:
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'dbeaver-community' ] }}"
-  when: ansible_os_family == 'Darwin'
+    pkg_cask: "{{ pkg_cask + ['dbeaver-community'] }}"

tasks/pkgs/dockerls.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['dockerfile-language-server-nodejs'] }}"
+    pkg_npm: "{{ pkg_npm + ['dockerfile-language-server-nodejs'] }}"

tasks/pkgs/dotenv-linter.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: "pkgs/rust.yml"
-  when: pkgconfig_rust is undefined
-
-- name: add to cargopkgs
+- name: Add to pkg_cargo
+  notify:
+    - Depend cargo
   ansible.builtin.set_fact:
-    cargopkgs: "{{ cargopkgs + [ 'dotenv-linter' ] }}"
+    pkg_cargo: "{{ pkg_cargo + ['dotenv-linter'] }}"

tasks/pkgs/duf.yml

@@ -1,10 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: "pkgs/go.yml"
-  when:
-    - pkgconfig_go is undefined
-
-- name: append to gopkgs
+- name: Append to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + [ 'github.com/muesli/duf@latest' ] }}"
+    pkg_go: "{{ pkg_go + ['github.com/muesli/duf@latest'] }}"

tasks/pkgs/dust.yml

@@ -1,19 +1,15 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to syspkgs
+- name: Linux specific install
+  when:
+    - ansible_system == 'Linux'
+  notify:
+    - Depend cargo
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'dust' ] }}"
+    pkg_cargo: "{{ pkg_cargo + ['du-dust'] }}"
+
+- name: Append to pkg_sys
   when:
     - ansible_os_family == 'Darwin'
-
-- name: linux specific install
-  block:
-    - ansible.builtin.include_tasks:
-        file: "pkgs/rust.yml"
-      when: pkgconfig_rust is undefined
-
-    - name: add to cargopkgs
-      ansible.builtin.set_fact:
-        cargopkgs: "{{ cargopkgs + [ 'du-dust' ] }}"
-  when:
-    - ansible_os_family != 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['dust'] }}"

tasks/pkgs/eslint.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['vscode-langservers-extracted'] }}"
+    pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}"

tasks/pkgs/eza.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: "pkgs/rust.yml"
-  when: pkgconfig_rust is undefined
-
-- name: add to cargopkgs
+- name: Add to pkg_cargo
+  notify:
+    - Depend cargo
   ansible.builtin.set_fact:
-    cargopkgs: "{{ cargopkgs + [ 'eza' ] }}"
+    pkg_cargo: "{{ pkg_cargo + ['eza'] }}"

tasks/pkgs/firefox.yml

@@ -1,11 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
+  when:
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'firefox' ] }}"
-  when: ansible_os_family != 'Darwin'
+    pkg_sys: "{{ pkg_sys + ['firefox'] }}"
 
-- name: append to caskpkgs
+- name: Append to pkg_cask
+  when:
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'firefox' ] }}"
-  when: ansible_os_family == 'Darwin'
+    pkg_cask: "{{ pkg_cask + ['firefox'] }}"

tasks/pkgs/flatpak.yml

@@ -1,7 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to syspkgs
+- name: Append to pkg_sys
+  when:
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'flatpak' ] }}"
-    flatpak: true
-  when: ansible_os_family != 'Darwin'
+    pkg_sys: "{{ pkg_sys + ['flatpak'] }}"

tasks/pkgs/ghostty.yml

@@ -2,7 +2,9 @@
 ---
 - name: Source pkg installation
   when:
-    - ghostty.method == 'src' or
+    - ghostty.method == 'src'
+  notify:
+    - Depend zig
   block:
     - name: Build ghostty from source
       ansible.builtin.set_fact:

tasks/pkgs/glow.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/go.yml
-  when: pkgconfig_go is undefined
-
-- name: add to gopkgs
+- name: Add to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + ['github.com/charmbracelet/glow@latest'] }}"
+    pkg_go: "{{ pkg_go + ['github.com/charmbracelet/glow@latest'] }}"

tasks/pkgs/go.yml

@@ -2,12 +2,12 @@
 ---
 - name: Install from archive
   when:
-    - prefer_archive
+    - go.use_archive
   ansible.builtin.set_fact:
-    archive_pkgs: "{{ archive_pkgs + ['go'] }}"
+    pkg_archive: "{{ pkg_archive + ['go'] }}"
 
 - name: Append to pkgs
   when:
-    - not prefer_archive
+    - not go.use_archive
   ansible.builtin.set_fact:
-    sys_pkgs: "{{ src_pkgs + ['go'] }}"
+    pkg_sys: "{{ pkg_sys + ['go'] }}"

tasks/pkgs/godot.yml

@@ -1,16 +1,15 @@
 # vim: set filetype=yaml.ansible :
 ---
-- block:
-    - ansible.builtin.include_tasks:
-        file: pkgs/flatpak.yml
-      when: flatpak is undefined
-    - name: append to flatpkgs
-      ansible.builtin.set_fact:
-        flatpkgs: "{{ flatpkgs + [ 'org.godotengine.Godot' ] }}"
+- name: Append to pkg_flatpak
   when:
-    - ansible_os_family != 'Darwin'
-
-- name: append to caskpkgs
+    - ansible_system == 'Linux'
+  notify:
+    - Depend flatpak
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'godot' ] }}"
-  when: ansible_os_family == 'Darwin'
+    pkg_flatpak: "{{ pkg_flatpak + ['org.godotengine.Godot'] }}"
+
+- name: Append to pkg_cask
+  when:
+    - ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['godot'] }}"

tasks/pkgs/gopls.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/go.yml
-  when: pkgconfig_go is undefined
-
-- name: add to gopkgs
+- name: Add to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + ['golang.org/x/tools/gopls@latest'] }}"
+    pkg_go: "{{ pkg_go + ['golang.org/x/tools/gopls@latest'] }}"

tasks/pkgs/gping.yml

@@ -1,19 +1,15 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to syspkgs
+- name: Append to pkg_sys
+  when:
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'gping' ] }}"
-  when:
-    - ansible_os_family == 'Darwin'
+    pkg_sys: "{{ pkg_sys + ['gping'] }}"
 
-- name: linux specific
-  block:
-    - ansible.builtin.include_tasks:
-        file: "pkgs/rust.yml"
-      when:
-        - pkgconfig_rust is undefined
-
-    - ansible.builtin.set_fact:
-        cargopkgs: "{{ cargopkgs + [ 'gping' ] }}"
+- name: Append to pkg_cargo
   when:
-    - ansible_os_family != 'Darwin'
+    - ansible_system == 'Linux'
+  notify:
+    - Depend cargo
+  ansible.builtin.set_fact:
+    pkg_cargo: "{{ pkg_cargo + ['gping'] }}"

tasks/pkgs/hashicorp.yml

@@ -1,3 +0,0 @@
-- name: Enable hashicorp repository
-  ansible.builtin.include_tasks:
-    file: repos/hashicorp.yml

tasks/pkgs/heroic.yml

@@ -1,16 +1,15 @@
 # vim: set filetype=yaml.ansible :
 ---
-- block:
-    - ansible.builtin.include_tasks:
-        file: pkgs/flatpak.yml
-      when: flatpak is undefined
-    - name: append to flatpkgs
-      ansible.builtin.set_fact:
-        flatpkgs: "{{ flatpkgs + [ 'com.heroicgameslauncher.hgl' ] }}"
+- name: Append to pkg_flatpak
   when:
-    - ansible_os_family != 'Darwin'
-
-- name: append to caskpkgs
+    - ansible_system == 'Linux'
+  notify:
+    - Depend flatpak
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'heroic' ] }}"
-  when: ansible_os_family == 'Darwin'
+    pkg_flatpak: "{{ pkg_flatpak + ['com.heroicgameslauncher.hgl'] }}"
+
+- name: Append to pkg_cask
+  when:
+    - ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['heroic'] }}"

tasks/pkgs/htmlls.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['vscode-langservers-extracted'] }}"
+    pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}"

tasks/pkgs/htmx-lsp.yml

@@ -1,9 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: "pkgs/rust.yml"
-  when: pkgconfig_rust is undefined
-
-- name: add to cargopkgs
+- name: Add to pkg_cargo
   ansible.builtin.set_fact:
-    cargopkgs: "{{ cargopkgs + [ 'htmx-lsp' ] }}"
+    pkg_cargo: "{{ pkg_cargo + ['htmx-lsp'] }}"

tasks/pkgs/httpie.yml

@@ -1,15 +1,15 @@
 # vim: set filetype=yaml.ansible :
 ---
-- block:
-    - ansible.builtin.include_tasks:
-        file: pkgs/flatpak.yml
-      when: flatpak is undefined
-
-    - ansible.builtin.set_fact:
-        flatpkgs: "{{ flatpkgs + [ 'io.httpie.Httpie' ] }}"
-  when: ansible_os_family != 'Darwin'
-
-- name: append to caskpkgs
+- name: Append to pkg_flatpak
+  when:
+    - ansible_system == 'Linux'
+  notify:
+    - Depend flatpak
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'httpie' ] }}"
-  when: ansible_os_family == 'Darwin'
+    pkg_flatpak: "{{ pkg_flatpak + ['io.httpie.Httpie'] }}"
+
+- name: Append to pkg_cask
+  when:
+    - ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['httpie'] }}"

tasks/pkgs/hugo.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'hugo' ] }}"
+    pkg_sys: "{{ pkg_sys + ['hugo'] }}"

tasks/pkgs/intelephense.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + [ 'intelephense' ] }}"
+    pkg_npm: "{{ pkg_npm + ['intelephense'] }}"

tasks/pkgs/jinja-lsp.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: "pkgs/rust.yml"
-  when: pkgconfig_rust is undefined
-
-- name: add to cargopkgs
+- name: Add to pkg_cargo
+  notify:
+    - Depend cargo
   ansible.builtin.set_fact:
-    cargopkgs: "{{ cargopkgs + [ 'jinja-lsp' ] }}"
+    pkg_cargo: "{{ pkg_cargo + ['jinja-lsp'] }}"

tasks/pkgs/jq.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'jq' ] }}"
+    pkg_sys: "{{ pkg_sys + ['jq'] }}"

tasks/pkgs/jsonls.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['vscode-langservers-extracted'] }}"
+    pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}"

tasks/pkgs/lazygit.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/go.yml
-  when: pkgconfig_go is undefined
-
-- name: add to gopkgs
+- name: Add to pkg_go
+  notify:
+    - Depend go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + ['github.com/jesseduffield/lazygit@latest'] }}"
+    pkg_go: "{{ pkg_go + ['github.com/jesseduffield/lazygit@latest'] }}"

tasks/pkgs/libreoffice.yml

@@ -1,20 +1,17 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Linux specific methods
+- name: Append to flatpkgs
   when:
-    - ansible_system == 'Linux'
-  block:
-    - name: Append to flatpkgs
-      when:
-        - libreoffice.method == 'flatpak'
-      ansible.builtin.set_fact:
-        flatpkgs: "{{ flatpkgs + libreoffice.flatpak }}"
+    - libreoffice.method == 'flatpak'
+  ansible.builtin.set_fact:
+    flatpkgs: "{{ flatpkgs + libreoffice.flatpak }}"
 
-    - name: Append to pkg_sys
-      when:
-        - libreoffice.method == 'sys'
-      ansible.builtin.set_fact:
-        sys_pkg: "{{ sys_pkg + libreoffice.pkgs }}"
+- name: Append to pkg_sys
+  when:
+    - libreoffice.method == 'sys'
+    - ansible_system == 'Linux'
+  ansible.builtin.set_fact:
+    sys_pkg: "{{ sys_pkg + libreoffice.pkgs }}"
 
 - name: Append to caskpkgs
   when:

tasks/pkgs/lua-language-server.yml

@@ -1,11 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Append to pkgs
+  when:
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
-    srcpkgs: "{{ srcpkgs + ['lua-language-server'] }}"
+    pkg_archive: "{{ pkg_archive + ['luals'] }}"
 
 - name: Append to pkg_sys
   when:
-    - ansible_os_family == 'Darwin'
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + ['lua-language-server'] }}"

tasks/pkgs/markdownlint-cli.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/nodejs.yml
-  when: nodejs is undefined
-
-- name: add to npmpkgs
+- name: Add to pkg_npm
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    npmpkgs: "{{ npmpkgs + ['markdownlint-cli'] }}"
+    pkg_npm: "{{ pkg_npm + ['markdownlint-cli'] }}"

tasks/pkgs/mcfly.yml

@@ -1,19 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to syspkgs
-  ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'mcfly' ] }}"
+- name: Append to pkg_sys
   when:
     - ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['mcfly'] }}"
 
-- name: linux specific install
-  block:
-    - ansible.builtin.include_tasks:
-        file: "pkgs/rust.yml"
-      when: pkgconfig_rust is undefined
-
-    - name: add to cargopkgs
-      ansible.builtin.set_fact:
-        cargopkgs: "{{ cargopkgs + [ 'mcfly' ] }}"
+- name: Add to pkg_cargo
   when:
-    - ansible_os_family != 'Darwin'
+    - ansible_system == 'Linux'
+  ansible.builtin.set_fact:
+    pkg_cargo: "{{ pkg_cargo + ['mcfly'] }}"

tasks/pkgs/neovide.yml

@@ -3,11 +3,13 @@
 - name: Append to pkgs
   when:
     - ansible_system == 'Linux'
+  notify:
+    - Depend cargo
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + neovide.deps }}"
     pkg_cargo: "{{ pkg_cargo + [neovide] }}"
 
-- name: Append neovide to caskpkgs
+- name: Append neovide to pkg_cask
   when:
     - ansible_system == 'Darwin'
   ansible.builtin.set_fact:

tasks/pkgs/neovim.yml

@@ -1,50 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Load neovim config
-  ansible.builtin.include_vars:
-    file: neovim.yml
-    name: _neovim
-
-- name: Combine neovim default and user config
-  ansible.builtin.set_fact:
-    pkgconfig_neovim: "{{ _neovim | ansible.builtin.combine(pkgconfig.neovim) }}"
-
-- name: Set neovim facts
-  ansible.builtin.set_fact:
-    nvim:
-      appimg: "{{ pkgconfig_neovim.appimage }}"
-      become: "{{ pkgconfig_neovim.dobecome }}"
-      bldtype: "{{ pkgconfig_neovim.build_type }}"
-      group: "{{ pkgconfig_neovim.group }}"
-      instdir: "{{ pkgconfig_neovim.install_dir }}"
-      instmtd: "{{ pkgconfig_neovim.install_method }}"
-      instpfx: "{{ pkgconfig_neovim.install_prefix }}"
-      owner: "{{ pkgconfig_neovim.owner }}"
-      ver: "{{ pkgconfig_neovim.version }}"
-
-- name: Linux specific install
+- name: Append to appimages
   when:
-    - ansible_system == 'Linux'
-  block:
-    # install system package when on an up to date distro
-    - name: Append to syspkgs
-      when:
-        - (ansible_distribution == 'Fedora') or
-          (ansible_distribution == 'Ubuntu')
-
-    - name: Append to appimages
-      when:
-        - nvim.instmtd == 'appimage'
-      ansible.builtin.set_fact:
-        appimages: "{{ appimages + ['neovim'] }}"
-- name: Append neovim to syspkgs
-  when:
-    - ansible_os_family == 'Darwin'
+    - nvim.method == 'appimage'
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + ['neovim'] }}"
+    pkg_appimage: "{{ pkg_appimage + ['neovim'] }}"
 
-- name: Append neovim to srcpkgs
+- name: Append neovim to pkg_sys
   when:
-    - nvim.instmtd == 'source'
+    - nvim.method == 'sys'
   ansible.builtin.set_fact:
-    srcpkgs: "{{ srcpkgs + ['neovim'] }}"
+    pkg_sys: "{{ pkg_sys + ['neovim'] }}"

tasks/pkgs/nerdfonts.yml

@@ -1,14 +1,16 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Append to srcpkgs
+  when:
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
     pkg_archive: "{{ pkg_archive + ['nerdfonts'] }}"
-  when: ansible_system == 'Linux'
 
 - name: Append to caskpkgs
-  ansible.builtin.set_fact:
-    pkg_cask: "{{ pkg_cask + [pkgconfig.nerdfonts.fonts[font].brew] }}"
+  when:
+    - ansible_system == 'Darwin'
   loop: "{{ nerdfonts.fonts }}"
   loop_control:
     loop_var: font
-  when: ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + [pkgconfig.nerdfonts.fonts[font].brew] }}"

tasks/pkgs/nextcloud.yml

@@ -1,17 +1,23 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to flatpkgs
-  block:
-    - ansible.builtin.include_tasks:
-        file: pkgs/flatpak.yml
-      when: flatpak is undefined
-
-    - ansible.builtin.set_fact:
-        flatpkgs: "{{ flatpkgs + [ 'com.nextcloud.desktopclient.nextcloud' ] }}"
+- name: Append to pkg_Flatpak
   when:
-    - ansible_os_family != 'Darwin'
-
-- name: append to caskpkgs
+    - ansible_system == 'Linux'
+    - nextcloud.method == 'flatpak'
+  notify:
+    - Depend flatpak
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'nextcloud' ] }}"
-  when: ansible_os_family == 'Darwin'
+    pkg_flatpak: "{{ pkg_flatpak + [nextcloud] }}"
+
+- name: Append to pkg_sys
+  when:
+    - ansible_system == 'Linux'
+    - nextcloud.method == 'sys'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['nextcloud'] }}"
+
+- name: Append to pkg_cask
+  when:
+    - ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['nextcloud'] }}"

tasks/pkgs/nginxls.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/pipx.yml
-  when: pipx is undefined
-
-- name: add to pipxpkgs
+- name: Add to pkg_pipx
+  notify:
+    - Depend node
   ansible.builtin.set_fact:
-    pipxpkgs: "{{ pipxpkgs + ['nginx-language-server'] }}"
+    pkg_pipx: "{{ pkg_pipx + ['nginx-language-server'] }}"

tasks/pkgs/nodejs.yml

@@ -2,4 +2,4 @@
 ---
 - name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig.nodejs.pkgs[ansible_system] }}"
+    pkg_sys: "{{ pkg_sys + pkgconfig.nodejs.pkgs[ansible_system] }}"

tasks/pkgs/nomad.yml

@@ -1,11 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: ensure hashicorp repo is active
-  ansible.builtin.include_tasks:
-    file: "pkgs/hashicorp_repo.yml"
-  when: hashicorp is undefined
-
-- name: append to pkgs
+- name: Append to pkgs
+  notify:
+    - Depend hashicorp repo
   ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig.nomad[ansible_system] ] }}"
-
+    pkg_tap: "{{ pkg_tap + [pkgconfig.nomad[ansible_system]] }}"

tasks/pkgs/packer.yml

@@ -1,10 +1,15 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: ensure hashicorp repo is active
-  ansible.builtin.include_tasks:
-    file: "pkgs/hashicorp_repo.yml"
-  when: hashicorp is undefined
-
-- name: append to pkgs
+- name: Append to pkg_tap
+  when:
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig.packer[ansible_system] ] }}"
+    pkg_tap: "{{ pkg_tap + [pkgconfig.packer[ansible_system]] }}"
+
+- name: Append to pkg_sys
+  when:
+    - ansible_system == 'Linux'
+  notify:
+    - Depend hashicorp repo
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['packer'] }}"

tasks/pkgs/templ.yml

@@ -1,9 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
-    file: pkgs/go.yml
-  when: pkgconfig_go is undefined
-
-- name: add to gopkgs
+- name: Add to pkg_go
+  notify:
+    - Depends go
   ansible.builtin.set_fact:
-    gopkgs: "{{ gopkgs + ['github.com/a-h/templ/cmd/templ@latest'] }}"
+    pkg_go: "{{ pkg_go + ['github.com/a-h/templ/cmd/templ@latest'] }}"