fix remaining packages to new format

- still needs testing

tasks/archive/zig.yml

@@ -1,46 +1,42 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: download zig archive
+- name: Download zig archive
   ansible.builtin.set_fact:
     zig_path: "zig-{{ pkgconfig_zig.sysmap[ansible_system] }}-{{ pkgconfig_zig.archmap[ansible_architecture] }}-{{ pkgconfig_zig.version }}"
     zig_pkg: "zig-{{ pkgconfig_zig.sysmap[ansible_system] }}-{{ pkgconfig_zig.archmap[ansible_architecture] }}-{{ pkgconfig_zig.version }}.tar.xz"
 
-- name: check if zig {{ pkgconfig_zig.version }} exists
+- name: Check if zig exists
   ansible.builtin.stat:
     path: "{{ pkgconfig_zig.install_path }}/{{ zig_path }}/zig"
   register: r_zig_stat
 
-- name: update/install zig
+- name: Update/install zig
+  when:
+    - not r_zig_stat.stat.exists
   block:
-    - name: create temp path
+    - name: Create temp path
       ansible.builtin.tempfile:
         state: directory
         prefix: zig_dl.
       register: d_zig_dl_tmp
 
-    - name: download zig archive
+    - name: Download zig archive
       ansible.builtin.get_url:
         dest: "{{ d_zig_dl_tmp.path }}/{{ zig_pkg }}"
         url: "{{ pkgconfig_zig.base_url }}/{{ pkgconfig_zig.version }}/{{ zig_pkg }}"
         decompress: false
+        mode: '0644'
 
-    - name: create install_path
+    - name: Extract zig package
-      ansible.builtin.file:
+      become: "{{ ext_become }}"
-        state: directory
-        path: "{{ pkgconfig_zig.install_path }}"
-      become: true
-
-    - name: extract zig package
       ansible.builtin.unarchive:
-        dest: "{{ pkgconfig_zig.install_path }}"
+        dest: "{{ path.archive }}/zig"
         src: "{{ d_zig_dl_tmp.path }}/{{ zig_pkg }}"
         remote_src: true
-      become: true
 
-    - name: link zig binary
+    - name: Link zig binary
+      become: "{{ ext_become }}"
       ansible.builtin.file:
         state: link
-        src: "{{ pkgconfig_zig.install_path }}/{{ zig_path }}/zig"
+        src: "{{ path.archive }}/{{ zig_path }}/zig"
-        path: "{{ pkgconfig_zig.install_prefix }}/bin/zig"
+        path: "{{ path.bin }}/zig"
-      become: true
-  when: not r_zig_stat.stat.exists

tasks/archive/zls.yml

@@ -1,46 +1,42 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: download zls archive
+- name: Download zls archive
   ansible.builtin.set_fact:
     zls_path: "zls-{{ pkgconfig_zls.sysmap[ansible_system] }}-{{ pkgconfig_zls.archmap[ansible_architecture] }}-{{ pkgconfig_zls.version }}"
     zls_pkg: "zls-{{ pkgconfig_zls.sysmap[ansible_system] }}-{{ pkgconfig_zls.archmap[ansible_architecture] }}-{{ pkgconfig_zls.version }}.tar.xz"
 
-- name: check if zls {{ pkgconfig_zls.version }} exists
+- name: Check if zls exists
   ansible.builtin.stat:
     path: "{{ pkgconfig_zls.install_path }}/{{ zls_path }}/zls"
   register: r_zls_stat
 
-- name: update/install zls
+- name: Update/install zls
+  when:
+    - not r_zls_stat.stat.exists
   block:
-    - name: create temp path
+    - name: Create temp path
       ansible.builtin.tempfile:
         state: directory
         prefix: zls_dl.
       register: d_zls_dl_tmp
 
-    - name: download zls archive
+    - name: Download zls archive
       ansible.builtin.get_url:
         dest: "{{ d_zls_dl_tmp.path }}/{{ zls_pkg }}"
-        url: "{{ pkgconfig_zls.base_url }}/{{ zls_pkg }}"
+        url: "{{ pkgconfig.zls.base_url }}/{{ zls_pkg }}"
         decompress: false
+        mode: '0644'
 
-    - name: create install_path
+    - name: Extract zls package
-      ansible.builtin.file:
+      become: "{{ ext_become }}"
-        state: directory
-        path: "{{ pkgconfig_zls.install_path }}/{{ zls_path }}"
-      become: true
-
-    - name: extract zls package
       ansible.builtin.unarchive:
-        dest: "{{ pkgconfig_zls.install_path }}/{{ zls_path }}"
+        dest: "{{ path.ardhive }}/{{ zls_path }}"
         src: "{{ d_zls_dl_tmp.path }}/{{ zls_pkg }}"
         remote_src: true
