calendar: rename dcal binary

- Add keyboard navigation to overview
- Add edit events to overview
- Add create events to overview
- Add setting for auto/khal/dankcalendar backend selection

quickshell/Common/DankSocket.qml

@@ -7,29 +7,31 @@ Item {
     property alias path: socket.path
     property alias parser: socket.parser
     property bool connected: false
+    property bool linkUp: false
 
     property int reconnectBaseMs: 400
     property int reconnectMaxMs: 15000
 
     property int _reconnectAttempt: 0
 
-    signal connectionStateChanged()
+    signal connectionStateChanged
 
     onConnectedChanged: {
-        socket.connected = connected
+        socket.connected = connected;
     }
 
     Socket {
         id: socket
 
         onConnectionStateChanged: {
-            root.connectionStateChanged()
+            root.linkUp = connected;
+            root.connectionStateChanged();
             if (connected) {
-                root._reconnectAttempt = 0
+                root._reconnectAttempt = 0;
-                return
+                return;
             }
             if (root.connected) {
-                root._scheduleReconnect()
+                root._scheduleReconnect();
             }
         }
     }
@@ -39,24 +41,24 @@ Item {
         interval: 0
         repeat: false
         onTriggered: {
-            socket.connected = false
+            socket.connected = false;
-            Qt.callLater(() => socket.connected = true)
+            Qt.callLater(() => socket.connected = true);
         }
     }
 
     function send(data) {
-        const json = typeof data === "string" ? data : JSON.stringify(data)
+        const json = typeof data === "string" ? data : JSON.stringify(data);
-        const message = json.endsWith("\n") ? json : json + "\n"
+        const message = json.endsWith("\n") ? json : json + "\n";
-        socket.write(message)
+        socket.write(message);
-        socket.flush()
+        socket.flush();
     }
 
     function _scheduleReconnect() {
-        const pow = Math.min(_reconnectAttempt, 10)
+        const pow = Math.min(_reconnectAttempt, 10);
-        const base = Math.min(reconnectBaseMs * Math.pow(2, pow), reconnectMaxMs)
+        const base = Math.min(reconnectBaseMs * Math.pow(2, pow), reconnectMaxMs);
-        const jitter = Math.floor(Math.random() * Math.floor(base / 4))
+        const jitter = Math.floor(Math.random() * Math.floor(base / 4));
-        reconnectTimer.interval = base + jitter
+        reconnectTimer.interval = base + jitter;
-        reconnectTimer.restart()
+        reconnectTimer.restart();
-        _reconnectAttempt++
+        _reconnectAttempt++;
     }
 }

quickshell/Common/SettingsData.qml

