reorg bar

components/StyledLayoutSeparator.qml

@@ -0,0 +1,12 @@
+import qs.config
+import QtQuick
+import QtQuick.Layouts
+
+Rectangle {
+    color: Styling.theme.basecontent
+    opacity: 0.33
+    Layout.fillHeight: true
+    Layout.margins: 2
+    implicitWidth: 0.5
+    radius: 9999
+}

modules/bar/Bar.qml

@@ -28,7 +28,7 @@ StyledWrapperRectangle {
         RowLayout {
             id: leftbar
 
-            spacing: Styling.layout.spacing.base
+            spacing: Styling.layout.spacing.lg
 
             SystemLogo {
                 implicitSize: 22
@@ -44,7 +44,7 @@ StyledWrapperRectangle {
 
             Layout.alignment: Qt.AlignHCenter
 
-            spacing: Styling.layout.spacing.base
+            spacing: Styling.layout.spacing.lg
 
             Mpris {}
         }
@@ -54,18 +54,14 @@ StyledWrapperRectangle {
 
             Layout.alignment: Qt.AlignRight
 
-            spacing: Styling.layout.spacing.base
+            spacing: Styling.layout.spacing.lg
-
-            Pywal {}
 
             Pipewire {}
 
-            Caffeine {}
+            StyledLayoutSeparator {}
 
             Network {}
 
-            Bluetooth {}
-
             Storage {}
 
             Memory {}
@@ -74,10 +70,20 @@ StyledWrapperRectangle {
 
             Gpu {}
 
-            Power {}
+            StyledLayoutSeparator {}
+
+            Pywal {}
+
+            Caffeine {}
+
+            Bluetooth {}
+
+            StyledLayoutSeparator {}
 
             Clock {}
 
+            Power {}
+
             Notifications {}
         }
     }

modules/bar/components/Caffeine.qml

@@ -6,7 +6,7 @@ StyledIconButton {
     id: root
 
     border.width: 2
-    border.color: Caffeine.enabled ? Styling.theme.secondary : root.hovered ? Styling.theme.primary : Styling.theme.base300
+    border.color: Caffeine.enabled ? Styling.theme.secondary : root.hovered ? Styling.theme.primary : Styling.theme.base200
     text: Styling.lucide.icons.coffee
 
     onClicked: {

modules/bar/components/Clock.qml

@@ -1,12 +1,10 @@
 import qs.components
 import Quickshell
 
-StyledRectangle {
+StyledText {
-    StyledText {
+    text: ` ${Qt.formatDateTime(clock.date, "hh:mm:ss AP")}`
-        text: ` ${Qt.formatDateTime(clock.date, "hh:mm:ss AP")}`
+    SystemClock {
-        SystemClock {
+        id: clock
-            id: clock
+        precision: SystemClock.Seconds
-            precision: SystemClock.Seconds
-        }
     }
 }

modules/bar/components/Memory.qml

@@ -5,20 +5,17 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-StyledRectangle {
+RowLayout {
 
-    RowLayout {
+    Ref {
+        service: SystemInfo
+    }
 
-        Ref {
+    LucideIcon {
-            service: SystemInfo
+        text: Styling.lucide.icons.memoryStick
-        }
+    }
 
-        LucideIcon {
+    StyledText {
-            text: Styling.lucide.icons.memoryStick
+        text: ` ${(SystemInfo.memPerc * 100).toFixed()}%`
-        }
-
-        StyledText {
-            text: ` ${(SystemInfo.memPerc * 100).toFixed()}%`
-        }
     }
 }

modules/bar/components/Network.qml

@@ -5,51 +5,48 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-StyledRectangle {
+RowLayout {
 
-    RowLayout {
+    Ref {
+        service: NetworkService
+    }
 
-        Ref {
+    LucideIcon {
-            service: NetworkService
+        id: icon
-        }
+        text: Styling.lucide.icons.wifiOff
-
+        states: [
-        LucideIcon {
+            State {
-            id: icon
+                name: "high"
-            text: Styling.lucide.icons.wifiOff
+                when: NetworkService.active?.strength > 50
-            states: [
+                PropertyChanges {
-                State {
+                    icon {
-                    name: "high"
+                        text: Styling.lucide.icons.wifi
-                    when: NetworkService.active?.strength > 50
-                    PropertyChanges {
-                        icon {
-                            text: Styling.lucide.icons.wifi
-                        }
-                    }
-                },
-                State {
-                    name: "medium"
-                    when: NetworkService.active?.strength > 25
-                    PropertyChanges {
-                        icon {
-                            text: Styling.lucide.icons.wifiHigh
-                        }
-                    }
-                },
-                State {
-                    name: "low"
-                    when: NetworkService.active?.strength > 0
-                    PropertyChanges {
-                        icon {
-                            text: Styling.lucide.icons.wifiLow
-                        }
                     }
                 }
-            ]
+            },
-        }
+            State {
+                name: "medium"
+                when: NetworkService.active?.strength > 25
+                PropertyChanges {
+                    icon {
+                        text: Styling.lucide.icons.wifiHigh
+                    }
+                }
+            },
+            State {
+                name: "low"
+                when: NetworkService.active?.strength > 0
+                PropertyChanges {
+                    icon {
+                        text: Styling.lucide.icons.wifiLow
+                    }
+                }
+            }
+        ]
+    }
 
-        StyledText {
+    StyledText {
-            id: text
+        id: text
-            text: ` ${(NetworkService.active?.strength ?? 0).toFixed()}%`
+        text: ` ${(NetworkService.active?.strength ?? 0).toFixed()}%`
-        }
     }
 }

modules/bar/components/Storage.qml

@@ -5,22 +5,19 @@ import qs.utils
 import QtQuick
 import QtQuick.Layouts
 
-StyledRectangle {
+RowLayout {
 
-    RowLayout {
+    Ref {
+        service: SystemInfo
+    }
 
-        Ref {
+    LucideIcon {
-            service: SystemInfo
+        text: Styling.lucide.icons.hardDrive
-        }
+    }
 
-        LucideIcon {
+    StyledText {
-            text: Styling.lucide.icons.hardDrive
+        id: text
-        }
 
-        StyledText {
+        text: ` ${(SystemInfo.storagePerc * 100).toFixed()}%`
-            id: text
-
-            text: ` ${(SystemInfo.storagePerc * 100).toFixed()}%`
-        }
     }
 }