Merge branch 'dev' into mercury
status: fix icons system: change default fonts to Fira + Nerd Symbols support japanes characters (no kanji)
This commit is contained in:
commit
21ca0c28de
|
@ -1,6 +1,7 @@
|
||||||
!! Set a default font and font size as below:
|
!! Set a default font and font size as below:
|
||||||
*.font: Fira Code:size=12
|
*.font: Fira Code:size=12
|
||||||
*.symbols: Font Awesome 5 Free:size=11
|
*.symbols: Symbols Nerd Font:size=12
|
||||||
|
*.japan: IPAexGothic:size=12
|
||||||
|
|
||||||
/* dwm config */
|
/* dwm config */
|
||||||
dwm.borderpx: 2
|
dwm.borderpx: 2
|
||||||
|
@ -8,6 +9,6 @@ dwm.gappx: 15
|
||||||
|
|
||||||
/* st config */
|
/* st config */
|
||||||
st.font: Fira Code:size=12
|
st.font: Fira Code:size=12
|
||||||
st.symbols: Font Awesome 5 Free:size=12
|
st.symbols: Symbols Nerd Font:size=12
|
||||||
st.termname: st-256color
|
st.termname: st-256color
|
||||||
st.borderpx: 5
|
st.borderpx: 5
|
||||||
|
|
|
@ -10,19 +10,19 @@
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
|
|
||||||
# Wifi quality percentage and icon if ethernet is connected.
|
# Wifi quality percentage and icon if ethernet is connected.
|
||||||
ssid="$(wpa_cli status | grep -i ^ssid | sed -e 's/.*=//')"
|
ssid="$(wpa_cli status | grep -i ^ssid | sed -e 's/.*=//')"
|
||||||
state="$(wpa_cli status | grep -i ^wpa_state | sed -e 's/.*=//')"
|
state="$(wpa_cli status | grep -i ^wpa_state | sed -e 's/.*=//')"
|
||||||
case "$state" in
|
case "$state" in
|
||||||
COMPLETED) str="$(printf " %s" $ssid)" ;;
|
COMPLETED) str="$(printf " %s" $ssid)" ;;
|
||||||
INTERFACE_DISABLED) str="WIFI DOWN" ;;
|
INTERFACE_DISABLED) str="WIFI DOWN" ;;
|
||||||
*) str="$(printf "NO WIFI")";;
|
*) str="$(printf "NO WIFI")";;
|
||||||
esac
|
esac
|
||||||
eth="$(cat /sys/class/net/enp0s31f6/operstate)"
|
eth="$(cat /sys/class/net/enp0s31f6/operstate)"
|
||||||
if [ "up" = "$eth" ]; then
|
if [ "up" = "$eth" ]; then
|
||||||
str="$(printf "%s / " "$str")"
|
str="$(printf "%s / " "$str")"
|
||||||
fi
|
fi
|
||||||
vpn="$(pidof openvpn)"
|
vpn="$(pidof openvpn)"
|
||||||
[ -n "$vpn" ] && str="$(printf "%s ()" "$str")"
|
[ -n "$vpn" ] && str="$(printf "%s " "$str")"
|
||||||
|
|
||||||
printf " %s " "$str"
|
printf " %s " "$str"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 82003c8dad7b966ab65f339749fb4272eafb8f4b
|
Subproject commit 89d751ef3abec67adcdf1dbed7c2361795d7f550
|
Reference in New Issue