@@ -182,6 +182,7 @@ Singleton {
 
     property int firstDayOfWeek: -1
     property bool showWeekNumber: false
+    property string calendarBackend: "auto"
     property bool use24HourClock: true
     property bool showSeconds: false
     property bool padHours12Hour: false

quickshell/Common/settings/SettingsSpec.js

@@ -37,6 +37,7 @@ var SPEC = {
 
     firstDayOfWeek: { def: -1 },
     showWeekNumber: { def: false },
+    calendarBackend: { def: "auto" },
     use24HourClock: { def: true },
     showSeconds: { def: false },
     padHours12Hour: { def: false },

quickshell/DMSShellIPC.qml

@@ -956,7 +956,7 @@ Item {
 
         function tabs(): string {
             if (!PopoutService.settingsModal)
-                return "wallpaper\ntheme\ntypography\ntime_weather\nsounds\ndankbar\ndankbar_settings\ndankbar_appearance\ndankbar_widgets\nframe\nworkspaces\ncompositor\nmedia_player\nnotifications\nosd\nrunning_apps\nupdater\ndock\nlauncher\nkeybinds\ndisplays\nnetwork\nprinters\nlock_screen\npower_sleep\nplugins\nabout";
+                return "wallpaper\ntheme\ntypography\ntime_weather\nsounds\ndankbar\ndankbar_settings\ndankbar_appearance\ndankbar_widgets\nframe\nworkspaces\ncompositor\nmedia_player\nnotifications\nosd\nrunning_apps\nupdater\ndock\nlauncher\nkeybinds\ndisplays\nnetwork\nnetwork_status\nnetwork_ethernet\nnetwork_wifi\nnetwork_vpn\nprinters\nlock_screen\npower_sleep\nplugins\nabout";
             var modal = PopoutService.settingsModal;
             var ids = [];
             var structure = modal.sidebar?.categoryStructure ?? [];

quickshell/Modals/Settings/SettingsContent.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import qs.Common
 import qs.Modules.Settings
+import qs.Services
 import qs.Widgets
 
 FocusScope {
@@ -232,7 +233,52 @@ FocusScope {
             visible: active
             focus: active
 
-            sourceComponent: NetworkTab {}
+            sourceComponent: NetworkStatusTab {}
+
+            onActiveChanged: {
+                if (active && item)
+                    Qt.callLater(() => item.forceActiveFocus());
+            }
+        }
+
+        Loader {
+            id: networkEthernetLoader
+            anchors.fill: parent
+            active: root.currentIndex === 39
+            visible: active
+            focus: active
+
+            sourceComponent: NetworkEthernetTab {}
+
+            onActiveChanged: {
+                if (active && item)
+                    Qt.callLater(() => item.forceActiveFocus());
+            }
+        }
+
+        Loader {
+            id: networkWifiLoader
+            anchors.fill: parent
+            active: root.currentIndex === 40
+            visible: active
+            focus: active
+
+            sourceComponent: NetworkWifiTab {}
+
+            onActiveChanged: {
+                if (active && item)
+                    Qt.callLater(() => item.forceActiveFocus());
+            }
+        }
+
+        Loader {
+            id: networkVpnLoader
+            anchors.fill: parent
+            active: root.currentIndex === 41
+            visible: active
+            focus: active
+
+            sourceComponent: NetworkVpnTab {}
 
             onActiveChanged: {
                 if (active && item)

quickshell/Modals/Settings/SettingsModal.qml

@@ -53,20 +53,21 @@ FloatingWindow {
         visible = !visible;
     }
 
-    function showWithTab(tabIndex: int) {
+    function setTabIndex(tabIndex: int) {
-        if (tabIndex >= 0) {
+        if (tabIndex < 0)
+            return;
         currentTabIndex = tabIndex;
         sidebar.autoExpandForTab(tabIndex);
     }
+
+    function showWithTab(tabIndex: int) {
+        setTabIndex(tabIndex);
         visible = true;
     }
 
     function showWithTabName(tabName: string) {
         var idx = sidebar.resolveTabIndex(tabName);
-        if (idx >= 0) {
+        setTabIndex(idx);
-            currentTabIndex = idx;
-            sidebar.autoExpandForTab(idx);
-        }
         visible = true;
     }
 

quickshell/Modals/Settings/SettingsSidebar.qml

@@ -238,8 +238,33 @@ Rectangle {
             "id": "network",
             "text": I18n.tr("Network"),
             "icon": "wifi",
-            "tabIndex": 7,
+            "dmsOnly": true,
-            "dmsOnly": true
+            "children": [
+                {
+                    "id": "network_status",
+                    "text": I18n.tr("Status"),
+                    "icon": "lan",
+                    "tabIndex": 7
+                },
+                {
+                    "id": "network_ethernet",
+                    "text": I18n.tr("Ethernet"),
+                    "icon": "settings_ethernet",
+                    "tabIndex": 39
+                },
+                {
+                    "id": "network_wifi",
+                    "text": I18n.tr("WiFi"),
+                    "icon": "wifi",
+                    "tabIndex": 40
+                },
+                {
+                    "id": "network_vpn",
+                    "text": I18n.tr("VPN"),
+                    "icon": "vpn_key",
+                    "tabIndex": 41
+                }
+            ]
         },
         {
             "id": "applications",

quickshell/Modules/ControlCenter/Details/NetworkDetail.qml

@@ -151,7 +151,7 @@ Rectangle {
                 iconColor: Theme.surfaceVariantText
                 onClicked: {
                     PopoutService.closeControlCenter();
-                    PopoutService.openSettingsWithTab("network");
+                    PopoutService.openSettingsWithTab(currentPreferenceIndex === 0 ? "network_ethernet" : "network_wifi");
                 }
             }
         }

quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -1179,11 +1179,12 @@ BasePill {
         }
 
         function updatePosition() {
-            const globalPos = root.mapToGlobal(0, 0);
+            // Window-local maps directly to screen-local because the bar window spans the
-            const screenX = screen.x || 0;
+            // full screen edge; this avoids mixing mapToGlobal with a separately-tracked
-            const screenY = screen.y || 0;
+            // screen.x/.y origin, which desync on non-primary monitors and after DPMS/hotplug.
-            const relativeX = globalPos.x - screenX;
+            const localPos = root.mapToItem(null, 0, 0);
-            const relativeY = globalPos.y - screenY;
+            const relativeX = localPos.x;
+            const relativeY = localPos.y;
 
             if (root.isVerticalOrientation) {
                 const edge = root.axis?.edge;
@@ -1722,11 +1723,13 @@ BasePill {
                             anchorPos = Qt.point(targetX, targetY);
                         }
                     } else {
-                        const globalPos = targetItem.mapToGlobal(0, 0);
+                        // Window-local maps directly to screen-local because the bar window spans
-                        const screenX = screen.x || 0;
+                        // the full screen edge; this avoids mixing mapToGlobal with a separately-
-                        const screenY = screen.y || 0;
+                        // tracked screen.x/.y origin, which desync on non-primary monitors and after
-                        const relativeX = globalPos.x - screenX;
+                        // DPMS/hotplug.
-                        const relativeY = globalPos.y - screenY;
+                        const localPos = targetItem.mapToItem(null, 0, 0);
+                        const relativeX = localPos.x;
+                        const relativeY = localPos.y;
 
                         if (menuRoot.isVertical) {
                             const edge = menuRoot.axis?.edge;

quickshell/Modules/DankDash/DankDashPopout.qml

@@ -227,6 +227,13 @@ DankPopout {
                     return;
                 }
 
+                if (root.currentTabIndex === 0 && overviewLoader.item?.handleKeyEvent) {
+                    if (overviewLoader.item.handleKeyEvent(event)) {
+                        event.accepted = true;
+                        return;
+                    }
+                }
+
                 if (root.currentTabIndex === 1 && mediaLoader.item?.handleKeyEvent) {
                     if (mediaLoader.item.handleKeyEvent(event)) {
                         event.accepted = true;
@@ -356,6 +363,7 @@ DankPopout {
                         sourceComponent: Component {
                             OverviewTab {
                                 onCloseDash: root.dashVisible = false
+                                onNavFocusRequested: mainContainer.forceActiveFocus()
                                 onSwitchToWeatherTab: {
                                     if (SettingsData.weatherEnabled) {
                                         root.currentTabIndex = 3;

quickshell/Modules/DankDash/Overview/CalendarEventDetail.qml

@@ -0,0 +1,311 @@
+import QtQuick
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: root
+
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
+    property var eventData: null
+    property bool canEdit: false
+
+    signal editRequested
+    signal deleteRequested
+    signal closeRequested
+
+    readonly property bool _descriptionIsHtml: /<[a-z][^>]*>/i.test((eventData && eventData.description) || "")
+
+    function _styleAnchors(html) {
+        return html.replace(/<a\s([^>]*)>/gi, (m, attrs) => {
+            const cleaned = attrs.replace(/style="[^"]*"/gi, "");
+            return "<a style=\"text-decoration:none; color:" + Theme.primary + ";\" " + cleaned + ">";
+        });
+    }
+
+    function _inlineMarkdown(line) {
+        let out = line.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+        out = out.replace(/\\([\\`*_{}[\]()#+\-.!~>])/g, "$1");
+        out = out.replace(/(?:https?:\/\/|www\.)[^\s<>)\]]*[^\s<>)\].,;:!?"']/g, (m, offset, s) => {
+            const prev = offset > 0 ? s[offset - 1] : "";
+            if (prev === "(" || prev === "[" || prev === "\"" || prev === "'")
+                return m;
+            const href = m.startsWith("www.") ? "https://" + m : m;
+            return "<a href=\"" + href + "\">" + m + "</a>";
+        });
+        out = out.replace(/\[([^\]]+)\]\(([^()\s]+)\)/g, "<a href=\"$2\">$1</a>");
+        out = out.replace(/\*\*([^*]+)\*\*/g, "<b>$1</b>");
+        out = out.replace(/(^|[^*])\*([^*\s][^*]*)\*/g, "$1<i>$2</i>");
+        return out;
+    }
+
+    // Descriptions arrive as HTML (Google) or markdown/plain text; both render
+    // as RichText so links become clickable anchors recolored to the theme.
+    function _descriptionRichText() {
+        const raw = ((eventData && eventData.description) || "").trim();
+        if (raw === "")
+            return "";
+        if (_descriptionIsHtml)
+            return _styleAnchors(raw);
+
+        const parts = [];
+        let list = "";
+        const closeList = () => {
+            if (list === "")
+                return;
+            parts.push("</" + list + ">");
+            list = "";
+        };
+
+        const lines = raw.split("\n");
+        for (let i = 0; i < lines.length; i++) {
+            const ul = lines[i].match(/^\s*[-*+]\s+(.+)$/);
+            const ol = lines[i].match(/^\s*\d+[.)]\s+(.+)$/);
+            if (ul || ol) {
+                const tag = ul ? "ul" : "ol";
+                if (list !== tag) {
+                    closeList();
+                    parts.push("<" + tag + ">");
+                    list = tag;
+                }
+                parts.push("<li>" + _inlineMarkdown((ul || ol)[1]) + "</li>");
+                continue;
+            }
+            closeList();
+            parts.push(_inlineMarkdown(lines[i]) + "<br/>");
+        }
+        closeList();
+        return _styleAnchors(parts.join("").replace(/<br\/>$/, ""));
+    }
+
+    function _timeText() {
+        if (!eventData)
+            return "";
+        const dateStr = Qt.formatDate(eventData.start, "ddd, MMM d");
+        if (eventData.allDay)
+            return I18n.tr("All day") + " · " + dateStr;
+        const fmt = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
+        const startStr = Qt.formatTime(eventData.start, fmt);
+        if (eventData.start.getTime() === eventData.end.getTime())
+            return dateStr + " · " + startStr;
+        return dateStr + " · " + startStr + " – " + Qt.formatTime(eventData.end, fmt);
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        radius: Theme.cornerRadius
+        color: Qt.rgba(0, 0, 0, 0.45)
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: root.closeRequested()
+        }
+    }
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: Math.min(parent.width - Theme.spacingL * 2, 380)
+        height: Math.min(parent.height - Theme.spacingM * 2, body.implicitHeight + Theme.spacingL * 2)
+        radius: Theme.cornerRadius
+        color: Theme.surfaceContainerHigh
+        border.color: Theme.outlineMedium
+        border.width: 1
+        clip: true
+
+        MouseArea {
+            anchors.fill: parent
+        }
+
+        DankActionButton {
+            id: closeButton
+            anchors.top: parent.top
+            anchors.right: parent.right
+            anchors.margins: Theme.spacingXS
+            circular: false
+            iconName: "close"
+            iconSize: 16
+            z: 1
+            onClicked: root.closeRequested()
+        }
+
+        DankFlickable {
+            anchors.fill: parent
+            anchors.margins: Theme.spacingL
+            anchors.topMargin: Theme.spacingL
+            contentWidth: width
+            contentHeight: body.implicitHeight
+            clip: true
+
+            Column {
+                id: body
+                width: parent.width
+                spacing: Theme.spacingS
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingS
+
+                    Rectangle {
+                        width: 4
+                        height: titleText.implicitHeight
+                        radius: 2
+                        anchors.top: parent.top
+                        color: (root.eventData && root.eventData.color) ? root.eventData.color : Theme.primary
+                    }
+
+                    StyledText {
+                        id: titleText
+                        width: parent.width - 4 - Theme.spacingS - closeButton.width
+                        text: root.eventData ? root.eventData.title : ""
+                        font.pixelSize: Theme.fontSizeLarge
+                        font.weight: Font.Medium
+                        color: Theme.surfaceText
+                        horizontalAlignment: Text.AlignLeft
+                        wrapMode: Text.Wrap
+                        maximumLineCount: 3
+                        elide: Text.ElideRight
+                    }
+                }
+
+                StyledText {
+                    width: parent.width
+                    text: root._timeText()
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.surfaceVariantText
+                    wrapMode: Text.Wrap
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingXS
+                    visible: root.eventData && root.eventData.calendar
+
+                    DankIcon {
+                        name: "calendar_month"
+                        size: 14
+                        color: Theme.surfaceVariantText
+                        anchors.top: parent.top
+                        anchors.topMargin: 2
+                    }
+
+                    StyledText {
+                        width: parent.width - 14 - Theme.spacingXS
+                        text: {
+                            if (!root.eventData)
+                                return "";
+                            const acc = root.eventData.account || "";
+                            return root.eventData.calendar + (acc ? " · " + acc : "");
+                        }
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        wrapMode: Text.Wrap
+                        maximumLineCount: 2
+                        elide: Text.ElideRight
+                    }
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingXS
+                    visible: root.eventData && root.eventData.location
+
+                    DankIcon {
+                        name: "place"
+                        size: 14
+                        color: Theme.surfaceVariantText
+                        anchors.top: parent.top
+                        anchors.topMargin: 2
+                    }
+
+                    StyledText {
+                        width: parent.width - 14 - Theme.spacingXS
+                        text: root.eventData ? root.eventData.location : ""
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        wrapMode: Text.Wrap
+                        maximumLineCount: 2
+                        elide: Text.ElideRight
+                    }
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingXS
+                    visible: root.eventData && root.eventData.url
+
+                    DankIcon {
+                        name: "link"
+                        size: 14
+                        color: Theme.primary
+                        anchors.top: parent.top
+                        anchors.topMargin: 2
+                    }
+
+                    StyledText {
+                        width: parent.width - 14 - Theme.spacingXS
+                        text: root.eventData ? root.eventData.url : ""
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.primary
+                        wrapMode: Text.WrapAnywhere
+                        maximumLineCount: 2
+                        elide: Text.ElideRight
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: Qt.PointingHandCursor
+                            onClicked: {
+                                if (root.eventData && root.eventData.url)
+                                    Qt.openUrlExternally(root.eventData.url);
+                            }
+                        }
+                    }
+                }
+
+                StyledText {
+                    id: descriptionText
+                    width: parent.width
+                    text: root._descriptionRichText()
+                    visible: root.eventData && root.eventData.description
+                    textFormat: Text.RichText
+                    linkColor: Theme.primary
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.surfaceText
+                    horizontalAlignment: Text.AlignLeft
+                    wrapMode: Text.Wrap
+                    onLinkActivated: link => Qt.openUrlExternally(link)
+
+                    MouseArea {
+                        anchors.fill: parent
+                        acceptedButtons: Qt.NoButton
+                        cursorShape: descriptionText.hoveredLink !== "" ? Qt.PointingHandCursor : Qt.ArrowCursor
+                    }
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingS
+                    visible: root.canEdit
+                    topPadding: Theme.spacingXS
+
+                    DankButton {
+                        text: I18n.tr("Edit")
+                        iconName: "edit"
+                        buttonHeight: 32
+                        onClicked: root.editRequested()
+                    }
+
+                    DankButton {
+                        text: I18n.tr("Delete")
+                        iconName: "delete"
+                        buttonHeight: 32
+                        backgroundColor: Theme.withAlpha(Theme.error, 0.15)
+                        textColor: Theme.error
+                        onClicked: root.deleteRequested()
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/DankDash/Overview/CalendarEventEditor.qml

@@ -0,0 +1,350 @@
+import QtQuick
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: root
+
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
+    property var eventData: null
+    property date initialDate: new Date()
+
+    signal saved
+    signal closeRequested
+
+    property string fTitle: ""
+    property bool fAllDay: false
+    property date fDate: initialDate
+    property string fStart: "10:00"
+    property string fEnd: "11:00"
+    property string fLocation: ""
+    property string fDescription: ""
+    property string fCalendarId: ""
+    property int fReminder: -1
+    property string errorText: ""
+    property bool saving: false
+
+    readonly property var _cals: CalendarService.writableCalendars()
+    readonly property var _remLabels: [I18n.tr("No reminder"), I18n.tr("At start"), I18n.tr("5 min before"), I18n.tr("10 min before"), I18n.tr("15 min before"), I18n.tr("30 min before"), I18n.tr("1 hour before"), I18n.tr("1 day before")]
+    readonly property var _remMins: [-1, 0, 5, 10, 15, 30, 60, 1440]
+
+    function _parseTime(value) {
+        const m = value.trim().match(/^(\d{1,2}):(\d{2})$/);
+        if (!m)
+            return null;
+        const h = parseInt(m[1]);
+        const min = parseInt(m[2]);
+        if (h > 23 || min > 59)
+            return null;
+        return {
+            "h": h,
+            "m": min
+        };
+    }
+
+    function _isoFromDateTime(dateObj, h, m) {
+        const d = new Date(dateObj);
+        d.setHours(h, m, 0, 0);
+        return d.toISOString();
+    }
+
+    function _allDayIso(dateObj, dayOffset) {
+        return new Date(Date.UTC(dateObj.getFullYear(), dateObj.getMonth(), dateObj.getDate() + dayOffset)).toISOString();
+    }
+
+    function _calendarName(id) {
+        for (let i = 0; i < _cals.length; i++) {
+            if (_cals[i].id === id)
+                return _cals[i].name;
+        }
+        return _cals.length > 0 ? _cals[0].name : "";
+    }
+
+    function save() {
+        const title = fTitle.trim();
+        if (!title) {
+            errorText = I18n.tr("Title is required");
+            return;
+        }
+        let calId = fCalendarId;
+        if (!calId) {
+            const def = CalendarService.defaultCalendar();
+            calId = def ? def.id : "";
+        }
+        if (!calId) {
+            errorText = I18n.tr("No writable calendar available");
+            return;
+        }
+        let startIso, endIso;
+        if (fAllDay) {
+            startIso = _allDayIso(fDate, 0);
+            endIso = _allDayIso(fDate, 1);
+        } else {
+            const s = _parseTime(fStart);
+            const e = _parseTime(fEnd);
+            if (!s || !e) {
+                errorText = I18n.tr("Use HH:MM time format");
+                return;
+            }
+            startIso = _isoFromDateTime(fDate, s.h, s.m);
+            endIso = _isoFromDateTime(fDate, e.h, e.m);
+            if (new Date(endIso).getTime() <= new Date(startIso).getTime()) {
+                errorText = I18n.tr("End must be after start");
+                return;
+            }
+        }
+        const fields = {
+            "calendarId": calId,
+            "summary": title,
+            "description": fDescription,
+            "location": fLocation,
+            "start": startIso,
+            "end": endIso,
+            "allDay": fAllDay,
+            "reminders": fReminder >= 0 ? [
+                {
+                    "method": "popup",
+                    "minutes": fReminder
+                }
+            ] : []
+        };
+        saving = true;
+        errorText = "";
+        const cb = response => {
+            saving = false;
+            if (response.error) {
+                errorText = response.error;
+                return;
+            }
+            root.saved();
+        };
+        if (eventData && eventData.id)
+            CalendarService.updateEvent(eventData.id, fields, cb);
+        else
+            CalendarService.createEvent(fields, cb);
+    }
+
+    Component.onCompleted: {
+        if (!eventData) {
+            fCalendarId = CalendarService.defaultCalendar() ? CalendarService.defaultCalendar().id : "";
+            return;
+        }
+        fTitle = eventData.title || "";
+        fAllDay = !!eventData.allDay;
+        fDate = eventData.start;
+        const fmt = "HH:mm";
+        fStart = Qt.formatTime(eventData.start, fmt);
+        fEnd = Qt.formatTime(eventData.end, fmt);
+        fLocation = eventData.location || "";
+        fDescription = eventData.description || "";
+        fCalendarId = eventData.calendarId || "";
+        if (eventData.reminders && eventData.reminders.length > 0)
+            fReminder = eventData.reminders[0].minutes;
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        radius: Theme.cornerRadius
+        color: Qt.rgba(0, 0, 0, 0.45)
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: root.closeRequested()
+        }
+    }
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: Math.min(parent.width - Theme.spacingL * 2, 400)
+        height: Math.min(parent.height - Theme.spacingM, 300)
+        radius: Theme.cornerRadius
+        color: Theme.surfaceContainerHigh
+        border.color: Theme.outlineMedium
+        border.width: 1
+
+        MouseArea {
+            anchors.fill: parent
+        }
+
+        DankFlickable {
+            anchors.fill: parent
+            anchors.margins: Theme.spacingM
+            contentWidth: width
+            contentHeight: form.implicitHeight
+            clip: true
+
+            Column {
+                id: form
+                width: parent.width
+                spacing: Theme.spacingS
+
+                StyledText {
+                    width: parent.width
+                    text: root.eventData ? I18n.tr("Edit event") : I18n.tr("New event")
+                    font.pixelSize: Theme.fontSizeMedium
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    horizontalAlignment: Text.AlignLeft
+                }
+
+                DankTextField {
+                    width: parent.width
+                    labelText: I18n.tr("Title")
+                    leftIconName: "title"
+                    leftIconSize: Theme.iconSize - 6
+                    placeholderText: I18n.tr("Event title")
+                    text: root.fTitle
+                    onTextChanged: root.fTitle = text
+                }
+
+                DankToggle {
+                    width: parent.width
+                    text: I18n.tr("All day")
+                    checked: root.fAllDay
+                    onToggled: checked => root.fAllDay = checked
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingXS
+
+                    DankActionButton {
+                        circular: false
+                        iconName: "chevron_left"
+                        iconSize: 16
+                        onClicked: {
+                            let d = new Date(root.fDate);
+                            d.setDate(d.getDate() - 1);
+                            root.fDate = d;
+                        }
+                    }
+
+                    StyledText {
+                        width: parent.width - 72
+                        text: Qt.formatDate(root.fDate, "ddd, MMM d yyyy")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceText
+                        horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignVCenter
+                        height: 32
+                    }
+
+                    DankActionButton {
+                        circular: false
+                        iconName: "chevron_right"
+                        iconSize: 16
+                        onClicked: {
+                            let d = new Date(root.fDate);
+                            d.setDate(d.getDate() + 1);
+                            root.fDate = d;
+                        }
+                    }
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingS
+                    visible: !root.fAllDay
+
+                    DankTextField {
+                        width: (parent.width - Theme.spacingS) / 2
+                        labelText: I18n.tr("Start")
+                        leftIconName: "schedule"
+                        leftIconSize: Theme.iconSize - 6
+                        placeholderText: "HH:MM"
+                        text: root.fStart
+                        onTextChanged: root.fStart = text
+                    }
+
+                    DankTextField {
+                        width: (parent.width - Theme.spacingS) / 2
+                        labelText: I18n.tr("End")
+                        placeholderText: "HH:MM"
+                        text: root.fEnd
+                        onTextChanged: root.fEnd = text
+                    }
+                }
+
+                DankDropdown {
+                    width: parent.width
+                    text: I18n.tr("Calendar")
+                    options: root._cals.map(c => c.name)
+                    currentValue: root._calendarName(root.fCalendarId)
+                    onValueChanged: value => {
+                        for (let i = 0; i < root._cals.length; i++) {
+                            if (root._cals[i].name === value) {
+                                root.fCalendarId = root._cals[i].id;
+                                return;
+                            }
+                        }
+                    }
+                }
+
+                DankDropdown {
+                    width: parent.width
+                    text: I18n.tr("Reminder")
+                    options: root._remLabels
+                    currentValue: root._remLabels[Math.max(0, root._remMins.indexOf(root.fReminder))]
+                    onValueChanged: value => {
+                        const idx = root._remLabels.indexOf(value);
+                        if (idx >= 0)
+                            root.fReminder = root._remMins[idx];
+                    }
+                }
+
+                DankTextField {
+                    width: parent.width
+                    labelText: I18n.tr("Location")
+                    leftIconName: "place"
+                    leftIconSize: Theme.iconSize - 6
+                    placeholderText: I18n.tr("Add location")
+                    text: root.fLocation
+                    onTextChanged: root.fLocation = text
+                }
+
+                DankTextField {
+                    width: parent.width
+                    labelText: I18n.tr("Notes")
+                    leftIconName: "notes"
+                    leftIconSize: Theme.iconSize - 6
+                    placeholderText: I18n.tr("Add notes")
+                    text: root.fDescription
+                    onTextChanged: root.fDescription = text
+                }
+
+                StyledText {
+                    width: parent.width
+                    text: root.errorText
+                    visible: root.errorText !== ""
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.error
+                    wrapMode: Text.WordWrap
+                }
+
+                Row {
+                    width: parent.width
+                    spacing: Theme.spacingS
+
+                    DankButton {
+                        text: root.saving ? I18n.tr("Saving…") : I18n.tr("Save")
+                        iconName: "check"
+                        buttonHeight: 32
+                        backgroundColor: Theme.primary
+                        textColor: Theme.primaryText
+                        enabled: !root.saving
+                        onClicked: root.save()
+                    }
+
+                    DankButton {
+                        text: I18n.tr("Cancel")
+                        buttonHeight: 32
+                        onClicked: root.closeRequested()
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml

@@ -8,14 +8,21 @@ Rectangle {
     id: root
     readonly property var log: Log.scoped("CalendarOverviewCard")
 
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
     implicitWidth: SettingsData.showWeekNumber ? 736 : 700
 
     property bool showEventDetails: false
     property date selectedDate: systemClock.date
     property var selectedDateEvents: []
     property bool hasEvents: selectedDateEvents && selectedDateEvents.length > 0
+    property var detailEvent: null
+    property bool showEditor: false
+    property var editorEvent: null
 
     signal closeDash
+    signal navFocusRequested
 
     function weekStartQt() {
         if (SettingsData.firstDayOfWeek >= 7 || SettingsData.firstDayOfWeek < 0) {
@@ -79,7 +86,7 @@ Rectangle {
     }
 
     function updateSelectedDateEvents() {
-        if (CalendarService && CalendarService.khalAvailable) {
+        if (CalendarService && CalendarService.calendarAvailable) {
             const events = CalendarService.getEventsForDate(selectedDate);
             selectedDateEvents = events;
         } else {
@@ -88,7 +95,7 @@ Rectangle {
     }
 
     function loadEventsForMonth() {
-        if (!CalendarService || !CalendarService.khalAvailable) {
+        if (!CalendarService || !CalendarService.calendarAvailable) {
             return;
         }
 
@@ -104,11 +111,83 @@ Rectangle {
         CalendarService.loadEvents(startDate, endDate);
     }
 
+    function goToToday() {
+        const now = systemClock.date;
+        calendarGrid.selectedDate = now;
+        calendarGrid.displayDate = now;
+        root.selectedDate = now;
+        loadEventsForMonth();
+    }
+
+    function moveSelection(days) {
+        let d = new Date(calendarGrid.selectedDate);
+        d.setDate(d.getDate() + days);
+        calendarGrid.selectedDate = d;
+        root.selectedDate = d;
+        if (d.getMonth() !== calendarGrid.displayDate.getMonth() || d.getFullYear() !== calendarGrid.displayDate.getFullYear()) {
+            calendarGrid.displayDate = d;
+            loadEventsForMonth();
+        }
+    }
+
+    function shiftMonth(delta) {
+        let d = new Date(calendarGrid.displayDate);
+        d.setMonth(d.getMonth() + delta);
+        calendarGrid.displayDate = d;
+        loadEventsForMonth();
+    }
+
+    function handleKeyEvent(event) {
+        if (showEventDetails) {
+            if (event.key === Qt.Key_Escape) {
+                showEventDetails = false;
+                return true;
+            }
+            return false;
+        }
+        switch (event.key) {
+        case Qt.Key_Left:
+        case Qt.Key_H:
+            moveSelection(I18n.isRtl ? 1 : -1);
+            return true;
+        case Qt.Key_Right:
+        case Qt.Key_L:
+            moveSelection(I18n.isRtl ? -1 : 1);
+            return true;
+        case Qt.Key_Up:
+        case Qt.Key_K:
+            moveSelection(-7);
+            return true;
+        case Qt.Key_Down:
+        case Qt.Key_J:
+            moveSelection(7);
+            return true;
+        case Qt.Key_PageUp:
+            shiftMonth(-1);
+            return true;
+        case Qt.Key_PageDown:
+            shiftMonth(1);
+            return true;
+        case Qt.Key_T:
+            goToToday();
+            return true;
+        case Qt.Key_Return:
+        case Qt.Key_Enter:
+        case Qt.Key_Space:
+            root.selectedDate = calendarGrid.selectedDate;
+            showEventDetails = true;
+            return true;
+        }
+        return false;
+    }
+
     onSelectedDateChanged: updateSelectedDateEvents()
 
     onShowEventDetailsChanged: {
         if (showEventDetails) {
             taskInput.forceActiveFocus();
+        } else {
+            navFocusRequested();
         }
     }
 
@@ -122,8 +201,8 @@ Rectangle {
             updateSelectedDateEvents();
         }
 
-        function onKhalAvailableChanged() {
+        function onCalendarAvailableChanged() {
-            if (CalendarService && CalendarService.khalAvailable) {
+            if (CalendarService && CalendarService.calendarAvailable) {
                 loadEventsForMonth();
             }
             updateSelectedDateEvents();
@@ -143,6 +222,55 @@ Rectangle {
         anchors.margins: Theme.spacingM
         spacing: Theme.spacingS
 
+        Rectangle {
+            id: dankWarning
+            width: parent.width
+            visible: CalendarService && CalendarService.dankNeedsLaunch
+            height: visible ? Math.max(28, warningRow.implicitHeight) + Theme.spacingS : 0
+            radius: Theme.cornerRadius
+            color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12)
+            border.color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.35)
+            border.width: 1
+
+            Row {
+                id: warningRow
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.leftMargin: Theme.spacingS
+                anchors.rightMargin: Theme.spacingS
+                spacing: Theme.spacingS
+
+                DankIcon {
+                    name: "warning"
+                    size: 16
+                    color: Theme.warning
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    width: parent.width - 16 - Theme.spacingS - (launchButton.visible ? launchButton.width + Theme.spacingS : 0)
+                    anchors.verticalCenter: parent.verticalCenter
+                    text: (CalendarService && CalendarService.dankBinaryExists) ? I18n.tr("DankCalendar isn't running") : I18n.tr("DankCalendar isn't installed")
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.surfaceText
+                    horizontalAlignment: Text.AlignLeft
+                    wrapMode: Text.Wrap
+                }
+
+                DankButton {
+                    id: launchButton
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: CalendarService && CalendarService.dankBinaryExists
+                    text: I18n.tr("Launch")
+                    buttonHeight: 26
+                    backgroundColor: Theme.primary
+                    textColor: Theme.primaryText
+                    onClicked: CalendarService.launchDankCalendar()
+                }
+            }
+        }
+
         Item {
             width: parent.width
             height: 40
@@ -173,11 +301,40 @@ Rectangle {
                 }
             }
 
+            Rectangle {
+                width: 32
+                height: 32
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+                anchors.rightMargin: Theme.spacingS
+                radius: Theme.cornerRadius
+                visible: CalendarService && CalendarService.canCreateEvents
+                color: addEventArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
+
+                DankIcon {
+                    anchors.centerIn: parent
+                    name: "event"
+                    size: 16
+                    color: Theme.primary
+                }
+
+                MouseArea {
+                    id: addEventArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        root.editorEvent = null;
+                        root.showEditor = true;
+                    }
+                }
+            }
+
             StyledText {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 32 + Theme.spacingS * 2
-                anchors.rightMargin: Theme.spacingS
+                anchors.rightMargin: (CalendarService && CalendarService.canCreateEvents) ? 32 + Theme.spacingS * 2 : Theme.spacingS
                 height: 40
                 anchors.verticalCenter: parent.verticalCenter
                 text: {
@@ -229,7 +386,7 @@ Rectangle {
             }
 
             StyledText {
-                width: parent.width - 56
+                width: parent.width - 84
                 height: 28
                 text: calendarGrid.displayDate.toLocaleDateString(I18n.locale(), "MMMM yyyy")
                 font.pixelSize: Theme.fontSizeMedium
@@ -239,6 +396,28 @@ Rectangle {
                 verticalAlignment: Text.AlignVCenter
             }
 
+            Rectangle {
+                width: 28
+                height: 28
+                radius: Theme.cornerRadius
+                color: todayArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
+
+                DankIcon {
+                    anchors.centerIn: parent
+                    name: "today"
+                    size: 14
+                    color: Theme.primary
+                }
+
+                MouseArea {
+                    id: todayArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: root.goToToday()
+                }
+            }
+
             Rectangle {
                 width: 28
                 height: 28
@@ -388,6 +567,8 @@ Rectangle {
                                 height: width
                                 color: isToday ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : dayArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
                                 radius: Theme.cornerRadius
+                                border.color: (isSelected && !isToday) ? Theme.primary : "transparent"
+                                border.width: (isSelected && !isToday) ? 1 : 0
 
                                 StyledText {
                                     anchors.centerIn: parent
@@ -397,21 +578,31 @@ Rectangle {
                                     font.weight: isToday ? Font.Medium : Font.Normal
                                 }
 
-                                Rectangle {
+                                Row {
                                     anchors.bottom: parent.bottom
                                     anchors.horizontalCenter: parent.horizontalCenter
-                                    anchors.bottomMargin: 4
+                                    anchors.bottomMargin: 3
-                                    width: 12
+                                    spacing: 2
-                                    height: 2
+                                    visible: CalendarService && CalendarService.calendarAvailable && CalendarService.hasEventsForDate(dayDate)
-                                    radius: Theme.cornerRadius
-                                    visible: CalendarService && CalendarService.khalAvailable && CalendarService.hasEventsForDate(dayDate)
-                                    color: isToday ? Qt.lighter(Theme.primary, 1.3) : Theme.primary
-                                    opacity: isToday ? 0.9 : 0.7
 
-                                    Behavior on opacity {
+                                    Repeater {
-                                        NumberAnimation {
+                                        model: {
-                                            duration: Theme.shortDuration
+                                            const evs = CalendarService.getEventsForDate(dayDate);
-                                            easing.type: Theme.standardEasing
+                                            const seen = [];
+                                            for (let i = 0; i < evs.length && seen.length < 3; i++) {
+                                                const c = (evs[i].color && evs[i].color.length) ? evs[i].color : "primary";
+                                                if (seen.indexOf(c) === -1)
+                                                    seen.push(c);
+                                            }
+                                            return seen;
+                                        }
+
+                                        Rectangle {
+                                            width: 5
+                                            height: 5
+                                            radius: 2.5
+                                            color: modelData === "primary" ? (isToday ? Qt.lighter(Theme.primary, 1.3) : Theme.primary) : modelData
+                                            opacity: isToday ? 0.95 : 0.8
                                         }
                                     }
                                 }
@@ -423,6 +614,7 @@ Rectangle {
                                 hoverEnabled: true
                                 cursorShape: Qt.PointingHandCursor
                                 onClicked: {
+                                    calendarGrid.selectedDate = dayDate;
                                     root.selectedDate = dayDate;
                                     root.showEventDetails = true;
                                 }
@@ -622,7 +814,15 @@ Rectangle {
                             }
                         }
 
-                        color: isDragging ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : Theme.nestedSurface)
+                        readonly property bool isTask: modelData && modelData.id && modelData.id.startsWith("task_")
+                        readonly property color accentColor: {
+                            if (isTask)
+                                return modelData.completed ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Theme.primary;
+                            return (modelData && modelData.color && modelData.color.length) ? modelData.color : Theme.primary;
+                        }
+                        readonly property color surfaceColor: isDragging ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : Theme.nestedSurface)
+
+                        color: surfaceColor
                         border.color: isDragging ? Theme.primary : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : Theme.outlineMedium)
                         border.width: (isDragging || eventMouseArea.containsMouse) ? 1 : Theme.layerOutlineWidth
 
@@ -660,15 +860,22 @@ Rectangle {
                             }
                         }
 
-                        Rectangle {
+                        Item {
-                            width: 3
+                            id: accentClip
-                            height: parent.height - 6
+                            width: 4
+                            clip: true
+                            anchors.top: parent.top
+                            anchors.bottom: parent.bottom
                             anchors.left: parent.left
-                            anchors.leftMargin: 3
+
-                            anchors.verticalCenter: parent.verticalCenter
+                            Rectangle {
-                            radius: Theme.cornerRadius
+                                width: taskItem.width
-                            color: (modelData && modelData.id && modelData.id.startsWith("task_")) ? (modelData.completed ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Theme.primary) : Theme.primary
+                                height: taskItem.height
-                            opacity: 0.8
+                                radius: taskItem.radius
+                                color: taskItem.accentColor
+                                anchors.top: parent.top
+                                anchors.left: parent.left
+                            }
                         }
 
                         // Drag Handle
@@ -767,6 +974,7 @@ Rectangle {
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: (modelData && modelData.id && modelData.id.startsWith("task_") && modelData.completed) ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5) : Theme.surfaceText
                                 font.weight: Font.Medium
+                                horizontalAlignment: Text.AlignLeft
                                 elide: Text.ElideRight
                                 maximumLineCount: 1
                             }
@@ -774,21 +982,24 @@ Rectangle {
                             StyledText {
                                 width: parent.width
                                 text: {
-                                    if (!modelData || modelData.allDay) {
+                                    if (!modelData)
-                                        return I18n.tr("All day", "calendar task with no specific time");
+                                        return "";
-                                    } else if (modelData.start && modelData.end) {
+                                    const cal = (modelData.calendar && modelData.calendar.length) ? " · " + modelData.calendar : "";
+                                    if (modelData.allDay)
+                                        return I18n.tr("All day", "calendar task with no specific time") + cal;
+                                    if (modelData.start && modelData.end) {
                                         const timeFormat = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
                                         const startTime = Qt.formatTime(modelData.start, timeFormat);
-                                        if (modelData.start.toDateString() !== modelData.end.toDateString() || modelData.start.getTime() !== modelData.end.getTime()) {
+                                        if (modelData.start.toDateString() !== modelData.end.toDateString() || modelData.start.getTime() !== modelData.end.getTime())
-                                            return startTime + " – " + Qt.formatTime(modelData.end, timeFormat);
+                                            return startTime + " – " + Qt.formatTime(modelData.end, timeFormat) + cal;
-                                        }
+                                        return startTime + cal;
-                                        return startTime;
                                     }
                                     return "";
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
                                 font.weight: Font.Normal
+                                horizontalAlignment: Text.AlignLeft
                                 visible: text !== "" && modelData && modelData.id && !modelData.id.startsWith("task_")
                             }
                         }
@@ -824,8 +1035,9 @@ Rectangle {
                                     taskItem.isEditing = false;
                                 }
 
-                                Keys.onEscapePressed: {
+                                Keys.onEscapePressed: event => {
                                     taskItem.isEditing = false;
+                                    event.accepted = true;
                                 }
                             }
                         }
@@ -838,18 +1050,15 @@ Rectangle {
                             anchors.leftMargin: (modelData && modelData.id && modelData.id.startsWith("task_")) ? 32 : 6
                             anchors.rightMargin: (modelData && modelData.id && modelData.id.startsWith("task_")) ? 64 : 0
                             hoverEnabled: true
-                            cursorShape: (modelData && (modelData.url || (modelData.id && modelData.id.startsWith("task_")))) ? Qt.PointingHandCursor : Qt.ArrowCursor
+                            cursorShape: modelData ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            enabled: modelData && (modelData.url !== "" || (modelData.id && modelData.id.startsWith("task_"))) && !taskItem.isEditing
+                            enabled: modelData && !taskItem.isEditing
                             onClicked: {
                                 if (modelData && modelData.id && modelData.id.startsWith("task_")) {
                                     CalendarService.toggleTask(modelData.id);
-                                } else if (modelData && modelData.url && modelData.url !== "") {
+                                    return;
-                                    if (Qt.openUrlExternally(modelData.url) === false) {
-                                        log.warn("Failed to open URL: " + modelData.url);
-                                    } else {
-                                        root.closeDash();
-                                    }
                                 }
+                                if (modelData)
+                                    root.detailEvent = modelData;
                             }
                         }
 
@@ -953,7 +1162,7 @@ Rectangle {
                 Text {
                     text: I18n.tr("Add a task...", "placeholder in the new-task input field")
                     color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.4)
-                    visible: !taskInput.text && !taskInput.activeFocus
+                    visible: taskInput.text.length === 0
                     font.pixelSize: Theme.fontSizeSmall
                     anchors.verticalCenter: parent.verticalCenter
                 }
@@ -965,6 +1174,52 @@ Rectangle {
                         text = "";
                     }
                 }
+
+                Keys.onEscapePressed: event => {
+                    root.showEventDetails = false;
+                    event.accepted = true;
+                }
+            }
+        }
+    }
+
+    Loader {
+        anchors.fill: parent
+        z: 1000
+        active: root.detailEvent !== null
+
+        sourceComponent: CalendarEventDetail {
+            eventData: root.detailEvent
+            canEdit: CalendarService && CalendarService.canCreateEvents && root.detailEvent && !root.detailEvent.readOnly && !(root.detailEvent.id && root.detailEvent.id.startsWith("task_"))
+            onCloseRequested: root.detailEvent = null
+            onEditRequested: {
+                root.editorEvent = root.detailEvent;
+                root.detailEvent = null;
+                root.showEditor = true;
+            }
+            onDeleteRequested: {
+                if (root.detailEvent && root.detailEvent.id)
+                    CalendarService.deleteEvent(root.detailEvent.id, null);
+                root.detailEvent = null;
+            }
+        }
+    }
+
+    Loader {
+        anchors.fill: parent
+        z: 1000
+        active: root.showEditor
+
+        sourceComponent: CalendarEventEditor {
+            eventData: root.editorEvent
+            initialDate: root.selectedDate
+            onCloseRequested: {
+                root.showEditor = false;
+                root.editorEvent = null;
+            }
+            onSaved: {
+                root.showEditor = false;
+                root.editorEvent = null;
             }
         }
     }

quickshell/Modules/DankDash/OverviewTab.qml

@@ -14,6 +14,11 @@ Item {
     signal switchToWeatherTab
     signal switchToMediaTab
     signal closeDash
+    signal navFocusRequested
+
+    function handleKeyEvent(event) {
+        return calendarCard.handleKeyEvent(event);
+    }
 
     Item {
         anchors.fill: parent
@@ -54,12 +59,14 @@ Item {
 
         // Calendar - bottom middle (wider and taller)
         CalendarOverviewCard {
+            id: calendarCard
             x: parent.width * 0.2 - Theme.spacingM
             y: 100 + Theme.spacingM
             width: parent.width * 0.6
             height: 300
 
             onCloseDash: root.closeDash()
+            onNavFocusRequested: root.navFocusRequested()
         }
 
         // Media - bottom right (narrow and taller)

quickshell/Modules/Settings/NetworkEthernetTab.qml

@@ -0,0 +1,462 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import qs.Common
+import qs.Modules.Settings.Widgets
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: networkEthernetTab
+
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
+    Component.onCompleted: {
+        NetworkService.addRef();
+    }
+
+    Component.onDestruction: {
+        NetworkService.removeRef();
+    }
+
+    DankFlickable {
+        anchors.fill: parent
+        clip: true
+        contentHeight: mainColumn.height + Theme.spacingXL
+        contentWidth: width
+
+        Column {
+            id: mainColumn
+
+            topPadding: 4
+            width: Math.min(600, parent.width - Theme.spacingL * 2)
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: Theme.spacingL
+
+            SettingsCard {
+                id: root
+
+                property string expandedEthDevice: ""
+
+                title: I18n.tr("Ethernet")
+                iconName: "settings_ethernet"
+                settingKey: "networkEthernet"
+                tags: ["ethernet", "wired", "network", "adapters", "connection"]
+
+                width: parent.width
+
+                Column {
+                    id: ethernetSection
+
+                    width: parent.width
+                    spacing: Theme.spacingM
+
+                    StyledText {
+                        text: {
+                            const devices = NetworkService.ethernetDevices;
+                            const connected = devices.filter(d => d.connected).length;
+                            if (devices.length === 0)
+                                return I18n.tr("No adapters");
+                            if (connected === 0)
+                                return devices.length === 1 ? I18n.tr("%1 adapter, none connected").arg(devices.length) : I18n.tr("%1 adapters, none connected").arg(devices.length);
+                            return I18n.tr("%1 connected").arg(connected);
+                        }
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: NetworkService.ethernetConnected ? Theme.primary : Theme.surfaceVariantText
+                        width: parent.width
+                        horizontalAlignment: Text.AlignLeft
+                    }
+
+                    Rectangle {
+                        width: parent.width
+                        height: 1
+                        color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: 4
+                        visible: NetworkService.ethernetDevices.length > 0
+
+                        StyledText {
+                            text: I18n.tr("Adapters")
+                            font.pixelSize: Theme.fontSizeMedium
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            width: parent.width
+                            horizontalAlignment: Text.AlignLeft
+                        }
+
+                        Repeater {
+                            model: NetworkService.ethernetDevices
+
+                            delegate: Rectangle {
+                                id: ethDeviceDelegate
+                                required property var modelData
+                                required property int index
+
+                                readonly property bool isConnected: modelData.connected || false
+                                readonly property bool isExpanded: root.expandedEthDevice === modelData.name
+
+                                width: parent.width
+                                height: isExpanded ? 56 + ethExpandedContent.height : 56
+                                radius: Theme.cornerRadius
+                                color: ethDeviceMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
+                                border.width: isConnected ? 2 : 0
+                                border.color: Theme.primary
+                                clip: true
+
+                                Behavior on height {
+                                    NumberAnimation {
+                                        duration: 150
+                                        easing.type: Easing.OutQuad
+                                    }
+                                }
+
+                                Column {
+                                    anchors.fill: parent
+                                    spacing: 0
+
+                                    Item {
+                                        width: parent.width
+                                        height: 56
+
+                                        Row {
+                                            anchors.left: parent.left
+                                            anchors.leftMargin: Theme.spacingM
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            anchors.right: ethDeviceActions.left
+                                            anchors.rightMargin: Theme.spacingS
+                                            spacing: Theme.spacingS
+
+                                            DankIcon {
+                                                name: "lan"
+                                                size: 20
+                                                color: isConnected ? Theme.primary : Theme.surfaceText
+                                                anchors.verticalCenter: parent.verticalCenter
+                                            }
+
+                                            Column {
+                                                anchors.verticalCenter: parent.verticalCenter
+                                                spacing: 2
+                                                width: parent.width - 20 - Theme.spacingS
+
+                                                StyledText {
+                                                    text: modelData.name || I18n.tr("Unknown")
+                                                    font.pixelSize: Theme.fontSizeMedium
+                                                    color: isConnected ? Theme.primary : Theme.surfaceText
+                                                    font.weight: isConnected ? Font.Medium : Font.Normal
+                                                    elide: Text.ElideRight
+                                                    width: parent.width
+                                                    horizontalAlignment: Text.AlignLeft
+                                                }
+
+                                                Row {
+                                                    anchors.left: parent.left
+                                                    spacing: Theme.spacingXS
+
+                                                    StyledText {
+                                                        text: {
+                                                            switch (modelData.state) {
+                                                            case "activated":
+                                                                return I18n.tr("Connected");
+                                                            case "disconnected":
+                                                                return I18n.tr("Disconnected");
+                                                            case "unavailable":
+                                                                return I18n.tr("Unavailable");
+                                                            default:
+                                                                return modelData.state || I18n.tr("Unknown");
+                                                            }
+                                                        }
+                                                        font.pixelSize: Theme.fontSizeSmall
+                                                        color: isConnected ? Theme.primary : Theme.surfaceVariantText
+                                                    }
+
+                                                    StyledText {
+                                                        text: "•"
+                                                        font.pixelSize: Theme.fontSizeSmall
+                                                        color: Theme.surfaceVariantText
+                                                        visible: (modelData.ip || "").length > 0
+                                                    }
+
+                                                    StyledText {
+                                                        text: modelData.ip || ""
+                                                        font.pixelSize: Theme.fontSizeSmall
+                                                        color: Theme.surfaceVariantText
+                                                        visible: (modelData.ip || "").length > 0
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                        Row {
+                                            id: ethDeviceActions
+                                            anchors.right: parent.right
+                                            anchors.rightMargin: Theme.spacingS
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            spacing: Theme.spacingXS
+
+                                            Rectangle {
+                                                width: 28
+                                                height: 28
+                                                radius: 14
+                                                color: ethExpandBtn.containsMouse ? Theme.surfacePressed : "transparent"
+                                                visible: isConnected
+
+                                                DankIcon {
+                                                    anchors.centerIn: parent
+                                                    name: isExpanded ? "expand_less" : "expand_more"
+                                                    size: 18
+                                                    color: Theme.surfaceText
+                                                }
+
+                                                MouseArea {
+                                                    id: ethExpandBtn
+                                                    anchors.fill: parent
+                                                    hoverEnabled: true
+                                                    cursorShape: Qt.PointingHandCursor
+                                                    onClicked: {
+                                                        if (isExpanded) {
+                                                            root.expandedEthDevice = "";
+                                                        } else {
+                                                            root.expandedEthDevice = modelData.name;
+                                                            NetworkService.fetchWiredNetworkInfo(NetworkService.ethernetConnectionUuid);
+                                                        }
+                                                    }
+                                                }
+                                            }
+
+                                            Rectangle {
+                                                width: 28
+                                                height: 28
+                                                radius: 14
+                                                color: ethDisconnectBtn.containsMouse ? Theme.errorHover : "transparent"
+                                                visible: isConnected
+
+                                                DankIcon {
+                                                    anchors.centerIn: parent
+                                                    name: "link_off"
+                                                    size: 18
+                                                    color: ethDisconnectBtn.containsMouse ? Theme.error : Theme.surfaceVariantText
+                                                }
+
+                                                MouseArea {
+                                                    id: ethDisconnectBtn
+                                                    anchors.fill: parent
+                                                    hoverEnabled: true
+                                                    cursorShape: Qt.PointingHandCursor
+                                                    onClicked: NetworkService.disconnectEthernetDevice(modelData.name)
+                                                }
+                                            }
+                                        }
+
+                                        MouseArea {
+                                            id: ethDeviceMouseArea
+                                            anchors.fill: parent
+                                            anchors.rightMargin: ethDeviceActions.width + Theme.spacingM
+                                            hoverEnabled: true
+                                        }
+                                    }
+
+                                    Column {
+                                        id: ethExpandedContent
+                                        width: parent.width
+                                        visible: isExpanded
+
+                                        Rectangle {
+                                            width: parent.width - Theme.spacingM * 2
+                                            height: 1
+                                            x: Theme.spacingM
+                                            color: Theme.outlineLight
+                                        }
+
+                                        Item {
+                                            width: parent.width
+                                            height: ethDetailsColumn.implicitHeight + Theme.spacingM * 2
+
+                                            Column {
+                                                id: ethDetailsColumn
+                                                anchors.fill: parent
+                                                anchors.margins: Theme.spacingM
+                                                spacing: Theme.spacingS
+
+                                                Flow {
+                                                    width: parent.width
+                                                    spacing: Theme.spacingXS
+
+                                                    Repeater {
+                                                        model: {
+                                                            const fields = [];
+                                                            const dev = modelData;
+                                                            if (!dev)
+                                                                return fields;
+
+                                                            if (dev.ip)
+                                                                fields.push({
+                                                                    label: I18n.tr("IP"),
+                                                                    value: dev.ip
+                                                                });
+                                                            if (dev.speed && dev.speed > 0)
+                                                                fields.push({
+                                                                    label: I18n.tr("Speed"),
+                                                                    value: dev.speed + " Mbps"
+                                                                });
+                                                            if (dev.hwAddress)
+                                                                fields.push({
+                                                                    label: I18n.tr("MAC"),
+                                                                    value: dev.hwAddress
+                                                                });
+                                                            if (dev.driver)
+                                                                fields.push({
+                                                                    label: I18n.tr("Driver"),
+                                                                    value: dev.driver
+                                                                });
+                                                            fields.push({
+                                                                label: I18n.tr("State"),
+                                                                value: dev.state || I18n.tr("Unknown")
+                                                            });
+
+                                                            return fields;
+                                                        }
+
+                                                        delegate: Rectangle {
+                                                            required property var modelData
+                                                            required property int index
+
+                                                            width: ethFieldContent.width + Theme.spacingM * 2
+                                                            height: 32
+                                                            radius: Theme.cornerRadius - 2
+                                                            color: Theme.surfaceContainerHigh
+                                                            border.width: 1
+                                                            border.color: Theme.outlineLight
+
+                                                            Row {
+                                                                id: ethFieldContent
+                                                                anchors.centerIn: parent
+                                                                spacing: Theme.spacingXS
+
+                                                                StyledText {
+                                                                    text: modelData.label + ":"
+                                                                    font.pixelSize: Theme.fontSizeSmall
+                                                                    color: Theme.surfaceVariantText
+                                                                    anchors.verticalCenter: parent.verticalCenter
+                                                                }
+
+                                                                StyledText {
+                                                                    text: modelData.value
+                                                                    font.pixelSize: Theme.fontSizeSmall
+                                                                    color: Theme.surfaceText
+                                                                    font.weight: Font.Medium
+                                                                    anchors.verticalCenter: parent.verticalCenter
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+
+                                                Item {
+                                                    width: parent.width
+                                                    height: NetworkService.networkWiredInfoLoading ? 40 : 0
+                                                    visible: NetworkService.networkWiredInfoLoading
+
+                                                    DankSpinner {
+                                                        anchors.centerIn: parent
+                                                        size: 20
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingS
+                        visible: NetworkService.wiredConnections.length > 0
+
+                        Rectangle {
+                            width: parent.width
+                            height: 1
+                            color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Saved Configurations")
+                            font.pixelSize: Theme.fontSizeMedium
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            width: parent.width
+                            horizontalAlignment: Text.AlignLeft
+                        }
+
+                        Repeater {
+                            model: NetworkService.wiredConnections
+
+                            delegate: Rectangle {
+                                required property var modelData
+                                required property int index
+
+                                width: parent.width
+                                height: 48
+                                radius: Theme.cornerRadius
+                                color: wiredMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
+                                border.width: modelData.isActive ? 2 : 0
+                                border.color: Theme.primary
+
+                                Row {
+                                    anchors.left: parent.left
+                                    anchors.leftMargin: Theme.spacingM
+                                    anchors.verticalCenter: parent.verticalCenter
+                                    spacing: Theme.spacingS
+
+                                    DankIcon {
+                                        name: "lan"
+                                        size: 20
+                                        color: modelData.isActive ? Theme.primary : Theme.surfaceText
+                                        anchors.verticalCenter: parent.verticalCenter
+                                    }
+
+                                    Column {
+                                        anchors.verticalCenter: parent.verticalCenter
+                                        spacing: 2
+
+                                        StyledText {
+                                            text: modelData.id || I18n.tr("Unknown")
+                                            font.pixelSize: Theme.fontSizeMedium
+                                            color: modelData.isActive ? Theme.primary : Theme.surfaceText
+                                            font.weight: modelData.isActive ? Font.Medium : Font.Normal
+                                        }
+
+                                        StyledText {
+                                            text: modelData.isActive ? I18n.tr("Active") : ""
+                                            font.pixelSize: Theme.fontSizeSmall
+                                            color: Theme.primary
+                                            visible: modelData.isActive
+                                        }
+                                    }
+                                }
+
+                                MouseArea {
+                                    id: wiredMouseArea
+
+                                    anchors.fill: parent
+                                    hoverEnabled: true
+                                    cursorShape: Qt.PointingHandCursor
+                                    onClicked: {
+                                        if (!modelData.isActive) {
+                                            NetworkService.connectToSpecificWiredConfig(modelData.uuid);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/Settings/NetworkStatusTab.qml

@@ -0,0 +1,202 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import qs.Common
+import qs.Modules.Settings.Widgets
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: networkStatusTab
+
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
+    Component.onCompleted: {
+        NetworkService.addRef();
+    }
+
+    Component.onDestruction: {
+        NetworkService.removeRef();
+    }
+
+    DankFlickable {
+        anchors.fill: parent
+        clip: true
+        contentHeight: mainColumn.height + Theme.spacingXL
+        contentWidth: width
+
+        Column {
+            id: mainColumn
+
+            topPadding: 4
+            width: Math.min(600, parent.width - Theme.spacingL * 2)
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: Theme.spacingL
+
+            SettingsCard {
+                id: root
+
+                title: I18n.tr("Network Status")
+                iconName: "lan"
+                settingKey: "networkStatus"
+                tags: ["status", "network", "connectivity", "internet"]
+
+                width: parent.width
+
+                Column {
+                    id: overviewSection
+
+                    width: parent.width
+                    spacing: Theme.spacingM
+
+                    StyledText {
+                        text: I18n.tr("Overview of your network connections")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        width: parent.width
+                        horizontalAlignment: Text.AlignLeft
+                    }
+
+                    Rectangle {
+                        width: parent.width
+                        height: 1
+                        color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                    }
+
+                    Grid {
+                        columns: 2
+                        columnSpacing: Theme.spacingL
+                        rowSpacing: Theme.spacingS
+                        width: parent.width
+
+                        StyledText {
+                            text: I18n.tr("Backend")
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceVariantText
+                        }
+                        StyledText {
+                            text: NetworkService.backend || I18n.tr("Unknown")
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceText
+                            font.weight: Font.Medium
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Status")
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceVariantText
+                        }
+                        Row {
+                            spacing: Theme.spacingS
+
+                            Rectangle {
+                                width: 8
+                                height: 8
+                                radius: 4
+                                anchors.verticalCenter: parent.verticalCenter
+                                color: {
+                                    switch (NetworkService.networkStatus) {
+                                    case "ethernet":
+                                    case "wifi":
+                                        return Theme.success;
+                                    case "disconnected":
+                                        return Theme.error;
+                                    default:
+                                        return Theme.warning;
+                                    }
+                                }
+                            }
+
+                            StyledText {
+                                text: {
+                                    switch (NetworkService.networkStatus) {
+                                    case "ethernet":
+                                        return I18n.tr("Ethernet");
+                                    case "wifi":
+                                        return I18n.tr("WiFi");
+                                    case "disconnected":
+                                        return I18n.tr("Disconnected");
+                                    default:
+                                        return NetworkService.networkStatus || I18n.tr("Unknown");
+                                    }
+                                }
+                                font.pixelSize: Theme.fontSizeMedium
+                                color: Theme.surfaceText
+                                font.weight: Font.Medium
+                            }
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Primary")
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceVariantText
+                            visible: NetworkService.primaryConnection.length > 0
+                        }
+                        StyledText {
+                            text: NetworkService.primaryConnection || "-"
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceText
+                            elide: Text.ElideRight
+                            visible: NetworkService.primaryConnection.length > 0
+                        }
+                    }
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+                        visible: NetworkService.backend === "networkmanager" && NetworkService.ethernetConnected && NetworkService.wifiConnected
+
+                        StyledText {
+                            text: I18n.tr("Preference")
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceVariantText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        Item {
+                            width: parent.width - preferenceLabel.width - preferenceButtons.width - Theme.spacingM * 2
+                            height: 1
+                        }
+
+                        DankButtonGroup {
+                            id: preferenceButtons
+                            model: [I18n.tr("Auto"), I18n.tr("Ethernet"), I18n.tr("WiFi")]
+                            currentIndex: {
+                                switch (NetworkService.userPreference) {
+                                case "ethernet":
+                                    return 1;
+                                case "wifi":
+                                    return 2;
+                                default:
+                                    return 0;
+                                }
+                            }
+                            onSelectionChanged: (index, selected) => {
+                                if (!selected)
+                                    return;
+                                switch (index) {
+                                case 0:
+                                    NetworkService.setNetworkPreference("auto");
+                                    break;
+                                case 1:
+                                    NetworkService.setNetworkPreference("ethernet");
+                                    break;
+                                case 2:
+                                    NetworkService.setNetworkPreference("wifi");
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    StyledText {
+                        id: preferenceLabel
+                        visible: false
+                        text: I18n.tr("Preference")
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/Settings/NetworkVpnTab.qml

@@ -0,0 +1,516 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import qs.Common
+import qs.Modules.Settings.Widgets
+import qs.Modals.Common
+import qs.Modals.FileBrowser
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: networkVpnTab
+
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
+    Component.onCompleted: {
+        NetworkService.addRef();
+    }
+
+    Component.onDestruction: {
+        NetworkService.removeRef();
+    }
+
+    DankFlickable {
+        anchors.fill: parent
+        clip: true
+        contentHeight: mainColumn.height + Theme.spacingXL
+        contentWidth: width
+
+        Column {
+            id: mainColumn
+
+            topPadding: 4
+            width: Math.min(600, parent.width - Theme.spacingL * 2)
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: Theme.spacingL
+
+            SettingsCard {
+                id: root
+
+                property string expandedVpnUuid: ""
+
+                title: I18n.tr("VPN")
+                iconName: "vpn_key"
+                settingKey: "networkVpn"
+                tags: ["vpn", "network", "profiles", "import", "openvpn", "wireguard"]
+
+                function openVpnFileBrowser() {
+                    vpnFileBrowserLoader.active = true;
+                    if (vpnFileBrowserLoader.item)
+                        vpnFileBrowserLoader.item.open();
+                }
+
+                property var vpnFileBrowserLoader: LazyLoader {
+                    active: false
+
+                    FileBrowserModal {
+                        browserTitle: I18n.tr("Import VPN")
+                        browserIcon: "vpn_key"
+                        browserType: "vpn"
+                        fileExtensions: VPNService.getFileFilter()
+
+                        onFileSelected: path => {
+                            VPNService.importVpn(path.replace("file://", ""));
+                        }
+                    }
+                }
+
+                property var deleteVpnConfirm: ConfirmModal {}
+
+                width: parent.width
+
+                Column {
+                    id: vpnSection
+
+                    width: parent.width
+                    spacing: Theme.spacingM
+
+                    StyledText {
+                        text: I18n.tr("Unavailable")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        width: parent.width
+                        horizontalAlignment: Text.AlignLeft
+                        visible: !DMSNetworkService.vpnAvailable
+                    }
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+                        visible: DMSNetworkService.vpnAvailable
+
+                        StyledText {
+                            text: {
+                                if (!DMSNetworkService.connected)
+                                    return I18n.tr("Disconnected");
+                                const names = DMSNetworkService.activeNames || [];
+                                if (names.length <= 1)
+                                    return names[0] || I18n.tr("Connected");
+                                return names[0] + " +" + (names.length - 1);
+                            }
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: DMSNetworkService.connected ? Theme.primary : Theme.surfaceVariantText
+                            width: parent.width - vpnHeaderControls.width - Theme.spacingM
+                            horizontalAlignment: Text.AlignLeft
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        Row {
+                            id: vpnHeaderControls
+                            anchors.verticalCenter: parent.verticalCenter
+                            spacing: Theme.spacingS
+
+                            Rectangle {
+                                height: 28
+                                radius: 14
+                                width: importVpnRow.width + Theme.spacingM * 2
+                                color: importVpnArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
+                                opacity: VPNService.importing ? 0.5 : 1.0
+
+                                Row {
+                                    id: importVpnRow
+                                    anchors.centerIn: parent
+                                    spacing: Theme.spacingXS
+
+                                    DankIcon {
+                                        name: VPNService.importing ? "sync" : "add"
+                                        size: Theme.fontSizeSmall
+                                        color: Theme.primary
+                                    }
+
+                                    StyledText {
+                                        text: I18n.tr("Import")
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.primary
+                                        font.weight: Font.Medium
+                                    }
+                                }
+
+                                MouseArea {
+                                    id: importVpnArea
+                                    anchors.fill: parent
+                                    hoverEnabled: true
+                                    cursorShape: VPNService.importing ? Qt.BusyCursor : Qt.PointingHandCursor
+                                    enabled: !VPNService.importing
+                                    onClicked: root.openVpnFileBrowser()
+                                }
+                            }
+
+                            Rectangle {
+                                height: 28
+                                radius: 14
+                                width: disconnectAllRow.width + Theme.spacingM * 2
+                                color: disconnectAllArea.containsMouse ? Theme.errorHover : Theme.surfaceLight
+                                visible: DMSNetworkService.connected
+                                opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
+
+                                Row {
+                                    id: disconnectAllRow
+                                    anchors.centerIn: parent
+                                    spacing: Theme.spacingXS
+
+                                    DankIcon {
+                                        name: "link_off"
+                                        size: Theme.fontSizeSmall
+                                        color: Theme.surfaceText
+                                    }
+
+                                    StyledText {
+                                        text: I18n.tr("Disconnect")
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.surfaceText
+                                        font.weight: Font.Medium
+                                    }
+                                }
+
+                                MouseArea {
+                                    id: disconnectAllArea
+                                    anchors.fill: parent
+                                    hoverEnabled: true
+                                    cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
+                                    enabled: !DMSNetworkService.isBusy
+                                    onClicked: DMSNetworkService.disconnectAllActive()
+                                }
+                            }
+                        }
+                    }
+
+                    Rectangle {
+                        width: parent.width
+                        height: 1
+                        color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                        visible: DMSNetworkService.vpnAvailable
+                    }
+
+                    Item {
+                        width: parent.width
+                        height: 100
+                        visible: DMSNetworkService.vpnAvailable && DMSNetworkService.profiles.length === 0
+
+                        Column {
+                            anchors.centerIn: parent
+                            spacing: Theme.spacingS
+
+                            DankIcon {
+                                name: "vpn_key_off"
+                                size: 36
+                                color: Theme.surfaceVariantText
+                                anchors.horizontalCenter: parent.horizontalCenter
+                            }
+
+                            StyledText {
+                                text: I18n.tr("No VPN profiles")
+                                font.pixelSize: Theme.fontSizeMedium
+                                color: Theme.surfaceVariantText
+                                anchors.horizontalCenter: parent.horizontalCenter
+                            }
+
+                            StyledText {
+                                text: I18n.tr("Click Import to add a .ovpn or .conf")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                                anchors.horizontalCenter: parent.horizontalCenter
+                            }
+                        }
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: 4
+                        visible: DMSNetworkService.vpnAvailable && DMSNetworkService.profiles.length > 0
+
+                        Repeater {
+                            model: DMSNetworkService.profiles
+
+                            delegate: Rectangle {
+                                id: vpnProfileRow
+                                required property var modelData
+                                required property int index
+
+                                readonly property bool isActive: DMSNetworkService.isActiveUuid(modelData.uuid)
+                                readonly property bool isTransient: !!modelData.transient
+                                readonly property bool canExpand: modelData.canExpand !== false
+                                readonly property bool canDelete: modelData.canDelete !== false
+                                readonly property bool isExpanded: root.expandedVpnUuid === modelData.uuid
+                                readonly property var configData: (!isTransient && isExpanded) ? VPNService.editConfig : null
+
+                                width: parent.width
+                                height: isExpanded ? 56 + vpnExpandedContent.height : 56
+                                radius: Theme.cornerRadius
+                                color: vpnRowArea.containsMouse ? Theme.primaryHoverLight : (isActive ? Theme.primaryPressed : Theme.surfaceLight)
+                                border.width: isActive ? 2 : 0
+                                border.color: Theme.primary
+                                opacity: DMSNetworkService.isBusy ? 0.6 : 1.0
+                                clip: true
+
+                                Behavior on height {
+                                    NumberAnimation {
+                                        duration: 150
+                                        easing.type: Easing.OutQuad
+                                    }
+                                }
+
+                                MouseArea {
+                                    id: vpnRowArea
+                                    anchors.fill: parent
+                                    hoverEnabled: true
+                                    cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
+                                    enabled: !DMSNetworkService.isBusy
+                                    onClicked: DMSNetworkService.toggle(modelData.uuid)
+                                }
+
+                                Column {
+                                    anchors.fill: parent
+                                    anchors.margins: Theme.spacingS
+                                    spacing: Theme.spacingS
+
+                                    Row {
+                                        width: parent.width
+                                        height: 56 - Theme.spacingS * 2
+                                        spacing: Theme.spacingS
+
+                                        DankIcon {
+                                            name: isActive ? "vpn_lock" : "vpn_key_off"
+                                            size: 20
+                                            color: isActive ? Theme.primary : Theme.surfaceText
+                                            anchors.verticalCenter: parent.verticalCenter
+                                        }
+
+                                        Column {
+                                            spacing: 2
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            width: parent.width - 20 - ((canExpand ? 28 : 0) + (canDelete ? 28 : 0)) - Theme.spacingS * 4
+
+                                            StyledText {
+                                                text: modelData.name
+                                                font.pixelSize: Theme.fontSizeMedium
+                                                color: isActive ? Theme.primary : Theme.surfaceText
+                                                elide: Text.ElideRight
+                                                width: parent.width
+                                                horizontalAlignment: Text.AlignLeft
+                                            }
+
+                                            StyledText {
+                                                text: VPNService.getVpnTypeFromProfile(modelData)
+                                                font.pixelSize: Theme.fontSizeSmall
+                                                color: Theme.surfaceVariantText
+                                                anchors.left: parent.left
+                                            }
+                                        }
+
+                                        Item {
+                                            width: Theme.spacingXS
+                                            height: 1
+                                        }
+
+                                        Rectangle {
+                                            width: 28
+                                            height: 28
+                                            radius: 14
+                                            color: vpnExpandBtn.containsMouse ? Theme.surfacePressed : "transparent"
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            visible: canExpand
+
+                                            DankIcon {
+                                                anchors.centerIn: parent
+                                                name: isExpanded ? "expand_less" : "expand_more"
+                                                size: 18
+                                                color: Theme.surfaceText
+                                            }
+
+                                            MouseArea {
+                                                id: vpnExpandBtn
+                                                anchors.fill: parent
+                                                hoverEnabled: true
+                                                cursorShape: Qt.PointingHandCursor
+                                                onClicked: {
+                                                    if (isExpanded) {
+                                                        root.expandedVpnUuid = "";
+                                                    } else {
+                                                        root.expandedVpnUuid = modelData.uuid;
+                                                        VPNService.getConfig(modelData.uuid);
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                        Rectangle {
+                                            width: 28
+                                            height: 28
+                                            radius: 14
+                                            color: vpnDeleteBtn.containsMouse ? Theme.errorHover : "transparent"
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            visible: canDelete
+
+                                            DankIcon {
+                                                anchors.centerIn: parent
+                                                name: "delete"
+                                                size: 18
+                                                color: vpnDeleteBtn.containsMouse ? Theme.error : Theme.surfaceVariantText
+                                            }
+
+                                            MouseArea {
+                                                id: vpnDeleteBtn
+                                                anchors.fill: parent
+                                                hoverEnabled: true
+                                                cursorShape: Qt.PointingHandCursor
+                                                onClicked: {
+                                                    deleteVpnConfirm.showWithOptions({
+                                                        title: I18n.tr("Delete VPN"),
+                                                        message: I18n.tr("Delete \"%1\"?").arg(modelData.name),
+                                                        confirmText: I18n.tr("Delete"),
+                                                        confirmColor: Theme.error,
+                                                        onConfirm: () => VPNService.deleteVpn(modelData.uuid)
+                                                    });
+                                                }
+                                            }
+                                        }
+                                    }
+
+                                    Column {
+                                        id: vpnExpandedContent
+                                        width: parent.width
+                                        spacing: Theme.spacingXS
+                                        visible: !isTransient && isExpanded
+
+                                        Rectangle {
+                                            width: parent.width
+                                            height: 1
+                                            color: Theme.outlineLight
+                                        }
+
+                                        Item {
+                                            width: parent.width
+                                            height: VPNService.configLoading ? 40 : 0
+                                            visible: VPNService.configLoading
+
+                                            DankSpinner {
+                                                anchors.centerIn: parent
+                                                size: 20
+                                            }
+                                        }
+
+                                        Flow {
+                                            width: parent.width
+                                            spacing: Theme.spacingXS
+                                            visible: !VPNService.configLoading && configData
+
+                                            Repeater {
+                                                model: {
+                                                    if (!configData)
+                                                        return [];
+                                                    const fields = [];
+                                                    const data = configData.data || {};
+
+                                                    if (data.remote)
+                                                        fields.push({
+                                                            label: I18n.tr("Server"),
+                                                            value: data.remote
+                                                        });
+                                                    if (configData.username || data.username)
+                                                        fields.push({
+                                                            label: I18n.tr("Username"),
+                                                            value: configData.username || data.username
+                                                        });
+                                                    if (data.cipher)
+                                                        fields.push({
+                                                            label: I18n.tr("Cipher"),
+                                                            value: data.cipher
+                                                        });
+                                                    if (data.auth)
+                                                        fields.push({
+                                                            label: I18n.tr("Auth"),
+                                                            value: data.auth
+                                                        });
+                                                    if (data["proto-tcp"] === "yes" || data["proto-tcp"] === "no")
+                                                        fields.push({
+                                                            label: I18n.tr("Protocol"),
+                                                            value: data["proto-tcp"] === "yes" ? "TCP" : "UDP"
+                                                        });
+                                                    if (data["tunnel-mtu"])
+                                                        fields.push({
+                                                            label: I18n.tr("MTU"),
+                                                            value: data["tunnel-mtu"]
+                                                        });
+                                                    if (data["connection-type"])
+                                                        fields.push({
+                                                            label: I18n.tr("Auth Type"),
+                                                            value: data["connection-type"]
+                                                        });
+                                                    return fields;
+                                                }
+
+                                                delegate: Rectangle {
+                                                    required property var modelData
+                                                    required property int index
+
+                                                    width: vpnFieldContent.width + Theme.spacingM * 2
+                                                    height: 32
+                                                    radius: Theme.cornerRadius - 2
+                                                    color: Theme.surfaceContainerHigh
+                                                    border.width: 1
+                                                    border.color: Theme.outlineLight
+
+                                                    Row {
+                                                        id: vpnFieldContent
+                                                        anchors.centerIn: parent
+                                                        spacing: Theme.spacingXS
+
+                                                        StyledText {
+                                                            text: modelData.label + ":"
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: Theme.surfaceVariantText
+                                                            anchors.verticalCenter: parent.verticalCenter
+                                                        }
+
+                                                        StyledText {
+                                                            text: modelData.value
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: Theme.surfaceText
+                                                            font.weight: Font.Medium
+                                                            anchors.verticalCenter: parent.verticalCenter
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                        DankToggle {
+                                            width: parent.width
+                                            text: I18n.tr("Autoconnect")
+                                            checked: configData ? (configData.autoconnect || false) : false
+                                            visible: !VPNService.configLoading && configData !== null
+                                            onToggled: checked => {
+                                                VPNService.updateConfig(modelData.uuid, {
+                                                    autoconnect: checked
+                                                });
+                                            }
+                                        }
+
+                                        Item {
+                                            width: 1
+                                            height: Theme.spacingXS
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/Settings/NetworkWifiTab.qml

@@ -0,0 +1,761 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import qs.Common
+import qs.Modules.Settings.Widgets
+import qs.Modals.Common
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: networkWifiTab
+
+    LayoutMirroring.enabled: I18n.isRtl
+    LayoutMirroring.childrenInherit: true
+
+    Component.onCompleted: {
+        NetworkService.addRef();
+    }
+
+    Component.onDestruction: {
+        NetworkService.removeRef();
+    }
+
+    DankFlickable {
+        anchors.fill: parent
+        clip: true
+        contentHeight: mainColumn.height + Theme.spacingXL
+        contentWidth: width
+
+        Column {
+            id: mainColumn
+
+            topPadding: 4
+            width: Math.min(600, parent.width - Theme.spacingL * 2)
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: Theme.spacingL
+
+            SettingsCard {
+                id: root
+
+                property string expandedWifiSsid: ""
+                property int maxPinnedWifiNetworks: 3
+
+                function normalizePinList(value) {
+                    if (Array.isArray(value))
+                        return value.filter(v => v);
+                    if (typeof value === "string" && value.length > 0)
+                        return [value];
+                    return [];
+                }
+
+                function getPinnedWifiNetworks() {
+                    const pins = SettingsData.wifiNetworkPins || {};
+                    return normalizePinList(pins["preferredWifi"]);
+                }
+
+                function toggleWifiPin(ssid) {
+                    const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}));
+                    let pinnedList = normalizePinList(pins["preferredWifi"]);
+                    const pinIndex = pinnedList.indexOf(ssid);
+
+                    if (pinIndex !== -1) {
+                        pinnedList.splice(pinIndex, 1);
+                    } else {
+                        pinnedList.unshift(ssid);
+                        if (pinnedList.length > maxPinnedWifiNetworks)
+                            pinnedList = pinnedList.slice(0, maxPinnedWifiNetworks);
+                    }
+
+                    if (pinnedList.length > 0)
+                        pins["preferredWifi"] = pinnedList;
+                    else
+                        delete pins["preferredWifi"];
+
+                    SettingsData.set("wifiNetworkPins", pins);
+                }
+
+                property var forgetNetworkConfirm: ConfirmModal {}
+
+                width: parent.width
+                title: I18n.tr("WiFi")
+                iconName: "wifi"
+                settingKey: "networkWifi"
+                tags: ["wifi", "wi-fi", "wireless", "network", "ssid", "adapter", "radio"]
+
+                Column {
+                    id: wifiSection
+
+                    width: parent.width
+                    spacing: Theme.spacingM
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        StyledText {
+                            text: {
+                                if (NetworkService.wifiToggling)
+                                    return I18n.tr("Toggling...");
+                                if (!NetworkService.wifiEnabled)
+                                    return I18n.tr("Disabled");
+                                if (NetworkService.wifiConnected)
+                                    return NetworkService.currentWifiSSID;
+                                return I18n.tr("Not connected");
+                            }
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: NetworkService.wifiConnected ? Theme.primary : Theme.surfaceVariantText
+                            width: parent.width - wifiControls.width - Theme.spacingM
+                            horizontalAlignment: Text.AlignLeft
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        Row {
+                            id: wifiControls
+                            anchors.verticalCenter: parent.verticalCenter
+                            spacing: Theme.spacingS
+
+                            DankActionButton {
+                                iconName: "wifi_find"
+                                buttonSize: 32
+                                visible: NetworkService.backend === "networkmanager" && NetworkService.wifiEnabled && !NetworkService.wifiToggling
+                                onClicked: PopoutService.showHiddenNetworkModal()
+                            }
+
+                            DankActionButton {
+                                iconName: "refresh"
+                                buttonSize: 32
+                                visible: NetworkService.wifiEnabled && !NetworkService.wifiToggling && !NetworkService.isScanning
+                                onClicked: NetworkService.scanWifi()
+                            }
+
+                            DankToggle {
+                                checked: NetworkService.wifiEnabled
+                                enabled: !NetworkService.wifiToggling
+                                onToggled: NetworkService.toggleWifiRadio()
+                            }
+                        }
+                    }
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+                        visible: NetworkService.wifiEnabled && (NetworkService.wifiDevices?.length ?? 0) > 1
+
+                        StyledText {
+                            text: I18n.tr("WiFi Device")
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceVariantText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        Item {
+                            width: parent.width - wifiDeviceLabel.width - wifiDeviceDropdown.width - Theme.spacingM * 2
+                            height: 1
+                        }
+
+                        DankDropdown {
+                            id: wifiDeviceDropdown
+                            dropdownWidth: 150
+                            popupWidth: 180
+                            currentValue: NetworkService.wifiDeviceOverride || I18n.tr("Auto")
+                            options: {
+                                const devices = NetworkService.wifiDevices;
+                                if (!devices || devices.length === 0)
+                                    return [I18n.tr("Auto")];
+                                return [I18n.tr("Auto")].concat(devices.map(d => d.name));
+                            }
+                            onValueChanged: value => {
+                                const deviceName = value === I18n.tr("Auto") ? "" : value;
+                                NetworkService.setWifiDeviceOverride(deviceName);
+                            }
+                        }
+                    }
+
+                    StyledText {
+                        id: wifiDeviceLabel
+                        visible: false
+                        text: I18n.tr("WiFi Device")
+                    }
+
+                    Rectangle {
+                        width: parent.width
+                        height: 1
+                        color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                        visible: NetworkService.wifiEnabled
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingS
+                        visible: NetworkService.wifiEnabled && !NetworkService.wifiToggling
+
+                        Column {
+                            width: parent.width
+                            spacing: Theme.spacingS
+                            visible: NetworkService.wifiInterface.length > 0
+
+                            Row {
+                                width: parent.width
+                                height: 24
+
+                                StyledText {
+                                    text: I18n.tr("Interface:")
+                                    font.pixelSize: Theme.fontSizeMedium
+                                    color: Theme.surfaceVariantText
+                                    width: 100
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+                                StyledText {
+                                    text: NetworkService.wifiInterface || "-"
+                                    font.pixelSize: Theme.fontSizeMedium
+                                    color: Theme.surfaceText
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+                            }
+
+                            Row {
+                                width: parent.width
+                                height: 24
+                                visible: NetworkService.wifiIP.length > 0
+
+                                StyledText {
+                                    text: I18n.tr("IP Address:")
+                                    font.pixelSize: Theme.fontSizeMedium
+                                    color: Theme.surfaceVariantText
+                                    width: 100
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+                                StyledText {
+                                    text: NetworkService.wifiIP || "-"
+                                    font.pixelSize: Theme.fontSizeMedium
+                                    color: Theme.surfaceText
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+                            }
+
+                            Row {
+                                width: parent.width
+                                height: 24
+                                visible: NetworkService.wifiConnected
+
+                                StyledText {
+                                    text: I18n.tr("Signal:")
+                                    font.pixelSize: Theme.fontSizeMedium
+                                    color: Theme.surfaceVariantText
+                                    width: 100
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+
+                                Row {
+                                    spacing: Theme.spacingXS
+                                    anchors.verticalCenter: parent.verticalCenter
+
+                                    DankIcon {
+                                        name: {
+                                            const s = NetworkService.wifiSignalStrength;
+                                            if (s >= 50)
+                                                return "wifi";
+                                            if (s >= 25)
+                                                return "wifi_2_bar";
+                                            return "wifi_1_bar";
+                                        }
+                                        size: 18
+                                        color: Theme.surfaceText
+                                        anchors.verticalCenter: parent.verticalCenter
+                                    }
+
+                                    StyledText {
+                                        text: NetworkService.wifiSignalStrength + "%"
+                                        font.pixelSize: Theme.fontSizeMedium
+                                        color: Theme.surfaceText
+                                    }
+                                }
+                            }
+                        }
+
+                        Item {
+                            width: parent.width
+                            height: Theme.spacingS
+                        }
+
+                        Row {
+                            width: parent.width
+                            spacing: Theme.spacingM
+
+                            StyledText {
+                                text: I18n.tr("Available Networks")
+                                font.pixelSize: Theme.fontSizeMedium
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            Item {
+                                width: 1
+                                height: 1
+                                Layout.fillWidth: true
+                            }
+
+                            StyledText {
+                                text: NetworkService.wifiNetworks?.length ?? 0
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+                        }
+
+                        Item {
+                            width: parent.width
+                            height: 80
+                            visible: NetworkService.isScanning && (NetworkService.wifiNetworks?.length ?? 0) === 0
+
+                            Column {
+                                anchors.centerIn: parent
+                                spacing: Theme.spacingS
+
+                                DankIcon {
+                                    id: scanningIcon
+                                    name: "wifi_find"
+                                    size: 32
+                                    color: Theme.surfaceVariantText
+                                    anchors.horizontalCenter: parent.horizontalCenter
+
+                                    SequentialAnimation {
+                                        running: NetworkService.isScanning
+                                        loops: Animation.Infinite
+                                        OpacityAnimator {
+                                            target: scanningIcon
+                                            to: 0.3
+                                            duration: 400
+                                            easing.type: Easing.InOutQuad
+                                        }
+                                        OpacityAnimator {
+                                            target: scanningIcon
+                                            to: 1.0
+                                            duration: 400
+                                            easing.type: Easing.InOutQuad
+                                        }
+                                        onRunningChanged: if (!running)
+                                            scanningIcon.opacity = 1.0
+                                    }
+                                }
+
+                                StyledText {
+                                    text: I18n.tr("Scanning...")
+                                    font.pixelSize: Theme.fontSizeSmall
+                                    color: Theme.surfaceVariantText
+                                    anchors.horizontalCenter: parent.horizontalCenter
+                                }
+                            }
+                        }
+
+                        Column {
+                            width: parent.width
+                            spacing: 4
+                            visible: (NetworkService.wifiNetworks?.length ?? 0) > 0
+
+                            Repeater {
+                                model: {
+                                    const ssid = NetworkService.currentWifiSSID;
+                                    const networks = NetworkService.wifiNetworks || [];
+                                    const pinnedList = root.getPinnedWifiNetworks();
+
+                                    let sorted = [...networks];
+                                    sorted.sort((a, b) => {
+                                        const aPinnedIndex = pinnedList.indexOf(a.ssid);
+                                        const bPinnedIndex = pinnedList.indexOf(b.ssid);
+                                        if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
+                                            if (aPinnedIndex === -1)
+                                                return 1;
+                                            if (bPinnedIndex === -1)
+                                                return -1;
+                                            return aPinnedIndex - bPinnedIndex;
+                                        }
+                                        if (a.ssid === ssid)
+                                            return -1;
+                                        if (b.ssid === ssid)
+                                            return 1;
+                                        return b.signal - a.signal;
+                                    });
+                                    return sorted;
+                                }
+
+                                delegate: Rectangle {
+                                    id: wifiNetworkDelegate
+                                    required property var modelData
+                                    required property int index
+
+                                    readonly property bool isConnected: modelData.ssid === NetworkService.currentWifiSSID
+                                    readonly property bool isPinned: root.getPinnedWifiNetworks().includes(modelData.ssid)
+                                    readonly property bool isExpanded: root.expandedWifiSsid === modelData.ssid
+
+                                    width: parent.width
+                                    height: isExpanded ? 56 + wifiExpandedContent.height : 56
+                                    radius: Theme.cornerRadius
+                                    color: wifiNetworkMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
+                                    border.width: isConnected ? 2 : 0
+                                    border.color: Theme.primary
+                                    clip: true
+
+                                    Behavior on height {
+                                        NumberAnimation {
+                                            duration: 150
+                                            easing.type: Easing.OutQuad
+                                        }
+                                    }
+
+                                    Column {
+                                        anchors.fill: parent
+                                        spacing: 0
+
+                                        Item {
+                                            width: parent.width
+                                            height: 56
+
+                                            Row {
+                                                anchors.left: parent.left
+                                                anchors.leftMargin: Theme.spacingM
+                                                anchors.verticalCenter: parent.verticalCenter
+                                                anchors.right: wifiNetworkActions.left
+                                                anchors.rightMargin: Theme.spacingS
+                                                spacing: Theme.spacingS
+
+                                                DankIcon {
+                                                    name: {
+                                                        const s = modelData.signal || 0;
+                                                        if (s >= 50)
+                                                            return "wifi";
+                                                        if (s >= 25)
+                                                            return "wifi_2_bar";
+                                                        return "wifi_1_bar";
+                                                    }
+                                                    size: 20
+                                                    color: isConnected ? Theme.primary : Theme.surfaceText
+                                                    anchors.verticalCenter: parent.verticalCenter
+                                                }
+
+                                                Column {
+                                                    anchors.verticalCenter: parent.verticalCenter
+                                                    spacing: 2
+                                                    width: parent.width - 20 - Theme.spacingS
+
+                                                    Row {
+                                                        anchors.left: parent.left
+                                                        spacing: Theme.spacingXS
+
+                                                        StyledText {
+                                                            text: modelData.ssid || I18n.tr("Unknown")
+                                                            font.pixelSize: Theme.fontSizeMedium
+                                                            color: isConnected ? Theme.primary : Theme.surfaceText
+                                                            font.weight: isConnected ? Font.Medium : Font.Normal
+                                                            elide: Text.ElideRight
+                                                        }
+
+                                                        DankIcon {
+                                                            name: "push_pin"
+                                                            size: 14
+                                                            color: Theme.primary
+                                                            visible: isPinned
+                                                            anchors.verticalCenter: parent.verticalCenter
+                                                        }
+
+                                                        DankIcon {
+                                                            name: "visibility_off"
+                                                            size: 14
+                                                            color: Theme.surfaceVariantText
+                                                            visible: modelData.hidden || false
+                                                            anchors.verticalCenter: parent.verticalCenter
+                                                        }
+                                                    }
+
+                                                    Row {
+                                                        anchors.left: parent.left
+                                                        spacing: Theme.spacingXS
+
+                                                        StyledText {
+                                                            text: isConnected ? I18n.tr("Connected") : (modelData.secured ? I18n.tr("Secured") : I18n.tr("Open"))
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: isConnected ? Theme.primary : Theme.surfaceVariantText
+                                                        }
+
+                                                        StyledText {
+                                                            text: "•"
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: Theme.surfaceVariantText
+                                                            visible: modelData.saved
+                                                        }
+
+                                                        StyledText {
+                                                            text: I18n.tr("Saved")
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: Theme.primary
+                                                            visible: modelData.saved
+                                                        }
+
+                                                        StyledText {
+                                                            text: "•"
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: Theme.surfaceVariantText
+                                                            visible: modelData.hidden || false
+                                                        }
+
+                                                        StyledText {
+                                                            text: I18n.tr("Hidden")
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: Theme.surfaceVariantText
+                                                            visible: modelData.hidden || false
+                                                        }
+
+                                                        StyledText {
+                                                            text: "•"
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: Theme.surfaceVariantText
+                                                        }
+
+                                                        StyledText {
+                                                            text: modelData.signal + "%"
+                                                            font.pixelSize: Theme.fontSizeSmall
+                                                            color: Theme.surfaceVariantText
+                                                        }
+                                                    }
+                                                }
+                                            }
+
+                                            Row {
+                                                id: wifiNetworkActions
+                                                anchors.right: parent.right
+                                                anchors.rightMargin: Theme.spacingS
+                                                anchors.verticalCenter: parent.verticalCenter
+                                                spacing: Theme.spacingXS
+
+                                                Rectangle {
+                                                    width: 28
+                                                    height: 28
+                                                    radius: 14
+                                                    color: wifiExpandBtn.containsMouse ? Theme.surfacePressed : "transparent"
+                                                    visible: isConnected || modelData.saved
+
+                                                    DankIcon {
+                                                        anchors.centerIn: parent
+                                                        name: isExpanded ? "expand_less" : "expand_more"
+                                                        size: 18
+                                                        color: Theme.surfaceText
+                                                    }
+
+                                                    MouseArea {
+                                                        id: wifiExpandBtn
+                                                        anchors.fill: parent
+                                                        hoverEnabled: true
+                                                        cursorShape: Qt.PointingHandCursor
+                                                        onClicked: {
+                                                            if (isExpanded) {
+                                                                root.expandedWifiSsid = "";
+                                                            } else {
+                                                                root.expandedWifiSsid = modelData.ssid;
+                                                                NetworkService.fetchNetworkInfo(modelData.ssid);
+                                                            }
+                                                        }
+                                                    }
+                                                }
+
+                                                DankActionButton {
+                                                    iconName: "qr_code"
+                                                    buttonSize: 28
+                                                    visible: modelData.secured && modelData.saved
+                                                    onClicked: {
+                                                        PopoutService.showWifiQRCodeModal(modelData.ssid);
+                                                    }
+                                                }
+
+                                                DankActionButton {
+                                                    iconName: isPinned ? "push_pin" : "push_pin"
+                                                    buttonSize: 28
+                                                    iconColor: isPinned ? Theme.primary : Theme.surfaceVariantText
+                                                    onClicked: {
+                                                        root.toggleWifiPin(modelData.ssid);
+                                                    }
+                                                }
+
+                                                DankActionButton {
+                                                    iconName: "delete"
+                                                    buttonSize: 28
+                                                    iconColor: Theme.error
+                                                    visible: modelData.saved || isConnected
+                                                    onClicked: {
+                                                        forgetNetworkConfirm.showWithOptions({
+                                                            title: I18n.tr("Forget Network"),
+                                                            message: I18n.tr("Forget \"%1\"?").arg(modelData.ssid),
+                                                            confirmText: I18n.tr("Forget"),
+                                                            confirmColor: Theme.error,
+                                                            onConfirm: () => NetworkService.forgetWifiNetwork(modelData.ssid)
+                                                        });
+                                                    }
+                                                }
+                                            }
+
+                                            MouseArea {
+                                                id: wifiNetworkMouseArea
+
+                                                anchors.fill: parent
+                                                anchors.rightMargin: wifiNetworkActions.width + Theme.spacingM
+                                                hoverEnabled: true
+                                                cursorShape: Qt.PointingHandCursor
+                                                onClicked: {
+                                                    if (isConnected) {
+                                                        NetworkService.disconnectWifi();
+                                                        return;
+                                                    }
+                                                    if (modelData.secured && !modelData.saved && (DMSService.apiVersion < 7 || modelData.enterprise)) {
+                                                        PopoutService.showWifiPasswordModal(modelData.ssid);
+                                                        return;
+                                                    }
+                                                    NetworkService.connectToWifi(modelData.ssid);
+                                                }
+                                            }
+                                        }
+
+                                        Column {
+                                            id: wifiExpandedContent
+                                            width: parent.width
+                                            visible: isExpanded
+
+                                            Rectangle {
+                                                width: parent.width - Theme.spacingM * 2
+                                                height: 1
+                                                x: Theme.spacingM
+                                                color: Theme.outlineLight
+                                            }
+
+                                            Item {
+                                                width: parent.width
+                                                height: wifiDetailsColumn.implicitHeight + Theme.spacingM * 2
+
+                                                Column {
+                                                    id: wifiDetailsColumn
+                                                    anchors.fill: parent
+                                                    anchors.margins: Theme.spacingM
+                                                    spacing: Theme.spacingS
+
+                                                    Item {
+                                                        width: parent.width
+                                                        height: NetworkService.networkInfoLoading ? 40 : 0
+                                                        visible: NetworkService.networkInfoLoading
+
+                                                        DankSpinner {
+                                                            anchors.centerIn: parent
+                                                            size: 20
+                                                        }
+                                                    }
+
+                                                    Flow {
+                                                        width: parent.width
+                                                        spacing: Theme.spacingXS
+                                                        visible: !NetworkService.networkInfoLoading
+
+                                                        Repeater {
+                                                            model: {
+                                                                const fields = [];
+                                                                const net = modelData;
+                                                                if (!net)
+                                                                    return fields;
+
+                                                                fields.push({
+                                                                    label: I18n.tr("Signal"),
+                                                                    value: net.signal + "%"
+                                                                });
+                                                                if (net.frequency)
+                                                                    fields.push({
+                                                                        label: I18n.tr("Frequency"),
+                                                                        value: (net.frequency / 1000).toFixed(1) + " GHz"
+                                                                    });
+                                                                if (net.channel)
+                                                                    fields.push({
+                                                                        label: I18n.tr("Channel"),
+                                                                        value: String(net.channel)
+                                                                    });
+                                                                if (net.rate)
+                                                                    fields.push({
+                                                                        label: I18n.tr("Rate"),
+                                                                        value: net.rate + " Mbps"
+                                                                    });
+                                                                if (net.mode)
+                                                                    fields.push({
+                                                                        label: I18n.tr("Mode"),
+                                                                        value: net.mode
+                                                                    });
+                                                                if (net.bssid)
+                                                                    fields.push({
+                                                                        label: I18n.tr("BSSID"),
+                                                                        value: net.bssid
+                                                                    });
+                                                                fields.push({
+                                                                    label: I18n.tr("Security"),
+                                                                    value: net.secured ? (net.enterprise ? I18n.tr("Enterprise") : I18n.tr("WPA/WPA2")) : I18n.tr("Open")
+                                                                });
+
+                                                                return fields;
+                                                            }
+
+                                                            delegate: Rectangle {
+                                                                required property var modelData
+                                                                required property int index
+
+                                                                width: wifiFieldContent.width + Theme.spacingM * 2
+                                                                height: 32
+                                                                radius: Theme.cornerRadius - 2
+                                                                color: Theme.surfaceContainerHigh
+                                                                border.width: 1
+                                                                border.color: Theme.outlineLight
+
+                                                                Row {
+                                                                    id: wifiFieldContent
+                                                                    anchors.centerIn: parent
+                                                                    spacing: Theme.spacingXS
+
+                                                                    StyledText {
+                                                                        text: modelData.label + ":"
+                                                                        font.pixelSize: Theme.fontSizeSmall
+                                                                        color: Theme.surfaceVariantText
+                                                                        anchors.verticalCenter: parent.verticalCenter
+                                                                    }
+
+                                                                    StyledText {
+                                                                        text: modelData.value
+                                                                        font.pixelSize: Theme.fontSizeSmall
+                                                                        color: Theme.surfaceText
+                                                                        font.weight: Font.Medium
+                                                                        anchors.verticalCenter: parent.verticalCenter
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+
+                                                    Row {
+                                                        spacing: Theme.spacingS
+                                                        visible: (modelData.saved || isConnected) && DMSService.apiVersion > 13
+
+                                                        DankToggle {
+                                                            id: autoconnectToggle
+                                                            text: I18n.tr("Autoconnect")
+                                                            checked: modelData.autoconnect || false
+                                                            onToggled: checked => {
+                                                                NetworkService.setWifiAutoconnect(modelData.ssid, checked);
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

quickshell/Modules/Settings/TimeWeatherTab.qml

@@ -115,6 +115,43 @@ Item {
                     }
                 }
 
+                SettingsDropdownRow {
+                    tab: "time"
+                    tags: ["calendar", "backend", "daemon", "khal", "dankcalendar", "events"]
+                    settingKey: "calendarBackend"
+                    text: I18n.tr("Calendar Backend")
+                    description: {
+                        const resolved = CalendarService.activeBackend;
+                        switch (resolved) {
+                        case "dankcal":
+                            return I18n.tr("Using DankCalendar%1", "calendar backend status").arg(CalendarService.isDankActive && CalendarService.calendars.length > 0 ? "" : " (connecting…)");
+                        case "khal":
+                            return I18n.tr("Using khal", "calendar backend status");
+                        default:
+                            return I18n.tr("No calendar source available", "calendar backend status");
+                        }
+                    }
+                    readonly property var _backendValues: ["auto", "khal", "dankcal"]
+                    readonly property var _backendLabels: [I18n.tr("Auto", "calendar backend option"), I18n.tr("khal", "calendar backend option"), I18n.tr("DankCalendar", "calendar backend option")]
+                    options: _backendLabels
+                    currentValue: _backendLabels[Math.max(0, _backendValues.indexOf(SettingsData.calendarBackend))]
+                    onValueChanged: value => {
+                        const idx = _backendLabels.indexOf(value);
+                        if (idx < 0)
+                            return;
+                        SettingsData.set("calendarBackend", _backendValues[idx]);
+                    }
+                }
+
+                DankButton {
+                    text: I18n.tr("Launch DankCalendar")
+                    iconName: "calendar_month"
+                    backgroundColor: Theme.primary
+                    textColor: Theme.primaryText
+                    visible: CalendarService.dankNeedsLaunch && CalendarService.dankBinaryExists
+                    onClicked: CalendarService.launchDankCalendar()
+                }
+
                 Rectangle {
                     width: parent.width
                     height: 1

quickshell/Services/CalendarDankBackend.qml

@@ -0,0 +1,478 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Common
+import qs.Services
+
+Item {
+    id: root
+    readonly property var log: Log.scoped("CalendarDankBackend")
+
+    property bool enabled: false
+
+    property string socketPath: ""
+    readonly property bool socketFound: socketPath.length > 0
+    property bool connected: false
+    property bool binaryExists: false
+    property bool binaryChecked: false
+
+    property var calendars: []
+    property var events: []
+    property var eventsByDate: ({})
+    property string lastError: ""
+    property date focusDate: new Date()
+    property var _loadedFrom: null
+    property var _loadedTo: null
+
+    property var pendingRequests: ({})
+    property int requestCounter: 0
+
+    readonly property var fallbackPalette: ["#7287fd", "#f38ba8", "#a6e3a1", "#fab387", "#cba6f7", "#94e2d5", "#f9e2af", "#89dceb"]
+
+    signal eventsUpdated
+
+    onEnabledChanged: {
+        if (enabled) {
+            if (!connected)
+                discoverProcess.running = true;
+            return;
+        }
+        requestSocket.connected = false;
+        subscribeSocket.connected = false;
+        socketPath = "";
+        connected = false;
+    }
+
+    Component.onCompleted: {
+        binaryCheck.running = true;
+        discoverProcess.running = true;
+    }
+
+    Process {
+        id: binaryCheck
+        command: ["sh", "-c", "command -v dcal"]
+        running: false
+        onExited: code => {
+            root.binaryExists = (code === 0);
+            root.binaryChecked = true;
+        }
+    }
+
+    Process {
+        id: discoverProcess
+        running: false
+        command: ["sh", "-c", "s=\"${DANKCAL_SOCKET:-}\"; if [ -S \"$s\" ]; then echo \"$s\"; exit 0; fi; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/dankcal-*.sock /tmp/dankcal-*.sock; do [ -S \"$f\" ] || continue; p=$(basename \"$f\" .sock); p=${p#dankcal-}; if kill -0 \"$p\" 2>/dev/null; then echo \"$f\"; exit 0; fi; done"]
+
+        stdout: StdioCollector {
+            onStreamFinished: {
+                const path = text.trim().split('\n')[0] || "";
+                if (path.length > 0) {
+                    root._applySocketPath(path);
+                    return;
+                }
+                if (!root.connected) {
+                    if (root.socketPath !== "")
+                        root.log.info("dankcal socket gone, waiting for daemon");
+                    requestSocket.connected = false;
+                    subscribeSocket.connected = false;
+                    root.socketPath = "";
+                }
+            }
+        }
+    }
+
+    Timer {
+        id: rediscoverTimer
+        interval: 3000
+        repeat: true
+        running: root.enabled && !root.connected
+        onTriggered: {
+            if (!discoverProcess.running)
+                discoverProcess.running = true;
+        }
+    }
+
+    function launch() {
+        if (!binaryExists)
+            return;
+        Quickshell.execDetached(["dcal", "run", "-d", "--hidden"]);
+        if (enabled && !connected)
+            discoverProcess.running = true;
+    }
+
+    function _applySocketPath(path) {
+        if (path === socketPath) {
+            if (socketFound && !connected)
+                requestSocket.connected = true;
+            return;
+        }
+        log.info("dankcal socket discovered:", path);
+        requestSocket.connected = false;
+        subscribeSocket.connected = false;
+        socketPath = path;
+        Qt.callLater(() => requestSocket.connected = true);
+    }
+
+    DankSocket {
+        id: requestSocket
+        path: root.socketPath
+        connected: false
+
+        onConnectionStateChanged: {
+            if (linkUp) {
+                root.connected = true;
+                subscribeSocket.connected = true;
+                root.log.info("connected to dankcal:", root.socketPath);
+                root.refreshCalendars();
+                root.reloadEvents();
+                return;
+            }
+            if (!root.connected && !root.socketFound)
+                return;
+            root.connected = false;
+            root._flushPending();
+            requestSocket.connected = false;
+            subscribeSocket.connected = false;
+            root.log.info("dankcal disconnected, rediscovering");
+            if (root.enabled)
+                discoverProcess.running = true;
+        }
+
+        parser: SplitParser {
+            onRead: line => {
+                if (!line || line.length === 0)
+                    return;
+                let response;
+                try {
+                    response = JSON.parse(line);
+                } catch (e) {
+                    return;
+                }
+                root._handleResponse(response);
+            }
+        }
+    }
+
+    DankSocket {
+        id: subscribeSocket
+        path: root.socketPath
+        connected: false
+
+        onConnectionStateChanged: {
+            if (linkUp)
+                root._sendSubscribe();
+        }
+
+        parser: SplitParser {
+            onRead: line => {
+                if (!line || line.length === 0)
+                    return;
+                let event;
+                try {
+                    event = JSON.parse(line);
+                } catch (e) {
+                    return;
+                }
+                root._handleEvent(event);
+            }
+        }
+    }
+
+    Timer {
+        id: refreshDebounce
+        interval: 400
+        repeat: false
+        onTriggered: {
+            root.refreshCalendars();
+            root.reloadEvents();
+        }
+    }
+
+    function _sendSubscribe() {
+        subscribeSocket.send({
+            "id": _nextId(),
+            "method": "subscribe",
+            "params": {
+                "topics": ["accounts", "calendars", "events", "sync"]
+            }
+        });
+    }
+
+    function _nextId() {
+        requestCounter++;
+        return Date.now() + requestCounter;
+    }
+
+    function _flushPending() {
+        const ids = Object.keys(pendingRequests);
+        for (const id of ids) {
+            const cb = pendingRequests[id];
+            delete pendingRequests[id];
+            if (cb)
+                cb({
+                    "error": "disconnected"
+                });
+        }
+    }
+
+    function _handleResponse(response) {
+        if (response.event) {
+            _handleEvent(response);
+            return;
+        }
+        const id = response.id;
+        if (!id)
+            return;
+        const cb = pendingRequests[id];
+        if (cb) {
+            delete pendingRequests[id];
+            cb(response);
+        }
+    }
+
+    function _handleEvent(event) {
+        switch (event.event) {
+        case "accounts":
+        case "calendars":
+            refreshCalendars();
+            refreshDebounce.restart();
+            break;
+        case "events":
+        case "sync":
+            refreshDebounce.restart();
+            break;
+        }
+    }
+
+    function sendRequest(method, params, callback) {
+        if (!connected) {
+            if (callback)
+                callback({
+                    "error": "not connected to dankcal socket"
+                });
+            return;
+        }
+        const id = _nextId();
+        const req = {
+            "id": id,
+            "method": method
+        };
+        if (params)
+            req.params = params;
+        if (callback)
+            pendingRequests[id] = callback;
+        requestSocket.send(req);
+    }
+
+    function refreshCalendars() {
+        sendRequest("calendars.list", null, response => {
+            if (response.error) {
+                lastError = response.error;
+                return;
+            }
+            const list = response.result || [];
+            for (let i = 0; i < list.length; i++) {
+                if (!list[i].color)
+                    list[i].color = fallbackPalette[i % fallbackPalette.length];
+            }
+            calendars = list;
+            _rebuildEventsByDate();
+        });
+    }
+
+    function calendarById(id) {
+        for (let i = 0; i < calendars.length; i++) {
+            if (calendars[i].id === id)
+                return calendars[i];
+        }
+        return null;
+    }
+
+    function writableCalendars() {
+        return calendars.filter(c => !c.readOnly);
+    }
+
+    function defaultCalendar() {
+        const writable = writableCalendars().filter(c => !c.hidden);
+        return writable.length > 0 ? writable[0] : null;
+    }
+
+    function loadEvents(startDate, endDate) {
+        const mid = new Date((startDate.getTime() + endDate.getTime()) / 2);
+        focusDate = mid;
+        _ensureWindow();
+    }
+
+    function _ensureWindow() {
+        if (!connected)
+            return;
+        if (!_loadedFrom || !_loadedTo) {
+            reloadEvents();
+            return;
+        }
+        const margin = 14 * 86400000;
+        const t = focusDate.getTime();
+        if (t < _loadedFrom.getTime() + margin || t > _loadedTo.getTime() - margin)
+            reloadEvents();
+        else
+            _rebuildEventsByDate();
+    }
+
+    function reloadEvents() {
+        if (!connected)
+            return;
+        const from = new Date(focusDate.getTime() - 60 * 86400000);
+        const to = new Date(focusDate.getTime() + 90 * 86400000);
+        sendRequest("events.list", {
+            "from": from.toISOString(),
+            "to": to.toISOString(),
+            "limit": 5000
+        }, response => {
+            if (response.error) {
+                lastError = response.error;
+                return;
+            }
+            _loadedFrom = from;
+            _loadedTo = to;
+            const raw = (response.result || {}).events || [];
+            events = raw.map(e => _normalizeEvent(e));
+            _rebuildEventsByDate();
+        });
+    }
+
+    function _dayBoundary(iso) {
+        const d = new Date(iso);
+        return new Date(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());
+    }
+
+    function _normalizeEvent(e) {
+        const allDay = !!e.allDay;
+        const id = e.id || "";
+        if (id.startsWith("task_"))
+            log.warn("daemon event id collides with task prefix:", id);
+        return {
+            "id": id,
+            "calendarId": e.calendarId || "",
+            "title": e.summary || "(untitled)",
+            "description": e.description || "",
+            "location": e.location || "",
+            "url": e.url || "",
+            "start": allDay ? _dayBoundary(e.start) : new Date(e.start),
+            "end": allDay ? _dayBoundary(e.end) : new Date(e.end),
+            "allDay": allDay,
+            "status": e.status || "confirmed",
+            "recurringId": e.recurringId || "",
+            "attendees": e.attendees || [],
+            "organizer": e.organizer || null,
+            "reminders": e.reminders || []
+        };
+    }
+
+    function decorateEvent(ev) {
+        const cal = calendarById(ev.calendarId);
+        const out = Object.assign({}, ev);
+        out.color = cal ? cal.color : fallbackPalette[0];
+        out.calendar = cal ? cal.name : "";
+        out.account = cal ? (cal.accountName || cal.accountId || "") : "";
+        out.readOnly = cal ? !!cal.readOnly : false;
+        out.isMultiDay = ev.start.toDateString() !== ev.end.toDateString();
+        return out;
+    }
+
+    function _hiddenCalendarIds() {
+        const hidden = {};
+        for (let i = 0; i < calendars.length; i++) {
+            if (calendars[i].hidden)
+                hidden[calendars[i].id] = true;
+        }
+        return hidden;
+    }
+
+    function _clampForDay(ev, cur, endDay) {
+        const out = Object.assign({}, ev);
+        const dayStart = new Date(cur.getFullYear(), cur.getMonth(), cur.getDate());
+        const startDay = new Date(ev.start.getFullYear(), ev.start.getMonth(), ev.start.getDate());
+        if (dayStart.getTime() === startDay.getTime()) {
+            out.start = new Date(ev.start);
+        } else {
+            out.start = new Date(dayStart);
+            if (!ev.allDay)
+                out.start.setHours(0, 0, 0, 0);
+        }
+        if (dayStart.getTime() === endDay.getTime()) {
+            out.end = new Date(ev.end);
+        } else {
+            out.end = new Date(dayStart);
+            if (!ev.allDay)
+                out.end.setHours(23, 59, 59, 999);
+        }
+        return out;
+    }
+
+    function _rebuildEventsByDate() {
+        const hidden = _hiddenCalendarIds();
+        const map = {};
+        for (const raw of events) {
+            if (raw.status === "cancelled")
+                continue;
+            if (hidden[raw.calendarId])
+                continue;
+            const ev = decorateEvent(raw);
+            const lastInstant = ev.allDay ? new Date(ev.end.getTime() - 1) : ev.end;
+            let cur = new Date(ev.start.getFullYear(), ev.start.getMonth(), ev.start.getDate());
+            let endDay = new Date(lastInstant.getFullYear(), lastInstant.getMonth(), lastInstant.getDate());
+            if (endDay < cur)
+                endDay = new Date(cur);
+            while (cur <= endDay) {
+                const key = Qt.formatDate(cur, "yyyy-MM-dd");
+                if (!map[key])
+                    map[key] = [];
+                if (!map[key].some(e => e.id === ev.id))
+                    map[key].push(_clampForDay(ev, cur, endDay));
+                cur.setDate(cur.getDate() + 1);
+            }
+        }
+        eventsByDate = map;
+        eventsUpdated();
+    }
+
+    function createEvent(fields, callback) {
+        sendRequest("events.create", fields, response => {
+            if (response.error)
+                lastError = response.error;
+            else
+                reloadEvents();
+            if (callback)
+                callback(response);
+        });
+    }
+
+    function updateEvent(id, fields, callback) {
+        const params = Object.assign({
+            "id": id
+        }, fields);
+        sendRequest("events.update", params, response => {
+            if (response.error)
+                lastError = response.error;
+            else
+                reloadEvents();
+            if (callback)
+                callback(response);
+        });
+    }
+
+    function deleteEvent(id, callback) {
+        sendRequest("events.delete", {
+            "id": id
+        }, response => {
+            if (response.error)
+                lastError = response.error;
+            else
+                reloadEvents();
+            if (callback)
+                callback(response);
+        });
+    }
+}

quickshell/Services/CalendarKhalBackend.qml

@@ -0,0 +1,237 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell.Io
+import qs.Common
+import qs.Services
+
+Item {
+    id: root
+    readonly property var log: Log.scoped("CalendarKhalBackend")
+
+    property bool installed: false
+    property var eventsByDate: ({})
+    property bool isLoading: false
+    property string lastError: ""
+    property date lastStartDate
+    property date lastEndDate
+    property string dateFormat: "MM/dd/yyyy"
+
+    function checkAvailability() {
+        if (!formatProcess.running)
+            formatProcess.running = true;
+    }
+
+    function loadCurrentMonth() {
+        let today = new Date();
+        let firstDay = new Date(today.getFullYear(), today.getMonth(), 1);
+        let lastDay = new Date(today.getFullYear(), today.getMonth() + 1, 0);
+        let startDate = new Date(firstDay);
+        startDate.setDate(startDate.getDate() - firstDay.getDay() - 7);
+        let endDate = new Date(lastDay);
+        endDate.setDate(endDate.getDate() + (6 - lastDay.getDay()) + 7);
+        loadEvents(startDate, endDate);
+    }
+
+    function loadEvents(startDate, endDate) {
+        if (!installed)
+            return;
+        if (eventsProcess.running)
+            return;
+        root.lastStartDate = startDate;
+        root.lastEndDate = endDate;
+        root.isLoading = true;
+        let startDateStr = Qt.formatDate(startDate, root.dateFormat);
+        let endDateStr = Qt.formatDate(endDate, root.dateFormat);
+        eventsProcess.requestStartDate = startDate;
+        eventsProcess.requestEndDate = endDate;
+        eventsProcess.command = ["khal", "list", "--json", "title", "--json", "description", "--json", "start-date", "--json", "start-time", "--json", "end-date", "--json", "end-time", "--json", "all-day", "--json", "location", "--json", "url", startDateStr, endDateStr];
+        eventsProcess.running = true;
+    }
+
+    function _parseDateFormat(formatExample) {
+        return formatExample.replace("12", "MM").replace("21", "dd").replace("2013", "yyyy");
+    }
+
+    Component.onCompleted: checkAvailability()
+
+    Process {
+        id: formatProcess
+
+        command: ["khal", "printformats"]
+        running: false
+        onExited: exitCode => {
+            if (exitCode !== 0)
+                checkProcess.running = true;
+        }
+
+        stdout: StdioCollector {
+            onStreamFinished: {
+                let lines = text.split('\n');
+                for (let line of lines) {
+                    if (!line.startsWith('dateformat:'))
+                        continue;
+                    let formatExample = line.substring(line.indexOf(':') + 1).trim();
+                    root.dateFormat = root._parseDateFormat(formatExample);
+                    break;
+                }
+                checkProcess.running = true;
+            }
+        }
+    }
+
+    Process {
+        id: checkProcess
+
+        command: ["khal", "list", "today"]
+        running: false
+        onExited: exitCode => {
+            root.installed = (exitCode === 0);
+            if (root.installed)
+                root.loadCurrentMonth();
+        }
+    }
+
+    Process {
+        id: eventsProcess
+
+        property date requestStartDate
+        property date requestEndDate
+        property string rawOutput: ""
+
+        running: false
+        onExited: exitCode => {
+            root.isLoading = false;
+            if (exitCode !== 0) {
+                root.lastError = "Failed to load events (exit code: " + exitCode + ")";
+                return;
+            }
+            try {
+                let newEventsByDate = {};
+                let lines = eventsProcess.rawOutput.split('\n');
+                for (let line of lines) {
+                    line = line.trim();
+                    if (!line || line === "[]")
+                        continue;
+
+                    let dayEvents = JSON.parse(line);
+                    for (let event of dayEvents) {
+                        if (!event.title)
+                            continue;
+
+                        let startDate, endDate;
+                        if (event['start-date'])
+                            startDate = Date.fromLocaleString(I18n.locale(), event['start-date'], root.dateFormat);
+                        else
+                            startDate = new Date();
+                        if (event['end-date'])
+                            endDate = Date.fromLocaleString(I18n.locale(), event['end-date'], root.dateFormat);
+                        else
+                            endDate = new Date(startDate);
+
+                        let startTime = new Date(startDate);
+                        let endTime = new Date(endDate);
+                        if (event['start-time'] && event['all-day'] !== "True") {
+                            let timeStr = event['start-time'];
+                            if (timeStr) {
+                                let timeParts = timeStr.match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i);
+                                if (timeParts) {
+                                    let hours = parseInt(timeParts[1]);
+                                    let minutes = parseInt(timeParts[2]);
+                                    if (timeParts[3]) {
+                                        let period = timeParts[3].toUpperCase();
+                                        if (period === 'PM' && hours !== 12)
+                                            hours += 12;
+                                        else if (period === 'AM' && hours === 12)
+                                            hours = 0;
+                                    }
+                                    startTime.setHours(hours, minutes);
+                                    if (event['end-time']) {
+                                        let endTimeParts = event['end-time'].match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i);
+                                        if (endTimeParts) {
+                                            let endHours = parseInt(endTimeParts[1]);
+                                            let endMinutes = parseInt(endTimeParts[2]);
+                                            if (endTimeParts[3]) {
+                                                let endPeriod = endTimeParts[3].toUpperCase();
+                                                if (endPeriod === 'PM' && endHours !== 12)
+                                                    endHours += 12;
+                                                else if (endPeriod === 'AM' && endHours === 12)
+                                                    endHours = 0;
+                                            }
+                                            endTime.setHours(endHours, endMinutes);
+                                        }
+                                    } else {
+                                        endTime = new Date(startTime);
+                                        endTime.setHours(startTime.getHours() + 1);
+                                    }
+                                }
+                            }
+                        }
+                        let eventId = event.title + "_" + event['start-date'] + "_" + (event['start-time'] || 'allday');
+                        let extractedUrl = "";
+                        if (!event.url && event.description) {
+                            let urlMatch = event.description.match(/https?:\/\/[^\s]+/);
+                            if (urlMatch)
+                                extractedUrl = urlMatch[0];
+                        }
+                        let eventTemplate = {
+                            "id": eventId,
+                            "title": event.title || "Untitled Event",
+                            "start": startTime,
+                            "end": endTime,
+                            "location": event.location || "",
+                            "description": event.description || "",
+                            "url": event.url || extractedUrl,
+                            "calendar": "",
+                            "color": "",
+                            "allDay": event['all-day'] === "True",
+                            "isMultiDay": startDate.toDateString() !== endDate.toDateString()
+                        };
+                        let currentDate = new Date(startDate);
+                        while (currentDate <= endDate) {
+                            let dateKey = Qt.formatDate(currentDate, "yyyy-MM-dd");
+                            if (!newEventsByDate[dateKey])
+                                newEventsByDate[dateKey] = [];
+
+                            let existingEvent = newEventsByDate[dateKey].find(e => e.id === eventId);
+                            if (existingEvent) {
+                                currentDate.setDate(currentDate.getDate() + 1);
+                                continue;
+                            }
+                            let dayEvent = Object.assign({}, eventTemplate);
+                            if (currentDate.getTime() === startDate.getTime()) {
+                                dayEvent.start = new Date(startTime);
+                            } else {
+                                dayEvent.start = new Date(currentDate);
+                                if (!dayEvent.allDay)
+                                    dayEvent.start.setHours(0, 0, 0, 0);
+                            }
+                            if (currentDate.getTime() === endDate.getTime()) {
+                                dayEvent.end = new Date(endTime);
+                            } else {
+                                dayEvent.end = new Date(currentDate);
+                                if (!dayEvent.allDay)
+                                    dayEvent.end.setHours(23, 59, 59, 999);
+                            }
+                            newEventsByDate[dateKey].push(dayEvent);
+                            currentDate.setDate(currentDate.getDate() + 1);
+                        }
+                    }
+                }
+                root.eventsByDate = newEventsByDate;
+                root.lastError = "";
+            } catch (error) {
+                root.lastError = "Failed to parse events JSON: " + error.toString();
+                root.eventsByDate = {};
+            }
+            eventsProcess.rawOutput = "";
+        }
+
+        stdout: SplitParser {
+            splitMarker: "\n"
+            onRead: data => {
+                eventsProcess.rawOutput += data + "\n";
+            }
+        }
+    }
+}

quickshell/Services/CalendarService.qml

@@ -11,71 +11,87 @@ Singleton {
     id: root
     readonly property var log: Log.scoped("CalendarService")
 
-    property bool khalAvailable: true // Always true to enable DMS calendar card UI
+    readonly property string backendPref: SettingsData.calendarBackend
-    property bool khalInstalled: false // Tracks if khal is actually on the system
+    readonly property string activeBackend: {
+        switch (backendPref) {
+        case "khal":
+            return "khal";
+        case "dankcal":
+            return "dankcal";
+        default:
+            if (dankBackend.connected)
+                return "dankcal";
+            if (khalBackend.installed)
+                return "khal";
+            return "none";
+        }
+    }
+
+    readonly property bool calendarAvailable: activeBackend !== "none"
+    readonly property bool isDankActive: activeBackend === "dankcal"
+    readonly property bool canCreateEvents: isDankActive && dankBackend.connected
+    property bool khalAvailable: true // compatibility alias - calendar card UI gate
+
+    readonly property bool dankConnected: dankBackend.connected
+    readonly property bool dankBinaryExists: dankBackend.binaryExists
+    readonly property bool dankNeedsLaunch: backendPref === "dankcal" && !dankBackend.connected
+
+    property var calendars: dankBackend.calendars
     property var eventsByDate: ({})
-    property var khalEventsByDate: ({})
     property var taskEventsByDate: ({})
     property var localTasks: ({})
-    property bool isLoading: false
+    property bool isLoading: khalBackend.isLoading
     property string lastError: ""
+
+    property bool _rangeSet: false
     property date lastStartDate
     property date lastEndDate
-    property string khalDateFormat: "MM/dd/yyyy"
 
-    onKhalEventsByDateChanged: mergeEvents()
     onTaskEventsByDateChanged: mergeEvents()
-
+    onActiveBackendChanged: {
-    function checkKhalAvailability() {
+        mergeEvents();
-        if (!khalCheckProcess.running)
+        if (_rangeSet)
-            khalCheckProcess.running = true;
+            loadEvents(lastStartDate, lastEndDate);
     }
 
-    function detectKhalDateFormat() {
+    CalendarKhalBackend {
-        if (!khalFormatProcess.running)
+        id: khalBackend
-            khalFormatProcess.running = true;
+        onEventsByDateChanged: root.mergeEvents()
     }
 
-    function parseKhalDateFormat(formatExample) {
+    CalendarDankBackend {
-        let qtFormat = formatExample.replace("12", "MM").replace("21", "dd").replace("2013", "yyyy");
+        id: dankBackend
-        return {
+        enabled: root.backendPref === "dankcal" || root.backendPref === "auto"
-            format: qtFormat,
+        onEventsByDateChanged: root.mergeEvents()
-            parser: null
+        onConnectedChanged: {
-        };
+            if (connected && root._rangeSet)
+                root.loadEvents(root.lastStartDate, root.lastEndDate);
         }
-
-    function loadCurrentMonth() {
-        if (!root.khalAvailable)
-            return;
-        let today = new Date();
-        let firstDay = new Date(today.getFullYear(), today.getMonth(), 1);
-        let lastDay = new Date(today.getFullYear(), today.getMonth() + 1, 0);
-        // Add padding
-        let startDate = new Date(firstDay);
-        startDate.setDate(startDate.getDate() - firstDay.getDay() - 7);
-        let endDate = new Date(lastDay);
-        endDate.setDate(endDate.getDate() + (6 - lastDay.getDay()) + 7);
-        loadEvents(startDate, endDate);
     }
 
     function loadEvents(startDate, endDate) {
-        if (!root.khalInstalled) {
-            return;
-        }
-        if (eventsProcess.running) {
-            return;
-        }
-        // Store last requested date range for refresh timer
         root.lastStartDate = startDate;
         root.lastEndDate = endDate;
-        root.isLoading = true;
+        root._rangeSet = true;
-        // Format dates for khal using detected format
+        switch (activeBackend) {
-        let startDateStr = Qt.formatDate(startDate, root.khalDateFormat);
+        case "dankcal":
-        let endDateStr = Qt.formatDate(endDate, root.khalDateFormat);
+            dankBackend.loadEvents(startDate, endDate);
-        eventsProcess.requestStartDate = startDate;
+            break;
-        eventsProcess.requestEndDate = endDate;
+        case "khal":
-        eventsProcess.command = ["khal", "list", "--json", "title", "--json", "description", "--json", "start-date", "--json", "start-time", "--json", "end-date", "--json", "end-time", "--json", "all-day", "--json", "location", "--json", "url", startDateStr, endDateStr];
+            khalBackend.loadEvents(startDate, endDate);
-        eventsProcess.running = true;
+            break;
+        }
+    }
+
+    function _activeBackendEventsByDate() {
+        switch (activeBackend) {
+        case "dankcal":
+            return dankBackend.eventsByDate;
+        case "khal":
+            return khalBackend.eventsByDate;
+        default:
+            return {};
+        }
     }
 
     function getEventsForDate(date) {
@@ -84,11 +100,54 @@ Singleton {
     }
 
     function hasEventsForDate(date) {
-        let events = getEventsForDate(date);
+        return getEventsForDate(date).length > 0;
-        return events.length > 0;
+    }
+
+    function writableCalendars() {
+        return isDankActive ? dankBackend.writableCalendars() : [];
+    }
+
+    function defaultCalendar() {
+        return isDankActive ? dankBackend.defaultCalendar() : null;
+    }
+
+    function launchDankCalendar() {
+        dankBackend.launch();
+    }
+
+    function createEvent(fields, callback) {
+        if (isDankActive) {
+            dankBackend.createEvent(fields, callback);
+            return;
+        }
+        if (callback)
+            callback({
+                "error": "read-only backend"
+            });
+    }
+
+    function updateEvent(id, fields, callback) {
+        if (isDankActive) {
+            dankBackend.updateEvent(id, fields, callback);
+            return;
+        }
+        if (callback)
+            callback({
+                "error": "read-only backend"
+            });
+    }
+
+    function deleteEvent(id, callback) {
+        if (isDankActive) {
+            dankBackend.deleteEvent(id, callback);
+            return;
+        }
+        if (callback)
+            callback({
+                "error": "read-only backend"
+            });
     }
 
-    // In-memory Task CRUD methods
     function loadTasks(text) {
         if (!text || text.trim() === "") {
             root.localTasks = {};
@@ -129,8 +188,7 @@ Singleton {
                     "description": "Task from your Planner",
                     "url": "",
                     "calendar": "Todo Planner",
-                    "color": "#10B981" // Pastel Green
+                    "color": "#10B981",
-                    ,
                     "allDay": true,
                     "isMultiDay": false
                 });
@@ -142,9 +200,8 @@ Singleton {
     function addTaskForDate(date, text) {
         let dateKey = Qt.formatDate(date, "yyyy-MM-dd");
         let tasks = Object.assign({}, root.localTasks);
-        if (!tasks[dateKey]) {
+        if (!tasks[dateKey])
             tasks[dateKey] = [];
-        }
         let taskId = (new Date().getTime()) + "-dms";
         tasks[dateKey].push({
             "id": taskId,
@@ -187,11 +244,10 @@ Singleton {
             let list = tasks[dateKey];
             let filtered = list.filter(item => item.id !== cleanId);
             if (filtered.length !== list.length) {
-                if (filtered.length === 0) {
+                if (filtered.length === 0)
                     delete tasks[dateKey];
-                } else {
+                else
                     tasks[dateKey] = filtered;
-                }
                 updated = true;
                 break;
             }
@@ -208,21 +264,18 @@ Singleton {
         let tasks = Object.assign({}, root.localTasks);
         let v = tasks[dateKey] || [];
         let idToItem = {};
-        for (let item of v) {
+        for (let item of v)
             idToItem[item.id] = item;
-        }
         let newV = [];
         for (let tid of orderedIds) {
-            if (idToItem[tid]) {
+            if (idToItem[tid])
                 newV.push(idToItem[tid]);
         }
-        }
         let orderedSet = new Set(orderedIds);
         for (let item of v) {
-            if (!orderedSet.has(item.id)) {
+            if (!orderedSet.has(item.id))
                 newV.push(item);
         }
-        }
         tasks[dateKey] = newV;
         root.localTasks = tasks;
         updateTaskEvents();
@@ -254,30 +307,24 @@ Singleton {
 
     function mergeEvents() {
         let merged = {};
+        let backendEvents = _activeBackendEventsByDate();
 
-        // Merge khal events
+        for (let dateKey in backendEvents)
-        for (let dateKey in root.khalEventsByDate) {
+            merged[dateKey] = [].concat(backendEvents[dateKey]);
-            merged[dateKey] = [].concat(root.khalEventsByDate[dateKey]);
-        }
 
-        // Merge task events
         for (let dateKey in root.taskEventsByDate) {
-            if (!merged[dateKey]) {
+            if (!merged[dateKey])
                 merged[dateKey] = [];
-            }
             for (let event of root.taskEventsByDate[dateKey]) {
-                if (!merged[dateKey].some(e => e.id === event.id)) {
+                if (!merged[dateKey].some(e => e.id === event.id))
                     merged[dateKey].push(event);
             }
         }
-        }
 
-        // Sort events within each date
         for (let dateKey in merged) {
             let list = merged[dateKey];
-            for (let idx = 0; idx < list.length; idx++) {
+            for (let idx = 0; idx < list.length; idx++)
                 list[idx]._origIdx = idx;
-            }
             list.sort((a, b) => {
                 let diff = a.start.getTime() - b.start.getTime();
                 if (diff !== 0)
@@ -289,12 +336,6 @@ Singleton {
         root.eventsByDate = merged;
     }
 
-    // Initialize on component completion
-    Component.onCompleted: {
-        detectKhalDateFormat();
-    }
-
-    // Atomic file view for tasks
     FileView {
         id: tasksFileView
         path: Quickshell.env("HOME") + "/.config/niri-calendar-todo/tasks.json"
@@ -304,233 +345,11 @@ Singleton {
         watchChanges: true
         printErrors: false
 
-        onLoaded: {
+        onLoaded: loadTasks(tasksFileView.text())
-            loadTasks(tasksFileView.text());
-        }
 
         onLoadFailed: {
             root.localTasks = {};
             root.taskEventsByDate = {};
         }
     }
-
-    // Process for detecting khal date format
-    Process {
-        id: khalFormatProcess
-
-        command: ["khal", "printformats"]
-        running: false
-        onExited: exitCode => {
-            if (exitCode !== 0) {
-                checkKhalAvailability();
-            }
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                let lines = text.split('\n');
-                for (let line of lines) {
-                    if (line.startsWith('dateformat:')) {
-                        let formatExample = line.substring(line.indexOf(':') + 1).trim();
-                        let formatInfo = parseKhalDateFormat(formatExample);
-                        root.khalDateFormat = formatInfo.format;
-                        break;
-                    }
-                }
-                checkKhalAvailability();
-            }
-        }
-    }
-
-    // Process for checking khal configuration
-    Process {
-        id: khalCheckProcess
-
-        command: ["khal", "list", "today"]
-        running: false
-        onExited: exitCode => {
-            root.khalInstalled = (exitCode === 0);
-            if (root.khalInstalled) {
-                loadCurrentMonth();
-            } else {
-                loadEvents(root.lastStartDate || new Date(), root.lastEndDate || new Date());
-            }
-        }
-    }
-
-    // Process for loading events
-    Process {
-        id: eventsProcess
-
-        property date requestStartDate
-        property date requestEndDate
-        property string rawOutput: ""
-
-        running: false
-        onExited: exitCode => {
-            root.isLoading = false;
-            if (exitCode !== 0) {
-                root.lastError = "Failed to load events (exit code: " + exitCode + ")";
-                return;
-            }
-            try {
-                let newEventsByDate = {};
-                let lines = eventsProcess.rawOutput.split('\n');
-                for (let line of lines) {
-                    line = line.trim();
-                    if (!line || line === "[]")
-                        continue;
-
-                    // Parse JSON line
-                    let dayEvents = JSON.parse(line);
-                    // Process each event in this day's array
-                    for (let event of dayEvents) {
-                        if (!event.title)
-                            continue;
-
-                        // Parse start and end dates using detected format
-                        let startDate, endDate;
-                        if (event['start-date']) {
-                            startDate = Date.fromLocaleString(I18n.locale(), event['start-date'], root.khalDateFormat);
-                        } else {
-                            startDate = new Date();
-                        }
-                        if (event['end-date']) {
-                            endDate = Date.fromLocaleString(I18n.locale(), event['end-date'], root.khalDateFormat);
-                        } else {
-                            endDate = new Date(startDate);
-                        }
-                        // Create start/end times
-                        let startTime = new Date(startDate);
-                        let endTime = new Date(endDate);
-                        if (event['start-time'] && event['all-day'] !== "True") {
-                            // Parse time if available and not all-day
-                            let timeStr = event['start-time'];
-                            if (timeStr) {
-                                // Match time with optional seconds and AM/PM
-                                let timeParts = timeStr.match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i);
-                                if (timeParts) {
-                                    let hours = parseInt(timeParts[1]);
-                                    let minutes = parseInt(timeParts[2]);
-
-                                    // Handle AM/PM conversion if present
-                                    if (timeParts[3]) {
-                                        let period = timeParts[3].toUpperCase();
-                                        if (period === 'PM' && hours !== 12) {
-                                            hours += 12;
-                                        } else if (period === 'AM' && hours === 12) {
-                                            hours = 0;
-                                        }
-                                    }
-
-                                    startTime.setHours(hours, minutes);
-                                    if (event['end-time']) {
-                                        let endTimeParts = event['end-time'].match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i);
-                                        if (endTimeParts) {
-                                            let endHours = parseInt(endTimeParts[1]);
-                                            let endMinutes = parseInt(endTimeParts[2]);
-
-                                            // Handle AM/PM conversion if present
-                                            if (endTimeParts[3]) {
-                                                let endPeriod = endTimeParts[3].toUpperCase();
-                                                if (endPeriod === 'PM' && endHours !== 12) {
-                                                    endHours += 12;
-                                                } else if (endPeriod === 'AM' && endHours === 12) {
-                                                    endHours = 0;
-                                                }
-                                            }
-
-                                            endTime.setHours(endHours, endMinutes);
-                                        }
-                                    } else {
-                                        // Default to 1 hour duration on same day
-                                        endTime = new Date(startTime);
-                                        endTime.setHours(startTime.getHours() + 1);
-                                    }
-                                }
-                            }
-                        }
-                        // Create unique ID for this event (to track multi-day events)
-                        let eventId = event.title + "_" + event['start-date'] + "_" + (event['start-time'] || 'allday');
-                        // Create event object template
-                        let extractedUrl = "";
-                        if (!event.url && event.description) {
-                            let urlMatch = event.description.match(/https?:\/\/[^\s]+/);
-                            if (urlMatch) {
-                                extractedUrl = urlMatch[0];
-                            }
-                        }
-                        let eventTemplate = {
-                            "id": eventId,
-                            "title": event.title || "Untitled Event",
-                            "start": startTime,
-                            "end": endTime,
-                            "location": event.location || "",
-                            "description": event.description || "",
-                            "url": event.url || extractedUrl,
-                            "calendar": "",
-                            "color": "",
-                            "allDay": event['all-day'] === "True",
-                            "isMultiDay": startDate.toDateString() !== endDate.toDateString()
-                        };
-                        // Add event to each day it spans
-                        let currentDate = new Date(startDate);
-                        while (currentDate <= endDate) {
-                            let dateKey = Qt.formatDate(currentDate, "yyyy-MM-dd");
-                            if (!newEventsByDate[dateKey])
-                                newEventsByDate[dateKey] = [];
-
-                            // Check if this exact event is already added to this date (prevent duplicates)
-                            let existingEvent = newEventsByDate[dateKey].find(e => {
-                                return e.id === eventId;
-                            });
-                            if (existingEvent) {
-                                // Move to next day without adding duplicate
-                                currentDate.setDate(currentDate.getDate() + 1);
-                                continue;
-                            }
-                            // Create a copy of the event for this date
-                            let dayEvent = Object.assign({}, eventTemplate);
-                            // For multi-day events, adjust the display time for this specific day
-                            if (currentDate.getTime() === startDate.getTime()) {
-                                // First day - use original start time
-                                dayEvent.start = new Date(startTime);
-                            } else {
-                                // Subsequent days - start at beginning of day for all-day events
-                                dayEvent.start = new Date(currentDate);
-                                if (!dayEvent.allDay)
-                                    dayEvent.start.setHours(0, 0, 0, 0);
-                            }
-                            if (currentDate.getTime() === endDate.getTime()) {
-                                // Last day - use original end time
-                                dayEvent.end = new Date(endTime);
-                            } else {
-                                // Earlier days - end at end of day for all-day events
-                                dayEvent.end = new Date(currentDate);
-                                if (!dayEvent.allDay)
-                                    dayEvent.end.setHours(23, 59, 59, 999);
-                            }
-                            newEventsByDate[dateKey].push(dayEvent);
-                            // Move to next day
-                            currentDate.setDate(currentDate.getDate() + 1);
-                        }
-                    }
-                }
-                root.khalEventsByDate = newEventsByDate;
-                root.lastError = "";
-            } catch (error) {
-                root.lastError = "Failed to parse events JSON: " + error.toString();
-                root.khalEventsByDate = {};
-            }
-            // Reset for next run
-            eventsProcess.rawOutput = "";
-        }
-
-        stdout: SplitParser {
-            splitMarker: "\n"
-            onRead: data => {
-                eventsProcess.rawOutput += data + "\n";
-            }
-        }
-    }
 }

quickshell/Services/PopoutService.qml

@@ -392,8 +392,7 @@ Singleton {
     function toggleSettingsWithTab(tabName: string) {
         if (settingsModal) {
             var idx = settingsModal.resolveTabIndex(tabName);
-            if (idx >= 0)
+            settingsModal.setTabIndex(idx);
-                settingsModal.currentTabIndex = idx;
             settingsModal.toggle();
             return;
         }
@@ -433,8 +432,7 @@ Singleton {
                     return;
                 }
                 var idx = settingsModal.resolveTabIndex(tabName);
-                if (idx >= 0)
+                settingsModal.setTabIndex(idx);
-                    settingsModal.currentTabIndex = idx;
                 toplevel.activate();
                 return;
             }
@@ -466,12 +464,11 @@ Singleton {
         if (_settingsWantsToggle) {
             _settingsWantsToggle = false;
             if (_settingsPendingTabIndex >= 0) {
-                settingsModal.currentTabIndex = _settingsPendingTabIndex;
+                settingsModal?.setTabIndex(_settingsPendingTabIndex);
                 _settingsPendingTabIndex = -1;
             } else if (_settingsPendingTab) {
                 var idx = settingsModal?.resolveTabIndex(_settingsPendingTab) ?? -1;
-                if (idx >= 0)
+                settingsModal?.setTabIndex(idx);
-                    settingsModal.currentTabIndex = idx;
                 _settingsPendingTab = "";
             }
             settingsModal?.toggle();

quickshell/Widgets/DankTextField.qml

@@ -23,6 +23,7 @@ StyledRect {
 
     property alias text: textInput.text
     property string placeholderText: ""
+    property string labelText: ""
     property alias font: textInput.font
     property alias textColor: textInput.color
     property alias echoMode: textInput.echoMode
@@ -85,8 +86,10 @@ StyledRect {
         textInput.insert(textInput.cursorPosition, str);
     }
 
+    readonly property real labelBandHeight: Math.round(Theme.fontSizeSmall * 1.4) + Theme.spacingXS * 2
+
     width: 200
-    height: Math.round(Theme.fontSizeMedium * 3)
+    height: labelText !== "" ? Math.round(Theme.fontSizeMedium * 3) + labelBandHeight : Math.round(Theme.fontSizeMedium * 3)
     radius: cornerRadius
     color: backgroundColor
     border.color: textInput.activeFocus ? focusedBorderColor : normalBorderColor
@@ -97,13 +100,27 @@ StyledRect {
 
         anchors.left: parent.left
         anchors.leftMargin: Theme.spacingM
-        anchors.verticalCenter: parent.verticalCenter
+        anchors.verticalCenter: textInput.verticalCenter
         name: leftIconName
         size: leftIconSize
         color: textInput.activeFocus ? leftIconFocusedColor : leftIconColor
         visible: leftIconName !== ""
     }
 
+    StyledText {
+        id: fieldLabel
+
+        anchors.left: textInput.left
+        anchors.right: textInput.right
+        anchors.top: parent.top
+        anchors.topMargin: Theme.spacingXS
+        text: root.labelText
+        visible: root.labelText !== ""
+        font.pixelSize: Theme.fontSizeSmall
+        color: textInput.activeFocus ? Theme.primary : Theme.surfaceVariantText
+        elide: Text.ElideRight
+    }
+
     TextInput {
         id: textInput
 
@@ -112,7 +129,7 @@ StyledRect {
         anchors.right: rightButtonsRow.left
         anchors.rightMargin: rightButtonsRow.visible ? Theme.spacingS : Theme.spacingM
         anchors.top: parent.top
-        anchors.topMargin: root.topPadding
+        anchors.topMargin: root.labelText !== "" ? root.labelBandHeight : root.topPadding
         anchors.bottom: parent.bottom
         anchors.bottomMargin: root.bottomPadding
         font.pixelSize: Theme.fontSizeMedium

quickshell/Widgets/VpnDetailContent.qml

@@ -148,7 +148,7 @@ Rectangle {
                 iconColor: Theme.surfaceVariantText
                 onClicked: {
                     PopoutService.closeControlCenter();
-                    PopoutService.openSettingsWithTab("network");
+                    PopoutService.openSettingsWithTab("network_vpn");
                 }
             }
         }

quickshell/translations/extract_settings_index.py

@@ -102,7 +102,10 @@ TAB_INDEX_MAP = {
     "DockTab.qml": 5,
     "DankBarAppearanceTab.qml": 6,
     "WorkspaceAppearanceCard.qml": 6,
-    "NetworkTab.qml": 7,
+    "NetworkStatusTab.qml": 7,
+    "NetworkEthernetTab.qml": 39,
+    "NetworkWifiTab.qml": 40,
+    "NetworkVpnTab.qml": 41,
     "PrinterTab.qml": 8,
     "LauncherTab.qml": 9,
     "ThemeColorsTab.qml": 10,
@@ -172,6 +175,9 @@ TAB_CATEGORY_MAP = {
     36: "Autostart",
     37: "Personalization",
     38: "Applications",
+    39: "Network",
+    40: "Network",
+    41: "Network",
 }
 
 SEARCHABLE_COMPONENTS = [

quickshell/translations/settings_search_index.json

@@ -2118,6 +2118,25 @@
     "icon": "wifi",
     "conditionKey": "dmsConnected"
   },
+  {
+    "section": "networkStatus",
+    "label": "Network Status",
+    "tabIndex": 7,
+    "category": "Network",
+    "keywords": [
+      "connection",
+      "connectivity",
+      "ethernet",
+      "internet",
+      "network",
+      "online",
+      "status",
+      "wi-fi",
+      "wifi",
+      "wireless"
+    ],
+    "icon": "lan"
+  },
   {
     "section": "_tab_8",
     "label": "Printers",
@@ -7302,7 +7321,8 @@
       "screen",
       "widgets"
     ],
-    "icon": "widgets"
+    "icon": "widgets",
+    "conditionKey": "dmsConnected"
   },
   {
     "section": "_tab_27",
@@ -8901,5 +8921,95 @@
     "icon": "select_window",
     "description": "Define compositor rules for window behavior",
     "conditionKey": "windowRulesCapable"
+  },
+  {
+    "section": "_tab_39",
+    "label": "Ethernet",
+    "tabIndex": 39,
+    "category": "Network",
+    "keywords": [
+      "connectivity",
+      "ethernet",
+      "network",
+      "online"
+    ],
+    "icon": "settings_ethernet"
+  },
+  {
+    "section": "networkEthernet",
+    "label": "Ethernet",
+    "tabIndex": 39,
+    "category": "Network",
+    "keywords": [
+      "adapters",
+      "connection",
+      "connectivity",
+      "ethernet",
+      "network",
+      "online",
+      "wired"
+    ],
+    "icon": "settings_ethernet"
+  },
+  {
+    "section": "_tab_40",
+    "label": "WiFi",
+    "tabIndex": 40,
+    "category": "Network",
+    "keywords": [
+      "connectivity",
+      "network",
+      "online",
+      "wifi"
+    ],
+    "icon": "wifi"
+  },
+  {
+    "section": "networkWifi",
+    "label": "WiFi",
+    "tabIndex": 40,
+    "category": "Network",
+    "keywords": [
+      "adapter",
+      "connectivity",
+      "network",
+      "online",
+      "radio",
+      "ssid",
+      "wi-fi",
+      "wifi",
+      "wireless"
+    ],
+    "icon": "wifi"
+  },
+  {
+    "section": "_tab_41",
+    "label": "VPN",
+    "tabIndex": 41,
+    "category": "Network",
+    "keywords": [
+      "connectivity",
+      "network",
+      "online",
+      "vpn"
+    ],
+    "icon": "vpn_key"
+  },
+  {
+    "section": "networkVpn",
+    "label": "VPN",
+    "tabIndex": 41,
+    "category": "Network",
+    "keywords": [
+      "connectivity",
+      "import",
+      "network",
+      "online",
+      "openvpn",
+      "profiles",
+      "vpn",
+      "wireguard"
+    ],
+    "icon": "vpn_key"
   }
 ]