more fixs for packages

tasks/config/alacritty.yml

@@ -4,10 +4,7 @@
   ansible.builtin.set_fact:
     alacritty:
       deps: "{{ pkgconfig.alacritty[ansible_os_family].build_deps }}"
-      ver: "{{ pkgconfig.alacritty.version }}"
-      repo: "{{ pkgconfig.alacritty.git_repo }}"
-      pkgs: "{{ pkgconfig.alacritty[ansible_os_family].pkgs | default(omit) }}"
-      bin: "{{ paths.install }}/bin/alacritty"
-      cargo:
-        locked: true
-        pkg: alacritty
+      vers: "{{ pkgconfig.alacritty.version }}"
+      cask: "{{ pkgconfig.alacritty.cask | default(omit) }}"
+      locked: true
+      name: alacritty

tasks/config/carapace.yml

@@ -1,3 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-version: 1.1.1
+- name: Set carapace config
+  ansible.builtin.set_fact:
+    carapace:
+      pkgs: "{{ pkgconfig.carapace.pkgs[ansible_system] }}"
+      repo: "{{ pkgconfig.carapace.repo[ansible_os_family] }}"

tasks/config/clangd.yml

@@ -0,0 +1,4 @@
+- name: Set clangd config
+  ansible.builtin.set_fact:
+    clangd:
+      pkgs: "{{ pkgconfig.clangd.pkg[ansible_os_family] }}"

tasks/config/consul.yml

@@ -0,0 +1,4 @@
+- name: Set configuration for consul
+  ansible.builtin.set_fact:
+    consul:
+      pkgs: "{{ pkgconfig.consul.pkgs[ansible_system] }}"

tasks/config/hashicorp.yml

@@ -0,0 +1,13 @@
+- name: Set OS name for RedHat family
+  when:
+    - ansible_os_famly == 'RedHat'
+  ansible.builtin.set_fact:
+    hashicorp:
+      repo: "{{ pkgconfig.hashicorp.Linux[rpm_dist.stdout] }}"
+
+- name: Set repo for debian
+  when:
+    - ansible_os_family == 'Debian'
+  ansible.builtin.set_Fact:
+    hashicorp:
+      repo: "{{ pkgconfig.hashicorp.Linux.Debian }}"

tasks/config/kitty.yml

@@ -0,0 +1,4 @@
+- name: Set kitty config
+  ansible.buitlin.set_fact:
+    kitty:
+      pkgs: "{{ pkgconfig.kitty.pkgs[ansible_system] }}"

tasks/config/libreoffice.yml

@@ -5,4 +5,4 @@
     libreoffice:
       method: "{{ pkgconfig.libreoffice.method }}"
       flatpak: "{{ pkgconfig.libreoffice.flatpak }}"
-      syspkgs: "{{ pkgconfig.libreoffice[ansible_os_family] }}"
+      pkgs: "{{ pkgconfig.libreoffice[ansible_os_family] }}"

tasks/config/lua-language-server.yml

@@ -1,5 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-version: 3.13.5
-install_prefix: "{{ default_install_prefix }}"
-install_path: /opt/lua-language-server

tasks/config/luals.yml

@@ -0,0 +1,14 @@
+# vim: set filetype=yaml.ansible :
+---
+- name: Set luals config
+  ansible.builtin.set_fact:
+    luals:
+      vers: "{{ pkgconfig.luals.version }}"
+      sys: "{{ pkgconfig.luals.sysmap[ansible_system] }}"
+      arch: "{{ pkgconfig.luals.archmap[ansible_architecture] }}"
+
+- name: Set luals variables
+  ansible.builtin.set_fact:
+    luals_vars:
+      archive: "lua-language-server-{{ luals.vers }}-{{ luals.sys }}-{{ luals.arch }}.tar.gz"
+      url: "{{ pkgconfig.luals.base_url }}/{{ luals.vers }}"

tasks/config/nerdfonts.yml

@@ -10,6 +10,6 @@
         - Lilex
         - Monoid
         - NerdFontsSymbolsOnly
-      install_path: "{{ path_prefix }}/{{ pkgconfig.nerdfonts.path }}"
+      install_path: "{{ path.prefix }}/{{ pkgconfig.nerdfonts.path }}"
       base_url: "{{ pkgconfig.nerdfonts.base_url }}"
       force_install: "{{ pkgconfig.force_install_nerdfonts | default(false) }}"

tasks/config/zfs.yml

@@ -1,17 +1,9 @@
 ---
-- name: Set zfs facts for RedHat based distros
+- name: Set distro name
   when:
     - ansible_os_family == 'RedHat'
-  block:
-    - name: Set distro name
-      ansible.builtin.set_fact:
-        rhname: "{%if ansible_distribution == 'Fedora' %}fedora{% else %}epel{% endif %}"
-
-    - name: Get rpm_dist for RedHat
-      changed_when: false
-      register: rpm_dist
-      ansible.builtin.command: # is there a better way to get this?
-        cmd: rpm --eval "%{dist}"
+  ansible.builtin.set_fact:
+    rhname: "{%if ansible_distribution == 'Fedora' %}fedora{% else %}epel{% endif %}"
 
 - name: Set ZFS config
   ansible.builtin.set_fact:

tasks/config/zig.yml

@@ -4,5 +4,5 @@
   ansible.builtin.set_fact:
     zig:
       version: 0.13.0
-      install_prefix: "{{ default_install_prefix }}"
-      install_path: /opt/zig
+      install_prefix: "{{ path.prefix }}"
+      install_path: "{{ path.archive }}/zig"