more fixs being done

tasks/pkgs/bitwarden.yml

@@ -2,18 +2,18 @@
 ---
 - name: Append to flatpkgs
   when:
-    - bw.method == 'flatpak'
+    - bitwarden.method == 'flatpak'
   ansible.builtin.set_fact:
-    pkg_flatpak: "{{ pkg_flatpak + [bw.pkg] }}"
+    pkg_flatpak: "{{ pkg_flatpak + [bitwarden.pkg] }}"
 
 - name: Append to srcpkgs
   when:
-    - bw.method == 'appimage'
+    - bitwarden.method == 'appimage'
   ansible.builtin.set_fact:
-    pkg_appimage: "{{ pkg_appimage + [bw.pkg] }}"
+    pkg_appimage: "{{ pkg_appimage + [bitwarden.pkg] }}"
 
 - name: Append to caskpkgs
   when:
-    - bw.method == 'brew'
+    - bitwarden.method == 'brew'
   ansible.builtin.set_fact:
-    pkg_cask: "{{ pkg_cask + [bw.pkg.name] }}"
+    pkg_cask: "{{ pkg_cask + [bitwarden.pkg.name] }}"

tasks/pkgs/fd.yml

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

tasks/pkgs/ghostty.yml

@@ -1,32 +1,35 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
-    file: ghostty.yml
-    name: _ghostty
-- ansible.builtin.set_fact:
-    pkgconfig_ghostty: "{{ _ghostty | ansible.builtin.combine(pkgconfig.ghostty) }}"
-
-- name: ensure dependencies
+- name: Source pkg installation
+  when:
+    - ghostty.method == 'src' or
   block:
-    - ansible.builtin.include_tasks:
-        file: "pkgs/terra_repo.yml"
-      when: terrarepo is undefined
-
-    - name: append to pkgs
+    - name: Build ghostty from source
       ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + [ 'ghostty' ] }}"
-  when: ansible_distribution == 'Fedora' or
-        not pkgconfig_ghostty.build
+        pkg_sys: "{{ pkg_sys + ghostty.deps }}"
+        pkg_src: "{{ pkg_src + ['ghostty'] }}"
 
-- name: build ghostty from source
-  block:
-    - ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + pkgconfig_ghostty.deps[ansible_os_family] }}"
-        srcpkgs: "{{ srcpkgs + ['ghostty'] }}"
-  when: (ansible_distribution != 'Fedora' and ansible_system == 'Linux') or
-        pkgconfig_ghostty.build
-
-- name: append ghostty to caskpkgs
+- name: Appimage installation
+  when:
+    - ghostty.method == 'appimage'
+    - ansible_distribution != 'MacOSX'
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'ghostty' ] }}"
-  when: ansible_distribution == 'MacOSX'
+    pkg_appimage: "{{ pkg_appimage + ghostty_vars.appimage }}"
+
+- name: Sys pkg installation
+  when:
+    - ghostty.method == 'sys'
+  block:
+    - name: Append to pkgs
+      when:
+        - ansible_distribution == 'Fedora'
+      notify:
+        - Depend terra repo
+      ansible.builtin.set_fact:
+        pkg_sys: "{{ pkg_sys + ['ghostty'] }}"
+
+- name: Cask pkg installation
+  when:
+    - ghostty.method == 'brew'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['ghostty'] }}"