From fdaf08d31cd5bf5851fb4c1770afa226afb3bb2c Mon Sep 17 00:00:00 2001
From: Joe <rrbo@proton.me>
Date: Tue, 10 Jan 2023 14:57:14 +0100
Subject: update

---
 .config/conkyrc       |  5 ++++-
 .config/tint2/tint2rc | 30 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.config/conkyrc b/.config/conkyrc
index bf6671a..bc67a05 100755
--- a/.config/conkyrc
+++ b/.config/conkyrc
@@ -45,7 +45,10 @@ ${color grey}${alignc}${time %A %e %B %Y : %Hh%M}
 ${hr}
 ${color grey}Fête du jour: ${font Hack:bold:size=12}${color white}${texeci 1000 wget -O - -q  http://fetedujour.fr/  --user-agent="Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Firefox/31.0" | grep "<span>Fête du jour" | head -1 | cut -d">" -f4 | cut -d"<" -f1 | sed -e 's/Nativité/jozan/' }${font}
 ${hr}
-${color grey}Uptime :   ${color white}${uptime}
+${color grey}Uptime: ${font Hack:bold:size=12}${color white}${uptime}${font}
+${hr}
+${color grey}Battery: ${color white}${apcupsd_loadbar}${font}
+${color grey}Battery: ${color white}${apcupsd_loadgauge}${font}
 ${hr}
 ${color grey}CPU: ${font Hack:bold:size=12}${color white} ${freq_g} GHz ${color white}${if_match ${cpu}>80}${color red}${else}${endif}${cpu}% ${cpubar 6}
 ${offset 4}${cpugraph bfbfbf c0c0c0}${color white}
diff --git a/.config/tint2/tint2rc b/.config/tint2/tint2rc
index afeac38..242f656 100755
--- a/.config/tint2/tint2rc
+++ b/.config/tint2/tint2rc
@@ -1,11 +1,11 @@
-#---- Generated by tint2conf b2cd ----
+#---- Generated by tint2conf 5ac8 ----
 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------
 # Gradients
 #-------------------------------------
 # Backgrounds
-# Background 1: Active taskbar, Default task, Iconified task, Inactive taskbar, Normal task, Panel
+# Background 1: Active taskbar, Battery, Default task, Iconified task, Inactive taskbar, Normal task, Panel
 rounded = 0
 border_width = 1
 border_sides = TBLR
@@ -31,7 +31,7 @@ border_color_hover = #000000 100
 background_color_pressed = #bdd1f1 100
 border_color_pressed = #000000 100
 
-# Background 3: Executor, Urgent task
+# Background 3: Urgent task
 rounded = 0
 border_width = 0
 border_sides = TBLR
@@ -182,16 +182,16 @@ clock_dwheel_command =
 
 #-------------------------------------
 # Battery
-battery_tooltip = 1
+battery_tooltip = 0
 battery_low_status = 0
 battery_low_cmd = 
 battery_full_cmd = 
-bat1_font = Cantarell Medium 11
+bat1_font = Cantarell Medium 9
 battery_font_color = #000000 100
-bat1_format = 
-bat2_format = 
+bat1_format = %p
+bat2_format = %s
 battery_padding = 0 0
-battery_background_id = 0
+battery_background_id = 1
 battery_hide = 100
 battery_lclick_command = 
 battery_rclick_command = 
@@ -204,8 +204,8 @@ ac_disconnected_cmd = notify-send -u low batter 'AC unplugged'
 #-------------------------------------
 # Separator 1
 separator = new
-separator_background_id = -1
-separator_color = #777777 89
+separator_background_id = 0
+separator_color = #777777 88
 separator_style = empty
 separator_size = 6
 separator_padding = 1 0
@@ -213,8 +213,8 @@ separator_padding = 1 0
 #-------------------------------------
 # Separator 2
 separator = new
-separator_background_id = -1
-separator_color = #777777 89
+separator_background_id = 0
+separator_color = #777777 88
 separator_style = empty
 separator_size = 6
 separator_padding = 1 0
@@ -222,8 +222,8 @@ separator_padding = 1 0
 #-------------------------------------
 # Separator 3
 separator = new
-separator_background_id = -1
-separator_color = #777777 89
+separator_background_id = 0
+separator_color = #777777 88
 separator_style = empty
 separator_size = 6
 separator_padding = 1 0
@@ -232,7 +232,7 @@ separator_padding = 1 0
 # Separator 4
 separator = new
 separator_background_id = 0
-separator_color = #777777 54
+separator_color = #777777 53
 separator_style = empty
 separator_size = 6
 separator_padding = 1 0
-- 
cgit v1.2.3