Merge branch 'main' into module/wifi

Services/Colors.qml

@@ -13,21 +13,17 @@ import qs.Paths
 Singleton {
 	id: root
 
-	readonly property M3Palette current: M3Palette {
-	}
+	readonly property M3Palette current: M3Palette {}
 	property bool currentLight
 	property string flavour
 	readonly property bool light: showPreview ? previewLight : currentLight
 	readonly property M3Palette palette: showPreview ? preview : current
-	readonly property M3Palette preview: M3Palette {
-	}
+	readonly property M3Palette preview: M3Palette {}
 	property bool previewLight
 	property string scheme
 	property bool showPreview
-	readonly property M3TPalette tPalette: M3TPalette {
-	}
-	readonly property Transparency transparency: Transparency {
-	}
+	readonly property M3TPalette tPalette: M3TPalette {}
+	readonly property Transparency transparency: Transparency {}
 	readonly property alias wallLuminance: analyser.luminance
 
 	function alterColor(c: color, a: real, layer: int): color {
@@ -112,7 +108,7 @@ Singleton {
 
 	function setMode(mode: string): void {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", mode]);
-		Config.general.color.mode = mode;
+		Config.colors.mode = mode;
 	}
 
 	function swapRG(c: color): color {

Services/ShellState.qml

@@ -0,0 +1,40 @@
+pragma Singleton
+
+import QtQuick
+import Quickshell
+import qs.Components
+import qs.Helpers
+
+Singleton {
+	function allStates(): list<ScreenState> {
+		return [...states.instances];
+	}
+
+	function anySidebarOpen(): bool {
+		return states.instances.some(s => s.sidebar);
+	}
+
+	function forActive(): ScreenState {
+		const mon = Hypr.focusedMonitor;
+		for (const s of states.instances)
+			if (Hypr.monitorFor(s.modelData) === mon)
+				return s;
+		return null;
+	}
+
+	function forScreen(screen: ShellScreen): ScreenState {
+		for (const s of states.instances)
+			if (s.modelData === screen)
+				return s;
+		return null;
+	}
+
+	Variants {
+		id: states
+
+		model: Quickshell.screens
+
+		ScreenState {
+		}
+	}
+}