internal: use icon os logo instead of nerd font

Add caelestia logo to use as fallback os logo
Add recolour lock fetch logo option

3 files changed, 60 insertions, 24 deletions

diff --git a/modules/bar/components/OsIcon.qml b/modules/bar/components/OsIcon.qml
index ee24457..8418902 100644
--- a/modules/bar/components/OsIcon.qml
+++ b/modules/bar/components/OsIcon.qml
@@ -1,11 +1,15 @@
-import qs.components
+import qs.components.effects
 import qs.services
 import qs.utils
 import qs.config
+import Quickshell.Widgets
 
-StyledText {
-    text: SysInfo.osIcon
-    font.pointSize: Appearance.font.size.smaller
-    font.family: Appearance.font.family.mono
-    color: Colours.palette.m3tertiary
+IconImage {
+    source: SysInfo.osLogo
+    implicitSize: Appearance.font.size.large * 1.2
+
+    layer.enabled: true
+    layer.effect: Colouriser {
+        colorizationColor: Colours.palette.m3tertiary
+    }
 }
diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml
index 2b475dd..e45153e 100644
--- a/modules/dashboard/dash/User.qml
+++ b/modules/dashboard/dash/User.qml
@@ -1,9 +1,11 @@
 import qs.components
+import qs.components.effects
 import qs.components.images
 import qs.services
 import qs.config
 import qs.utils
 import Quickshell
+import Quickshell.Widgets
 import QtQuick
 
 Row {
@@ -111,11 +113,39 @@ Row {
         anchors.verticalCenter: parent.verticalCenter
         spacing: Appearance.spacing.normal
 
-        InfoLine {
-            icon: SysInfo.osIcon
-            text: SysInfo.osPrettyName || SysInfo.osName
-            colour: Colours.palette.m3primary
-            materialIcon: false
+        Item {
+            id: line
+
+            implicitWidth: icon.implicitWidth + text.width + text.anchors.leftMargin
+            implicitHeight: Math.max(icon.implicitHeight, text.implicitHeight)
+
+            IconImage {
+                id: icon
+
+                anchors.left: parent.left
+                anchors.leftMargin: (Config.dashboard.sizes.infoIconSize - implicitWidth) / 2
+
+                source: SysInfo.osLogo
+                implicitSize: Math.floor(Appearance.font.size.normal * 1.34)
+
+                layer.enabled: true
+                layer.effect: Colouriser {
+                    colorizationColor: Colours.palette.m3primary
+                }
+            }
+
+            StyledText {
+                id: text
+
+                anchors.verticalCenter: icon.verticalCenter
+                anchors.left: icon.right
+                anchors.leftMargin: icon.anchors.leftMargin
+                text: `:  ${SysInfo.osPrettyName || SysInfo.osName}`
+                font.pointSize: Appearance.font.size.normal
+
+                width: Config.dashboard.sizes.infoWidth
+                elide: Text.ElideRight
+            }
         }
 
         InfoLine {
@@ -139,7 +169,6 @@ Row {
         required property string icon
         required property string text
         required property color colour
-        property bool materialIcon: true
 
         implicitWidth: icon.implicitWidth + text.width + text.anchors.leftMargin
         implicitHeight: Math.max(icon.implicitHeight, text.implicitHeight)
@@ -154,7 +183,6 @@ Row {
             text: line.icon
             color: line.colour
             font.pointSize: Appearance.font.size.normal
-            font.family: line.materialIcon ? Appearance.font.family.material : Appearance.font.family.sans
         }
 
         StyledText {
diff --git a/modules/lock/Fetch.qml b/modules/lock/Fetch.qml
index 5584fbd..ce64c8c 100644
--- a/modules/lock/Fetch.qml
+++ b/modules/lock/Fetch.qml
@@ -1,10 +1,11 @@
 pragma ComponentBehavior: Bound
 
 import qs.components
+import qs.components.widgets
+import qs.components.effects
 import qs.services
 import qs.config
 import qs.utils
-import Quickshell
 import Quickshell.Widgets
 import Quickshell.Services.UPower
 import QtQuick
@@ -50,14 +51,9 @@ ColumnLayout {
 
         WrappedLoader {
             Layout.fillHeight: true
-            asynchronous: true
             active: !iconLoader.active
-            visible: active
 
-            sourceComponent: IconImage {
-                source: Quickshell.iconPath(SysInfo.logo)
-                implicitSize: height
-            }
+            sourceComponent: OsLogo {}
         }
     }
 
@@ -72,10 +68,7 @@ ColumnLayout {
             Layout.fillHeight: true
             active: root.width > 320
 
-            sourceComponent: IconImage {
-                source: Quickshell.iconPath(SysInfo.logo)
-                implicitSize: height
-            }
+            sourceComponent: OsLogo {}
         }
 
         ColumnLayout {
@@ -156,6 +149,17 @@ ColumnLayout {
         visible: active
     }
 
+    component OsLogo: IconImage {
+        source: SysInfo.osLogo
+        implicitSize: height
+        asynchronous: true
+
+        layer.enabled: Config.lock.recolourLogo || SysInfo.isDefaultLogo
+        layer.effect: Colouriser {
+            colorizationColor: Colours.palette.m3primary
+        }
+    }
+
     component FetchText: MonoText {
         Layout.fillWidth: true
         font.pointSize: root.width > 400 ? Appearance.font.size.larger : Appearance.font.size.normal