From 98f1aea6730ad2f3b2299e09c7db20daed5e0fd0 Mon Sep 17 00:00:00 2001
From: Benjamin Palko <benjaminpalko@hotmail.com>
Date: Sat, 19 Jul 2025 10:07:29 -0400
Subject: [PATCH] clock formatting

---
 config/Dimensions.qml            |  8 +++++---
 modules/bar/Bar.qml              |  6 +++---
 modules/bar/components/Clock.qml | 31 +++++++++++++------------------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/config/Dimensions.qml b/config/Dimensions.qml
index 2dbac22..c1dc50a 100644
--- a/config/Dimensions.qml
+++ b/config/Dimensions.qml
@@ -19,17 +19,19 @@ Singleton {
         property int border: 2
         property int height: 50
         property int verticalMargins: 4
-        property int horizontalMargins: 6
+        property int horizontalMargins: 8
         property int verticalPadding: 2
-        property int horizontalPadding: 6
+        property int horizontalPadding: 8
     }
 
     component Clock: QtObject {
         id: clock
 
         property int fontSize: 14
-        property int width: 230
+        property int width: 130
         property int height: 30
+        property int horizontalPadding: 8
+        property int verticalPadding: 6
     }
 
     component Workspace: QtObject {
diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 2461420..28a835c 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -64,14 +64,12 @@ Scope {
                 anchors.bottomMargin: Dimensions.bar.verticalPadding
 
                 spacing: Dimensions.bar.spacing
-
-                Clock {}
             }
 
             Row {
                 id: rightbar
 
-                anchors.right: parent.left
+                anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
 
                 anchors.rightMargin: Dimensions.bar.horizontalPadding
@@ -79,6 +77,8 @@ Scope {
                 anchors.bottomMargin: Dimensions.bar.verticalPadding
 
                 spacing: Dimensions.bar.spacing
+
+                Clock {}
             }
         }
     }
diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml
index 3e67674..fabe5cc 100644
--- a/modules/bar/components/Clock.qml
+++ b/modules/bar/components/Clock.qml
@@ -1,40 +1,35 @@
+import Quickshell
 import Quickshell.Io
 import QtQuick
-import "root:styled"
+import "../../../styled/"
 import "../../../config/"
 
 Item {
-    id: clock
+    id: root
 
     implicitWidth: Dimensions.clock.width
     implicitHeight: Dimensions.clock.height
 
     StyledLabel {
-      anchors.fill: text
+        anchors.fill: parent
+        anchors.centerIn: parent
     }
 
     StyledText {
         id: text
         anchors.centerIn: parent
+        topPadding: Dimensions.clock.verticalPadding
+        bottomPadding: Dimensions.clock.verticalPadding
+        leftPadding: Dimensions.clock.horizontalPadding
+        rightPadding: Dimensions.clock.horizontalPadding
 
         font.pixelSize: Dimensions.clock.fontSize
 
-        Process {
-            id: dateProc
+        text: ` ${Qt.formatDateTime(clock.date, "hh:mm:ss AP")}`
 
-            command: ["date"]
-            running: true
-
-            stdout: StdioCollector {
-                onStreamFinished: text.text = ` ${this.text}`
-            }
-        }
-
-        Timer {
-            interval: 1000
-            running: true
-            repeat: true
-            onTriggered: dateProc.running = true
+        SystemClock {
+            id: clock
+            precision: SystemClock.Seconds
         }
     }
 }