From 4290535b3c8deaa28e5cc342c87062c16397099d Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Mon, 24 Mar 2025 21:42:43 -0600
Subject: [PATCH] refactored alacritty

---
 files/vault/Alpine/openrc  | 33 +--------------------------------
 tasks/cargo.yml            |  2 +-
 tasks/config/alacritty.yml | 20 ++++++++++++++------
 tasks/pkgs/alacritty.yml   | 27 +++++++++++----------------
 vars/pkgs/alacritty.yml    |  8 ++++++--
 5 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/files/vault/Alpine/openrc b/files/vault/Alpine/openrc
index 61bd768..99e8992 100644
--- a/files/vault/Alpine/openrc
+++ b/files/vault/Alpine/openrc
@@ -16,7 +16,7 @@ log_args="$log_file $log_format $log_level $log_rotate"
 command_args="server $config_args $log_args -non-interactive"
 
 depend() {
-  need net
+  need networking
 }
 
 start_pre() {
@@ -25,35 +25,4 @@ start_pre() {
     --mode 0755 \
     /var/log/$RC_SVCNAME
 }
-#
-# start() {
-#   ebegin "Starting $RC_SVCNAME"
-#   start-stop-daemon --start \
-#     --exec $command \
-#     --capabilities $capabilities \
-#     --make-pidfile \
-#     --pidfile /var/run/$RC_SVCNAME.pid \
-#     --user $command_user:$command_group \
-#
-#     -- \
-#     $command_args
-#
-#   eend $?
-# }
-#
-# stop() {
-#   ebegin "Stopping $RC_SVCNAME"
-#   start-stop-daemon --stop \
-#     --exec $command \
-#     --pidfile /var/run/$RC_SVCNAME.pid
-#
-#   eend $?
-# }
-#
-# restart() {
-#   ebegin "Restarting $RC_SVCNAME"
-#   stop()
-#   start()
-#   eend $?
-# }
 # vim: set filetype=sh :
diff --git a/tasks/cargo.yml b/tasks/cargo.yml
index 06f76b1..9a45528 100644
--- a/tasks/cargo.yml
+++ b/tasks/cargo.yml
@@ -5,5 +5,5 @@
   community.general.cargo:
     name: "{{ pkg.name | default(pkg) }}"
     version: "{{ pkg.vers | default(omit) }}"
-    path: "{{ paths.cargo | default(omit) }}"
+    path: "{{ path.cargo | default(path.prefix)}}"
     locked: "{{ pkg.locked | default(omit) }}"
diff --git a/tasks/config/alacritty.yml b/tasks/config/alacritty.yml
index c96dc69..e80c4f7 100644
--- a/tasks/config/alacritty.yml
+++ b/tasks/config/alacritty.yml
@@ -1,10 +1,18 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Set alacritty configuration
+- name: Set alacritty install method
   ansible.builtin.set_fact:
     alacritty:
-      deps: "{{ pkgconfig.alacritty.build_deps[ansible_os_family] }}"
-      vers: "{{ pkgconfig.alacritty.version }}"
-      cask: "{{ pkgconfig.alacritty.cask | default(omit) }}"
-      locked: true
-      name: alacritty
+      method: "{{ pkgconfig.alacritty.method[ansible_os_family] | default(pkgconfig.alacritty.method.default) }}"
+
+- name: Set alacritty configuration
+  when:
+    - alacritty.method == 'cargo'
+  ansible.builtin.set_fact:
+    alacritty:
+      method: "{{ alacritty.method }}"
+      build_deps: "{{ pkgconfig.alacritty.build_deps[ansible_os_family] }}"
+      cargo:
+        vers: "{{ pkgconfig.alacritty.version }}"
+        locked: true
+        name: alacritty
diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml
index 83d477d..6f6c474 100644
--- a/tasks/pkgs/alacritty.yml
+++ b/tasks/pkgs/alacritty.yml
@@ -1,6 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add alacritty
+- name: Append alacritty
   when:
     - alacritty_configured is undefined
   block:
@@ -8,26 +8,21 @@
       ansible.builtin.include_tasks:
         file: config/alacritty.yml
 
-    - name: Linux based installation
+    - name: Append alacritty to pkg_cargo
       when:
-        - ansible_system == 'Linux'
-      block:
-        - name: Append alacritty build_deps to pkg_sys
-          ansible.builtin.set_fact:
-            pkg_sys: "{{ pkg_sys + alacritty.build_deps }}"
-
-        - name: Append alacritty to pkg_cargo
-          notify:
-            - Depend cargo
-          changed_when: true
-          ansible.builtin.set_fact:
-            pkg_cargo: "{{ pkg_cargo + [alacritty] }}"
+        - alacritty.method == 'cargo'
+      notify:
+        - Depend cargo
+      changed_when: true
+      ansible.builtin.set_fact:
+        pkg_sys: "{{ pkg_sys + alacritty.build_deps }}"
+        pkg_cargo: "{{ pkg_cargo + [alacritty.cargo] }}"
 
     - name: Append alacritty to pkg_cask
       when:
-        - ansible_system == 'Darwin'
+        - alacritty.method == 'cask'
       ansible.builtin.set_fact:
-        pkg_cask: "{{ pkg_cask + alacritty.cask }}"
+        pkg_cask: "{{ pkg_cask + ['alacritty'] }}"
 
     - name: Set alacritty_configured
       ansible.builtin.set_fact:
diff --git a/vars/pkgs/alacritty.yml b/vars/pkgs/alacritty.yml
index 85e4101..f9fb6ab 100644
--- a/vars/pkgs/alacritty.yml
+++ b/vars/pkgs/alacritty.yml
@@ -1,5 +1,11 @@
 alacritty:
   version: 0.15.1
+  method:
+    default: cargo
+    Darwin: cask
+  cargo:
+    locked: true
+    name: alacritty
   build_deps:
     RedHat:
       - cmake
@@ -24,5 +30,3 @@ alacritty:
       - libxcb-dev
       - libxkbcommon-dev
       - pkgconf
-  cask:
-    - alacritty