From d029f52805658c5e0a6e3c726e907651a1f5ea46 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Mon, 31 Oct 2022 10:37:04 +0100 Subject: [PATCH 1/4] [status] fix: statusbar icons spacing --- .local/bin/statusbar/sb-internet | 4 ++-- .local/bin/statusbar/sb-mailbox | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.local/bin/statusbar/sb-internet b/.local/bin/statusbar/sb-internet index dbe07c8..cdd4312 100755 --- a/.local/bin/statusbar/sb-internet +++ b/.local/bin/statusbar/sb-internet @@ -14,13 +14,13 @@ ssid="$(wpa_cli status | grep -i ^ssid | sed -e 's/.*=//')" state="$(wpa_cli status | grep -i ^wpa_state | sed -e 's/.*=//')" case "$state" in - COMPLETED) str="$(printf " %s" $ssid)" ;; + COMPLETED) str="$(printf " %s" $ssid)" ;; INTERFACE_DISABLED) str="WIFI DOWN" ;; *) str="$(printf "NO WIFI")";; esac eth="$(cat /sys/class/net/enp0s31f6/operstate)" if [ "up" = "$eth" ]; then - str="$(printf "%s /  " "$str")" + str="$(printf "%s /  " "$str")" fi vpn="$(pidof openvpn)" [ -n "$vpn" ] && str="$(printf "() %s" "$str")" diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index c2d46be..754a4c1 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -19,7 +19,7 @@ do [ -n "$(echo "$acc" | sed -n '/@univ/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@mailo/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@posteo/p')" ] && box="" - unread="$unread/$box$new" + unread="$unread/$box $new" fi done [ -n "$unread" ] && unread="$(echo "$unread" | cut -c 2-)" || exit From e344488e65b621c341eec1202f81aca23d53d553 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Tue, 1 Nov 2022 23:21:45 +0100 Subject: [PATCH 2/4] [status] fix: icons --- .local/bin/statusbar/sb-internet | 4 ++-- .local/bin/statusbar/sb-mailbox | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.local/bin/statusbar/sb-internet b/.local/bin/statusbar/sb-internet index cdd4312..cc97934 100755 --- a/.local/bin/statusbar/sb-internet +++ b/.local/bin/statusbar/sb-internet @@ -10,7 +10,7 @@ ###################################################################### -# 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/.*=//')" state="$(wpa_cli status | grep -i ^wpa_state | sed -e 's/.*=//')" case "$state" in @@ -23,6 +23,6 @@ if [ "up" = "$eth" ]; then str="$(printf "%s /  " "$str")" fi vpn="$(pidof openvpn)" -[ -n "$vpn" ] && str="$(printf "() %s" "$str")" +[ -n "$vpn" ] && str="$(printf "%s  " "$str")" printf " %s " "$str" diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index 754a4c1..c2d46be 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -19,7 +19,7 @@ do [ -n "$(echo "$acc" | sed -n '/@univ/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@mailo/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@posteo/p')" ] && box="" - unread="$unread/$box $new" + unread="$unread/$box$new" fi done [ -n "$unread" ] && unread="$(echo "$unread" | cut -c 2-)" || exit From 61d1045e72b5429ef0738582792301e750df33ed Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Tue, 1 Nov 2022 23:24:06 +0100 Subject: [PATCH 3/4] [system] feat: use Fira + Nerd Symbols by default --- .config/X11/xresources | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.config/X11/xresources b/.config/X11/xresources index 63e2d76..a05fad9 100644 --- a/.config/X11/xresources +++ b/.config/X11/xresources @@ -1,13 +1,13 @@ !! Set a default font and font size as below: -*.font: Iosevka Fixed Slab:size=12 -*.symbols: Symbols Nerd Font:size=11 +*.font: Fira Code:size=12 +*.symbols: Symbols Nerd Font:size=12 /* dwm config */ dwm.borderpx: 2 dwm.gappx: 15 /* st config */ -st.font: Iosevka Fixed Slab:size=14 -st.symbols: Symbols Nerd Font:size=14 +st.font: Fira Code:size=12 +st.symbols: Symbols Nerd Font:size=12 st.termname: st-256color st.borderpx: 5 From 540613898d1d3e949ed3767e7bd42883d8c49db8 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Tue, 1 Nov 2022 23:32:02 +0100 Subject: [PATCH 4/4] [dwm] feat: support japanese symbols (no kanji) --- .config/X11/xresources | 1 + .local/src/dwm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/X11/xresources b/.config/X11/xresources index a05fad9..9568298 100644 --- a/.config/X11/xresources +++ b/.config/X11/xresources @@ -1,6 +1,7 @@ !! Set a default font and font size as below: *.font: Fira Code:size=12 *.symbols: Symbols Nerd Font:size=12 +*.japan: IPAexGothic:size=12 /* dwm config */ dwm.borderpx: 2 diff --git a/.local/src/dwm b/.local/src/dwm index 82003c8..89d751e 160000 --- a/.local/src/dwm +++ b/.local/src/dwm @@ -1 +1 @@ -Subproject commit 82003c8dad7b966ab65f339749fb4272eafb8f4b +Subproject commit 89d751ef3abec67adcdf1dbed7c2361795d7f550