[bar/conky] add lemon font & add kbd layout

diff --git a/bspwm/.local/bin/panel b/bspwm/.local/bin/panel
index e8e1b43..f04841b 100755 (executable)
--- a/bspwm/.local/bin/panel
+++ b/bspwm/.local/bin/panel
@@ -25,6 +25,6 @@ conky > "$PANEL_FIFO" &
 
 . panel_colors
 
-cat "$PANEL_FIFO" | panel_bar | bar-aint-recursive -g x$PANEL_HEIGHT -f "$PANEL_FONT_FAMILY1","$PANEL_FONT_FAMILY2" -F "$COLOR_FOREGROUND" -B "$COLOR_BACKGROUND" &
+cat "$PANEL_FIFO" | panel_bar | bar-aint-recursive -g x$PANEL_HEIGHT -f "$PANEL_FONT_FAMILY1","$PANEL_FONT_FAMILY2","$PANEL_FONT_FAMILY3" -F "$COLOR_FOREGROUND" -B "$COLOR_BACKGROUND" &
 
 wait

diff --git a/conky/.conkyrc b/conky/.conkyrc
index d369ff0..a54e762 100644 (file)
--- a/conky/.conkyrc
+++ b/conky/.conkyrc
@@ -6,4 +6,4 @@ total_run_times 0
 use_spacer none
 
 TEXT
-S %{F\#ffcc6666}â®  %{F\#ffffffff}${wireless_essid wlp3s0}   %{F\#ffcc6666}${exec ~/.local/bin/spk-icon} %{F\#ffffffff}${exec pamixer --get-volume}%%   %{F\#ffcc6666}⮏ %{F\#ffffffff}${execi 30 cat /sys/class/power_supply/BAT0/capacity}%% (${execi 30 acpi | grep '[0-9]\{2\}:[0-9]\{2\}' -o})   %{F\#ffcc6666}⮖ %{F\#ffffffff}${time %H:%M}
+S %{F\#ffcc6666}⮢ %{F\#ffffffff}${exec setxkbmap -print | grep xkb_symbols | cut -d'+' -f 2}   %{F\#ffcc6666}â®· %{F\#ffffffff}${wireless_essid wlp3s0}   %{F\#ffcc6666}${exec ~/.local/bin/spk-icon} %{F\#ffffffff}${exec pamixer --get-volume}%%   %{F\#ffcc6666}⮏ %{F\#ffffffff}${execi 30 cat /sys/class/power_supply/BAT0/capacity}%% (${execi 30 acpi | grep '[0-9]\{2\}:[0-9]\{2\}' -o})   %{F\#ffcc6666}⮖ %{F\#ffffffff}${time %H:%M}

diff --git a/x/.profile b/x/.profile
index 1dbea27..fcd358c 100644 (file)
--- a/x/.profile
+++ b/x/.profile
@@ -3,4 +3,5 @@ PANEL_FIFO=/tmp/panel-fifo
 PANEL_HEIGHT=24
 PANEL_FONT_FAMILY1="-*-termsyn-medium-r-normal-*-13-*-*-*-c-*-*-1"
 PANEL_FONT_FAMILY2="-*-uushi-medium-*-*-*-11-*-*-*-*-*-*-*"
-export PANEL_FIFO PANEL_HEIGHT PANEL_FONT_FAMILY1 PANEL_FONT_FAMILY2
+PANEL_FONT_FAMILY3="-*-lemon-medium-*-*-*-11-*-*-*-*-*-*-*"
+export PANEL_FIFO PANEL_HEIGHT PANEL_FONT_FAMILY1 PANEL_FONT_FAMILY2 PANEL_FONT_FAMILY3