Manual fixups for nerd fonts 3.0

* Make icon_prn a nerd-font icons. It was using a font awesome code
  point, which we don't install with sxmo.
* Fix phone locked and laptop icons that weren't automatically updated
* Fix brightness icon in legacy nerd-fonts range and move it to
  sxmo_hook_icons from sxmo_brightness
* Use standard Unicode arrows instead of nerd-fonts ones
* Use icon variables for arrows in sxmo_wmmenu.sh
* Add variable for audio icon & use in sxmo_audio.sh
* Remove no stray break space from sxmo_contactmenu
* Remove up arrow character from reddit script
* use only icon variables in modemtext
* Update icons breakpoints

Signed-off-by: Willow Barraco <contact@willowbarraco.fr>

configs/appcfg/fontconfig.conf

@@ -3,6 +3,9 @@
 <fontconfig>
     <alias>
         <family>Sxmo</family>
-        <prefer><family>Dejavu Sans Mono Nerd Font</family></prefer>
+        <prefer>
+            <family>Dejavu Sans Mono Nerd Font</family>
+            <family>Dejavu SansM Nerd Font</family>
+        </prefer>
     </alias>
 </fontconfig>

configs/default_hooks/sxmo_hook_contextmenu.sh

@@ -125,8 +125,8 @@ case "$WMCLASS" in
 			$icon_pau Pause        ^ 0 ^ sxmo_type -k Space
 			$icon_fbw Seek       ^ 1 ^ sxmo_type -k Left
 			$icon_ffw Seek       ^ 1 ^ sxmo_type -k Right
-			$icon_aru App Volume ↑ ^ 1 ^ sxmo_type 0
-			$icon_ard App Volume ↓ ^ 1 ^ sxmo_type 9
+			$icon_aru App Volume Up ^ 1 ^ sxmo_type 0
+			$icon_ard App Volume Down ^ 1 ^ sxmo_type 9
 			$icon_aru Speed up      ^ 1 ^ sxmo_type -k bracketRight
 			$icon_ard Speed down    ^ 1 ^ sxmo_type -k bracketLeft
 			$icon_cam Screenshot   ^ 1 ^ sxmo_type s

configs/default_hooks/sxmo_hook_icons.sh

@@ -14,56 +14,58 @@
 
 icon_a2x="⇄"
 icon_a2y="⇅"
-icon_ac1=""
-icon_ac2=""
-icon_ac3=""
-icon_ac4=""
+icon_ac1="↖"
+icon_ac2="↗"
+icon_ac3="↘"
+icon_ac4="↙"
 icon_and=""
-icon_ard=""
-icon_arl=""
-icon_arr=""
-icon_aru=""
+icon_ard="↓"
+icon_arl="←"
+icon_arr="→"
+icon_aru="↑"
 icon_att=""
+icon_audio="♫"
 icon_bel=""
 icon_bok=""
+icon_brightness="󰃝"
 icon_bth="" # bluetooth
 icon_cal=""
 icon_cam=""
 icon_cfg="" #configuration cog
 icon_chk=""
 icon_chs="♜" #chess
-icon_clc="" #calculator
-icon_clk=""
-icon_cls="" #close
-icon_com="" # (Laptop) Computer (💻)
+icon_clc="󰃬" #calculator
+icon_clk="󰥔"
+icon_cls="󰅖" #close
+icon_com="" # (Laptop) Computer (💻)
 icon_cpy=""
-icon_del="﫧" #delete
+icon_del="" #delete
 icon_dir="" #directory folder
 icon_dof="" # dot off
 icon_don="" # dot on
 icon_dop="" # dot point
-icon_dot="" # searching, connecting, etc.
-icon_drw="" # Drawing tablet
+icon_dot="󰇘" # searching, connecting, etc.
+icon_drw="󰏬" # Drawing tablet
 icon_ear="" # earpiece
-icon_edt="" #editor
-icon_eml="" #email
-icon_exp="" #expand
+icon_edt="󰎞" #editor
+icon_eml="󰇮" #email
+icon_exp="󰁌" #expand
 icon_fbw=""
 icon_ffw="" #fast forward
 icon_ffx="" #firefox
 icon_fil="" #file
 icon_flk="" #falkon
-icon_fll="" #flashlight
+icon_fll="󰉄" #flashlight
 icon_flt="" #filter/pipe
 icon_fnd="" #search/find
-icon_gam="" # gaming controller (🎮)
+icon_gam="󰊴" # gaming controller (🎮)
 icon_glb="" #globe
 icon_gps='' #gps
-icon_grd=""
+icon_grd="󰀻"
 icon_grp="" #group
 icon_hdp="" #headphones
 icon_hom=""
-icon_img=""
+icon_img="󰏜"
 icon_inf="" #info
 icon_itm="" #item (default)
 icon_kbd="" #keyboard
