Use a single font: deja vu mono nerd font

Signed-off-by: Willow Barraco <contact@willowbarraco.fr>
Signed-off-by: Peter John Hartman <peterjohnhartman@gmail.com>

configs/appcfg/conky.conf

@@ -5,12 +5,12 @@ conky.config = {
     own_window_argb_value = 0,
     default_shade_color = 'grey',
     draw_shades = true,
-    font = 'Mono:size=13',
+    font = 'Sxmo:size=13',
     update_interval = 5,
 }
 
 conky.text = [[
-${alignc}${font Mono:size=50:style=Bold}${exec date +"%H"}${font Mono:size=50}:${exec date +"%M"}${font}
+${alignc}${font Sxmo:size=50:style=Bold}${exec date +"%H"}${font Sxmo:size=50}:${exec date +"%M"}${font}
 
-${font Mono:size=20}${exec date +"%a %d %b %Y"}${font}
+${font Sxmo:size=20}${exec date +"%a %d %b %Y"}${font}
 ]]

configs/appcfg/fontconfig.conf

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <alias>
+        <family>Sxmo</family>
+        <prefer><family>Dejavu Sans Mono Nerd Font</family></prefer>
+    </alias>
+</fontconfig>

configs/appcfg/sway_template

@@ -20,6 +20,8 @@ set $term sxmo_terminal.sh
 # on the original workspace that the command was run on.
 set $menu bemenu-run
 
+font "Sxmo"
+
 exec_always sxmo_swayinitconf.sh
 
 exec_always dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@@ -195,7 +197,7 @@ bar {
         statusline #ffffff
         background #323232
         inactive_workspace #32323200 #32323200 #5c5c5c
-        font "Mono"
+        font "Sxmo"
     }
 }
 

configs/appcfg/xresources_dmenu.xr

@@ -1,2 +1,2 @@
 ! Space to setup configversion
-dmenu.font: FiraMono Nerd Font:size=14
+dmenu.font: Sxmo:size=14

configs/appcfg/xresources_dwm.xr

@@ -1,2 +1,2 @@
 ! Space to setup configversion
-dwm.font: FiraMono Nerd Font:size=10
+dwm.font: Sxmo:size=10

configs/appcfg/xresources_st.xr

@@ -1,2 +1,2 @@
 ! Space to setup configversion
-st.font: FiraMono Nerd Font:size=10
+st.font: Sxmo:size=10

configs/appcfg/xresources_svkbd.xr

@@ -1,2 +1,2 @@
 ! Space to setup configversion
-svkbd.font: FiraMono Nerd Font:size=12
+svkbd.font: Sxmo:size=12

configs/appcfg/xresources_xcalc.xr

@@ -90,6 +90,3 @@ xcalc*ti.button3.label: sqrt
 xcalc*ti.button21.label: \434
 xcalc*ti.button35.label: \367
 
-
-! Fontsize = TODO..
-xcalc*font: -*-terminus-*-*-*-*-32-*-*-*-*-*-*-*

configs/default_hooks/sxmo_hook_desktop_widget.sh

@@ -29,7 +29,7 @@ trap 'kill -- $WAYOUT' TERM INT EXIT
 		pangodraw
 		sxmo_aligned_sleep 60
 	done
-) | wayout --font "FiraMono Nerd Font" \
+) | wayout --font "Sxmo" \
 	--foreground-color "#ffffff" \
 	--fontsize "60" \
 	--height 500  \

configs/profile.d/sxmo_init.sh

@@ -75,7 +75,7 @@ _sxmo_load_environments() {
 	export SXMO_NOTIFDIR="${SXMO_NOTIFDIR:-$XDG_DATA_HOME/sxmo/notifications}"
 	export SXMO_UNSUSPENDREASONFILE="${SXMO_UNSUSPENDREASONFILE:-$XDG_RUNTIME_DIR/sxmo.suspend.reason}"
 
-	export BEMENU_OPTS="${BEMENU_OPTS:---fn 'Monospace 14' --scrollbar autohide -s -n -w -c -l8 -M 40 -H 20 --cb "#222222" --cf "#bbbbbb" --tb "#005577" --tf "#eeeeee" --fb "#222222" --ff "#bbbbbb" --nb "#222222" --af "#bbbbbb" --ab "#222222" --nf "#bbbbbb" --hb "#005577" --hf "#eeeeee" --scb "#005577" --scf "#eeeeee" --fbb "#eeeeee" --fbf "#222222"}"
+	export BEMENU_OPTS="${BEMENU_OPTS:---fn 'Sxmo 14' --scrollbar autohide -s -n -w -c -l8 -M 40 -H 20 --cb "#222222" --cf "#bbbbbb" --tb "#005577" --tf "#eeeeee" --fb "#222222" --ff "#bbbbbb" --nb "#222222" --af "#bbbbbb" --ab "#222222" --nf "#bbbbbb" --hb "#005577" --hf "#eeeeee" --scb "#005577" --scf "#eeeeee" --fbb "#eeeeee" --fbf "#222222"}"
 
 	export EDITOR="${EDITOR:-vim}"
 	export BROWSER="${BROWSER:-firefox}"

scripts/core/sxmo_migrate.sh

@@ -258,6 +258,7 @@ checkhooks() {
 
 common() {
 	defaultconfig "$(xdg_data_path sxmo/appcfg/profile_template)" "$XDG_CONFIG_HOME/sxmo/profile" 644
+	defaultconfig "$(xdg_data_path sxmo/appcfg/fontconfig.conf)" "$XDG_CONFIG_HOME/fontconfig/conf.d/50-sxmo.conf" 644
 }
 
 sway() {

setup_config_version.sh

@@ -8,14 +8,19 @@ case "$1" in
 		exit
 esac
 
-comment="#"
 case "$(busybox head -n1 "$1")" in
+	"#"*)
+		comment="#"
+		;;
 	!*)
 		comment="!"
 		;;
 	--*)
 		comment="--"
 		;;
+	*)
+		exit # we skip this file
+		;;
 esac
 
 busybox md5sum "$1" | \