diff --git a/components/StyledLayoutSeparator.qml b/components/StyledLayoutSeparator.qml new file mode 100644 index 0000000..e5b0295 --- /dev/null +++ b/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 +} diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 37d8226..afa5947 100644 --- a/modules/bar/Bar.qml +++ b/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 - - Pywal {} + spacing: Styling.layout.spacing.lg Pipewire {} - Caffeine {} + StyledLayoutSeparator {} Network {} - Bluetooth {} - Storage {} Memory {} @@ -74,10 +70,20 @@ StyledWrapperRectangle { Gpu {} - Power {} + StyledLayoutSeparator {} + + Pywal {} + + Caffeine {} + + Bluetooth {} + + StyledLayoutSeparator {} Clock {} + Power {} + Notifications {} } } diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml index 3ddb5a7..1941417 100644 --- a/modules/bar/components/Clock.qml +++ b/modules/bar/components/Clock.qml @@ -1,12 +1,10 @@ import qs.components import Quickshell -StyledRectangle { - StyledText { - text: ` ${Qt.formatDateTime(clock.date, "hh:mm:ss AP")}` - SystemClock { - id: clock - precision: SystemClock.Seconds - } +StyledText { + text: ` ${Qt.formatDateTime(clock.date, "hh:mm:ss AP")}` + SystemClock { + id: clock + precision: SystemClock.Seconds } } diff --git a/modules/bar/components/Memory.qml b/modules/bar/components/Memory.qml index 55f90df..deafda7 100644 --- a/modules/bar/components/Memory.qml +++ b/modules/bar/components/Memory.qml @@ -5,20 +5,17 @@ import qs.utils import QtQuick import QtQuick.Layouts -StyledRectangle { +RowLayout { - RowLayout { + Ref { + service: SystemInfo + } - Ref { - service: SystemInfo - } + LucideIcon { + text: Styling.lucide.icons.memoryStick + } - LucideIcon { - text: Styling.lucide.icons.memoryStick - } - - StyledText { - text: ` ${(SystemInfo.memPerc * 100).toFixed()}%` - } + StyledText { + text: ` ${(SystemInfo.memPerc * 100).toFixed()}%` } } diff --git a/modules/bar/components/Network.qml b/modules/bar/components/Network.qml index 57a0905..7b65d2c 100644 --- a/modules/bar/components/Network.qml +++ b/modules/bar/components/Network.qml @@ -5,51 +5,48 @@ import qs.utils import QtQuick import QtQuick.Layouts -StyledRectangle { +RowLayout { - RowLayout { + Ref { + service: NetworkService + } - Ref { - service: NetworkService - } - - LucideIcon { - id: icon - text: Styling.lucide.icons.wifiOff - states: [ - State { - name: "high" - 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 - } + LucideIcon { + id: icon + text: Styling.lucide.icons.wifiOff + states: [ + State { + name: "high" + 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 + } + } + } + ] + } - StyledText { - id: text - text: ` ${(NetworkService.active?.strength ?? 0).toFixed()}%` - } + StyledText { + id: text + text: ` ${(NetworkService.active?.strength ?? 0).toFixed()}%` } } diff --git a/modules/bar/components/Storage.qml b/modules/bar/components/Storage.qml index 0a1d2b7..7450969 100644 --- a/modules/bar/components/Storage.qml +++ b/modules/bar/components/Storage.qml @@ -5,22 +5,19 @@ import qs.utils import QtQuick import QtQuick.Layouts -StyledRectangle { +RowLayout { - RowLayout { + Ref { + service: SystemInfo + } - Ref { - service: SystemInfo - } + LucideIcon { + text: Styling.lucide.icons.hardDrive + } - LucideIcon { - text: Styling.lucide.icons.hardDrive - } + StyledText { + id: text - StyledText { - id: text - - text: ` ${(SystemInfo.storagePerc * 100).toFixed()}%` - } + text: ` ${(SystemInfo.storagePerc * 100).toFixed()}%` } }