more fixs for packages

tasks/pkgs/alacritty.yml

@@ -1,16 +1,18 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Linux based installation
-  when: ansible_system == 'Linux'
+  when:
+    - ansible_system == 'Linux'
   block:
     - name: Append to pkgs
       notify:
         - Depend cargo
       ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + alacritty.deps }}"
-        srcpkgs: "{{ cargopkgs + [alacritty] }}"
+        pkg_sys: "{{ pkg_sys + alacritty.deps }}"
+        pkg_cargo: "{{ pkg_cargo + [alacritty] }}"
 
 - name: Append alacritty to caskpkgs
+  when:
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + alacritty.pkgs }}"
-  when: ansible_system == 'Darwin'
+    caskpkgs: "{{ caskpkgs + alacritty.cask }}"

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

tasks/pkgs/clangd.yml

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

tasks/pkgs/consul.yml

@@ -1,16 +1,13 @@
 # vim: set filetype=yaml.ansible :
-# load hashicorp configuration
 ---
-- name: ensure hashicorp repo is active
-  ansible.builtin.include_tasks:
-    file: "pkgs/hashicorp_repo.yml"
-  when: hashicorp is undefined
-
-- name: append to syspkgs
+- name: Append to pkg_sys
+  when:
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ pkgconfig.consul[ansible_system] ] }}"
-  when: ansible_system == 'Linux'
+    pkg_sys: "{{ pkg_sys + consul.pkgs }}"
 
-- ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig.consul[ansible_system] ] }}"
-  when: ansible_system == 'Darwin'
+- name: Append to pkg_tap
+  when:
+    - ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_tap: "{{ pkg_tap + consul.pkgs }}"

tasks/pkgs/hashicorp.yml

@@ -0,0 +1,3 @@
+- name: Enable hashicorp repository
+  ansible.builtin.include_tasks:
+    file: repos/hashicorp.yml

tasks/pkgs/kitty.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: add to syspkgs
+- name: Add to pkg_sys
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig.kitty.pkgs[ansible_system] }}"
+    pkg_sys: "{{ pkg_sys + kitty.pkgs }}"

tasks/pkgs/libreoffice.yml

@@ -14,7 +14,7 @@
       when:
         - libreoffice.method == 'sys'
       ansible.builtin.set_fact:
-        sys_pkg: "{{ sys_pkg + libreoffice.syspkgs }}"
+        sys_pkg: "{{ sys_pkg + libreoffice.pkgs }}"
 
 - name: Append to caskpkgs
   when:

tasks/pkgs/lua-language-server.yml

@@ -1,23 +1,11 @@
 # vim: set filetype=yaml.ansible :
 ---
-- 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
+  ansible.builtin.set_fact:
+    srcpkgs: "{{ srcpkgs + ['lua-language-server'] }}"
 
-    - name: Append to pkgs
-      ansible.builtin.set_fact:
-        srcpkgs: "{{ srcpkgs + ['lua-language-server'] }}"
-
-- name: Append to syspkgs
+- name: Append to pkg_sys
   when:
     - ansible_os_family == 'Darwin'
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + ['lua-language-server'] }}"
+    pkg_sys: "{{ pkg_sys + ['lua-language-server'] }}"