-      become: true
 
-    - name: link zls binary
+    - name: Link zls binary
+      become: "{{ ext_become }}"
       ansible.builtin.file:
         state: link
-        src: "{{ pkgconfig_zls.install_path }}/{{ zls_path }}/zls"
+        src: "{{ path.ardhive }}/{{ zls_path }}/zls"
-        path: "{{ pkgconfig_zls.install_prefix }}/bin/zls"
+        path: "{{ path.bin }}/zls"
-      become: true
-  when: not r_zls_stat.stat.exists

tasks/config/rust.yml

@@ -1,3 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
-rustup_managed: false
+- name: Set rust config
+  ansible.builtin.set_fact:
+    rust:
+      pkgs: "{{ pkgconfig.rust.pkgs[ansible_system] }}"

tasks/pkgs/pandoc.yml

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

tasks/pkgs/pgadmin.yml

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

tasks/pkgs/podman.yml

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

tasks/pkgs/pyright.yml

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

tasks/pkgs/quobix-vacuum.yml

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

tasks/pkgs/revive.yml

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

tasks/pkgs/ripgrep.yml

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

tasks/pkgs/rust.yml

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

tasks/pkgs/sd.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 + [ 'sd' ] }}"
+    pkg_sys: "{{ pkg_sys + ['sd'] }}"
-  when:
-    - ansible_os_family == 'Darwin'
 
-- name: linux specific install
+- name: Add to pkg_cargo
-  block:
-    - ansible.builtin.include_tasks:
-        file: "pkgs/rust.yml"
-      when: pkgconfig_rust is undefined
-
-    - name: add to cargopkgs
-      ansible.builtin.set_fact:
-        cargopkgs: "{{ cargopkgs + [ 'sd' ] }}"
   when:
-    - ansible_os_family != 'Darwin'
+    - ansible_system == 'Linux'
+  notify:
+    - Depend cargo
+  ansible.builtin.set_fact:
+    pkg_cargo: "{{ pkg_cargo + ['sd'] }}"

tasks/pkgs/sqlfluff.yml

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

tasks/pkgs/sqlls.yml

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

tasks/pkgs/starship.yml

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

tasks/pkgs/stow.yml

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

tasks/pkgs/tailscale.yml

@@ -1,12 +1,14 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.set_fact:
+- name: Enable for linux
-    tailscale: true
+  when:
-- name: enable for linux
+    - ansible_system == 'Linux'
   block:
-    - name: enable for RedHat distros
+    - name: Enable for RedHat distros
+      when:
+        - ansible_os_family == 'RedHat'
       block:
-        - name: fedora >=41
+        - name: Fedora >=41
           ansible.builtin.command:
             creates: /etc/yum.repos.d/tailscale.repo
             cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig.tailscale.url_base }}/fedora/tailscale.repo"
@@ -15,7 +17,7 @@
             - ansible_distribution == 'Fedora'
             - ansible_distribution_major_version|int >= 41
 
-        - name: fedora <41
+        - name: Fedora <41
           ansible.builtin.command:
             creates: /etc/yum.repos.d/tailscale.repo
             cmd: "dnf config-manager --add-repo {{ pkgconfig.tailscale.url_base }}/fedora/tailscale.repo"
@@ -24,35 +26,40 @@
             - ansible_distribution == 'Fedora'
             - ansible_distribution_major_version|int < 41
 
-        - name: rhel based distros
+        - name: Rhel based distros
           ansible.builtin.command:
             creates: /etc/yum.repos.d/tailscale.repo
             cmd: "dnf config-manager --add-repo {{ pkgconfig.tailscale.url_base }}/rhel/{{ ansible_os_major_version }}/tailscale.repo"
           become: true
           when:
             - ansible_distribution != 'Fedora'
-      when: ansible_os_family == 'RedHat'
 
-    - name: enable for Debian distros
+    - name: Enable for Debian distros
+      when:
+        - ansible_os_family == 'Debian'
       block:
-        - name: install tailscale keyring
+        - name: Install tailscale keyring
           block:
-            - ansible.builtin.get_url:
+            - name: Get tailscal keyring
+              become: "{{ sys_pkg_become }}"
+              ansible.builtin.get_url:
                 url: "{{ pkgconfig.tailscale.url_base }}/debian/{{ pkgconfig.tailscale.release[ansible_os_release].gpg }}"
                 dest: /usr/share/keyrings/tailscale-archive-keyring.gpg
