From ec32ec0bb6ff5ddb338c3247751c97cde429fd41 Mon Sep 17 00:00:00 2001
From: Midgard <2885-Midgard@users.noreply.framagit.org>
Date: Mon, 29 Aug 2022 23:44:02 +0200
Subject: [PATCH] [polybar] Update for new version of font with combining icons

---
 polybar/bar-material-supplements.ttf | Bin 5028 -> 38 bytes
 polybar/clock.py                     |   4 ++--
 polybar/config.ini                   |  28 +++++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)
 mode change 100644 => 120000 polybar/bar-material-supplements.ttf

diff --git a/polybar/bar-material-supplements.ttf b/polybar/bar-material-supplements.ttf
deleted file mode 100644
index 0e766339598b95e068d01560b35a6d107a4df5fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5028
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

diff --git a/polybar/bar-material-supplements.ttf b/polybar/bar-material-supplements.ttf
new file mode 120000
index 0000000..d6cce5c
--- /dev/null
+++ b/polybar/bar-material-supplements.ttf
@@ -0,0 +1 @@
+../yambar/bar-material-supplements.ttf
\ No newline at end of file
diff --git a/polybar/clock.py b/polybar/clock.py
index 14dd29c..ed4f8e4 100755
--- a/polybar/clock.py
+++ b/polybar/clock.py
@@ -30,9 +30,9 @@ try:
         hour   = hourhands  [ t.hour % 12   ]
 
         if FILL_CLOCK_FACE:
-            return "%{O1}%{T8}" + color_for(t) + "%{O-27}%{F#000}"   + hour + minute + "%{O27}" + "%{T-}%{F}"
+            return "%{O1}%{T8}" + color_for(t) + "%{F#000}"   + hour + minute + "" + "%{T-}%{F}"
         else:
-            return "%{O1}%{T8}" + color_for(t) + hour + minute + "%{T-}%{F}"
+            return "%{O1}%{T8}" + color_for(t) + hour + minute + "%{T-}%{F}"
 
 
     def color_for(t):
diff --git a/polybar/config.ini b/polybar/config.ini
index e2e6cca..b3e1e91 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -58,7 +58,7 @@ cursor-scroll = ns-resize
 [bar/midbard]
 inherit = bardefaults
 
-monitor = ${env:MONITOR:eDP-1}
+;monitor = ${env:MONITOR:eDP-1}
 width = 100%
 
 modules-left   = i3 volume mpd-local
@@ -326,24 +326,24 @@ interval = 3
 
 ; %{T7}           select font 7
 ; %{F#333}        use a dark foreground colour
-;                icon for "full signal strength" in my font 8
+;                "combining icon full signal strength" in my font Bar Material Supplements
 ; %{F}%{T-}       reset foreground colour and font
-; %{O-18}         go back 18 pixels to the left
-; <ramp-signal>   show a signal strength icon
+; <ramp-signal>   show a combining signal strength icon
+;                advance one icon's width
 ; This overlays the actual signal strength icon over the dark "full signal" icon
-format-connected = %{A:alacritty -e wlan &:}%{T7}%{F#333}%{F}%{T-}%{O-18}<ramp-signal>%{A}
+format-connected = %{A:alacritty -e wlan &:}%{T7}%{F#333}%{F}%{T-}<ramp-signal>%{A}
 format-connected-foreground = ${colors.foreground-alt}
 label-connected = %essid%
 
-format-disconnected = %{A1:alacritty -e wlan &:}<label-disconnected>%{A}
-label-disconnected = 
+format-disconnected = %{A1:alacritty -e wlan &:}<label-disconnected>%{A}
+label-disconnected = 
 label-disconnected-foreground = ${colors.foreground-alt}
 
 ;ramp-signal-0 = ""
-ramp-signal-0 =
-ramp-signal-1 =
-ramp-signal-2 =
-ramp-signal-3 = 
+ramp-signal-0 = 
+ramp-signal-1 = 
+ramp-signal-2 = 
+ramp-signal-3 = 
 ramp-signal-font = 7
 ramp-signal-foreground = ${colors.foreground}
 
@@ -398,13 +398,13 @@ adapter = AC
 full-at = 90
 interval = 5
 
-format-charging = %{A:alacritty -e bat --hold &:}%{T7}%{F#555}%{O-18}%{F#DDA}<ramp-capacity>%{O-17}%{F#000}%{F}%{T-}%{O19}<label-charging>%{A}
+format-charging = %{A:alacritty -e bat --hold &:}%{T7}%{F#555}%{F#DDA}<ramp-capacity>%{F#000}%{F}%{T-}%{O19}<label-charging>%{A}
 label-charging  = %percentage%
 
-format-discharging = %{A:alacritty -e bat --hold &:}%{F#555}%{O-18}%{F}<ramp-capacity>%{O2}<label-discharging>%{A}
+format-discharging = %{A:alacritty -e bat --hold &:}%{F#555}%{F}<ramp-capacity>%{O2}<label-discharging>%{A}
 label-discharging  = %percentage%
 
-format-full = "%{A:alacritty -e bat --hold &:}%{F#dda}%{F#eea} unplug%{F}%{A}"
+format-full = "%{A:alacritty -e bat --hold &:}%{F#dda}%{F#eea} unplug%{F}%{A}"
 
 ; <5
 ramp-capacity-0  = %{F#f55}