diff --git a/settings/hyprland.nix b/settings/hyprland.nix index 1794d2a..a0308d4 100644 --- a/settings/hyprland.nix +++ b/settings/hyprland.nix @@ -1864,62 +1864,35 @@ in NumberAnimation { duration: 150; easing.type: Easing.OutCubic } } - Rectangle { - width: 7 * 32 + 8 - height: calTitle.height + 12 - radius: 8 - color: Theme.base02 - anchors.horizontalCenter: parent.horizontalCenter + Text { + id: calTitle + anchors.horizontalCenter: parent.horizontalCenter + text: clockText.now.toLocaleDateString(Qt.locale(), "dddd, d MMMM yyyy") + color: Theme.base05 + font.family: "FiraMono Nerd Font" + font.pixelSize: 16 + font.weight: Font.Medium + } - Text { - id: calTitle - anchors.centerIn: parent - text: clockText.now.toLocaleDateString(Qt.locale(), "dddd, d MMMM yyyy") - color: Theme.base05 - font.family: "FiraMono Nerd Font" - font.pixelSize: 16 - font.weight: Font.Medium - } + Row { + id: weekdayRow + anchors.horizontalCenter: parent.horizontalCenter + spacing: 0 + Repeater { + model: ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"] + Text { + required property var modelData + width: 32 + horizontalAlignment: Text.AlignHCenter + text: modelData + color: Theme.base04 + font.family: "FiraMono Nerd Font" + font.pixelSize: 13 } + } + } - Rectangle { - width: 7 * 32 + 8 - height: calInner.height + 12 - radius: 8 - color: Theme.base02 - anchors.horizontalCenter: parent.horizontalCenter - - Column { - id: calInner - anchors.centerIn: parent - spacing: 4 - - Rectangle { - width: 7 * 32 - height: weekdayRow.height + 8 - radius: 6 - color: Theme.base03 - - Row { - id: weekdayRow - anchors.centerIn: parent - spacing: 0 - Repeater { - model: ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"] - Text { - required property var modelData - width: 32 - horizontalAlignment: Text.AlignHCenter - text: modelData - color: Theme.base00 - font.family: "FiraMono Nerd Font" - font.pixelSize: 13 - } - } - } - } - - Grid { + Grid { columns: 7 spacing: 0 @@ -1963,17 +1936,15 @@ in font.pixelSize: 13 } } - } - } - } - } + } + } - Rectangle { - width: 7 * 32 + 8 - height: 1 - color: Theme.base02 - anchors.horizontalCenter: parent.horizontalCenter - } + Rectangle { + width: 7 * 32 + 8 + height: 1 + color: Theme.base02 + anchors.horizontalCenter: parent.horizontalCenter + } Row { width: 7 * 32 + 8