Merge branch 'main' into feat/peripheral-integration

2026-08-15 20:54:59 +02:00
parent bf5a8b8049 5e97ea6867
commit 070fe7add0
372 changed files with 7047 additions and 8335 deletions
@@ -3,9 +3,9 @@ pragma Singleton
 import Quickshell
 import Quickshell.Io
 import Quickshell.Services.UPower
-import qs.Config
+import ZShell.Config
+import qs.Services
 import qs.Paths
-import qs.Helpers

 Singleton {
 	id: root
@@ -26,18 +26,18 @@ Singleton {
 	function getColors(percentage: real, state: string): var {
 		if (state === "charging" || state === "full" || state === "recharging")
 			return {
-				fg: DynamicColors.swapRG(DynamicColors.palette.m3error),
-				bg: DynamicColors.swapRG(DynamicColors.palette.m3onError)
+				fg: Colors.swapRG(Colors.palette.m3error),
+				bg: Colors.swapRG(Colors.palette.m3onError)
 			};
 		else if (percentage <= 0.2)
 			return {
-				fg: DynamicColors.palette.m3error,
-				bg: DynamicColors.palette.m3onError
+				fg: Colors.palette.m3error,
+				bg: Colors.palette.m3onError
 			};
 		else
 			return {
-				fg: DynamicColors.palette.m3tertiary,
-				bg: DynamicColors.palette.m3onTertiary
+				fg: Colors.palette.m3tertiary,
+				bg: Colors.palette.m3onTertiary
 			};
 	}