From dda386537387e2f713bed07fd3b710577107792a Mon Sep 17 00:00:00 2001
From: Lucas <lucas@domain.invalid>
Date: Sun, 26 Jan 2020 15:00:53 +0000
Subject: [PATCH] Update hlwm panel

- Use lemonbar-xft instead of lemonbar
- Use the same font sizing than in ~/.Xdefaults
---
 xdg-config-dir/herbstluftwm/autostart      | 2 +-
 xdg-config-dir/herbstluftwm/herbstpanel.sh | 4 ++--
 xdg-config-dir/herbstluftwm/theme          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xdg-config-dir/herbstluftwm/autostart b/xdg-config-dir/herbstluftwm/autostart
index e28cfa7..08747fc 100755
--- a/xdg-config-dir/herbstluftwm/autostart
+++ b/xdg-config-dir/herbstluftwm/autostart
@@ -168,7 +168,7 @@ if [ -f ~/.config/herbstluftwm/herbstpanel.sh ]; then
 		hc pad "$m" 0 0 $bar_height 0
 		hc monitor_rect "$m" | {
 			read -r x y w h
-			y=$(($y + $h - $bar_height - 1))
+			y=$(($y + $h - $bar_height))
 			printf "%s\t%u\t%u\t%u\t%u\n" \
 			    "$m" "$x" "$y" "$w" $bar_height
 		}
diff --git a/xdg-config-dir/herbstluftwm/herbstpanel.sh b/xdg-config-dir/herbstluftwm/herbstpanel.sh
index 0ce5e07..229de82 100644
--- a/xdg-config-dir/herbstluftwm/herbstpanel.sh
+++ b/xdg-config-dir/herbstluftwm/herbstpanel.sh
@@ -75,9 +75,9 @@ while IFS="	" read -r m x y w h; do
 			;;
 		esac
 		printf "%s%s%s\n" "$left" "$center" "$right"
-	done | lemonbar -g "$w"x"$h"+"$x"+"$y" \
+	done | lemonbar-xft -g "$w"x"$h"+"$x"+"$y" \
 	    -B "$hlwm_background" -F "$hlwm_foreground" \
-	    -f "$hlwm_font" | sh &
+	    -f "$hlwm_face" | sh &
 done
 herbstclient -w reload >/dev/null
 kill 0
diff --git a/xdg-config-dir/herbstluftwm/theme b/xdg-config-dir/herbstluftwm/theme
index 6eb7659..a8435d1 100644
--- a/xdg-config-dir/herbstluftwm/theme
+++ b/xdg-config-dir/herbstluftwm/theme
@@ -29,6 +29,6 @@
 : ${hlwm_foreground="#fffcf2"}
 
 : ${hlwm_font="-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1"}
-: ${hlwm_face="monospace:pixelsize=12"}
+: ${hlwm_face="monospace:size=10.5"}
 
-: ${hlwm_font_height=14}
+: ${hlwm_font_height=17}