From 0e0f8555ede925c008f40b324edb2d5ee9970ad3 Mon Sep 17 00:00:00 2001
From: inorishio <inorishio@gmail.com>
Date: Mon, 15 Jun 2026 20:48:01 +0200
Subject: [PATCH] fixing singleton in helpers for network + getting output from
 systray

---
 Config/BarConfig.qml                      |  4 ---
 Helpers/Network.qml                       | 12 ++-----
 Modules/SysTray/Popouts/NetworkPopout.qml | 43 ++++++++++++-----------
 3 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/Config/BarConfig.qml b/Config/BarConfig.qml
index 0f489ef..a35e94b 100644
--- a/Config/BarConfig.qml
+++ b/Config/BarConfig.qml
@@ -40,10 +40,6 @@ JsonObject {
 			id: "tray",
 			enabled: true
 		},
-		{
-			id: "network",
-			enabled: false
-		},
 		{
 			id: "clock",
 			enabled: true
diff --git a/Helpers/Network.qml b/Helpers/Network.qml
index 97f7c8f..78aecd3 100644
--- a/Helpers/Network.qml
+++ b/Helpers/Network.qml
@@ -1,16 +1,10 @@
-pragma ComponentBehavior: Bound
+pragma Singleton
 
 import Quickshell
 import Quickshell.Networking
-import qs.Components
-import qs.Config
-import qs.Modules
-import qs.Helpers as Helpers
 
-item {
+Singleton {
 	id: root
 
-	function networkScan() {
-		Networking.scanForNetworks();
-	}
+	readonly property list<NetworkDevice> network: Networking.devices.values
 }
diff --git a/Modules/SysTray/Popouts/NetworkPopout.qml b/Modules/SysTray/Popouts/NetworkPopout.qml
index 65a7127..a7a512a 100644
--- a/Modules/SysTray/Popouts/NetworkPopout.qml
+++ b/Modules/SysTray/Popouts/NetworkPopout.qml
@@ -1,41 +1,44 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
-import Quickshell.Networking
 import QtQuick
 import QtQuick.Layouts
 import qs.Components
 import qs.Config
 import qs.Modules
-import qs.Helpers as Helpers
+import qs.Helpers
 
-Item {
+CustomClippingRect {
 	id: root
 
 	required property var wrapper
 
-	implicitHeight: networkPop.implicitHeight
-	implicitWidth: networkPop.implicitWidth
+	anchors.horizontalCenter: parent.horizontalCenter
+	color: DynamicColors.tPalette.m3surfaceContainer
+	implicitHeight: 500 + 5 * 2
+	implicitWidth: 500 + 8 * 2
+	radius: (20 - Appearance.padding.small) * Appearance.rounding.scale
 
-	CustomRect {
-		id: networkPop
+	Item {
+		id: networkPopContent
 
-		anchors.horizontalCenter: parent.horizontalCenter
-		color: DynamicColors.tPalette.m3surfaceContainer
-		implicitHeight: 500 + 5 * 2
-		implicitWidth: 500 + 8 * 2
-		radius: (20 - Appearance.padding.small) * Appearance.rounding.scale
+		anchors.fill: parent
+		anchors.margins: Appearance.padding.small
 
-		Item {
-			id: networkPopContent
+		CustomText {
+			anchors.left: parent.left
+			anchors.margins: Appearance.padding.large
+			anchors.top: parent.top
+			font.pointSize: Appearance.font.size.large
+			text: qsTr("Network")
+		}
 
-			anchors.fill: parent
-			anchors.margins: Appearance.padding.small
+		StateLayer {
+			id: buttonScan
 
-			// text {
-			// 	font.pixelSize: 20
-			// 	text: qsTr("Network Settings")
-			// }
+			onClicked: {
+				console.log(Network.network.length);
+			}
 		}
 	}
 }