@@ -71,41 +73,41 @@ icon_key=""
 icon_lck=""
 icon_lnk=""
 icon_lst="" #list
-icon_map=""
-icon_mdd="" # modem disabled state
-icon_mic=""
-icon_mmc=""
+icon_map="󰍍"
+icon_mdd="󰄢" # modem disabled state
+icon_mic="󰍬"
+icon_mmc="󰍭"
 icon_mnu=""
 icon_mod="" # modem
-icon_mov=""
-icon_mse="" # computer mouse (🖱️)
-icon_msg="" #text
-icon_mus=""
+icon_mov="󰁁"
+icon_mse="󰍽" # computer mouse (🖱️)
+icon_msg="󰍦" #text
+icon_mus="󰎈"
 icon_mut="" #mute
-icon_mvi="" #movie
-icon_net=""
+icon_mvi="󰎁" #movie
+icon_net="󰀂"
 icon_nto="" #no touch
 icon_nxt="" #next
-icon_out="" #logout
+icon_out="󰍃" #logout
 icon_pau=""
-icon_phl="" #phonelog
-icon_phn="" #phone
-icon_phx="" #hangup
-icon_plk="" # phone locked
+icon_phl="󰏹" #phonelog
+icon_phn="󰏲" #phone
+icon_phx="󰏵" #hangup
+icon_plk="󰏸" # phone locked
 icon_pls=""
-icon_prn="🖶" # printer (🖨️)
+icon_prn="" # printer (🖨️)
 icon_prv="" #previous
 icon_pst=""
 icon_pwr="⏻" #power
 icon_red="" #reddit
-icon_ret="" #return
+icon_ret="󰌑" #return
 icon_rld=""
 icon_rol="" #rotate left
 icon_ror="" #rotate right
 icon_rss=""
-icon_sav="" #save
+icon_sav="󰆓" #save
 icon_sfl="" #shuffle, random
-icon_shr="" #shrink
+icon_shr="󰁄" #shrink
 icon_snd="" #send
 icon_spk="" #speaker
 icon_spl=""
@@ -114,19 +116,19 @@ icon_stp="" #stop
 icon_str="" #star
 icon_tab=""
 icon_tgm='' #telegram
-icon_tmr="" #timer
+icon_tmr="󰀠" #timer
 icon_tof=""
 icon_ton=""
 icon_trh="" # trash
 icon_trm='' #terminal
-icon_upc="" #up in circle
+icon_upc="󰁠" #up in circle
 icon_usb="" # usb
-icon_usr=""
+icon_usr="󰀄"
 icon_vid="" #video
 icon_vim=''
 icon_wif=""
-icon_wfo="睊" # wifi off
-icon_wfh="" # wifi hotspot
+icon_wfo="󰖪" # wifi off
+icon_wfh="󰀂" # wifi hotspot
 icon_win="" #window
 icon_wat="" # watch (⌚)
 icon_wn2=""
@@ -160,7 +162,7 @@ icon_modem_threeg="󰜓" # a lot (see sxmo_hook_statusbar.sh)
 icon_modem_hspa="󰜕" # hspa
 icon_modem_hspa_plus="󰜖" # hspa plus
 icon_modem_twog="󰜒" # edge, pots, gsm, gprs, etc.
-icon_modem_notech="ﲁ" # disabled cell bars
+icon_modem_notech="󰞃" # disabled cell bars
 
 # modem signal strengths
 icon_modem_signal_0="󰢿"
@@ -186,7 +188,7 @@ icon_wifi_disconnected="󰤮"
 icon_bat_c_0="󰢟"
 icon_bat_c_1="󱊤"
 icon_bat_c_2="󱊥"
-icon_bat_c_3=""
+icon_bat_c_3="󰂅"
 icon_bat_0="󰂎"
 icon_bat_1="󱊡"
 icon_bat_2="󱊢"

scripts/appscripts/sxmo_reddit.sh

@@ -23,7 +23,7 @@ menu() {
 			sed 's/===/\n/g' |
 			sed 's/^\t//g' |
 			sort -t"$(printf '%b' '\t')" -rnk4 |
-			awk -F'\t' '{ printf "↑%4s", $3; print " " $4 " " $1 " " $2 }'
+			awk -F'\t' '{ printf "%4s", $3; print " " $4 " " $1 " " $2 }'
 	)"
 
 	while true; do

scripts/core/sxmo_audio.sh

@@ -19,7 +19,7 @@ notifyvol() {
 	if [ "$SXMO_WM" = "sway" ] && [ -z "$SXMO_WOB_DISABLE" ]; then
 		printf "%s\n" "$vol" > "$XDG_RUNTIME_DIR"/sxmo.wobsock
 	else
-		dunstify -r 999 "♫ Volume $vol"
+		dunstify -r 999 "$icon_audio Volume $vol"
 	fi
 }
 

