From 76229406e06553acbc60dac417f6d362a82ab722 Mon Sep 17 00:00:00 2001
From: mewoocat <azure.horizon.4@gmail.com>
Date: Sat, 10 May 2025 13:59:41 -0500
Subject: [PATCH 1/7] intial investigation

---
 default.nix                                | 6 +++++-
 src/services/CMakeLists.txt                | 4 ++++
 src/services/networkmanager/CMakeLists.txt | 0
 src/services/networkmanager/core.cpp       | 0
 src/services/pipewire/core.cpp             | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 src/services/networkmanager/CMakeLists.txt
 create mode 100644 src/services/networkmanager/core.cpp

diff --git a/default.nix b/default.nix
index 79c9b7a4..de014d7c 100644
--- a/default.nix
+++ b/default.nix
@@ -18,6 +18,7 @@
   libgbm ? null,
   xorg,
   pipewire,
+  networkmanager,
   pam,
 
   gitRev ? (let
@@ -38,6 +39,7 @@
   withWayland ? true,
   withX11 ? true,
   withPipewire ? true,
+  withNetworkmanager ? true,
   withPam ? true,
   withHyprland ? true,
   withI3 ? true,
@@ -69,7 +71,8 @@
   ++ lib.optionals withWayland ([ qt6.qtwayland wayland ] ++ (if libgbm != null then [ libdrm libgbm ] else []))
   ++ lib.optional withX11 xorg.libxcb
   ++ lib.optional withPam pam
-  ++ lib.optional withPipewire pipewire;
+  ++ lib.optional withPipewire pipewire
+  ++ lib.optional withNetworkmanager networkmanager;
 
   cmakeBuildType = if debug then "Debug" else "RelWithDebInfo";
 
@@ -83,6 +86,7 @@
     (lib.cmakeBool "WAYLAND" withWayland)
     (lib.cmakeBool "SCREENCOPY" (libgbm != null))
     (lib.cmakeBool "SERVICE_PIPEWIRE" withPipewire)
+    (lib.cmakeBool "SERVICE_NETWORKMANAGER" withNetworkmanager)
     (lib.cmakeBool "SERVICE_PAM" withPam)
     (lib.cmakeBool "HYPRLAND" withHyprland)
     (lib.cmakeBool "I3" withI3)
diff --git a/src/services/CMakeLists.txt b/src/services/CMakeLists.txt
index 5ab5c550..173ddeaa 100644
--- a/src/services/CMakeLists.txt
+++ b/src/services/CMakeLists.txt
@@ -6,6 +6,10 @@ if (SERVICE_PIPEWIRE)
 	add_subdirectory(pipewire)
 endif()
 
+if (SERVICE_NETWORKMANAGER)
+	add_subdirectory(networkmanager)
+endif()
+
 if (SERVICE_MPRIS)
 	add_subdirectory(mpris)
 endif()
diff --git a/src/services/networkmanager/CMakeLists.txt b/src/services/networkmanager/CMakeLists.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/src/services/networkmanager/core.cpp b/src/services/networkmanager/core.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/src/services/pipewire/core.cpp b/src/services/pipewire/core.cpp
index 9c2a3dbf..998b0cb1 100644
--- a/src/services/pipewire/core.cpp
+++ b/src/services/pipewire/core.cpp
@@ -52,7 +52,7 @@ PwCore::PwCore(QObject* parent): QObject(parent), notifier(QSocketNotifier::Read
 	qCInfo(logLoop) << "Connecting to pipewire server.";
 	this->core = pw_context_connect(this->context, nullptr, 0);
 	if (this->core == nullptr) {
-		qCCritical(logLoop) << "Failed to connect pipewire context. Errno:" << errno;
+	qCCritical(logLoop) << "Failed to connect pipewire context. Errno:" << errno;
 		return;
 	}
 

From 415cf05c162bb7ec59005b9bfb283fa363b6f45d Mon Sep 17 00:00:00 2001
From: mewoocat <azure.horizon.4@gmail.com>
Date: Sun, 11 May 2025 00:39:09 -0500
Subject: [PATCH 2/7] class setup

---
 src/services/networkmanager/CMakeLists.txt | 23 ++++++++++++++++++++++
 src/services/networkmanager/core.cpp       | 18 +++++++++++++++++
 src/services/networkmanager/core.hpp       | 13 ++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 src/services/networkmanager/core.hpp

diff --git a/src/services/networkmanager/CMakeLists.txt b/src/services/networkmanager/CMakeLists.txt
index e69de29b..95df41c4 100644
--- a/src/services/networkmanager/CMakeLists.txt
+++ b/src/services/networkmanager/CMakeLists.txt
@@ -0,0 +1,23 @@
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(networkmanager REQUIRED IMPORTED_TARGET libnm)
+
+qt_add_library(quickshell-service-networkmanager STATIC
+	core.cpp
+)
+
+qt_add_qml_module(quickshell-service-networkmanager
+	URI Quickshell.Services.Networkmanager
+	VERSION 0.1
+	DEPENDENCIES QtQml
+)
+
+qs_add_module_deps_light(quickshell-service-networkmanager Quickshell)
+
+install_qml_module(quickshell-service-networkmanager)
+
+target_link_libraries(quickshell-service-networkmanager PRIVATE
+	Qt::Qml PkgConfig::networkmanager
+	Qt::Quick # pch
+)
+
+qs_module_pch(quickshell-service-networkmanager)
diff --git a/src/services/networkmanager/core.cpp b/src/services/networkmanager/core.cpp
index e69de29b..567ae019 100644
--- a/src/services/networkmanager/core.cpp
+++ b/src/services/networkmanager/core.cpp
@@ -0,0 +1,18 @@
+#include "core.hpp"
+#include <qdbusconnection.h>
+
+namespace qs::service::networkmanager {
+
+namespace {
+Q_LOGGING_CATEGORY(logNetworkManager, "quickshell.service.networkmanager", QtWarningMsg);
+}
+
+NetworkManager::NetworkManager(){
+	auto bus = QDbusConnection::systemBus();
+
+	if (!bus.isConnected()) {
+		// Log message
+	}
+}
+
+}
diff --git a/src/services/networkmanager/core.hpp b/src/services/networkmanager/core.hpp
new file mode 100644
index 00000000..2c7d4ed8
--- /dev/null
+++ b/src/services/networkmanager/core.hpp
@@ -0,0 +1,13 @@
+#pragma once
+#include <qobject.h>
+
+namespace qs::service::networkmanager {
+
+class NetworkManager : public QObject {	
+	Q_OBJECT;
+public:
+	static NetworkManager* instance(); // Get instance of the class
+	void test();
+};
+
+}

From d542038c45dc8843d7459de296ffafba37ec723c Mon Sep 17 00:00:00 2001
From: mewoocat <azure.horizon.4@gmail.com>
Date: Mon, 12 May 2025 23:01:22 -0500
Subject: [PATCH 3/7] working on network service: cmake + dbus

---
 CMakeLists.txt                                |   1 +
 src/services/networkmanager/CMakeLists.txt    |  19 +-
 src/services/networkmanager/core.cpp          |  37 +-
 src/services/networkmanager/core.hpp          |   6 +-
 .../org.freedesktop.NetworkManager.xml        | 598 ++++++++++++++++++
 5 files changed, 656 insertions(+), 5 deletions(-)
 create mode 100644 src/services/networkmanager/org.freedesktop.NetworkManager.xml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 846a280c..2393ab47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,7 @@ boption(SERVICE_MPRIS "Mpris" ON)
 boption(SERVICE_PAM "Pam" ON)
 boption(SERVICE_GREETD "Greetd" ON)
 boption(SERVICE_UPOWER "UPower" ON)
+boption(SERVICE_NETWORKMANAGER "NetworkManager" ON)
 boption(SERVICE_NOTIFICATIONS "Notifications" ON)
 
 include(cmake/install-qml-module.cmake)
diff --git a/src/services/networkmanager/CMakeLists.txt b/src/services/networkmanager/CMakeLists.txt
index 95df41c4..0a50222b 100644
--- a/src/services/networkmanager/CMakeLists.txt
+++ b/src/services/networkmanager/CMakeLists.txt
@@ -1,22 +1,37 @@
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(networkmanager REQUIRED IMPORTED_TARGET libnm)
+# Not using libnm
+#pkg_check_modules(networkmanager REQUIRED IMPORTED_TARGET libnm)
+
+set_source_files_properties(org.freedesktop.NetworkManager.xml PROPERTIES
+	CLASSNAME DBusNetworkManager
+	NO_NAMESPACE TRUE
+)
+qt_add_dbus_interface(DBUS_INTERFACES
+	org.freedesktop.NetworkManager.xml
+	dbus_service
+)
 
 qt_add_library(quickshell-service-networkmanager STATIC
 	core.cpp
+	${DBUS_INTERFACES}
 )
 
+# dbus headers
+target_include_directories(quickshell-service-networkmanager PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
 qt_add_qml_module(quickshell-service-networkmanager
 	URI Quickshell.Services.Networkmanager
 	VERSION 0.1
 	DEPENDENCIES QtQml
 )
 
+# Not sure what this is doing
 qs_add_module_deps_light(quickshell-service-networkmanager Quickshell)
 
 install_qml_module(quickshell-service-networkmanager)
 
 target_link_libraries(quickshell-service-networkmanager PRIVATE
-	Qt::Qml PkgConfig::networkmanager
+	Qt::Qml
 	Qt::Quick # pch
 )
 
diff --git a/src/services/networkmanager/core.cpp b/src/services/networkmanager/core.cpp
index 567ae019..bce29ad8 100644
--- a/src/services/networkmanager/core.cpp
+++ b/src/services/networkmanager/core.cpp
@@ -1,10 +1,15 @@
-#include "core.hpp"
 #include <qdbusconnection.h>
+#include <qlogging.h>
+#include <qloggingcategory.h>
+#include <qdbusextratypes.h>
+
+#include "core.hpp"
+#include "dbus_service.h"
 
 namespace qs::service::networkmanager {
 
 namespace {
-Q_LOGGING_CATEGORY(logNetworkManager, "quickshell.service.networkmanager", QtWarningMsg);
+Q_LOGGING_CATEGORY(logNetworkManager, "quickshell.service.networkmanager", QtDebugMsg);
 }
 
 NetworkManager::NetworkManager(){
@@ -12,7 +17,35 @@ NetworkManager::NetworkManager(){
 
 	if (!bus.isConnected()) {
 		// Log message
+		qCWarning(logNetworkManager) << "Could not connect to DBus. NetworkManager service will not work.";
+		return;
+	}
+
+	this->service = new DBusNetworkManagerService("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", bus, this);
+	
+	if (!this->service->isValid()) {
+		qCDebug(logNetworkManager) << "NetworkManager service is not currently running, attempting to start it.";
+
+		dbus::tryLaunchService(this, bus, "org.freedesktop.NetworkManager", [this](bool success) {
+			if (success) {
+				qCDebug(logNetworkManager) << "Successfully launched NetworkManager service.";
+				this->init();
+			} else {
+				qCWarning(logNetworkManager) << "Could not start NetworkManager. The NetworkManager service will not work.";
+			}
+		});
+	} else {
+		this->init();
 	}
 }
 
+NetworkManager* NetworkManager::instance() {
+	static NetworkManager* instance = new NetworkManager(); // NOLINT
+	return instance;
+}
+
+void NetworkManager::init() {
+	qCDebug(logNetworkManager) << "Hi mom";
+}
+
 }
diff --git a/src/services/networkmanager/core.hpp b/src/services/networkmanager/core.hpp
index 2c7d4ed8..9d234ce4 100644
--- a/src/services/networkmanager/core.hpp
+++ b/src/services/networkmanager/core.hpp
@@ -1,5 +1,7 @@
 #pragma once
 #include <qobject.h>
+#include <qdbusextratypes.h>
+#include "dbus_service.h"
 
 namespace qs::service::networkmanager {
 
@@ -7,7 +9,9 @@ class NetworkManager : public QObject {
 	Q_OBJECT;
 public:
 	static NetworkManager* instance(); // Get instance of the class
-	void test();
+private:
+	DBUSNetworkservice* service = nullptr;
+	void init();
 };
 
 }
diff --git a/src/services/networkmanager/org.freedesktop.NetworkManager.xml b/src/services/networkmanager/org.freedesktop.NetworkManager.xml
new file mode 100644
index 00000000..c92c8017
--- /dev/null
+++ b/src/services/networkmanager/org.freedesktop.NetworkManager.xml
@@ -0,0 +1,598 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/freedesktop/NetworkManager">
+  <!--
+      org.freedesktop.NetworkManager:
+      @short_description: Connection Manager.
+
+  -->
+  <interface name="org.freedesktop.NetworkManager">
+    <annotation name="org.gtk.GDBus.C.Name" value="Manager"/>
+
+    <!--
+        Reload:
+        @flags: Optional flags to specify which parts shall be reloaded.
+
+        Reload NetworkManager's configuration and perform certain updates, like flushing a cache or
+        rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it
+        allows for more fine-grained control over what to reload (see @flags). It also allows
+        non-root access via PolicyKit and contrary to signals it is synchronous.
+
+        No flags (0x00) means to reload everything that is supported which is identical to
+        sending a SIGHUP.
+        (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this
+        does not include connections, which can be reloaded via Setting's ReloadConnections.
+        (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf
+        anew.
+        (0x04) means to restart the DNS plugin. This is for example useful when using
+        dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d.
+        If you edit those files, you can restart the DNS plugin. This action shortly interrupts
+        name resolution.
+        Note that flags may affect each other. For example, restarting the DNS plugin (0x04)
+        implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes
+        to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting
+        the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration
+        changes in NetworkManager.conf.
+    -->
+    <method name="Reload">
+      <arg name="flags" type="u" direction="in"/>
+    </method>
+
+    <!--
+        GetDevices:
+        @devices: List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).
+
+        Get the list of realized network devices.
+    -->
+    <method name="GetDevices">
+      <arg name="devices" type="ao" direction="out"/>
+    </method>
+
+    <!--
+        GetAllDevices:
+        @devices: List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).
+
+        Get the list of all network devices.
+    -->
+    <method name="GetAllDevices">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_all_devices"/>
+      <arg name="devices" type="ao" direction="out"/>
+    </method>
+
+    <!--
+        GetDeviceByIpIface:
+        @iface: Interface name of the device to find.
+        @device: Object path of the network device.
+
+        Return the object path of the network device referenced by its IP
+        interface name. Note that some devices (usually modems) only have an IP
+        interface name when they are connected.
+    -->
+    <method name="GetDeviceByIpIface">
+      <arg name="iface" type="s" direction="in"/>
+      <arg name="device" type="o" direction="out"/>
+    </method>
+
+    <!--
+        ActivateConnection:
+        @connection: The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.
+        @device: The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
+        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.
+        @active_connection: The path of the active connection object representing this active connection.
+
+        Activate a connection using the supplied device.
+    -->
+    <method name="ActivateConnection">
+      <arg name="connection" type="o" direction="in"/>
+      <arg name="device" type="o" direction="in"/>
+      <arg name="specific_object" type="o" direction="in"/>
+      <arg name="active_connection" type="o" direction="out"/>
+    </method>
+
+    <!--
+        AddAndActivateConnection:
+        @connection: Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
+        @device: The object path of device to be activated using the given connection.
+        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+        @path: Object path of the new connection that was just added.
+        @active_connection: The path of the active connection object representing this active connection.
+
+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+
+        See also AddAndActivateConnection2.
+    -->
+    <method name="AddAndActivateConnection">
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="device" type="o" direction="in"/>
+      <arg name="specific_object" type="o" direction="in"/>
+      <arg name="path" type="o" direction="out"/>
+      <arg name="active_connection" type="o" direction="out"/>
+    </method>
+
+    <!--
+        AddAndActivateConnection2:
+        @connection: Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
+        @device: The object path of device to be activated using the given connection.
+        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+        @options: Further options for the method call.
+        @path: Object path of the new connection that was just added.
+        @active_connection: The path of the active connection object representing this active connection.
+        @result: A dictionary of additional output arguments for future extension. Currently, not additional output arguments are supported.
+
+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+
+        This method extends AddAndActivateConnection to allow passing further
+        parameters. At this time the following options are supported:
+
+         * persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected.
+         * bind-activation: Bind the activation lifetime. Set to "dbus-client" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally.
+    -->
+    <method name="AddAndActivateConnection2">
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="device" type="o" direction="in"/>
+      <arg name="specific_object" type="o" direction="in"/>
+      <arg name="options" type="a{sv}" direction="in"/>
+      <arg name="path" type="o" direction="out"/>
+      <arg name="active_connection" type="o" direction="out"/>
+      <arg name="result" type="a{sv}" direction="out"/>
+    </method>
+
+    <!--
+        DeactivateConnection:
+        @active_connection: The currently active connection to deactivate.
+
+        Deactivate an active connection.
+    -->
+    <method name="DeactivateConnection">
+      <arg name="active_connection" type="o" direction="in"/>
+    </method>
+
+    <!--
+        Sleep:
+        @sleep: Indicates whether the NetworkManager daemon should sleep or wake.
+
+        Control the NetworkManager daemon's sleep state. When asleep, all
+        interfaces that it manages are deactivated. When awake, devices are
+        available to be activated. This command should not be called directly by
+        users or clients; it is intended for system suspend/resume tracking.
+    -->
+    <method name="Sleep">
+      <arg name="sleep" type="b" direction="in"/>
+    </method>
+
+    <!--
+        Enable:
+        @enable: If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.
+
+        Control whether overall networking is enabled or disabled. When disabled,
+        all interfaces that NM manages are deactivated. When enabled, all managed
+        interfaces are re-enabled and available to be activated. This command
+        should be used by clients that provide to users the ability to
+        enable/disable all networking.
+    -->
+    <method name="Enable">
+      <arg name="enable" type="b" direction="in"/>
+    </method>
+
+    <!--
+        GetPermissions:
+        @permissions: Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.
+
+        Returns the permissions a caller has for various authenticated operations
+        that NetworkManager provides, like Enable/Disable networking, changing
+        Wi-Fi, WWAN, and WiMAX state, etc.
+    -->
+    <method name="GetPermissions">
+      <arg name="permissions" type="a{ss}" direction="out"/>
+    </method>
+
+    <!--
+        CheckPermissions:
+
+        Emitted when system authorization details change, indicating that clients
+        may wish to recheck permissions with GetPermissions.
+    -->
+    <signal name="CheckPermissions"/>
+
+    <!--
+        SetLogging:
+        @level: One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.
+        @domains: A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.
+
+        Set logging verbosity and which operations are logged.
+    -->
+    <method name="SetLogging">
+      <arg name="level" type="s" direction="in"/>
+      <arg name="domains" type="s" direction="in"/>
+    </method>
+
+    <!--
+        GetLogging:
+        @level: One of [ERR, WARN, INFO, DEBUG, TRACE].
+        @domains: For available domains see SetLogging() call.
+
+        Get current logging verbosity level and operations domains.
+    -->
+    <method name="GetLogging">
+      <arg name="level" type="s" direction="out"/>
+      <arg name="domains" type="s" direction="out"/>
+    </method>
+
+    <!--
+        CheckConnectivity:
+        @connectivity: (<link linkend="NMConnectivityState">NMConnectivityState</link>) The current connectivity state.
+
+        Re-check the network connectivity state.
+    -->
+    <method name="CheckConnectivity">
+      <arg name="connectivity" type="u" direction="out"/>
+    </method>
+
+    <!--
+        state:
+        @state: <link linkend="NMState">NMState</link>
+
+        The overall networking state as determined by the NetworkManager daemon,
+        based on the state of network devices under its management.
+    -->
+    <method name="state">
+      <arg name="state" type="u" direction="out"/>
+    </method>
+
+    <!--
+        CheckpointCreate:
+        @devices: A list of device paths for which a checkpoint should be created. An empty list means all devices.
+        @rollback_timeout: The time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite.
+        @flags: (<link linkend="NMCheckpointCreateFlags">NMCheckpointCreateFlags</link>) Flags for the creation.
+        @checkpoint: On success, the path of the new checkpoint.
+
+        Create a checkpoint of the current networking configuration
+        for given interfaces. If @rollback_timeout is not zero, a
+        rollback is automatically performed after the given timeout.
+    -->
+    <method name="CheckpointCreate">
+      <arg name="devices" type="ao" direction="in"/>
+      <arg name="rollback_timeout" type="u" direction="in"/>
+      <arg name="flags" type="u" direction="in"/>
+      <arg name="checkpoint" type="o" direction="out"/>
+    </method>
+
+    <!--
+        CheckpointDestroy:
+        @checkpoint: The checkpoint to be destroyed. Set to empty to cancel all pending checkpoints.
+
+        Destroy a previously created checkpoint.
+    -->
+    <method name="CheckpointDestroy">
+      <arg name="checkpoint" type="o" direction="in"/>
+    </method>
+
+    <!--
+        CheckpointRollback:
+        @checkpoint: The checkpoint to be rolled back.
+        @result: On return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a <link linkend="NMRollbackResult">RollbackResult</link>.
+
+        Rollback a checkpoint before the timeout is reached.
+    -->
+    <method name="CheckpointRollback">
+      <arg name="checkpoint" type="o" direction="in"/>
+      <arg name="result" type="a{su}" direction="out" />
+    </method>
+
+    <!--
+        CheckpointAdjustRollbackTimeout:
+        @checkpoint: The checkpoint to be rolled back.
+        @add_timeout: Number of seconds from <emphasis>now</emphasis> in which the timeout will expire. Set to 0 to disable the timeout.
+        @since: 1.12
+
+        Reset the timeout for rollback for the checkpoint.
+
+        Note that the added seconds start counting from now,
+        not "Created" timestamp or the previous expiration
+        time. Note that the "Created" property of the checkpoint
+        will stay unchanged by this call. However, the "RollbackTimeout"
+        will be recalculated to give the approximate new expiration time.
+        The new "RollbackTimeout" property will be approximate up to
+        one second precision, which is the accuracy of the property.
+    -->
+    <method name="CheckpointAdjustRollbackTimeout">
+      <arg name="checkpoint" type="o" direction="in"/>
+      <arg name="add_timeout" type="u" direction="in"/>
+    </method>
+
+    <!--
+        Devices:
+
+        The list of realized network devices. Realized devices are those which
+        have backing resources (eg from the kernel or a management daemon like
+        ModemManager, teamd, etc).
+    -->
+    <property name="Devices" type="ao" access="read"/>
+
+    <!--
+        AllDevices:
+
+        The list of both realized and un-realized network devices. Un-realized
+        devices are software devices which do not yet have backing resources, but
+        for which backing resources can be created if the device is activated.
+    -->
+    <property name="AllDevices" type="ao" access="read"/>
+
+    <!--
+        Checkpoints:
+
+        The list of active checkpoints.
+    -->
+    <property name="Checkpoints" type="ao" access="read"/>
+
+    <!--
+        NetworkingEnabled:
+
+        Indicates if overall networking is currently enabled or not. See the
+        Enable() method.
+    -->
+    <property name="NetworkingEnabled" type="b" access="read"/>
+
+    <!--
+        WirelessEnabled:
+
+        Indicates if wireless is currently enabled or not.
+    -->
+    <property name="WirelessEnabled" type="b" access="readwrite"/>
+
+    <!--
+        WirelessHardwareEnabled:
+
+        Indicates if the wireless hardware is currently enabled, i.e. the state of
+        the RF kill switch.
+    -->
+    <property name="WirelessHardwareEnabled" type="b" access="read"/>
+
+    <!--
+        WwanEnabled:
+
+        Indicates if mobile broadband devices are currently enabled or not.
+    -->
+    <property name="WwanEnabled" type="b" access="readwrite"/>
+
+    <!--
+        WwanHardwareEnabled:
+
+        Indicates if the mobile broadband hardware is currently enabled, i.e. the
+        state of the RF kill switch.
+    -->
+    <property name="WwanHardwareEnabled" type="b" access="read"/>
+
+    <!--
+        WimaxEnabled:
+
+        DEPRECATED. Doesn't have any meaning and is around only for
+        compatibility reasons.
+    -->
+    <property name="WimaxEnabled" type="b" access="readwrite"/>
+
+    <!--
+        WimaxHardwareEnabled:
+
+        DEPRECATED. Doesn't have any meaning and is around only for
+        compatibility reasons.
+    -->
+    <property name="WimaxHardwareEnabled" type="b" access="read"/>
+
+    <!--
+        RadioFlags:
+        @since: 1.38
+
+        Flags related to radio devices. See <link
+        linkend="NMRadioFlags">NMRadioFlags</link> for the list of flags
+        supported.
+    -->
+    <property name="RadioFlags" type="u" access="read"/>
+
+    <!--
+        ActiveConnections:
+
+        List of active connection object paths.
+    -->
+    <property name="ActiveConnections" type="ao" access="read"/>
+
+    <!--
+        PrimaryConnection:
+
+        The object path of the "primary" active connection being used to access
+        the network. In particular, if there is no VPN active, or the VPN does not
+        have the default route, then this indicates the connection that has the
+        default route. If there is a VPN active with the default route, then this
+        indicates the connection that contains the route to the VPN endpoint.
+    -->
+    <property name="PrimaryConnection" type="o" access="read"/>
+
+    <!--
+        PrimaryConnectionType:
+
+        The connection type of the "primary" active connection being used to
+        access the network. This is the same as the Type property on the object
+        indicated by PrimaryConnection.
+    -->
+    <property name="PrimaryConnectionType" type="s" access="read"/>
+
+    <!--
+        Metered:
+
+        Indicates whether the connectivity is metered. This is equivalent to the
+        metered property of the device associated with the primary connection.
+
+        Returns: <link linkend="NMMetered">NMMetered</link>
+    -->
+    <property name="Metered" type="u" access="read"/>
+
+    <!--
+        ActivatingConnection:
+
+        The object path of an active connection that is currently being activated
+        and which is expected to become the new PrimaryConnection when it finishes
+        activating.
+    -->
+    <property name="ActivatingConnection" type="o" access="read"/>
+
+    <!--
+        Startup:
+
+        Indicates whether NM is still starting up; this becomes FALSE when NM has
+        finished attempting to activate every connection that it might be able to
+        activate at startup.
+    -->
+    <property name="Startup" type="b" access="read"/>
+
+    <!--
+        Version:
+
+        NetworkManager version.
+    -->
+    <property name="Version" type="s" access="read"/>
+
+    <!--
+        VersionInfo:
+
+        NetworkManager version and capabilities.
+
+        The first element in the array is the NM_VERSION of the daemon. It is a binary representation
+        of the "Version" and can be compared numerically. The version is encoded as
+        "(major &lt;&lt; 16 | minor &lt;&lt; 8 | micro)".
+
+        The following elements are a bitfield of static capabilities of the daemon. See
+        #NMVersionInfoCapability for the available capability numbers.
+
+        Since: 1.42
+    -->
+    <property name="VersionInfo" type="au" access="read"/>
+
+    <!--
+        Capabilities:
+
+        The current set of capabilities. See <link
+        linkend="NMCapability">NMCapability</link> for currently
+        defined capability numbers. The array is guaranteed to
+        be sorted in ascending order without duplicates.
+    -->
+    <property name="Capabilities" type="au" access="read"/>
+
+    <!--
+        State:
+
+        The overall state of the NetworkManager daemon.
+
+        This takes state of all active connections and the connectivity state into account
+        to produce a single indicator of the network accessibility status.
+
+        The graphical shells may use this property to provide network connection status
+        indication and applications may use this to check if Internet connection is
+        accessible. Shell that is able to cope with captive portals should use the
+        "Connectivity" property to decide whether to present a captive portal authentication
+        dialog.
+
+        Returns: <link linkend="NMState">NMState</link>
+    -->
+    <property name="State" type="u" access="read"/>
+
+    <!--
+        StateChanged:
+        @state: (<link linkend="NMState">NMState</link>) The new state of NetworkManager.
+
+        NetworkManager's state changed.
+    -->
+    <signal name="StateChanged">
+      <arg name="state" type="u"/>
+    </signal>
+
+    <!--
+        Connectivity:
+
+        The result of the last connectivity check. The connectivity check is triggered
+        automatically when a default connection becomes available, periodically and by
+        calling a CheckConnectivity() method.
+
+        This property is in general useful for the graphical shell to determine whether
+        the Internet access is being hijacked by an authentication gateway (a "captive
+        portal"). In such case it would typically present a web browser window to give
+        the user a chance to authenticate and call CheckConnectivity() when the user
+        submits a form or dismisses the window.
+
+        To determine the whether the user is able to access the Internet without dealing
+        with captive portals (e.g. to provide a network connection indicator or disable
+        controls that require Internet access), the "State" property is more suitable.
+
+        Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
+    -->
+    <property name="Connectivity" type="u" access="read"/>
+
+    <!--
+        ConnectivityCheckAvailable:
+
+        Indicates whether connectivity checking service has been
+        configured.  This may return true even if the service is not
+        currently enabled.
+
+        This is primarily intended for use in a privacy control panel,
+        as a way to determine whether to show an option to
+        enable/disable the feature.
+    -->
+    <property name="ConnectivityCheckAvailable" type="b" access="read"/>
+
+    <!--
+        ConnectivityCheckEnabled:
+
+        Indicates whether connectivity checking is enabled.  This
+        property can also be written to disable connectivity
+        checking (as a privacy control panel might want to do).
+    -->
+    <property name="ConnectivityCheckEnabled" type="b" access="readwrite"/>
+
+    <!--
+        ConnectivityCheckUri:
+
+        The URI that NetworkManager will hit to check if there is internet connectivity.
+    -->
+    <property name="ConnectivityCheckUri" type="s" access="read"/>
+
+    <!--
+        GlobalDnsConfiguration:
+
+        Dictionary of global DNS settings where the key is one of "searches",
+        "options" and "domains". The values for the "searches" and "options" keys
+        are string arrays describing the list of search domains and resolver
+        options, respectively. The value of the "domains" key is a second-level
+        dictionary, where each key is a domain name, and each key's value is a
+        third-level dictionary with the keys "servers" and "options". "servers" is
+        a string array of DNS servers, "options" is a string array of
+        domain-specific options.
+    -->
+    <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite"/>
+
+    <!--
+        DeviceAdded:
+        @device_path: The object path of the newly added device.
+
+        A device was added to the system
+    -->
+    <signal name="DeviceAdded">
+      <arg name="device_path" type="o"/>
+    </signal>
+
+    <!--
+        DeviceRemoved:
+        @device_path: The object path of the device that was just removed.
+
+        A device was removed from the system, and is no longer available.
+    -->
+    <signal name="DeviceRemoved">
+      <arg name="device_path" type="o"/>
+    </signal>
+
+  </interface>
+</node>

From 27ace37d1aa40479d6378e6cca43e27a6f53162c Mon Sep 17 00:00:00 2001
From: mewoocat <azure.horizon.4@gmail.com>
Date: Tue, 13 May 2025 05:54:23 -0500
Subject: [PATCH 4/7] Working on dbus nm types

---
 src/services/networkmanager/CMakeLists.txt      |  3 ++-
 src/services/networkmanager/core.hpp            |  5 +++++
 .../org.freedesktop.NetworkManager.xml          |  6 +++++-
 .../org.freedesktop.NetworkManager.xml.test     | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/services/networkmanager/org.freedesktop.NetworkManager.xml.test

diff --git a/src/services/networkmanager/CMakeLists.txt b/src/services/networkmanager/CMakeLists.txt
index 0a50222b..4156c38e 100644
--- a/src/services/networkmanager/CMakeLists.txt
+++ b/src/services/networkmanager/CMakeLists.txt
@@ -32,7 +32,8 @@ install_qml_module(quickshell-service-networkmanager)
 
 target_link_libraries(quickshell-service-networkmanager PRIVATE
 	Qt::Qml
-	Qt::Quick # pch
+	#Qt::Quick # pch
+	Qt::DBus
 )
 
 qs_module_pch(quickshell-service-networkmanager)
diff --git a/src/services/networkmanager/core.hpp b/src/services/networkmanager/core.hpp
index 9d234ce4..6fa171d8 100644
--- a/src/services/networkmanager/core.hpp
+++ b/src/services/networkmanager/core.hpp
@@ -2,6 +2,11 @@
 #include <qobject.h>
 #include <qdbusextratypes.h>
 #include "dbus_service.h"
+#include <qtypes.h>
+
+// Defining the "au" debus type
+using NetworkManagerCapabilities = QList<quint32>;
+Q_DECLARE_METATYPE(NetworkManagerCapabilities);
 
 namespace qs::service::networkmanager {
 
diff --git a/src/services/networkmanager/org.freedesktop.NetworkManager.xml b/src/services/networkmanager/org.freedesktop.NetworkManager.xml
index c92c8017..8e6f2ed8 100644
--- a/src/services/networkmanager/org.freedesktop.NetworkManager.xml
+++ b/src/services/networkmanager/org.freedesktop.NetworkManager.xml
@@ -480,7 +480,9 @@
         defined capability numbers. The array is guaranteed to
         be sorted in ascending order without duplicates.
     -->
-    <property name="Capabilities" type="au" access="read"/>
+    <property name="Capabilities" type="au" access="read">
+		<annotation name="org.qtproject.QtDBus.QtTypeName" value="NetworkManagerCapabilities"/>
+	</property>
 
     <!--
         State:
@@ -573,6 +575,8 @@
         domain-specific options.
     -->
     <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite"/>
+		<annotation name="org.qtproject.QtDBus.QtTypeName" value=""/>
+	</property>
 
     <!--
         DeviceAdded:
diff --git a/src/services/networkmanager/org.freedesktop.NetworkManager.xml.test b/src/services/networkmanager/org.freedesktop.NetworkManager.xml.test
new file mode 100644
index 00000000..5ea471f5
--- /dev/null
+++ b/src/services/networkmanager/org.freedesktop.NetworkManager.xml.test
@@ -0,0 +1,17 @@
+<node>
+	<interface name="org.freedesktop.UPower">
+		<method name="EnumerateDevices">
+			<arg direction="out" type="ao" name="devices"/>
+		</method>
+		<method name="GetDisplayDevice">
+			<arg direction="out" type="o" name="devices"/>
+		</method>
+
+		<signal name="DeviceAdded">
+			<arg direction="out" type="o" name="device"/>
+		</signal>
+		<signal name="DeviceRemoved">
+			<arg direction="out" type="o" name="device"/>
+		</signal>
+	</interface>
+</node>

From 6c79beaf963c1c1fd7fab4237398bcf0d6439f5a Mon Sep 17 00:00:00 2001
From: mewoocat <azure.horizon.4@gmail.com>
Date: Fri, 16 May 2025 00:46:03 -0500
Subject: [PATCH 5/7] trying to get xml type annotations working... idk if it
 works

---
 src/services/networkmanager/core.cpp          |  5 ++++-
 src/services/networkmanager/core.hpp          |  8 +++++---
 .../org.freedesktop.NetworkManager.xml        | 19 ++++++++++++++-----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/services/networkmanager/core.cpp b/src/services/networkmanager/core.cpp
index bce29ad8..1dd0e328 100644
--- a/src/services/networkmanager/core.cpp
+++ b/src/services/networkmanager/core.cpp
@@ -2,9 +2,10 @@
 #include <qlogging.h>
 #include <qloggingcategory.h>
 #include <qdbusextratypes.h>
-
 #include "core.hpp"
 #include "dbus_service.h"
+#include <qdbusmetatype.h>
+#include <qtypes.h>
 
 namespace qs::service::networkmanager {
 
@@ -13,6 +14,8 @@ Q_LOGGING_CATEGORY(logNetworkManager, "quickshell.service.networkmanager", QtDeb
 }
 
 NetworkManager::NetworkManager(){
+	//qDBusRegisterMetaType<QList<quint32>>();
+
 	auto bus = QDbusConnection::systemBus();
 
 	if (!bus.isConnected()) {
diff --git a/src/services/networkmanager/core.hpp b/src/services/networkmanager/core.hpp
index 6fa171d8..192c5459 100644
--- a/src/services/networkmanager/core.hpp
+++ b/src/services/networkmanager/core.hpp
@@ -4,9 +4,11 @@
 #include "dbus_service.h"
 #include <qtypes.h>
 
-// Defining the "au" debus type
-using NetworkManagerCapabilities = QList<quint32>;
-Q_DECLARE_METATYPE(NetworkManagerCapabilities);
+// Define the "au" dbus type
+using dbus_type_au = QList<quint32>;
+Q_DECLARE_METATYPE(dbus_type_au);
+// Define the "a{sv}" dbus type
+//using NetworkManagerCapabilities = QList<quint32>;
 
 namespace qs::service::networkmanager {
 
diff --git a/src/services/networkmanager/org.freedesktop.NetworkManager.xml b/src/services/networkmanager/org.freedesktop.NetworkManager.xml
index 8e6f2ed8..2044c75d 100644
--- a/src/services/networkmanager/org.freedesktop.NetworkManager.xml
+++ b/src/services/networkmanager/org.freedesktop.NetworkManager.xml
@@ -109,6 +109,7 @@
       <arg name="specific_object" type="o" direction="in"/>
       <arg name="path" type="o" direction="out"/>
       <arg name="active_connection" type="o" direction="out"/>
+	  <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QMap&lt;QString, QVariantMap&gt;"/>
     </method>
 
     <!--
@@ -140,6 +141,9 @@
       <arg name="path" type="o" direction="out"/>
       <arg name="active_connection" type="o" direction="out"/>
       <arg name="result" type="a{sv}" direction="out"/>
+	  <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QMap&lt;QString, QVariantMap&gt;"/>
+	  <annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="QVariantMap"/>
+	  <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QVariantMap"/>
     </method>
 
     <!--
@@ -189,6 +193,7 @@
     -->
     <method name="GetPermissions">
       <arg name="permissions" type="a{ss}" direction="out"/>
+	  <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString, QString&gt;"/>
     </method>
 
     <!--
@@ -282,6 +287,7 @@
     <method name="CheckpointRollback">
       <arg name="checkpoint" type="o" direction="in"/>
       <arg name="result" type="a{su}" direction="out" />
+	  <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QMap&lt;QString, quint32&gt;"/>
     </method>
 
     <!--
@@ -470,7 +476,9 @@
 
         Since: 1.42
     -->
-    <property name="VersionInfo" type="au" access="read"/>
+    <property name="VersionInfo" type="au" access="read">
+		<annotation name="org.qtproject.QtDBus.QtTypeName" value="QList&lt;quint32&gt;"/>
+	</property>
 
     <!--
         Capabilities:
@@ -480,8 +488,9 @@
         defined capability numbers. The array is guaranteed to
         be sorted in ascending order without duplicates.
     -->
-    <property name="Capabilities" type="au" access="read">
-		<annotation name="org.qtproject.QtDBus.QtTypeName" value="NetworkManagerCapabilities"/>
+	<property name="Capabilities" type="au" access="read">
+		<!--<annotation name="org.qtproject.QtDBus.QtTypeName" value="dbus_au"/>-->
+		<annotation name="org.qtproject.QtDBus.QtTypeName" value="QList&lt;quint32&gt;"/>
 	</property>
 
     <!--
@@ -574,8 +583,8 @@
         a string array of DNS servers, "options" is a string array of
         domain-specific options.
     -->
-    <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite"/>
-		<annotation name="org.qtproject.QtDBus.QtTypeName" value=""/>
+    <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite">
+		<annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/>
 	</property>
 
     <!--

From 10f1473ef6196436b4ade6010757ffec2b8fa78c Mon Sep 17 00:00:00 2001
From: mewoocat <azure.horizon.4@gmail.com>
Date: Fri, 16 May 2025 01:19:11 -0500
Subject: [PATCH 6/7] compiles now :)

---
 src/services/networkmanager/CMakeLists.txt | 2 +-
 src/services/networkmanager/core.cpp       | 4 +++-
 src/services/networkmanager/core.hpp       | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/services/networkmanager/CMakeLists.txt b/src/services/networkmanager/CMakeLists.txt
index 4156c38e..b8e2d49d 100644
--- a/src/services/networkmanager/CMakeLists.txt
+++ b/src/services/networkmanager/CMakeLists.txt
@@ -3,7 +3,7 @@ find_package(PkgConfig REQUIRED)
 #pkg_check_modules(networkmanager REQUIRED IMPORTED_TARGET libnm)
 
 set_source_files_properties(org.freedesktop.NetworkManager.xml PROPERTIES
-	CLASSNAME DBusNetworkManager
+	CLASSNAME DBusNetworkManagerService
 	NO_NAMESPACE TRUE
 )
 qt_add_dbus_interface(DBUS_INTERFACES
diff --git a/src/services/networkmanager/core.cpp b/src/services/networkmanager/core.cpp
index 1dd0e328..97d42ec8 100644
--- a/src/services/networkmanager/core.cpp
+++ b/src/services/networkmanager/core.cpp
@@ -7,6 +7,8 @@
 #include <qdbusmetatype.h>
 #include <qtypes.h>
 
+#include "../../dbus/bus.hpp"
+
 namespace qs::service::networkmanager {
 
 namespace {
@@ -16,7 +18,7 @@ Q_LOGGING_CATEGORY(logNetworkManager, "quickshell.service.networkmanager", QtDeb
 NetworkManager::NetworkManager(){
 	//qDBusRegisterMetaType<QList<quint32>>();
 
-	auto bus = QDbusConnection::systemBus();
+	auto bus = QDBusConnection::systemBus();
 
 	if (!bus.isConnected()) {
 		// Log message
diff --git a/src/services/networkmanager/core.hpp b/src/services/networkmanager/core.hpp
index 192c5459..9a77f462 100644
--- a/src/services/networkmanager/core.hpp
+++ b/src/services/networkmanager/core.hpp
@@ -17,7 +17,8 @@ class NetworkManager : public QObject {
 public:
 	static NetworkManager* instance(); // Get instance of the class
 private:
-	DBUSNetworkservice* service = nullptr;
+	NetworkManager();
+	DBusNetworkManagerService* service = nullptr;
 	void init();
 };
 

From 0817c18271d87e83287ada46db443e8bd0977dcb Mon Sep 17 00:00:00 2001
From: mewoocat <azure.horizon.4@gmail.com>
Date: Tue, 1 Jul 2025 19:43:57 -0500
Subject: [PATCH 7/7] something

---
 src/services/networkmanager/CMakeLists.txt | 4 +++-
 src/services/networkmanager/core.hpp       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/services/networkmanager/CMakeLists.txt b/src/services/networkmanager/CMakeLists.txt
index b8e2d49d..c9d53e16 100644
--- a/src/services/networkmanager/CMakeLists.txt
+++ b/src/services/networkmanager/CMakeLists.txt
@@ -20,7 +20,7 @@ qt_add_library(quickshell-service-networkmanager STATIC
 target_include_directories(quickshell-service-networkmanager PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 qt_add_qml_module(quickshell-service-networkmanager
-	URI Quickshell.Services.Networkmanager
+	URI Quickshell.Services.NetworkManager
 	VERSION 0.1
 	DEPENDENCIES QtQml
 )
@@ -35,5 +35,7 @@ target_link_libraries(quickshell-service-networkmanager PRIVATE
 	#Qt::Quick # pch
 	Qt::DBus
 )
+qs_add_link_dependencies(quickshell-service-networkmanager quickshell-dbus)
+target_link_libraries(quickshell PRIVATE quickshell-service-networkmanagerplugin)
 
 qs_module_pch(quickshell-service-networkmanager)
diff --git a/src/services/networkmanager/core.hpp b/src/services/networkmanager/core.hpp
index 9a77f462..b6da2815 100644
--- a/src/services/networkmanager/core.hpp
+++ b/src/services/networkmanager/core.hpp
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <qobject.h>
 #include <qdbusextratypes.h>
 #include "dbus_service.h"