From 6884f050da57b5c616085f7c3b1b0167520a5fd3 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 15 May 2023 00:06:11 +0200
Subject: [PATCH] Some Waybar options use variables (fonts, thermal)

---
 group_vars/all/waybar.yml |  7 ++++---
 vars/rick/waybar.yml      | 19 +++----------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/group_vars/all/waybar.yml b/group_vars/all/waybar.yml
index f347137..1ebc3bf 100644
--- a/group_vars/all/waybar.yml
+++ b/group_vars/all/waybar.yml
@@ -39,7 +39,7 @@ waybar_options:
     timezone: "Europe/Paris"
     format-alt: "{:%Y-%m-%d}"
   temperature:
-    thermal-zone: 6
+    thermal-zone: "{{ cpu_thermal_zone | default(6) }}"
     critical-threshold: 80
     format: "{temperatureC}°C  "
   cpu:
@@ -123,7 +123,8 @@ waybar_style:
   fonts:
     bar:
       family: 'Fira Code Nerd Font'
-      size: '12px'
+      size: '{{ waybar_bar_font_size | default("12px") }}'
     tray:
       family: 'DejaVu sans'
-      size: '12px'
+      size: '{{ waybar_tray_font_size | default("12px") }}'
+
diff --git a/vars/rick/waybar.yml b/vars/rick/waybar.yml
index 44e114e..1e8cd23 100644
--- a/vars/rick/waybar.yml
+++ b/vars/rick/waybar.yml
@@ -1,17 +1,4 @@
 ---
-waybar_style:
-  colors:
-    bg: '#323232'
-    fg: '#ddd'
-    hover: '#f268b3'
-    selected: '#1cd180'
-    ok: '#1cd180'
-    warning: '#f2b768'
-    critical: '#f268b3'
-  fonts:
-    bar:
-      family: 'Fira Code Nerd Font'
-      size: '14px'
-    tray:
-      family: 'DejaVu sans'
-      size: '14px'
+cpu_thermal_zone: 0
+waybar_bar_font_size: '14px'
+waybar_tray_font_size: '14px'