more fixs for packages

tasks/pkgs/carapace.yml

@@ -1,31 +1,27 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
-    file: carapace.yml
-    name: _carapace
-- ansible.builtin.set_fact:
-    pkgconfig_carapace: "{{ _carapace | ansible.builtin.combine(pkgconfig.carapace) }}"
-
-- name: enable carapace yum repository
+- name: Enable carapace yum repository
+  when:
+    - ansible_os_family == 'RedHat'
+  become: true
   ansible.builtin.yum_repository:
-    name: carapace-yum
-    description: carapace-yum
-    baseurl: https://yum.fury.io/rsteube/
+    name: "{{ carapace.repo.name }}"
+    description: "{{ carapace.repo.description }}"
+    baseurl: "{{ charapace.repo.baseurl }}"
     enabled: true
     gpgcheck: false
     state: present
-  when: ansible_os_family == 'RedHat'
-  become: true
 
-- name: enable carapace apt repository
+- name: Enable carapace apt repository
+  when:
+    - ansible_os_family == 'Debian'
   become: true
   ansible.builtin.apt_repository:
-    repo: "deb [trusted=yes] https://apt.fury.io/rsteube/ /"
+    repo: "{{ carapace.repo.repo }}"
+    filename: "{{ carapace.repo.name }}"
     state: present
     update_cache: false
-    filename: carapace
-  when: ansible_os_family == 'Debian'
 
-- name: add carapace to syspkgs
+- name: Add carapace to pkg_sys
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_carapace.pkgs[ansible_system] }}"
+    pkg_sys: "{{ pkg_sys + carapace.pkgs }}"