fixing packages for new style

tasks/pkgs/bitwarden.yml

@@ -1,48 +1,19 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Read bitwarden configuration
-  ansible.builtin.include_vars:
-    file: bitwarden.yml
-    name: _bitwarden
-
-- name: Set bitwarden configuration
-  ansible.builtin.set_fact:
-    pkgconfig_bitwarden: "{{ _bitwarden | ansible.builtin.combine(pkgconfig.bitwarden) }}"
-
-- name: Set bitwarden facts
-  ansible.builtin.set_fact:
-    bw:
-      appimg: "{{ pkgconfig_bitwarden.appimage }}"
-      become: "{{ pkgconfig_bitwarden.dobecome }}"
-      flatpak: "{{ pkgconfig_bitwarden.flatpak }}"
-      group: "{{ pkgconfig_bitwarden.group }}"
-      instdir: "{{ pkgconfig_bitwarden.install_dir }}"
-      instmtd: "{{ pkgconfig_bitwarden.install_method }}"
-      bindir: "{{ pkgconfig_bitwarden.install_prefix }}/bin"
-      owner: "{{ pkgconfig_bitwarden.owner }}"
-
 - name: Append to flatpkgs
   when:
-    - ansible_os_family != 'Darwin'
-    - bw.instmtd == 'flatpak'
-  block:
-    - name: Ensure flatpak runtime activated
-      ansible.builtin.include_tasks:
-        file: pkgs/flatpak.yml
-      when: flatpak is undefined
-
-    - name: Append to flatpkgs
-      ansible.builtin.set_fact:
-        flatpkgs: "{{ flatpkgs + [bw.flatpak] }}"
+    - bw.method == 'flatpak'
+  ansible.builtin.set_fact:
+    pkg_flatpak: "{{ pkg_flatpak + [bw.pkg] }}"
 
 - name: Append to srcpkgs
   when:
-    - ansible_os_family != 'Darwin'
-    - bw.instmtd == 'appimage'
+    - bw.method == 'appimage'
   ansible.builtin.set_fact:
-    syspkgs: "{{ appimages + ['bitwarden'] }}"
+    pkg_appimage: "{{ pkg_appimage + [bw.pkg] }}"
 
 - name: Append to caskpkgs
-  when: ansible_os_family == 'Darwin'
+  when:
+    - bw.method == 'brew'
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + ['bitwarden'] }}"
+    pkg_cask: "{{ pkg_cask + [bw.pkg.name] }}"