change layout for better management

- instead of just `syspkgs` and `srcpkgs` add more lists
  - `appimages`, `flatpkgs` and others as they come up

tasks/pkgs/bitwarden.yml

@@ -1,31 +1,48 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
+- name: Read bitwarden configuration
+  ansible.builtin.include_vars:
     file: bitwarden.yml
     name: _bitwarden
-- ansible.builtin.set_fact:
+
+- name: Set bitwarden configuration
+  ansible.builtin.set_fact:
     pkgconfig_bitwarden: "{{ _bitwarden | ansible.builtin.combine(pkgconfig.bitwarden) }}"
 
-- name: append to flatpkgs
+- 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
+      instpfx: pkgconfig_bitwarden.install_prefix
+      owner: pkgconfig_bitwarden.owner
+
+- name: Append to flatpkgs
+  when:
+    - ansible_os_family != 'Darwin'
+    - bw.instmtd == 'flatpak'
   block:
-    - ansible.builtin.include_tasks:
+    - name: Ensure flatpak runtime activated
+      ansible.builtin.include_tasks:
         file: pkgs/flatpak.yml
       when: flatpak is undefined
 
-    - ansible.builtin.set_fact:
-        flatpkgs: "{{ flatpkgs + [ 'com.bitwarden.desktop' ] }}"
+    - name: Append to flatpkgs
+      ansible.builtin.set_fact:
+        flatpkgs: "{{ flatpkgs + [bw.flatpak] }}"
+
+- name: Append to srcpkgs
   when:
     - ansible_os_family != 'Darwin'
-    - pkgconfig_bitwarden.use_flatpak
-
-- name: append to srcpkgs
+    - bw.instmtd == 'appimage'
   ansible.builtin.set_fact:
-    syspkgs: "{{ srcpkgs + [ 'bitwarden' ] }}"
-  when:
-    - ansible_os_family != 'Darwin'
-    - not pkgconfig_bitwarden.use_flatpak
+    syspkgs: "{{ appimages + ['bitwarden'] }}"
 
-- name: append to caskpkgs
-  ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'bitwarden' ] }}"
+- name: Append to caskpkgs
   when: ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    caskpkgs: "{{ caskpkgs + ['bitwarden'] }}"

tasks/pkgs/lua-language-server.yml

@@ -1,11 +1,23 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
-    file: lua-language-server.yml
-    name: _luals
-- ansible.builtin.set_fact:
-    pkgconfig_luals: "{{ _luals | ansible.builtin.combine(pkgconfig.luals) }}"
+- name: Linux specific configuration
+  when:
+    - ansible_os_family != 'Darwin'
+  block:
+    - name: Load lua-language-server config
+      ansible.builtin.include_vars:
+        file: lua-language-server.yml
+        name: _luals
+    - name: Combine loaded config with defaults
+      ansible.builtin.set_fact:
+        pkgconfig_luals: "{{ _luals | ansible.builtin.combine(pkgconfig.luals) }}"
 
-- name: append to pkgs
+    - name: Append to pkgs
+      ansible.builtin.set_fact:
+        srcpkgs: "{{ srcpkgs + ['lua-language-server'] }}"
+
+- name: Append to syspkgs
+  when:
+    - ansible_os_family == 'Darwin'
   ansible.builtin.set_fact:
-    srcpkgs: "{{ srcpkgs + [ 'lua-language-server' ] }}"
+    syspkgs: "{{ syspkgs + ['lua-language-server'] }}"