more package fixes

tasks/pkgs/neovim.yml

@@ -1,50 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Load neovim config
-  ansible.builtin.include_vars:
-    file: neovim.yml
-    name: _neovim
-
-- name: Combine neovim default and user config
-  ansible.builtin.set_fact:
-    pkgconfig_neovim: "{{ _neovim | ansible.builtin.combine(pkgconfig.neovim) }}"
-
-- name: Set neovim facts
-  ansible.builtin.set_fact:
-    nvim:
-      appimg: "{{ pkgconfig_neovim.appimage }}"
-      become: "{{ pkgconfig_neovim.dobecome }}"
-      bldtype: "{{ pkgconfig_neovim.build_type }}"
-      group: "{{ pkgconfig_neovim.group }}"
-      instdir: "{{ pkgconfig_neovim.install_dir }}"
-      instmtd: "{{ pkgconfig_neovim.install_method }}"
-      instpfx: "{{ pkgconfig_neovim.install_prefix }}"
-      owner: "{{ pkgconfig_neovim.owner }}"
-      ver: "{{ pkgconfig_neovim.version }}"
-
-- name: Linux specific install
+- name: Append to appimages
   when:
-    - ansible_system == 'Linux'
-  block:
-    # install system package when on an up to date distro
-    - name: Append to syspkgs
-      when:
-        - (ansible_distribution == 'Fedora') or
-          (ansible_distribution == 'Ubuntu')
-
-    - name: Append to appimages
-      when:
-        - nvim.instmtd == 'appimage'
-      ansible.builtin.set_fact:
-        appimages: "{{ appimages + ['neovim'] }}"
-- name: Append neovim to syspkgs
-  when:
-    - ansible_os_family == 'Darwin'
+    - nvim.method == 'appimage'
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + ['neovim'] }}"
+    pkg_appimage: "{{ pkg_appimage + ['neovim'] }}"
 
-- name: Append neovim to srcpkgs
+- name: Append neovim to pkg_sys
   when:
-    - nvim.instmtd == 'source'
+    - nvim.method == 'sys'
   ansible.builtin.set_fact:
-    srcpkgs: "{{ srcpkgs + ['neovim'] }}"
+    pkg_sys: "{{ pkg_sys + ['neovim'] }}"