native NetworkManager + all native dbus bindings via dms

- Scrap janky NetworkService in favor of, dms' native NM integration socket - Scrap all gdbus usage in favor of native dbus bindings in dms (loginctl, freedesktop) It means that - some features won't work if running without dms wrapper. But the trade off is certainly worth it, in the long-run for efficiency improvements.
2026-01-26 14:32:52 -05:00 · 2025-10-08 12:03:50 -04:00
parent 1ed4abd347
commit 27f9b3cd0b
27 changed files with 1739 additions and 1792 deletions
--- a/Modules/ControlCenter/BuiltinPlugins/VpnWidget.qml
+++ b/Modules/ControlCenter/BuiltinPlugins/VpnWidget.qml
@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -8,6 +9,10 @@ import qs.Modules.Plugins
 PluginComponent {
    id: root

+    Ref {
+        service: VpnService
+    }
+
    ccWidgetIcon: VpnService.isBusy ? "sync" : (VpnService.connected ? "vpn_lock" : "vpn_key_off")
    ccWidgetPrimaryText: "VPN"
    ccWidgetSecondaryText: {
--- a/Modules/ControlCenter/Components/DetailHost.qml
+++ b/Modules/ControlCenter/Components/DetailHost.qml
@@ -48,7 +48,10 @@ Item {
            const builtinId = root.expandedSection
            let builtinInstance = null

-            if (builtinId === "builtin_vpn" && widgetModel?.vpnBuiltinInstance) {
+            if (builtinId === "builtin_vpn") {
+                if (widgetModel?.vpnLoader) {
+                    widgetModel.vpnLoader.active = true
+                }
                builtinInstance = widgetModel.vpnBuiltinInstance
            }

--- a/Modules/ControlCenter/Components/DragDropGrid.qml
+++ b/Modules/ControlCenter/Components/DragDropGrid.qml
@@ -126,7 +126,15 @@ Column {
                                return builtinPluginWidgetComponent
                            } else if (id.startsWith("plugin_")) {
                                return pluginWidgetComponent
-                            } else if (id === "wifi" || id === "bluetooth" || id === "audioOutput" || id === "audioInput") {
+                            } else if (id === "wifi") {
+                                if (!DMSService.dmsAvailable) {
+                                    return errorPillComponent
+                                }
+                                if (DMSService.dmsAvailable && !DMSService.capabilities.includes("network")) {
+                                    return errorPillComponent
+                                }
+                                return compoundPillComponent
+                            } else if (id === "bluetooth" || id === "audioOutput" || id === "audioInput") {
                                return compoundPillComponent
                            } else if (id === "volumeSlider") {
                                return audioSliderComponent
@@ -175,6 +183,22 @@ Column {
        }
    }

+    Component {
+        id: errorPillComponent
+        ErrorPill {
+            property var widgetData: parent.widgetData || {}
+            width: parent.width
+            height: 60
+            primaryMessage: {
+                if (!DMSService.dmsAvailable) {
+                    return qsTr("DMS_SOCKET not available")
+                }
+                return qsTr("NM not supported")
+            }
+            secondaryMessage: qsTr("update dms for NM integration.")
+        }
+    }
+
    Component {
        id: compoundPillComponent
        CompoundPill {
@@ -187,13 +211,13 @@ Column {
                switch (widgetData.id || "") {
                case "wifi":
                {
-                    if (NetworkService.wifiToggling)
+                    if (NetworkManagerService.wifiToggling)
                        return "sync"
-                    if (NetworkService.networkStatus === "ethernet")
+                    if (NetworkManagerService.networkStatus === "ethernet")
                        return "settings_ethernet"
-                    if (NetworkService.networkStatus === "wifi")
-                        return NetworkService.wifiSignalIcon
-                    if (NetworkService.wifiEnabled)
+                    if (NetworkManagerService.networkStatus === "wifi")
+                        return NetworkManagerService.wifiSignalIcon
+                    if (NetworkManagerService.wifiEnabled)
                        return "wifi_off"
                    return "wifi_off"
                }
@@ -246,13 +270,13 @@ Column {
                switch (widgetData.id || "") {
                case "wifi":
                {
-                    if (NetworkService.wifiToggling)
-                        return NetworkService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
-                    if (NetworkService.networkStatus === "ethernet")
+                    if (NetworkManagerService.wifiToggling)
+                        return NetworkManagerService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
+                    if (NetworkManagerService.networkStatus === "ethernet")
                        return "Ethernet"
-                    if (NetworkService.networkStatus === "wifi" && NetworkService.currentWifiSSID)
-                        return NetworkService.currentWifiSSID
-                    if (NetworkService.wifiEnabled)
+                    if (NetworkManagerService.networkStatus === "wifi" && NetworkManagerService.currentWifiSSID)
+                        return NetworkManagerService.currentWifiSSID
+                    if (NetworkManagerService.wifiEnabled)
                        return "Not connected"
                    return "WiFi off"
                }
@@ -278,13 +302,13 @@ Column {
                switch (widgetData.id || "") {
                case "wifi":
                {
-                    if (NetworkService.wifiToggling)
+                    if (NetworkManagerService.wifiToggling)
                        return "Please wait..."
-                    if (NetworkService.networkStatus === "ethernet")
+                    if (NetworkManagerService.networkStatus === "ethernet")
                        return "Connected"
-                    if (NetworkService.networkStatus === "wifi")
-                        return NetworkService.wifiSignalStrength > 0 ? NetworkService.wifiSignalStrength + "%" : "Connected"
-                    if (NetworkService.wifiEnabled)
+                    if (NetworkManagerService.networkStatus === "wifi")
+                        return NetworkManagerService.wifiSignalStrength > 0 ? NetworkManagerService.wifiSignalStrength + "%" : "Connected"
+                    if (NetworkManagerService.wifiEnabled)
                        return "Select network"
                    return ""
                }
@@ -332,13 +356,13 @@ Column {
                switch (widgetData.id || "") {
                case "wifi":
                {
-                    if (NetworkService.wifiToggling)
+                    if (NetworkManagerService.wifiToggling)
                        return false
-                    if (NetworkService.networkStatus === "ethernet")
+                    if (NetworkManagerService.networkStatus === "ethernet")
                        return true
-                    if (NetworkService.networkStatus === "wifi")
+                    if (NetworkManagerService.networkStatus === "wifi")
                        return true
-                    return NetworkService.wifiEnabled
+                    return NetworkManagerService.wifiEnabled
                }
                case "bluetooth":
                    return !!(BluetoothService.available && BluetoothService.adapter && BluetoothService.adapter.enabled)
@@ -723,12 +747,16 @@ Column {
            width: parent.width
            height: 60

-            property var builtinInstance: {
+            property var builtinInstance: null
+
+            Component.onCompleted: {
                const id = widgetData.id || ""
                if (id === "builtin_vpn") {
-                    return root.model?.vpnBuiltinInstance
+                    if (root.model?.vpnLoader) {
+                        root.model.vpnLoader.active = true
+                    }
+                    builtinInstance = Qt.binding(() => root.model?.vpnBuiltinInstance)
                }
-                return null
            }

            sourceComponent: {
--- a/Modules/ControlCenter/ControlCenterPopout.qml
+++ b/Modules/ControlCenter/ControlCenterPopout.qml
@@ -73,13 +73,13 @@ DankPopout {
    onShouldBeVisibleChanged: {
        if (shouldBeVisible) {
            Qt.callLater(() => {
-                NetworkService.autoRefreshEnabled = NetworkService.wifiEnabled
+                NetworkManagerService.autoRefreshEnabled = NetworkManagerService.wifiEnabled
                if (UserInfoService)
                    UserInfoService.getUptime()
            })
        } else {
            Qt.callLater(() => {
-                NetworkService.autoRefreshEnabled = false
+                NetworkManagerService.autoRefreshEnabled = false
                if (BluetoothService.adapter && BluetoothService.adapter.discovering)
                    BluetoothService.adapter.discovering = false
                editMode = false
--- a/Modules/ControlCenter/Details/NetworkDetail.qml
+++ b/Modules/ControlCenter/Details/NetworkDetail.qml
@@ -8,10 +8,10 @@ import qs.Modals

 Rectangle {
    implicitHeight: {
-        if (NetworkService.wifiToggling) {
+        if (NetworkManagerService.wifiToggling) {
            return headerRow.height + wifiToggleContent.height + Theme.spacingM
        }
-        if (NetworkService.wifiEnabled) {
+        if (NetworkManagerService.wifiEnabled) {
            return headerRow.height + wifiContent.height + Theme.spacingM
        }
        return headerRow.height + wifiOffContent.height + Theme.spacingM
@@ -20,16 +20,13 @@ Rectangle {
    color: Theme.surfaceContainerHigh
    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
    border.width: 0
-    
+
    Component.onCompleted: {
-        NetworkService.addRef()
-        if (NetworkService.wifiEnabled) {
-            NetworkService.scanWifi()
-        }
+        NetworkManagerService.addRef()
    }

    Component.onDestruction: {
-        NetworkService.removeRef()
+        NetworkManagerService.removeRef()
    }
    
    Row {
@@ -59,16 +56,31 @@ Rectangle {
        DankButtonGroup {
            id: preferenceControls
            anchors.verticalCenter: parent.verticalCenter
-            visible: NetworkService.ethernetConnected && NetworkService.wifiConnected
+            visible: NetworkManagerService.ethernetConnected

-            property int currentPreferenceIndex: NetworkService.userPreference === "ethernet" ? 0 : 1
+            property int currentPreferenceIndex: {
+                const pref = NetworkManagerService.userPreference
+                const status = NetworkManagerService.networkStatus
+                let index = 1
+
+                if (pref === "ethernet") {
+                    index = 0
+                } else if (pref === "wifi") {
+                    index = 1
+                } else {
+                    index = status === "ethernet" ? 0 : 1
+                }
+
+                return index
+            }

            model: ["Ethernet", "WiFi"]
            currentIndex: currentPreferenceIndex
            selectionMode: "single"
            onSelectionChanged: (index, selected) => {
                if (!selected) return
-                NetworkService.setNetworkPreference(index === 0 ? "ethernet" : "wifi")
+                console.log("NetworkDetail: Setting preference to", index === 0 ? "ethernet" : "wifi")
+                NetworkManagerService.setNetworkPreference(index === 0 ? "ethernet" : "wifi")
            }
        }
    }
@@ -80,31 +92,31 @@ Rectangle {
        anchors.right: parent.right
        anchors.margins: Theme.spacingM
        anchors.topMargin: Theme.spacingM
-        visible: NetworkService.wifiToggling
+        visible: NetworkManagerService.wifiToggling
        height: visible ? 80 : 0
-        
+
        Column {
            anchors.centerIn: parent
            spacing: Theme.spacingM
-            
+
            DankIcon {
                anchors.horizontalCenter: parent.horizontalCenter
                name: "sync"
                size: 32
                color: Theme.primary
-                
+
                RotationAnimation on rotation {
-                    running: NetworkService.wifiToggling
+                    running: NetworkManagerService.wifiToggling
                    loops: Animation.Infinite
                    from: 0
                    to: 360
                    duration: 1000
                }
            }
-            
+
            StyledText {
                anchors.horizontalCenter: parent.horizontalCenter
-                text: NetworkService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
+                text: NetworkManagerService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
                font.pixelSize: Theme.fontSizeMedium
                color: Theme.surfaceText
                horizontalAlignment: Text.AlignHCenter
@@ -119,7 +131,7 @@ Rectangle {
        anchors.right: parent.right
        anchors.margins: Theme.spacingM
        anchors.topMargin: Theme.spacingM
-        visible: !NetworkService.wifiEnabled && !NetworkService.wifiToggling
+        visible: !NetworkManagerService.wifiEnabled && !NetworkManagerService.wifiToggling
        height: visible ? 120 : 0
        
        Column {
@@ -165,7 +177,7 @@ Rectangle {
                    anchors.fill: parent
                    hoverEnabled: true
                    cursorShape: Qt.PointingHandCursor
-                    onClicked: NetworkService.toggleWifiRadio()
+                    onClicked: NetworkManagerService.toggleWifiRadio()
                }
                
            }
@@ -180,7 +192,7 @@ Rectangle {
        anchors.bottom: parent.bottom
        anchors.margins: Theme.spacingM
        anchors.topMargin: Theme.spacingM
-        visible: NetworkService.wifiInterface && NetworkService.wifiEnabled && !NetworkService.wifiToggling
+        visible: NetworkManagerService.wifiInterface && NetworkManagerService.wifiEnabled && !NetworkManagerService.wifiToggling
        contentHeight: wifiColumn.height
        clip: true
        
@@ -192,16 +204,16 @@ Rectangle {
            Item {
                width: parent.width
                height: 200
-                visible: NetworkService.wifiInterface && NetworkService.wifiNetworks?.length < 1 && !NetworkService.wifiToggling
-                
+                visible: NetworkManagerService.wifiInterface && NetworkManagerService.wifiNetworks?.length < 1 && !NetworkManagerService.wifiToggling && NetworkManagerService.isScanning
+
                DankIcon {
                    anchors.centerIn: parent
                    name: "refresh"
                    size: 48
                    color: Qt.rgba(Theme.surfaceText.r || 0.8, Theme.surfaceText.g || 0.8, Theme.surfaceText.b || 0.8, 0.3)
-                    
+
                    RotationAnimation on rotation {
-                        running: true
+                        running: NetworkManagerService.isScanning
                        loops: Animation.Infinite
                        from: 0
                        to: 360
@@ -211,14 +223,18 @@ Rectangle {
            }
            
            Repeater {
-                model: {
-                    let networks = [...NetworkService.wifiNetworks]
-                    networks.sort((a, b) => {
-                        if (a.ssid === NetworkService.currentWifiSSID) return -1
-                        if (b.ssid === NetworkService.currentWifiSSID) return 1
+                model: sortedNetworks
+
+                property var sortedNetworks: {
+                    const ssid = NetworkManagerService.currentWifiSSID
+                    const networks = NetworkManagerService.wifiNetworks
+                    let sorted = [...networks]
+                    sorted.sort((a, b) => {
+                        if (a.ssid === ssid) return -1
+                        if (b.ssid === ssid) return 1
                        return b.signal - a.signal
                    })
-                    return networks
+                    return sorted
                }
                delegate: Rectangle {
                    required property var modelData
@@ -228,7 +244,7 @@ Rectangle {
                    height: 50
                    radius: Theme.cornerRadius
                    color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
-                    border.color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                    border.color: modelData.ssid === NetworkManagerService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                    border.width: 0
                    
                    Row {
@@ -245,7 +261,7 @@ Rectangle {
                                return "wifi_1_bar"
                            }
                            size: Theme.iconSize - 4
-                            color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Theme.surfaceText
+                            color: modelData.ssid === NetworkManagerService.currentWifiSSID ? Theme.primary : Theme.surfaceText
                            anchors.verticalCenter: parent.verticalCenter
                        }
                        
@@ -257,16 +273,16 @@ Rectangle {
                                text: modelData.ssid || "Unknown Network"
                                font.pixelSize: Theme.fontSizeMedium
                                color: Theme.surfaceText
-                                font.weight: modelData.ssid === NetworkService.currentWifiSSID ? Font.Medium : Font.Normal
+                                font.weight: modelData.ssid === NetworkManagerService.currentWifiSSID ? Font.Medium : Font.Normal
                                elide: Text.ElideRight
                                width: parent.width
                            }
-                            
+
                            Row {
                                spacing: Theme.spacingXS
-                                
+
                                StyledText {
-                                    text: modelData.ssid === NetworkService.currentWifiSSID ? "Connected" : (modelData.secured ? "Secured" : "Open")
+                                    text: modelData.ssid === NetworkManagerService.currentWifiSSID ? "Connected" : (modelData.secured ? "Secured" : "Open")
                                    font.pixelSize: Theme.fontSizeSmall
                                    color: Theme.surfaceVariantText
                                }
@@ -300,7 +316,7 @@ Rectangle {
                            } else {
                                networkContextMenu.currentSSID = modelData.ssid
                                networkContextMenu.currentSecured = modelData.secured
-                                networkContextMenu.currentConnected = modelData.ssid === NetworkService.currentWifiSSID
+                                networkContextMenu.currentConnected = modelData.ssid === NetworkManagerService.currentWifiSSID
                                networkContextMenu.currentSaved = modelData.saved
                                networkContextMenu.currentSignal = modelData.signal
                                networkContextMenu.popup(optionsButton, -networkContextMenu.width + optionsButton.width, optionsButton.height + Theme.spacingXS)
@@ -315,11 +331,11 @@ Rectangle {
                        hoverEnabled: true
                        cursorShape: Qt.PointingHandCursor
                        onClicked: function(event) {
-                            if (modelData.ssid !== NetworkService.currentWifiSSID) {
+                            if (modelData.ssid !== NetworkManagerService.currentWifiSSID) {
                                if (modelData.secured && !modelData.saved) {
                                    wifiPasswordModal.show(modelData.ssid)
                                } else {
-                                    NetworkService.connectToWifi(modelData.ssid)
+                                    NetworkManagerService.connectToWifi(modelData.ssid)
                                }
                            }
                            event.accepted = true
@@ -368,12 +384,12 @@ Rectangle {
            
            onTriggered: {
                if (networkContextMenu.currentConnected) {
-                    NetworkService.disconnectWifi()
+                    NetworkManagerService.disconnectWifi()
                } else {
                    if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) {
                        wifiPasswordModal.show(networkContextMenu.currentSSID)
                    } else {
-                        NetworkService.connectToWifi(networkContextMenu.currentSSID)
+                        NetworkManagerService.connectToWifi(networkContextMenu.currentSSID)
                    }
                }
            }
@@ -397,7 +413,7 @@ Rectangle {
            }
            
            onTriggered: {
-                let networkData = NetworkService.getNetworkInfo(networkContextMenu.currentSSID)
+                let networkData = NetworkManagerService.getNetworkInfo(networkContextMenu.currentSSID)
                networkInfoModal.showNetworkInfo(networkContextMenu.currentSSID, networkData)
            }
        }
@@ -421,7 +437,7 @@ Rectangle {
            }
            
            onTriggered: {
-                NetworkService.forgetWifiNetwork(networkContextMenu.currentSSID)
+                NetworkManagerService.forgetWifiNetwork(networkContextMenu.currentSSID)
            }
        }
    }
--- a/Modules/ControlCenter/Models/WidgetModel.qml
+++ b/Modules/ControlCenter/Models/WidgetModel.qml
@@ -7,7 +7,30 @@ import "../utils/widgets.js" as WidgetUtils
 QtObject {
    id: root

-    property var vpnBuiltinInstance: VpnWidget {}
+    property var vpnBuiltinInstance: null
+
+    property var vpnLoader: Loader {
+        active: false
+        sourceComponent: Component {
+            VpnWidget {}
+        }
+
+        onItemChanged: {
+            root.vpnBuiltinInstance = item
+        }
+
+        Connections {
+            target: SettingsData
+            function onControlCenterWidgetsChanged() {
+                const widgets = SettingsData.controlCenterWidgets || []
+                const hasVpnWidget = widgets.some(w => w.id === "builtin_vpn")
+                if (!hasVpnWidget && vpnLoader.active) {
+                    console.log("VpnWidget: No VPN widget in control center, deactivating loader")
+                    vpnLoader.active = false
+                }
+            }
+        }
+    }

    readonly property var coreWidgetDefinitions: [{
            "id": "nightMode",
@@ -44,8 +67,8 @@ QtObject {
            "description": "Wi-Fi and Ethernet connection",
            "icon": "wifi",
            "type": "connection",
-            "enabled": NetworkService.wifiAvailable,
-            "warning": !NetworkService.wifiAvailable ? "Wi-Fi not available" : undefined
+            "enabled": NetworkManagerService.wifiAvailable,
+            "warning": !NetworkManagerService.wifiAvailable ? "Wi-Fi not available" : undefined
        }, {
            "id": "bluetooth",
            "text": "Bluetooth",
--- a/Modules/ControlCenter/Widgets/ErrorPill.qml
+++ b/Modules/ControlCenter/Widgets/ErrorPill.qml
@@ -0,0 +1,51 @@
+import QtQuick
+import qs.Common
+import qs.Widgets
+
+StyledRect {
+    id: root
+
+    property string primaryMessage: ""
+    property string secondaryMessage: ""
+
+    radius: Theme.cornerRadius
+    color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.1)
+    border.color: Theme.warning
+    border.width: 1
+
+    Row {
+        anchors.fill: parent
+        anchors.margins: Theme.spacingM
+        spacing: Theme.spacingXS
+
+        DankIcon {
+            name: "warning"
+            size: 16
+            color: Theme.warning
+            anchors.top: parent.top
+            anchors.topMargin: 2
+        }
+
+        Column {
+            width: parent.width - 16 - parent.spacing
+            spacing: Theme.spacingXS
+
+            StyledText {
+                width: parent.width
+                text: root.primaryMessage
+                font.pixelSize: Theme.fontSizeSmall
+                color: Theme.warning
+                font.weight: Font.Medium
+                wrapMode: Text.WordWrap
+            }
+
+            StyledText {
+                width: parent.width
+                text: root.secondaryMessage
+                font.pixelSize: Theme.fontSizeSmall
+                color: Theme.warning
+                visible: text.length > 0
+            }
+        }
+    }
+}
--- a/Modules/ControlCenter/Widgets/NetworkPill.qml
+++ b/Modules/ControlCenter/Widgets/NetworkPill.qml
@@ -1,78 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.ControlCenter.Widgets
-
-CompoundPill {
-    id: root
-
-    isActive: {
-        if (NetworkService.wifiToggling) {
-            return false
-        }
-        if (NetworkService.networkStatus === "ethernet") {
-            return true
-        }
-        if (NetworkService.networkStatus === "wifi") {
-            return true
-        }
-        return NetworkService.wifiEnabled
-    }
-
-    iconName: {
-        if (NetworkService.wifiToggling) {
-            return "sync"
-        }
-        if (NetworkService.networkStatus === "ethernet") {
-            return "settings_ethernet"
-        }
-        if (NetworkService.networkStatus === "wifi") {
-            return NetworkService.wifiSignalIcon
-        }
-        if (NetworkService.wifiEnabled) {
-            return "wifi_off"
-        }
-        return "wifi_off"
-    }
-
-    primaryText: {
-        if (NetworkService.wifiToggling) {
-            return NetworkService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
-        }
-        if (NetworkService.networkStatus === "ethernet") {
-            return "Ethernet"
-        }
-        if (NetworkService.networkStatus === "wifi" && NetworkService.currentWifiSSID) {
-            return NetworkService.currentWifiSSID
-        }
-        if (NetworkService.wifiEnabled) {
-            return "Not connected"
-        }
-        return "WiFi off"
-    }
-
-    secondaryText: {
-        if (NetworkService.wifiToggling) {
-            return "Please wait..."
-        }
-        if (NetworkService.networkStatus === "ethernet") {
-            return "Connected"
-        }
-        if (NetworkService.networkStatus === "wifi") {
-            return NetworkService.wifiSignalStrength > 0 ? NetworkService.wifiSignalStrength + "%" : "Connected"
-        }
-        if (NetworkService.wifiEnabled) {
-            return "Select network"
-        }
-        return ""
-    }
-
-    onToggled: {
-        if (NetworkService.networkStatus !== "ethernet" && !NetworkService.wifiToggling) {
-            NetworkService.toggleWifiRadio()
-        }
-    }
-}
--- a/Modules/DankBar/DankBar.qml
+++ b/Modules/DankBar/DankBar.qml
@@ -1003,8 +1003,8 @@ Item {
                                    }
                                    controlCenterLoader.item.triggerScreen = barWindow.screen
                                    controlCenterLoader.item.toggle()
-                                    if (controlCenterLoader.item.shouldBeVisible && NetworkService.wifiEnabled) {
-                                        NetworkService.scanWifi()
+                                    if (controlCenterLoader.item.shouldBeVisible && NetworkManagerService.wifiEnabled) {
+                                        NetworkManagerService.scanWifi()
                                    }
                                }
                            }
--- a/Modules/DankBar/Popouts/VpnPopout.qml
+++ b/Modules/DankBar/Popouts/VpnPopout.qml
@@ -13,6 +13,10 @@ import qs.Widgets
 DankPopout {
    id: root

+    Ref {
+        service: VpnService
+    }
+
    property var triggerScreen: null

    function setTriggerPosition(x, y, width, section, screen) {
--- a/Modules/DankBar/Widgets/ControlCenterButton.qml
+++ b/Modules/DankBar/Widgets/ControlCenterButton.qml
@@ -42,26 +42,26 @@ Rectangle {

        DankIcon {
            name: {
-                if (NetworkService.wifiToggling) {
+                if (NetworkManagerService.wifiToggling) {
                    return "sync"
                }

-                if (NetworkService.networkStatus === "ethernet") {
+                if (NetworkManagerService.networkStatus === "ethernet") {
                    return "lan"
                }

-                return NetworkService.wifiSignalIcon
+                return NetworkManagerService.wifiSignalIcon
            }
            size: Theme.barIconSize(barThickness)
            color: {
-                if (NetworkService.wifiToggling) {
+                if (NetworkManagerService.wifiToggling) {
                    return Theme.primary
                }

-                return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton
+                return NetworkManagerService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton
            }
            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showNetworkIcon
+            visible: root.showNetworkIcon && NetworkManagerService.networkAvailable
        }

        DankIcon {
@@ -141,26 +141,26 @@ Rectangle {
            id: networkIcon

            name: {
-                if (NetworkService.wifiToggling) {
+                if (NetworkManagerService.wifiToggling) {
                    return "sync";
                }

-                if (NetworkService.networkStatus === "ethernet") {
+                if (NetworkManagerService.networkStatus === "ethernet") {
                    return "lan";
                }

-                return NetworkService.wifiSignalIcon;
+                return NetworkManagerService.wifiSignalIcon;
            }
            size: Theme.barIconSize(barThickness)
            color: {
-                if (NetworkService.wifiToggling) {
+                if (NetworkManagerService.wifiToggling) {
                    return Theme.primary;
                }

-                return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton;
+                return NetworkManagerService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton;
            }
            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showNetworkIcon
+            visible: root.showNetworkIcon && NetworkManagerService.networkAvailable


        }
--- a/Modules/DankBar/Widgets/Vpn.qml
+++ b/Modules/DankBar/Widgets/Vpn.qml
@@ -7,6 +7,10 @@ import qs.Widgets
 Rectangle {
    id: root

+    Ref {
+        service: VpnService
+    }
+
    property bool isVertical: axis?.isVertical ?? false
    property var axis: null
    property int widgetThickness: 28
--- a/Modules/Lock/Lock.qml
+++ b/Modules/Lock/Lock.qml
@@ -7,120 +7,57 @@ import qs.Services

 Item {
    id: root
-    property string sid: Quickshell.env("XDG_SESSION_ID") || "self"
-    property string sessionPath: ""

    function activate() {
        loader.activeAsync = true
    }

    Component.onCompleted: {
-        getSessionPath.running = true
-    }
-
-    Component.onDestruction: {
-        lockStateMonitor.running = false
+        if (SessionService.loginctlAvailable) {
+            if (SessionService.locked || SessionService.lockedHint) {
+                console.log("Lock: Session locked on startup")
+                loader.activeAsync = true
+            }
+        }
    }

    Connections {
        target: IdleService
        function onLockRequested() {
            console.log("Lock: Received lock request from IdleService")
-            activate()
+            SessionService.lockSession()
        }
    }

-    Process {
-        id: getSessionPath
-        command: ["gdbus", "call", "--system", "--dest", "org.freedesktop.login1", "--object-path", "/org/freedesktop/login1", "--method", "org.freedesktop.login1.Manager.GetSession", sid]
-        running: false
+    Connections {
+        target: SessionService

-        stdout: StdioCollector {
-            onStreamFinished: {
-                const match = text.match(/objectpath '([^']+)'/)
-                if (match) {
-                    root.sessionPath = match[1]
-                    console.log("Found session path:", root.sessionPath)
-                    checkCurrentLockState.running = true
-                    lockStateMonitor.running = true
-                } else {
-                    console.warn("Could not determine session path")
-                }
+        function onSessionLocked() {
+            console.log("Lock: Lock signal received -> show lock")
+            loader.activeAsync = true
+        }
+
+        function onSessionUnlocked() {
+            console.log("Lock: Unlock signal received -> hide lock")
+            loader.active = false
+        }
+
+        function onLoginctlStateChanged() {
+            if (SessionService.lockedHint && !loader.active) {
+                console.log("Lock: LockedHint=true -> show lock")
+                loader.activeAsync = true
+            } else if (!SessionService.locked && !SessionService.lockedHint && loader.active) {
+                console.log("Lock: LockedHint=false -> hide lock")
+                loader.active = false
            }
        }

-        onExited: (exitCode, exitStatus) => {
-                      if (exitCode !== 0) {
-                          console.warn("Failed to get session path, exit code:", exitCode)
-                      }
-                  }
-    }
-
-    Process {
-        id: checkCurrentLockState
-        command: root.sessionPath ? ["gdbus", "call", "--system", "--dest", "org.freedesktop.login1", "--object-path", root.sessionPath, "--method", "org.freedesktop.DBus.Properties.Get", "org.freedesktop.login1.Session", "LockedHint"] : []
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                if (text.includes("true")) {
-                    console.log("Session is locked on startup, activating lock screen")
-                    loader.activeAsync = true
-                }
+        function onPrepareForSleep() {
+            if (SessionService.preparingForSleep && SessionData.lockBeforeSuspend) {
+                console.log("Lock: PrepareForSleep -> lock before suspend")
+                loader.activeAsync = true
            }
        }
-
-        onExited: (exitCode, exitStatus) => {
-                      if (exitCode !== 0) {
-                          console.warn("Failed to check initial lock state, exit code:", exitCode)
-                      }
-                  }
-    }
-
-    Process {
-        id: lockStateMonitor
-        command: root.sessionPath ? ["gdbus", "monitor", "--system", "--dest", "org.freedesktop.login1"] : []
-        running: false
-
-        stdout: SplitParser {
-            splitMarker: "\n"
-
-            onRead: line => {
-                        if (line.includes(root.sessionPath)) {
-                            if (line.includes("org.freedesktop.login1.Session.Lock")) {
-                                console.log("login1: Lock signal received -> show lock")
-                                loader.activeAsync = true
-                                return
-                            }
-                            if (line.includes("org.freedesktop.login1.Session.Unlock")) {
-                                console.log("login1: Unlock signal received -> hide lock")
-                                loader.active = false
-                                return
-                            }
-                            if (line.includes("LockedHint") && line.includes("true")) {
-                                console.log("login1: LockedHint=true -> show lock")
-                                loader.activeAsync = true
-                                return
-                            }
-                            if (line.includes("LockedHint") && line.includes("false")) {
-                                console.log("login1: LockedHint=false -> hide lock")
-                                loader.active = false
-                                return
-                            }
-                        }
-                        if (line.includes("PrepareForSleep") && 
-                            line.includes("true") &&
-                            SessionData.lockBeforeSuspend) {
-                            loader.activeAsync = true
-                        }
-                    }
-        }
-
-        onExited: (exitCode, exitStatus) => {
-                      if (exitCode !== 0) {
-                          console.warn("gdbus monitor failed, exit code:", exitCode)
-                      }
-                  }
    }

    LazyLoader {
@@ -160,7 +97,7 @@ Item {

        function lock() {
            console.log("Lock screen requested via IPC")
-            loader.activeAsync = true
+            SessionService.lockSession()
        }

        function demo() {
@@ -169,7 +106,7 @@ Item {
        }

        function isLocked(): bool {
-            return loader.active
+            return SessionService.locked || loader.active
        }
    }
 }
--- a/Modules/Lock/LockScreenContent.qml
+++ b/Modules/Lock/LockScreenContent.qml
@@ -906,20 +906,20 @@ Item {
                height: 24
                color: Qt.rgba(255, 255, 255, 0.2)
                anchors.verticalCenter: parent.verticalCenter
-                visible: WeatherService.weather.available && (NetworkService.networkStatus !== "disconnected" || BluetoothService.enabled || (AudioService.sink && AudioService.sink.audio) || BatteryService.batteryAvailable)
+                visible: WeatherService.weather.available && (NetworkManagerService.networkStatus !== "disconnected" || BluetoothService.enabled || (AudioService.sink && AudioService.sink.audio) || BatteryService.batteryAvailable)
            }

            Row {
                spacing: Theme.spacingM
                anchors.verticalCenter: parent.verticalCenter
-                visible: NetworkService.networkStatus !== "disconnected" || (BluetoothService.available && BluetoothService.enabled) || (AudioService.sink && AudioService.sink.audio)
+                visible: NetworkManagerService.networkStatus !== "disconnected" || (BluetoothService.available && BluetoothService.enabled) || (AudioService.sink && AudioService.sink.audio)

                DankIcon {
-                    name: NetworkService.networkStatus === "ethernet" ? "lan" : NetworkService.wifiSignalIcon
+                    name: NetworkManagerService.networkStatus === "ethernet" ? "lan" : NetworkManagerService.wifiSignalIcon
                    size: Theme.iconSize - 2
-                    color: NetworkService.networkStatus !== "disconnected" ? "white" : Qt.rgba(255, 255, 255, 0.5)
+                    color: NetworkManagerService.networkStatus !== "disconnected" ? "white" : Qt.rgba(255, 255, 255, 0.5)
                    anchors.verticalCenter: parent.verticalCenter
-                    visible: NetworkService.networkStatus !== "disconnected"
+                    visible: NetworkManagerService.networkStatus !== "disconnected"
                }

                DankIcon {
@@ -955,7 +955,7 @@ Item {
                height: 24
                color: Qt.rgba(255, 255, 255, 0.2)
                anchors.verticalCenter: parent.verticalCenter
-                visible: BatteryService.batteryAvailable && (NetworkService.networkStatus !== "disconnected" || BluetoothService.enabled || (AudioService.sink && AudioService.sink.audio))
+                visible: BatteryService.batteryAvailable && (NetworkManagerService.networkStatus !== "disconnected" || BluetoothService.enabled || (AudioService.sink && AudioService.sink.audio))
            }

            Row {
--- a/Modules/ProcessList/SystemTab.qml
+++ b/Modules/ProcessList/SystemTab.qml
@@ -69,7 +69,7 @@ DankFlickable {
                        }

                        StyledText {
-                            text: `Up ${UserInfoService.uptime} • Boot: ${DgopService.bootTime}`
+                            text: `${UserInfoService.uptime} • Boot: ${DgopService.bootTime}`
                            font.pixelSize: Theme.fontSizeSmall
                            font.family: SettingsData.monoFontFamily
                            color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)