From 6fd68a24b3289fedeafaabec0a00235f506c500c Mon Sep 17 00:00:00 2001
From: Midgard <2885-Midgard@users.noreply.framagit.org>
Date: Tue, 30 Aug 2022 00:57:59 +0200
Subject: [PATCH] [yambar] Improve CPU and temperature display

---
 yambar/bar-material-supplements.ttf | Bin 5028 -> 5680 bytes
 yambar/config.yml                   |  72 ++++++++++++++++------------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/yambar/bar-material-supplements.ttf b/yambar/bar-material-supplements.ttf
index 0e766339598b95e068d01560b35a6d107a4df5fb..608db116d22962b5a260110ad2396aff498c7667 100644
GIT binary patch
delta 1187
zcmYk5T}TvB6vzK(<_<2Fri+2WR+iRQ6zP8Wm07OtCWRDaA|chHwrlvYp_$RgDnwZH
z5Kf=cV-RFSVGltDJ%m`4_)yeCWj#dFheZ@Ygwwg}&7Fan|NMXF-gD2KJNKIV_S!fI
zzykC_M=TVot+~*BavWIbVCvdZ6%4_RD3JAz{mSh-*Lwo58nyw{!@jPuEgX9<Chr2;
z2(yVuxHD#1oC#U4IPQqF9@$_2+t~#eSwQN;Xmhw}(ecNr9Q(_6VKmwt4?DJ4V?5c%
zATQe1)sxZde<72x|J2&i7>?{{Is=Ha>`%3Ydtx{TSwKDeoc3^A^VL7`pZo>SxrkV-
zqqD1XmH8QPR<R%G<`s?O>DT##@?`#Q&hJXyI>5e~{S;^)3wI!;=JCh93(9_Bo?rmH
zbPo(lo%H<J4Ol)Q^bc$u&?M!H=jb1-^JtLc|3ZjF9}^+<@FqyW+(Ryn(#&I2u6<22
zN62lo@boq26y2d-^Ps+B9rsK23@(-92|KwfE(qLWb^KrV%P40U(~d6nzzZMzC`1v8
zQG!xzKp8fo9GkEi6~h6&m2$*QaZfxF6XLa)5<d+X^NnmH&&W5*jB2CS*k|4n$K*D1
z@%katV+2#UFzphi%@f8VF7UFEOAW&#MvWuR)mT3CSv|7Og<gMdU*A)1u&gq{AK3Wm
zB<FZ?{4*O5&hku|hcf5#;Iy6Zn&WYd+XK8aYGHEP`P(F~vvF;Ck`LPX{v@BY^PxGe
z<tBLCo2XR#mJCE}6LfEq583(QB>!&b^03TyPWRdP?5{T;7iBcjt!#MY`|y(VqZ$Rw
z!HlLH%BKSIke7Vqr$Q>CVk)6h+CXKrk;-Y)@JvQ4#ZwNow*)IgL8YODR^{g_El}!F
z>Q(Af>Q`E*v`A^O(h{W=N&`wOl~R>?z`2+z%zo#(OnHPT1DcqDJT8{c9Cfayp!wZ-
gH%IsC_w{bwqfKi!v}SD?y`d{q%cGy7AC;E%4~Pp30ssI2

delta 583
zcmXw0OK1~O6g_V~IudQ-U==Zx7C%Fw8XRgimM)}Cg|@h;NEg*Qv`GUdcCaC&Scp48
zM5QlUk%AjVbQOt<EX1X{5eg!@uykWVBvi3=Q=-o^QyqA7Ip@B6?s@lCyB;}Z2mn!B
zgAPBHIy-##%ENWQUL+eI=<83x!6<Qo_{f=&gnR1K_%T3~h|f*rJ%6QpnRm7O<f>EN
zjIR`xVCR^(rgF2HHGQcIFsi_g(QMkA+&}x}Hgip$WHy^Fd)9z@!{TldhqC!XDTWj8
ziI<4q=B6jS-XA?TC~%rMllMwKtqw9zQ)s{J<<pCs<qe?4q6y!ho+*rUym}18Xi)qt
zvZJ}&@`Q%!fqs$tk#{Gb5`PZ#Aucj-0`oT`2gaj4zYsA<03V(C2SHp(>?$jzDu$`A
z5?as#mLF^MRaL>50i~KS%y5odxvjq&GOoNJ;+g?DCwjHUZ~0O<W|rlh@~e2Bpa?Gq
zC;qSg8Bws2I1JokwEp*Oyk>PnyIQ-hUlP(b=PdeC^i`Di%>E8)atGgG0*Bpw+nuC_
z!J&nPp|xbao`hh(rg>1DueEO*wrU@ucQoP3j6GTVX6Hm3`_K|Mr-i+D675A>hy;$y
cjXg(qa}E$OXvQCeZ>~tUwNv!TvDO!V0cTr_UjP6A

diff --git a/yambar/config.yml b/yambar/config.yml
index 86eb704..29b8646 100644
--- a/yambar/config.yml
+++ b/yambar/config.yml
@@ -124,21 +124,59 @@ bar:
               - string: {foreground: *col_fg_caution, text: "RAM {percent_used}%"} # 90-95
               - string: {foreground: *col_fg_alert,   text: "RAM {percent_used}%"} # 95-100
 
+    - cpu:
+        interval: 5000
+        content:
+          list:
+            spacing: 0
+            font: *font_supplements
+            items:
+              - ramp:
+                  tag: cpu0
+                  items: &cpu_ramp
+                    # 
+                    - empty: {}                                        #  0-6
+                    - empty: {}                                        #  6-12
+                    - empty: {}                                        # 12-18
+                    - empty: {}                                        # 18-25
+                    - empty: {}                                        # 25-31
+                    - empty: {}                                        # 31-37
+                    - empty: {}                                        # 37-43
+                    - empty: {}                                        # 43-50
+                    - empty: {}                                        # 50-56
+                    - empty: {}                                        # 56-62
+                    - string: {margin: 1, text: "", foreground: "88888888"       } # 62-68
+                    - string: {margin: 1, text: "", foreground: "888888aa"       } # 68-75
+                    - string: {margin: 1, text: "", foreground: "888888cc"       } # 75-81
+                    - string: {margin: 1, text: "", foreground: "888888ee"       } # 81-87
+                    - string: {margin: 1, text: "", foreground: *col_fg_caution  } # 87-93
+                    - string: {margin: 1, text: "", foreground: *col_fg_caution  } # 93-100
+              - ramp: {tag: cpu1, items: *cpu_ramp}
+              - ramp: {tag: cpu2, items: *cpu_ramp}
+              - ramp: {tag: cpu3, items: *cpu_ramp}
+              - ramp: {tag: cpu4, items: *cpu_ramp}
+              - ramp: {tag: cpu5, items: *cpu_ramp}
+              - ramp: {tag: cpu6, items: *cpu_ramp}
+              - ramp: {tag: cpu7, items: *cpu_ramp}
+
     - script:
-        font: "Fira Mono:size=12"
         poll-interval: 5
         path: /home/midgard/.config/yambar/temp.sh
         content:
           map:
             tag: status
-            default: {string: {text: "{temp}°C {rpm} RPM"}}
+            default:
+              - string: &str_temp {text: "{temp}°C", font: "Fira Mono:size=12", right-margin: 5}
+              - string: &str_rpm {text: "{rpm} RPM", font: "Fira Sans:size=12", foreground: *col_fg_alt}
             values:
               normal:
                 empty: {}
               caution:
-                string: {text: "{temp}°C {rpm} RPM", foreground: *col_fg_caution}
+                - string: {<<: *str_temp, foreground: *col_fg_caution}
+                - string: {<<: *str_rpm}
               alert:
-                string: {text: "{temp}°C {rpm} RPM", foreground: *col_fg_alert}
+                - string: {<<: *str_temp, foreground: *col_fg_alert}
+                - string: {<<: *str_rpm}
 
 
 
@@ -177,32 +215,6 @@ bar:
 
 
   right:
-    - cpu:
-        interval: 1500
-        content:
-          list:
-            spacing: 0
-            font: "Fira Code:size=12"
-            items:
-              - ramp:
-                  tag: cpu0
-                  items: &cpu_ramp
-                    - empty: {}                                        #  0-12
-                    - empty: {}                                        # 12-25
-                    - empty: {}                                        # 25-37
-                    - empty: {}                                        # 37-50
-                    - empty: {}                                        # 50-62
-                    - string: {margin: 1, text: "▅", foreground: "666666ff"     } # 62-75
-                    - string: {margin: 1, text: "▆", foreground: "888888ff"     } # 75-87
-                    - string: {margin: 1, text: "▇", foreground: *col_fg_caution  } # 87-100
-              - ramp: {tag: cpu1, items: *cpu_ramp}
-              - ramp: {tag: cpu2, items: *cpu_ramp}
-              - ramp: {tag: cpu3, items: *cpu_ramp}
-              - ramp: {tag: cpu4, items: *cpu_ramp}
-              - ramp: {tag: cpu5, items: *cpu_ramp}
-              - ramp: {tag: cpu6, items: *cpu_ramp}
-              - ramp: {tag: cpu7, items: *cpu_ramp}
-
     - alsa:
         card: hw:PCH
         mixer: Master