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] }}"

tasks/pkgs/fd.yml

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

tasks/pkgs/hyperfine.yml

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

tasks/pkgs/nerdfonts.yml

@@ -1,20 +1,14 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
-    file: nerdfonts.yml
-    name: _nerdfonts
-- ansible.builtin.set_fact:
-    pkgconfig_nerdfonts: "{{ _nerdfonts | ansible.builtin.combine(pkgconfig.nerdfonts) }}"
-
-- name: append to srcpkgs
+- name: Append to srcpkgs
   ansible.builtin.set_fact:
-    srcpkgs: "{{ srcpkgs + [ 'nerdfonts' ] }}"
+    pkg_archive: "{{ pkg_archive + ['nerdfonts'] }}"
   when: ansible_system == 'Linux'
 
-- name: append to caskpkgs
+- name: Append to caskpkgs
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ pkgconfig_nerdfonts.fonts[font].brew ] }}"
-  loop: "{{ pkgconfig_nerdfonts.install }}"
+    pkg_cask: "{{ pkg_cask + [nerdfonts.fonts[font].brew] }}"
+  loop: "{{ nerdfonts.fonts }}"
   loop_control:
     loop_var: font
   when: ansible_system == 'Darwin'

tasks/pkgs/stow.yml

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

tasks/pkgs/zfs.yml

@@ -1,68 +1,55 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Linux based installation
+  when:
+    - ansible_os_family != 'Darwin'
   block:
     - name: RedHat based configuration
+      when:
+        - ansible_os_family == 'RedHat'
       block:
-        - ansible.builtin.set_fact:
-            rhname: "{%if ansible_distribution == 'Fedora' %}fedora{% else %}epel{% endif %}"
-        - ansible.builtin.command:
-            cmd: rpm --eval "%{dist}"
-          register: rpm_dist
-
-        - name: add openzfs gpg_key
+        - name: Add openzfs gpg_key
+          become: "{{ sys_pkg_become }}"
           ansible.builtin.rpm_key:
-            key: "{{ pkgconfig.zfs.gpg_key }}"
-            fingerprint: "{{ pkgconfig.zfs.gpg_key_fingerprint }}"
+            key: "{{ zfs.gpg_key }}"
+            fingerprint: "{{ zfs.gpg_fp }}"
             state: present
-          become: true
 
-        - name: enable openzfs repository
+        - name: Enable openzfs repository
+          become: "{{ sys_pkg_become }}"
           ansible.builtin.dnf:
-            name: "{{ pkgconfig.zfs.repo_base }}{{ rhname }}/zfs-release-{{ pkgconfig.zfs[rhname].release }}{{ rpm_dist.stdout }}.noarch.rpm"
-            state: "{{ install_state }}"
-          become: true
-
-        - name: install zfs deps
-          ansible.builtin.set_fact:
-            syspkgs: "{{ pkgconfig.zfs.deps[ansible_os_family] }}"
-      when: ansible_os_family == 'RedHat'
+            name: "{{ zfs.repo_pkg }}"
+            state: present
 
     - name: Debian configuration
       when: ansible_os_family == 'Debian'
       block:
-        - name: enable openzfs repository
+        - name: Enable openzfs repository
+          become: "{{ sys_pkg_become }}"
           ansible.builtin.apt_repository:
             repo: |
-                deb http://deb.debian.org/debian {{ ansible_distribution_release }}-backports main contrib
-                deb-src http://deb.debian.org/debian {{ ansible_distribution_release }}-backports main contrib
-            filename: "{{ ansible_distribution_release }}-backports"
+                deb http://deb.debian.org/debian {{ zfs.release }}-backports main contrib
+                deb-src http://deb.debian.org/debian {{ zfs.release }}-backports main contrib
+            filename: "{{ zfs.release }}-backports"
             state: present
             update_cache: false
-          become: true
 
-        - name: pin zfs package to backports
+        - name: Pin zfs package to backports
+          become: "{{ sys_pkg_become }}"
           ansible.builtin.file:
             content: |
                 Package: src:zfs-linux
-                Pin: release n={{ ansible_distribution_release }}-backports
+                Pin: release n={{ zfs.release }}-backports
                 Pin-Priority: 990
             dest: /etc/apt/preferences.d/90_zfs
             state: present
-          become: true
+            mode: '0644'
 
-        - name: install zfs deps
-          ansible.builtin.set_fact:
-            syspkgs: "{{ pkgconfig.zfs.deps[ansible_os_family] }}"
-          become: true
-
-    - name: append to pkgs
+    - name: Append to pkgs
       ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + pkgconfig.zfs.pkgs[ansible_os_family] }}"
-      become: true
-  when: ansible_os_family != 'Darwin'
+        pkg_sys: "{{ pkg_sys + zfs.deps + zfs.pkgs }}"
 
-- name: append to caskpkgs
-  ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'openzfs' ] }}"
+- name: Append to caskpkgs
   when: ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['openzfs'] }}"

tasks/pkgs/zsh.yml

@@ -1,10 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'zsh' ] }}"
-  when: ansible_os_family != 'Darwin'
-
-- debug:
-    msg: "macOS already has zsh, skipping"
-  when: ansible_os_family == 'Darwin'
+    pkg_sys: "{{ pkg_sys + ['zsh'] }}"