Merge branch 'main' of git.zander.im:Zander671/dwmblocks

Makefile

@@ -42,6 +42,7 @@ uninstall:
 		${DESTDIR}${PREFIX}/bin/dwmblocks-pulse-listener \
 		${DESTDIR}${PREFIX}/bin/dwmblocks-battery \
 		${DESTDIR}${PREFIX}/bin/dwmblocks-network \
-		${DESTDIR}${PREFIX}/bin/dwmblocks-volume
+		${DESTDIR}${PREFIX}/bin/dwmblocks-volume \
+		${DESTDIR}${PREFIX}/bin/dwmblocks-fcitx5
 
 .PHONY: all options clean install uninstall

scripts/dwmblocks-fcitx5

@@ -0,0 +1,12 @@
+#!/usr/bin/env zsh
+
+local ime_sym='？'
+case "$(fcitx5-remote -n)" in
+    'keyboard-us')
+        ime_sym='Ｅ'
+        ;;
+    'mozc')
+        ime_sym="和"
+        ;;
+esac
+printf '󰌌 %s' "${ime_sym}"

scripts/dwmblocks-volume

@@ -6,7 +6,7 @@ if [[ "$(pamixer --get-mute)" = "true" ]]; then
     icon='󰸈'
 elif ((${volume} > 50)); then
     icon='󰕾'
-elif ((${volume} > 0)); then
+elif ((${volume} >= 0)); then
     icon='󰖀'
 else
     icon='？'