-              become: true
+                mode: '0644'
-            - ansible.builtin.get_url:
+
+            - name: Get tailscale repo list
+              become: "{{ sys_pkg_become }}"
+              ansible.builtin.get_url:
                 url: "{{ pkgconfig.tailscale.url_base }}/debian/{{ pkgconfig.tailscale.release[ansible_os_release].list }}"
                 dest: /etc/apt/sources.list.d/tailscale.list
-              become: true
+                mode: '0644'
-      when: ansible_os_family == 'Debian'
 
-    - name: append to syspkgs
+    - name: Append to pkg_sys
       ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + [ 'tailscale' ] }}"
+        pkg_sys: "{{ pkg_sys + ['tailscale'] }}"
-  when: ansible_os_family != 'Darwin'
 
-- name: append to caskpkgs
+- name: Append to pkg_cask
-  set_fact:
+  when:
-    caskpkgs: "{{ caskpkgs + [ 'tailscale' ] }}"
+    - ansible_system == 'Darwin'
-  when: ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['tailscale'] }}"

tasks/pkgs/tailwindcss-languageserver.yml

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

tasks/pkgs/templ.yml

@@ -2,6 +2,6 @@
 ---
 - name: Add to pkg_go
   notify:
-    - Depends go
+    - Depend go
   ansible.builtin.set_fact:
     pkg_go: "{{ pkg_go + ['github.com/a-h/templ/cmd/templ@latest'] }}"

tasks/pkgs/terraform.yml

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

tasks/pkgs/terraformls.yml

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

tasks/pkgs/thunderbird.yml

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

tasks/pkgs/tidy.yml

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

tasks/pkgs/tldr.yml

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

tasks/pkgs/vault.yml

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

tasks/pkgs/xh.yml

@@ -8,6 +8,6 @@
 
 - name: Add to cargopkgs
   when:
-    - ansible_os_family != 'Darwin'
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
     pkg_cargo: "{{ pkg_cargo + [xh] }}"

tasks/pkgs/yamlls.yml

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

tasks/pkgs/zfs.yml

@@ -2,7 +2,7 @@
 ---
 - name: Linux based installation
   when:
-    - ansible_os_family != 'Darwin'
+    - ansible_system == 'Linux'
   block:
     - name: RedHat based configuration
       when:
@@ -22,7 +22,8 @@
             state: present
 
     - name: Debian configuration
-      when: ansible_os_family == 'Debian'
+      when:
+        - ansible_os_family == 'Debian'
       block:
         - name: Enable openzfs repository
           become: "{{ sys_pkg_become }}"
@@ -37,19 +38,20 @@
         - name: Pin zfs package to backports
           become: "{{ sys_pkg_become }}"
           ansible.builtin.file:
+            dest: /etc/apt/preferences.d/90_zfs
+            state: file
+            mode: '0644'
             content: |
                 Package: src:zfs-linux
                 Pin: release n={{ zfs.release }}-backports
                 Pin-Priority: 990
-            dest: /etc/apt/preferences.d/90_zfs
-            state: present
-            mode: '0644'
 
     - name: Append to pkgs
       ansible.builtin.set_fact:
         pkg_sys: "{{ pkg_sys + zfs.deps + zfs.pkgs }}"
 
 - name: Append to caskpkgs
-  when: ansible_os_family == 'Darwin'
+  when:
+    - ansible_os_family == 'Darwin'
   ansible.builtin.set_fact:
     pkg_cask: "{{ pkg_cask + ['openzfs'] }}"

tasks/pkgs/zig.yml

@@ -1,11 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
+- name: Append to pkgs
-    file: zig.yml
-    name: _zig
-- ansible.builtin.set_fact:
-    pkgconfig_zig: "{{ _zig | ansible.builtin.combine(pkgconfig.zig) }}"
-
-- name: append to pkgs
   ansible.builtin.set_fact:
-    srcpkgs: "{{ srcpkgs + [ 'zig' ] }}"
+    pkg_src: "{{ pkg_src + ['zig'] }}"

tasks/pkgs/zls.yml

@@ -1,11 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
+- name: Append to pkgs
-    file: zls.yml
+  notify:
-    name: _zls
+    - Depend zig
-- ansible.builtin.set_fact:
-    pkgconfig_zls: "{{ _zls | ansible.builtin.combine(pkgconfig.zls) }}"
-
-- name: append to pkgs
   ansible.builtin.set_fact:
-    srcpkgs: "{{ srcpkgs + [ 'zls' ] }}"
+    pkg_src: "{{ pkg_src + ['zls'] }}"

tasks/pkgs/zoxide.yml

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

vars/pkgs/pgadmin.yml

@@ -0,0 +1,4 @@
+pgadmin:
+  flatpak:
+    name: org.pgadmin.pgadmin4
+    remote: flathub