Added Color via matugen

modules/bar/Bar.qml

@@ -2,6 +2,7 @@ import QtQuick
 import Quickshell
 import Quickshell.Hyprland
 import "./widgets"
+import "../../colors"
 
 // TODO: interact with PyWal
 
@@ -29,7 +30,7 @@ PanelWindow {
     Rectangle { // Bar
         id: bar
         anchors.fill: parent   
-        color: "#800a0a0a"
+        color: Qt.alpha(Colors.background, 0.5)
         radius: 0
 
         Row {   // bar widgets left

modules/bar/widgets/Clock.qml

@@ -1,13 +1,14 @@
 import QtQuick
 import Quickshell
 import Quickshell.Hyprland
+import "../../../colors"
 
 Rectangle {  //workspace
     width: timeDisplay.width + 16
     height: timeDisplay.height + 16
     radius: 4
-    color: "#333333"
-    border.color: "#555555"
+    color: Colors.tertiaryContainer
+    border.color: Colors.tertiaryContainer_fg
     border.width: 2
 
     Text {
@@ -16,7 +17,7 @@ Rectangle {  //workspace
         property string currentTime: ""
 
         text: currentTime
-        color: "#ffffff"
+        color: Colors.tertiary
         font.pixelSize: 18
         font.family: "Inter, sans-serif"
 

modules/bar/widgets/MenuButton.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import Quickshell
 import Quickshell.Hyprland
+import "../../../colors"
 
 MouseArea {
     id: archButton
@@ -11,7 +12,7 @@ MouseArea {
     
     Rectangle {
         anchors.fill: parent
-        color: archButton.containsMouse ? "#2a2a2a" : "transparent"
+        color: archButton.containsMouse ? Colors.tertiary : Qt.alpha(Colors.primaryContainer, 0.25)
         radius: 6
 
         Text {
@@ -19,7 +20,7 @@ MouseArea {
             text: "󰣇"
             font.pixelSize: 26
             font.family: "Nerd Font"
-            color: "#ffffff"
+            color: archButton.containsMouse ? Colors.tertiary_fg : Colors.primary
         }
     }
 }

modules/bar/widgets/Network.qml

@@ -2,6 +2,7 @@ import QtQuick
 import Quickshell
 import Quickshell.Hyprland
 import Quickshell.Io
+import "../../../colors"
 
 MouseArea {
     id: networkButton
@@ -21,7 +22,7 @@ MouseArea {
 
     Rectangle {
         anchors.fill: parent
-        color: networkButton.containsMouse ? "#2a2a2a" : "transparent"
+        color: networkButton.containsMouse ? Colors.tertiary : Qt.alpha(Colors.tertiaryContainer, 0.25)
         radius: 6
         width: output.width + 16
 
@@ -30,7 +31,7 @@ MouseArea {
             anchors.centerIn: parent
             font.pixelSize: 26
             font.family: "Nerd Font"
-            color: output.text === "󰤭 /󱐤" ? "#FF0000" : "#00ff00"
+            color: networkButton.containsMouse ? Colors.tertiary_fg : output.text === "󰤭 /󱐤" ? Colors.error : Colors.primary
         }
 
         Process {

modules/bar/widgets/PowerButton.qml

@@ -2,17 +2,18 @@ import QtQuick
 import Quickshell
 import Quickshell.Hyprland
 import Quickshell.Io
+import "../../../colors"
 
 MouseArea {
     id: powerButton
-    width: 30
+    width: powerText.width + 16
     height: bar.height
     hoverEnabled: true
     cursorShape: Qt.PointingHandCursor
     
     Rectangle {
         anchors.fill: parent
-        color: powerButton.containsMouse ? "#2a2a2a" : "transparent"
+        color: powerButton.containsMouse ? Colors.secondaryContainer_fg : Qt.alpha(Colors.secondary, 0.5)
         radius: 6
 
         Item {
@@ -37,11 +38,12 @@ MouseArea {
         }
 
         Text {
+            id: powerText
             anchors.centerIn: parent
             text: ""
             font.pixelSize: 26
             font.family: "Nerd Font"
-            color: "#ffffff"
+            color:powerButton.containsMouse ? Colors.secondaryContainer : Colors.secondary_fg
         }
     }
 }

modules/bar/widgets/Workspaces.qml

@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import Quickshell.Hyprland
-
+import "../../../colors"
 
 Row {   // Workspace Row
     id: workspacesRow
@@ -17,8 +17,12 @@ Row {   // Workspace Row
             width: workspaceNum.width + 26
             height: workspaceNum.height + 8
             radius: 4
-            color: modelData.active ? "#4a93ff": "#333333"
-            border.color: "#555555"
+            color: workspaceButton.containsMouse ? Colors.tertiaryContainer
+                 : modelData.active ? Colors.primaryContainer
+                 : Colors.secondaryContainer
+            border.color: workspaceButton.containsMouse ? Colors.tertiaryContainer_fg
+                 : modelData.active ? Colors.primaryContainer_fg
+                 : Colors.secondaryContainer_fg
             border.width: 2
 
             MouseArea {
@@ -30,10 +34,7 @@ Row {   // Workspace Row
     
                 Rectangle {
                     anchors.fill: parent
-                    color: workspaceButton.containsMouse ? 
-                                modelData.active ? "#7fbaff" 
-                                : "#808080" 
-                            : "transparent"
+                    color:  "transparent"
                     radius: 6
                 }
             }
@@ -42,7 +43,9 @@ Row {   // Workspace Row
                 id: workspaceNum
                 text: modelData.id
                 anchors.centerIn: parent
-                color: modelData.active ? "#ffffff" : "#cccccc"
+                color: workspaceButton.containsMouse ? Colors.tertiary
+                     : modelData.active ? Colors.primary
+                     : Colors.secondary
                 font.pixelSize: 18
                 font.family: "Inter, sans-serif"
             }
@@ -53,7 +56,7 @@ Row {   // Workspace Row
     Text {
         visible: Hyprland.workspaces.length === 0
         text: "No Workspaces"
-        color: "#ffffff"
+        color: Colors.error
         font.pixelSize: 18
     }
 }