fix packages

tasks/pkgs/broot.yml

@@ -3,6 +3,8 @@
 - name: Append to pkg_sys and pkg_cargo
   when:
     - ansible_system == 'Linux'
+  notify:
+    - Depend cargo
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + broot.deps }}"
     pkg_cargo: "{{ pkg_cargo + [broot] }}"

tasks/pkgs/direnv.yml

@@ -0,0 +1,3 @@
+- name: Append to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['direnv'] }}"

tasks/pkgs/ghostty.yml

@@ -3,6 +3,7 @@
 - name: Source pkg installation
   when:
     - ghostty.method == 'src'
+    - ansible_distribution != 'MacOSX'
   notify:
     - Depend zig
   block:

tasks/pkgs/go.yml

@@ -2,12 +2,11 @@
 ---
 - name: Install from archive
   when:
-    - go.use_archive
+    - go.method == 'archive'
   ansible.builtin.set_fact:
     pkg_archive: "{{ pkg_archive + ['go'] }}"
 
 - name: Append to pkgs
-  when:
-    - not go.use_archive
+    - go.method != 'archive'
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + ['go'] }}"

tasks/pkgs/libreoffice.yml

@@ -1,20 +1,19 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Append to flatpkgs
+- name: Append to pkg_flatpak
   when:
     - libreoffice.method == 'flatpak'
   ansible.builtin.set_fact:
-    flatpkgs: "{{ flatpkgs + libreoffice.flatpak }}"
+    pkg_flatpak: "{{ pkg_flatpak + libreoffice.flatpak }}"
 
 - 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:
-    - ansible_system == 'Darwin'
+    - libreoffice.method == 'cask'
   ansible.builtin.set_fact:
-    pkg_cask: "{{ pkg_cask + ['libreoffice'] }}"
+    pkg_cask: "{{ pkg_cask + libreoffice.pkgs }}"

tasks/pkgs/neovim.yml

@@ -2,12 +2,12 @@
 ---
 - name: Append to appimages
   when:
-    - nvim.method == 'appimage'
+    - neovim.method == 'appimage'
   ansible.builtin.set_fact:
     pkg_appimage: "{{ pkg_appimage + ['neovim'] }}"
 
 - name: Append neovim to pkg_sys
   when:
-    - nvim.method == 'sys'
+    - neovim.method == 'sys'
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + ['neovim'] }}"

tasks/pkgs/nodejs.yml

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

tasks/pkgs/pgadmin.yml

@@ -2,14 +2,14 @@
 ---
 - name: Append to pkg_flatpak
   when:
-    - ansible_system == 'Linux'
+    - pgadmin.method == 'flatpak'
   notify:
     - Depend flatpak
   ansible.builtin.set_fact:
-    pkg_flatpak: "{{ pkg_flatpak + [pkgconfig.pgadmin.flatpak] }}"
+    pkg_flatpak: "{{ pkg_flatpak + [pgadmin.flatpak] }}"
 
 - name: Append to pkg_cask
   when:
-    - ansible_system == 'Darwin'
+    - pgadmin.method == 'cask'
   ansible.builtin.set_fact:
-    pkg_cask: "{{ pkg_cask + ['pgadmin4'] }}"
+    pkg_cask: "{{ pkg_cask + pgadmin.pkgs }}"

tasks/pkgs/rust.yml

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

tasks/pkgs/terraform.yml

@@ -3,5 +3,15 @@
 - name: Append to pkgs
   notify:
     - Depend hashicorp repo
-  ansible.builtin.set_fact:
-    pkg_taps: "{{ pkg_taps + [pkgconfig.terraform[ansible_system]] }}"
+  block:
+    - name: MacOSX specific
+      when:
+        - ansible_distribution == 'MacOSX'
+      ansible.builtin.set_fact:
+        pkg_tap: "{{ pkg_tap + terraform.pkgs }}"
+
+    - name: Linux specific
+      when:
+        - ansible_system == 'Linux'
+      ansible.builtin.set_fact:
+        pkg_sys: "{{ pkg_sys + terraform.pkgs }}"

tasks/pkgs/terraformls.yml

@@ -8,10 +8,10 @@
       when:
         - ansible_system == 'Darwin'
       ansible.builtin.set_fact:
-        pkg_taps: "{{ pkg_taps + [pkgconfig.terraformls[ansible_system]] }}"
+        pkg_tap: "{{ pkg_tap + terraformls.pkgs }}"
 
     - name: Linux specific
       when:
         - ansible_system == 'Linux'
       ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['terraformls'] }}"
+        pkg_sys: "{{ pkg_sys + terraformls.pkgs }}"

tasks/pkgs/tidy.yml

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

tasks/pkgs/vault.yml

@@ -8,7 +8,7 @@
       when:
         - ansible_system == 'Darwin'
       ansible.builtin.set_fact:
-        pkg_taps: "{{ pkg_taps + [pkgconfig.vault[ansible_system]] }}"
+        pkg_tap: "{{ pkg_tap + [pkgconfig.vault[ansible_system]] }}"
 
     - name: Linux specific
       when:

tasks/pkgs/zls.yml

@@ -4,4 +4,4 @@
   notify:
     - Depend zig
   ansible.builtin.set_fact:
-    pkg_src: "{{ pkg_src + ['zls'] }}"
+    pkg_archive: "{{ pkg_archive + ['zls'] }}"