6 files changed, 115 insertions, 99 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp
index 929b7be6..df0c5781 100644
--- a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp
@@ -75,14 +75,10 @@ void Chrono::schedule(const std::chrono::time_point<std::chrono::system_clock>&
   this->timer.start(delay);
 }
 
-QString Chrono::format() const { return this->mFormat; }
-void Chrono::setFormat(QString format) {
-  if (format == this->mFormat) return;
-  this->mFormat = format;
-  emit this->formatChanged();
-  this->update();
+QString Chrono::format(const QString& fmt) const {
+  return QString::fromStdString(std::format(std::runtime_format(fmt.toStdString()), std::chrono::zoned_time(std::chrono::current_zone(), std::chrono::time_point_cast<std::chrono::seconds>(this->currentTime))));
 }
 
-QString Chrono::date() const {
-  return QString::fromStdString(std::format(std::runtime_format(this->mFormat.toStdString()), std::chrono::zoned_time(std::chrono::current_zone(), std::chrono::time_point_cast<std::chrono::seconds>(this->currentTime))));
+QDateTime Chrono::date() const {
+  return QDateTime::fromStdTimePoint(std::chrono::time_point_cast<std::chrono::milliseconds>(this->currentTime));
 }
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp
index 788fa88e..4d06007d 100644
--- a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QDateTime>
 #include <QObject>
 #include <QTimer>
 
@@ -10,8 +11,7 @@ class Chrono : public QObject {
   Q_OBJECT;
   Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged);
   Q_PROPERTY(Chrono::Precision precision READ precision WRITE setPrecision NOTIFY precisionChanged);
-  Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged);
-  Q_PROPERTY(QString date READ date NOTIFY dateChanged);
+  Q_PROPERTY(QDateTime date READ date NOTIFY dateChanged)
   QML_ELEMENT;
 
 public:
@@ -30,15 +30,13 @@ public:
   Chrono::Precision precision() const;
   void setPrecision(Chrono::Precision precision);
 
-  QString format() const;
-  void setFormat (QString format);
+  Q_INVOKABLE QString format(const QString& fmt) const;
 
-  QString date() const;
+  QDateTime date() const;
 
 signals:
   void enabledChanged();
   void precisionChanged();
-  void formatChanged();
   void dateChanged();
 
 private slots:
@@ -47,7 +45,6 @@ private slots:
 private:
   bool mEnabled = true;
   Chrono::Precision mPrecision = Chrono::Seconds;
-  QString mFormat = "{:%c}";
   QTimer timer;
   std::chrono::time_point<std::chrono::system_clock> currentTime, targetTime;
 
diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
index 55fabd1c..a1872ff5 100644
--- a/accounts/gkleen@sif/shell/quickshell/Clock.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts
 import Quickshell.Widgets
 
 Item {
+  id: clockItem
+
   width: clock.contentWidth
   height: parent.height
   anchors.verticalCenter: parent.verticalCenter
@@ -30,22 +32,25 @@ Item {
 
     onWheel: event => scrollYear(event)
 
-    Text {
-      id: clock
-      color: "white"
+    Item {
+      anchors.fill: parent
+
+      Text {
+        id: clock
+        color: "white"
 
-      anchors.verticalCenter: parent.verticalCenter
+        anchors.verticalCenter: parent.verticalCenter
 
-      Custom.Chrono {
-        id: chrono
-        format: "W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}"
-      }
+        Custom.Chrono {
+          id: chrono
 
-      text: chrono.date
+          onDateChanged: clock.text = format("W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}")
+        }
 
-      font.pointSize: 10
-      font.family: "Fira Sans"
-      font.features: { "tnum": 1 }
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        font.features: { "tnum": 1 }
+      }
     }
   }
 
@@ -73,8 +78,7 @@ Item {
     color: "black"
 
     onVisibleChanged: {
-      const d = new Date();
-      yearCalendar.year = d.getFullYear();
+      yearCalendar.year = chrono.date.getFullYear();
       clockMouseArea.angleRem = 0;
     }
 
@@ -112,7 +116,7 @@ Item {
           }
 
           GridLayout {
-            property int year: { const d = new Date(); return d.getFullYear(); }
+            property int year: chrono.date.getFullYear()
 
             id: yearCalendar
 
@@ -146,10 +150,7 @@ Item {
                   font.pointSize: 10
                   font.family: "Fira Sans"
 
-                  text: {
-                    const date = Date.fromLocaleDateString(Qt.locale(), `${yearCalendar.year}-${monthCalendar.month + 1}-01`, "yyyy-M-dd");
-                    return date.toLocaleString(Qt.locale("en_DK"), "MMMM")
-                  }
+                  text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
 
                   color: "#ffead3"
                 }
@@ -236,8 +237,10 @@ Item {
                       font.family: "Fira Sans"
                       font.features: { "tnum": 1 }
 
+                      property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day
+
                       text: model.day
-                      color: model.today ? "#ff6699" : "white"
+                      color: today ? "#ff6699" : "white"
 
                       horizontalAlignment: Text.AlignRight
                       verticalAlignment: Text.AlignVCenter
diff --git a/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
index 4a6b8390..bc3750f9 100644
--- a/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
+++ b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
@@ -3,18 +3,8 @@ import QtQuick
 import qs.Services
 import Quickshell.Widgets
 
-Rectangle {
-  id: kbdWidget
-
-  property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
-
+Item {
   width: kbdLabel.contentWidth + 8
-  color: {
-    if (kbdMouseArea.containsMouse) {
-      return "#33808080";
-    }
-    return "transparent";
-  }
   height: parent.height
   anchors.verticalCenter: parent.verticalCenter
 
@@ -22,6 +12,7 @@ Rectangle {
     id: kbdMouseArea
 
     anchors.fill: parent
+
     hoverEnabled: true
     cursorShape: Qt.PointingHandCursor
     enabled: true
@@ -32,23 +23,37 @@ Rectangle {
       NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": event.angleDelta > 0 ? "Next" : "Prev" } } }, _ => {})
     }
 
-    Text {
-      id: kbdLabel
+    Rectangle {
+      id: kbdWidget
 
-      font.pointSize: 10
-      font.family: "Fira Sans"
+      property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
+
+      anchors.fill: parent
       color: {
-        if (NiriService.keyboardLayouts?.current_idx === 0)
-          return "#555";
-        return "white";
+        if (kbdMouseArea.containsMouse) {
+          return "#33808080";
+        }
+        return "transparent";
       }
-      anchors.centerIn: parent
 
-      text: {
-        const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
-        if (!currentLayout)
-          return "";
-        return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
+      Text {
+        id: kbdLabel
+
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        color: {
+          if (NiriService.keyboardLayouts?.current_idx === 0)
+            return "#555";
+          return "white";
+        }
+        anchors.centerIn: parent
+
+        text: {
+          const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
+          if (!currentLayout)
+            return "";
+          return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
+        }
       }
     }
   }
diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
index 024026a3..55b1690e 100644
--- a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
+++ b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
@@ -17,10 +17,12 @@ Item {
     spacing: 0
 
     Repeater {
-      model: {
-        var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
-        trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
-        return trayItems;
+      model: ScriptModel {
+        values: {
+          var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
+          trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
+          return trayItems;
+        }
       }
 
       delegate: Item {
diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
index 153c56bb..9546abb4 100644
--- a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
+++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
@@ -1,5 +1,7 @@
+import Quickshell
 import QtQuick
 import qs.Services
+import Quickshell.Widgets
 
 Row {
   id: workspaces
@@ -11,61 +13,72 @@ Row {
   spacing: 0
 
   Repeater {
-    model: {
-      let currWorkspaces = NiriService.workspaces;
-      const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
-      currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
-      currWorkspaces.sort((a, b) => {
-        if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
-          return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
-        if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
-          return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
-        return a.idx - b.idx;
-      });
-      return currWorkspaces;
+    model: ScriptModel {
+      values: {
+        let currWorkspaces = NiriService.workspaces;
+        const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
+        currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
+        currWorkspaces.sort((a, b) => {
+          if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
+            return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
+          if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
+            return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
+          return a.idx - b.idx;
+        });
+        return currWorkspaces;
+      }
     }
 
-    Rectangle {
+    Item {
+      id: wsItem
+
       property var workspaceData: modelData
 
       width: wsLabel.contentWidth + 8
-      color: {
-        if (mouseArea.containsMouse) {
-          return "#33808080";
-        }
-        return "transparent";
-      }
       height: parent.height
       anchors.verticalCenter: parent.verticalCenter
 
-      MouseArea {
+      WrapperMouseArea {
         id: mouseArea
 
         anchors.fill: parent
+
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
         enabled: true
         onClicked: {
           NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {})
         }
-      }
 
-      Text {
-        id: wsLabel
-
-        font.pointSize: 10
-        font.family: "Fira Sans"
-        color: {
-          if (workspaceData.is_active)
-            return "#23fd00";
-          if (workspaceData.active_window_id === null)
-            return "#555";
-          return "white";
-        }
-        anchors.centerIn: parent
+        Rectangle {
+          anchors.fill: parent
+
+          color: {
+            if (mouseArea.containsMouse) {
+              return "#33808080";
+            }
+            return "transparent";
+          }
+
+          Text {
+            id: wsLabel
 
-        text: workspaceData.name ? workspaceData.name : workspaceData.idx
+            anchors.centerIn: parent
+
+            font.pointSize: 10
+            font.family: "Fira Sans"
+            color: {
+              if (workspaceData.is_active)
+                return "#23fd00";
+              if (workspaceData.active_window_id === null)
+                return "#555";
+              return "white";
+            }
+
+            text: workspaceData.name ? workspaceData.name : workspaceData.idx
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}