scripts/core/sxmo_brightness.sh

@@ -4,13 +4,15 @@
 
 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh
+# shellcheck source=configs/default_hooks/sxmo_hook_icons.sh
+. sxmo_hook_icons.sh
 
 notify() {
 	if [ "$SXMO_WM" = "sway" ] && [ -z "$SXMO_WOB_DISABLE" ]; then
 		light | grep -o "^[0-9]*" > "$XDG_RUNTIME_DIR"/sxmo.wobsock
 	else
-		light | xargs dunstify -r 888 " Brightness"
+		light | xargs dunstify -r 888 "$icon_brightness Brightness"
 	fi
 }
 

scripts/core/sxmo_contactmenu.sh

@@ -80,7 +80,7 @@ deletecontact() {
 	ENTRIES="$(printf "$icon_cls No\n$icon_chk Yes")"
 	PICKED="$(
 		printf %b "$ENTRIES" |
-		dmenu -p "$icon_del Delete $name ?"
+		dmenu -p "$icon_del Delete $name?"
 	)"
 
 	# reverse them

scripts/core/sxmo_wmmenu.sh

@@ -76,11 +76,11 @@ swaywmmenu() {
 		)"
 		if [ -n "$CURRENT_LAYOUT" ]; then
 			if [ "$CURRENT_LAYOUT" = "splith" ]; then
-				LAYOUT_LINE="splith → splitv → tabbed"
+				LAYOUT_LINE="splith $icon_arr splitv $icon_arr tabbed"
 			elif [ "$CURRENT_LAYOUT" = "tabbed" ] ; then
-				LAYOUT_LINE="tabbed → splith → splitv"
+				LAYOUT_LINE="tabbed $icon_arr splith $icon_arr splitv"
 			else
-				LAYOUT_LINE="splitv → tabbed → splith"
+				LAYOUT_LINE="splitv $icon_arr tabbed $icon_arr splith"
 			fi
 		fi
 		CHOICES="$(grep . <<EOF

scripts/modem/sxmo_modemtext.sh

@@ -65,19 +65,24 @@ sendtextmenu() {
 
 	while true
 	do
+		# We use them in printf statements
+		export icon_cls
+		export icon_att
+		export icon_usr
+
 		ATTACHMENTS=
 		if [ -f "$SXMO_LOGDIR/$NUMBER/draft.attachments.txt" ]; then
 			# shellcheck disable=SC2016
 			ATTACHMENTS="$(
 				tr '\n' '\0' < "$SXMO_LOGDIR/$NUMBER/draft.attachments.txt" |
-				xargs -0 -I{} sh -c 'printf "%s %s %s :: %s\n" "" "" "$(basename "{}")" "{}"'
+				xargs -0 -I{} sh -c 'printf "%s %s %s :: %s\n" "$icon_cls" "$icon_att" "$(basename "{}")" "{}"'
 			)"
 		fi
 
 		RECIPIENTS=
 		if [ "$(printf %s "$NUMBER" | xargs pnc find | wc -l)" -gt 1 ]; then
 			# shellcheck disable=SC2016
-			RECIPIENTS="$(printf %s "$NUMBER" | xargs pnc find | xargs -I{} sh -c 'printf "  "$(sxmo_contacts.sh --name {})" :: {}\n"')"
+			RECIPIENTS="$(printf %s "$NUMBER" | xargs pnc find | xargs -I{} sh -c 'printf "$icon_cls $icon_usr "$(sxmo_contacts.sh --name {})" :: {}\n"')"
 		fi
 
 		CHOICES="$(printf "%s Send to %s (%s)\n%b\n%s Add Recipient\n%b\n%s Add Attachment\n%s Edit '%s'\n%s Cancel\n" \
@@ -98,7 +103,7 @@ sendtextmenu() {
 				fi
 				;;
 			# Remove Attachment
-			" "*)
+			"$icon_cls $icon_att"*)
 				FILE="$(printf %s "$CONFIRM" | awk -F' :: ' '{print $2}')"
 				sed -i "\|$FILE|d" "$SXMO_LOGDIR/$NUMBER/draft.attachments.txt"
 				if [ ! -s "$SXMO_LOGDIR/$NUMBER/draft.attachments.txt" ] ; then
@@ -106,7 +111,7 @@ sendtextmenu() {
 				fi
 				;;
 			# Remove Recipient
-			" "*)
+			"$icon_cls $icon_usr"*)
 				if [ "$(printf %s "$NUMBER" | xargs pnc find | wc -l)" -gt 1 ]; then
 					OLDNUMBER="$NUMBER"
 					RECIPIENT="$(printf %s "$CONFIRM" | awk -F' :: ' '{print $2}')"