Merge branch 'main' into feat/settings-revamp

Modules/Dashboard/Dash/Resources.qml

@@ -24,8 +24,8 @@ Item {
 		service: Cpu
 	}
 
-	Ref {
-		service: SystemUsage
+	ServiceRef {
+		service: Gpu
 	}
 
 	ColumnLayout {
@@ -52,13 +52,13 @@ Item {
 		Resource {
 			fgColor: DynamicColors.palette.m3tertiary
 			icon: "gamepad"
-			value: SystemUsage.gpuPerc
+			value: Gpu.percentage
 		}
 
 		Resource {
 			fgColor: DynamicColors.palette.m3primary
 			icon: "host"
-			value: SystemUsage.gpuMemUsed
+			value: Gpu.memoryUsed / Gpu.memoryTotal
 		}
 
 		Resource {

Modules/Resources.qml

@@ -34,8 +34,8 @@ CustomRect {
 		implicitHeight: root.implicitHeight
 		spacing: Appearance.spacing.smaller
 
-		Ref {
-			service: SystemUsage
+		ServiceRef {
+			service: Gpu
 		}
 
 		ServiceRef {
@@ -70,7 +70,7 @@ CustomRect {
 			icon: "gamepad"
 			iconColor: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
 			mainColor: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3tertiary
-			percentage: SystemUsage.gpuPerc
+			percentage: Gpu.percentage
 		}
 
 		Resource {
@@ -78,7 +78,7 @@ CustomRect {
 			icon: "developer_board"
 			iconColor: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
 			mainColor: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
-			percentage: SystemUsage.gpuMemUsed
+			percentage: Gpu.memoryUsed / Gpu.memoryTotal
 		}
 	}
 }

Modules/Resources/Content.qml

@@ -55,18 +55,18 @@ Item {
 				WrappedLoader {
 					id: gpuCard
 
-					active: Config.dashboard.performance.showGpu && SystemUsage.gpuType !== ""
+					active: Config.dashboard.performance.showGpu && Gpu.type !== Gpu.None
 
 					sourceComponent: HeroCard {
 						accent: DynamicColors.palette.m3secondary
 						icon: "desktop_windows"
 						label: qsTr("GPU")
-						subLabel: SystemUsage.gpuName
-						temperature: SystemUsage.gpuTemp
-						usage: SystemUsage.gpuPerc
+						subLabel: Gpu.name
+						temperature: Gpu.temperature
+						usage: Gpu.percentage
 
-						Ref {
-							service: SystemUsage
+						ServiceRef {
+							service: Gpu
 						}
 					}
 				}