bar: better colours

8 files changed, 7 insertions, 25 deletions

diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml
index b2b9572..17bc6a7 100644
--- a/modules/bar/components/ActiveWindow.qml
+++ b/modules/bar/components/ActiveWindow.qml
@@ -10,7 +10,7 @@ Item {
     id: root
 
     readonly property bool vertical: parent?.vertical ?? false
-    property color colour: Colours.palette.pink
+    property color colour: Colours.palette.m3primary
 
     implicitWidth: child.implicitWidth
     implicitHeight: child.implicitHeight
diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml
index bec7e30..a0fb267 100644
--- a/modules/bar/components/Clock.qml
+++ b/modules/bar/components/Clock.qml
@@ -7,7 +7,7 @@ Item {
     id: root
 
     readonly property bool vertical: parent?.vertical ?? false
-    property color colour: Colours.palette.peach
+    property color colour: Colours.palette.m3tertiary
 
     implicitWidth: vertical ? Math.max(icon.implicitWidth, text.implicitWidth) : icon.implicitWidth + text.implicitWidth + text.anchors.leftMargin
     implicitHeight: vertical ? icon.implicitHeight + text.implicitHeight + text.anchors.topMargin : Math.max(icon.implicitHeight, text.implicitHeight)
diff --git a/modules/bar/components/OsIcon.qml b/modules/bar/components/OsIcon.qml
index ce7d51b..e040cf0 100644
--- a/modules/bar/components/OsIcon.qml
+++ b/modules/bar/components/OsIcon.qml
@@ -7,5 +7,5 @@ StyledText {
     text: Icons.osIcon
     font.pointSize: Appearance.font.size.smaller
     font.family: Appearance.font.family.mono
-    color: Colours.palette.yellow
+    color: Colours.palette.m3tertiary
 }
diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml
index 14c02f9..38d6166 100644
--- a/modules/bar/components/StatusIcons.qml
+++ b/modules/bar/components/StatusIcons.qml
@@ -9,7 +9,7 @@ Item {
     id: root
 
     readonly property bool vertical: parent?.vertical ?? false
-    property color colour: Colours.palette.rosewater
+    property color colour: Colours.palette.m3secondary
 
     clip: true
     implicitWidth: vertical ? Math.max(network.implicitWidth, bluetooth.implicitWidth, devices.implicitWidth) : network.implicitWidth + bluetooth.implicitWidth + bluetooth.anchors.leftMargin + (repeater.count > 0 ? devices.implicitWidth + devices.anchors.leftMargin : 0)
diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml
index 8ccd48a..78efad7 100644
--- a/modules/bar/components/Tray.qml
+++ b/modules/bar/components/Tray.qml
@@ -8,7 +8,6 @@ Item {
     id: root
 
     readonly property bool vertical: parent?.vertical ?? false
-    property color colour: Colours.palette.lavender
 
     clip: true
     visible: width > 0 && height > 0 // To avoid warnings about being visible with no size
@@ -22,9 +21,7 @@ Item {
         Repeater {
             model: SystemTray.items
 
-            TrayItem {
-                colour: root.colour
-            }
+            TrayItem {}
         }
     }
 
diff --git a/modules/bar/components/TrayItem.qml b/modules/bar/components/TrayItem.qml
index 202c8bf..b8e5d42 100644
--- a/modules/bar/components/TrayItem.qml
+++ b/modules/bar/components/TrayItem.qml
@@ -6,13 +6,11 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Services.SystemTray
 import QtQuick
-import QtQuick.Effects
 
 MouseArea {
     id: root
 
     required property SystemTrayItem modelData
-    required property color colour
 
     acceptedButtons: Qt.LeftButton | Qt.RightButton
     implicitWidth: Appearance.font.size.small * 2
@@ -36,7 +34,6 @@ MouseArea {
     IconImage {
         id: icon
 
-        visible: !BarConfig.tray.recolourIcons
         source: {
             let icon = root.modelData.icon;
             if (icon.includes("?path=")) {
@@ -48,15 +45,4 @@ MouseArea {
         asynchronous: true
         anchors.fill: parent
     }
-
-    Loader {
-        anchors.fill: icon
-        active: BarConfig.tray.recolourIcons
-        asynchronous: true
-
-        sourceComponent: Colouriser {
-            source: icon
-            colorizationColor: root.colour
-        }
-    }
 }
diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml
index 4965252..58727dd 100644
--- a/modules/bar/components/workspaces/ActiveIndicator.qml
+++ b/modules/bar/components/workspaces/ActiveIndicator.qml
@@ -27,13 +27,14 @@ Rectangle {
     implicitWidth: (vertical ? BarConfig.sizes.innerHeight : size) - 2
     implicitHeight: (vertical ? size : BarConfig.sizes.innerHeight) - 2
     radius: BarConfig.workspaces.rounded ? Appearance.rounding.full : 0
+    color: Colours.palette.m3primary
 
     Rectangle {
         id: base
 
         visible: false
         anchors.fill: parent
-        color: Colours.on(root.color)
+        color: Colours.palette.m3onPrimary
 
         Behavior on color {
             ColorAnimation {
diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml
index 738f679..164698c 100644
--- a/modules/bar/components/workspaces/Workspaces.qml
+++ b/modules/bar/components/workspaces/Workspaces.qml
@@ -9,7 +9,6 @@ Item {
     id: root
 
     property alias vertical: layout.vertical
-    property color colour: Colours.palette.mauve
 
     readonly property list<Workspace> workspaces: layout.children.filter(c => c.isWorkspace).sort((w1, w2) => w1.ws - w2.ws)
     readonly property var occupied: Hyprland.workspaces.values.reduce((acc, curr) => {
@@ -59,7 +58,6 @@ Item {
         asynchronous: true
 
         sourceComponent: ActiveIndicator {
-            color: root.colour
             vertical: root.vertical
             workspaces: root.workspaces
             mask: layout