dedup, monospace font for icons

modules/Backlight.qml

@@ -33,7 +33,7 @@ Row {
         text: root.percent + "% "
         color: M.Theme.base05
         font.pixelSize: M.Theme.fontSize
-        font.family: M.Theme.fontFamily
+        font.family: M.Theme.iconFontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
 }

modules/BarIcon.qml

@@ -0,0 +1,12 @@
+import QtQuick
+import "." as M
+
+Text {
+    property string icon: ""
+
+    text: icon
+    color: M.Theme.base05
+    font.pixelSize: M.Theme.fontSize + 1
+    font.family: M.Theme.iconFontFamily
+    verticalAlignment: Text.AlignVCenter
+}

modules/BarLabel.qml

@@ -0,0 +1,12 @@
+import QtQuick
+import "." as M
+
+Text {
+    property string label: ""
+
+    text: label
+    color: M.Theme.base05
+    font.pixelSize: M.Theme.fontSize
+    font.family: M.Theme.fontFamily
+    verticalAlignment: Text.AlignVCenter
+}

modules/Battery.qml

@@ -11,23 +11,19 @@ Row {
     readonly property real pct: (dev?.percentage ?? 0) * 100
     readonly property bool charging: dev?.state === UPowerDeviceState.Charging
 
-    Text {
+    M.BarIcon {
-        text: {
+        icon: {
-            if (root.charging)
+            if (root.charging) return "";
-                return "";
             const icons = ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󱟢"];
             return icons[Math.min(10, Math.floor(root.pct / 10))];
         }
         color: root.pct < 15 ? M.Theme.base08 : M.Theme.base05
         font.pixelSize: M.Theme.fontSize + 2
-        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
-    Text {
+    M.BarLabel {
-        text: Math.round(root.pct) + "%"
+        label: Math.round(root.pct) + "%"
         color: root.pct < 15 ? M.Theme.base08 : M.Theme.base05
-        font.pixelSize: M.Theme.fontSize
-        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
 }

modules/Bluetooth.qml

@@ -32,7 +32,7 @@ Row {
         text: root.status === "connected" ? (" " + root.device) : ""
         color: M.Theme.base05
         font.pixelSize: M.Theme.fontSize + 1
-        font.family: M.Theme.fontFamily
+        font.family: M.Theme.iconFontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
 }

modules/Cpu.qml

@@ -54,6 +54,6 @@ Text {
     text: " " + root.usage.toString().padStart(2) + "%@" + root.freqGhz.toFixed(2)
     color: M.Theme.base05
     font.pixelSize: M.Theme.fontSize
-    font.family: M.Theme.fontFamily
+    font.family: M.Theme.iconFontFamily
     verticalAlignment: Text.AlignVCenter
 }

modules/Disk.qml

@@ -33,6 +33,6 @@ Text {
     text: " " + root.freePct + "% " + root.totalTb.toFixed(1)
     color: M.Theme.base05
     font.pixelSize: M.Theme.fontSize
-    font.family: M.Theme.fontFamily
+    font.family: M.Theme.iconFontFamily
     verticalAlignment: Text.AlignVCenter
 }

modules/IdleInhibitor.qml

@@ -2,16 +2,12 @@ import QtQuick
 import Quickshell.Io
 import "." as M
 
-Text {
+M.BarIcon {
     id: root
 
     property bool active: false
 
-    text: root.active ? "" : ""
+    icon: root.active ? "" : ""
-    color: M.Theme.base05
-    font.pixelSize: M.Theme.fontSize + 1
-    font.family: M.Theme.fontFamily
-    verticalAlignment: Text.AlignVCenter
 
     Process {
         id: toggle

modules/Memory.qml

@@ -33,6 +33,6 @@ Text {
     text: " " + root.percent + "%"
     color: M.Theme.base05
     font.pixelSize: M.Theme.fontSize
-    font.family: M.Theme.fontFamily
+    font.family: M.Theme.iconFontFamily
     verticalAlignment: Text.AlignVCenter
 }

modules/Mpris.qml

@@ -10,18 +10,12 @@ Row {
     readonly property MprisPlayer player: Mpris.players.values[0] ?? null
     readonly property bool playing: player?.playbackState === MprisPlaybackState.Playing
 
-    Text {
+    M.BarIcon {
-        text: root.playing ? "" : (root.player?.playbackState === MprisPlaybackState.Paused ? "󰏤" : "󰓛")
+        icon: root.playing ? "" : (root.player?.playbackState === MprisPlaybackState.Paused ? "󰏤" : "󰓛")
-        color: M.Theme.base05
-        font.pixelSize: M.Theme.fontSize + 1
-        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
-    Text {
+    M.BarLabel {
-        text: root.player?.identity ?? ""
+        label: root.player?.identity ?? ""
-        color: M.Theme.base05
-        font.pixelSize: M.Theme.fontSize
-        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
 

modules/Network.qml

@@ -54,7 +54,7 @@ Row {
         }
         color: M.Theme.base05
         font.pixelSize: M.Theme.fontSize + 1
-        font.family: M.Theme.fontFamily
+        font.family: M.Theme.iconFontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
 }

modules/Notifications.qml

@@ -28,24 +28,16 @@ Row {
         }
     }
 
-    Text {
+    M.BarIcon {
-        text: {
+        icon: {
-            if (root.inhibited)
+            if (root.inhibited) return root.count > 0 ? "󰂛" : "󰪑";
-                return root.count > 0 ? "󰂛" : "󰪑";
+            if (root.dnd) return root.count > 0 ? "󰂠" : "󰪓";
-            if (root.dnd)
-                return root.count > 0 ? "󰂠" : "󰪓";
             return root.count > 0 ? "󱅫" : "󰂜";
         }
-        color: M.Theme.base05
-        font.pixelSize: M.Theme.fontSize + 2
-        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
-    Text {
+    M.BarLabel {
-        text: root.count > 0 ? String(root.count) : ""
+        label: root.count > 0 ? String(root.count) : ""
-        color: M.Theme.base05
-        font.pixelSize: M.Theme.fontSize
-        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
 

modules/PowerProfile.qml

@@ -2,11 +2,18 @@ import QtQuick
 import Quickshell.Io
 import "." as M
 
-Text {
+M.BarIcon {
     id: root
 
     property string profile: ""
 
+    icon: {
+        if (root.profile === "performance") return "";
+        if (root.profile === "power-saver") return "";
+        if (root.profile === "balanced") return "";
+        return "";
+    }
+
     Process {
         id: proc
         running: true
@@ -21,18 +28,4 @@ Text {
         repeat: true
         onTriggered: proc.running = true
     }
-
-    text: {
-        if (root.profile === "performance")
-            return "";
-        if (root.profile === "power-saver")
-            return "";
-        if (root.profile === "balanced")
-            return "";
-        return "";
-    }
-    color: M.Theme.base05
-    font.pixelSize: M.Theme.fontSize + 1
-    font.family: M.Theme.fontFamily
-    verticalAlignment: Text.AlignVCenter
 }

modules/Temperature.qml

@@ -22,6 +22,6 @@ Text {
     text: " " + root.celsius + "°C"
     color: root.celsius > 80 ? M.Theme.base08 : M.Theme.base05
     font.pixelSize: M.Theme.fontSize
-    font.family: M.Theme.fontFamily
+    font.family: M.Theme.iconFontFamily
     verticalAlignment: Text.AlignVCenter
 }

modules/Theme.qml

@@ -26,6 +26,7 @@ QtObject {
     property color base0F: "#f2cdcd"
 
     property string fontFamily: "sans-serif"
+    property string iconFontFamily: "Symbols Nerd Font Mono"
     property int fontSize: 12
     property real barOpacity: 0.9
     property int barHeight: 32
@@ -51,6 +52,8 @@ QtObject {
         }
         if (data.fontFamily)
             root.fontFamily = data.fontFamily;
+        if (data.iconFontFamily)
+            root.iconFontFamily = data.iconFontFamily;
         if (data.fontSize)
             root.fontSize = data.fontSize;
         if (data.barOpacity !== undefined)

modules/Volume.qml

@@ -14,24 +14,16 @@ Row {
     readonly property real volume: sink?.audio?.volume ?? 0
     readonly property bool muted: sink?.audio?.muted ?? false
 
-    Text {
+    M.BarIcon {
-        text: root.muted ? "" : (root.volume > 0.5 ? "" : (root.volume > 0 ? "" : ""))
+        icon: root.muted ? "" : (root.volume > 0.5 ? "" : (root.volume > 0 ? "" : ""))
-        color: M.Theme.base05
-        font.pixelSize: M.Theme.fontSize + 1
-        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
-
+    M.BarLabel {
-    Text {
+        label: Math.round(root.volume * 100) + "%"
-        text: Math.round(root.volume * 100) + "%"
-        color: M.Theme.base05
-        font.pixelSize: M.Theme.fontSize
-        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
 
     TapHandler {
-        onTapped: if (root.sink?.audio)
+        onTapped: if (root.sink?.audio) root.sink.audio.muted = !root.sink.audio.muted
-            root.sink.audio.muted = !root.sink.audio.muted
     }
 }

modules/Wlogout.qml

@@ -2,12 +2,8 @@ import QtQuick
 import Quickshell.Io
 import "." as M
 
-Text {
+M.BarIcon {
-    text: ""
+    icon: ""
-    color: M.Theme.base05
-    font.pixelSize: M.Theme.fontSize + 2
-    font.family: M.Theme.fontFamily
-    verticalAlignment: Text.AlignVCenter
 
     Process {
         id: proc

nix/hm-module.nix

@@ -37,6 +37,7 @@ let
           ;
       };
       fontFamily = f.sansSerif.name;
+      iconFontFamily = f.monospace.name;
       fontSize = f.sizes.desktop;
       barOpacity = 1.0 - config.stylix.opacity.desktop;
     }