update blobs

.gitea/workflows/format-js.yml

@@ -0,0 +1,26 @@
+name: Format (JS/TS)
+
+on:
+  pull_request:
+
+jobs:
+  format:
+    runs-on: alpine
+    container: node:20-alpine
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install tools
+        run: |
+          apk add --no-cache \
+            git
+
+      - name: Prettier
+        run: |
+          if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
+            npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .gitignore
+          else
+            echo "No JS/TS files found"
+          fi

.gitea/workflows/lint-js.yml

@@ -1,12 +1,12 @@
-name: Lint & Format (JS/TS)
+name: Lint (JS/TS)
 
 on:
   pull_request:
 
 jobs:
-    lint-format:
+  lint:
     runs-on: alpine
-        container: node:26-alpine
+    container: node:20-alpine
 
     steps:
       - name: Checkout
@@ -17,15 +17,6 @@ jobs:
           apk add --no-cache \
             git
 
-            - name: Prettier
-              continue-on-error: true
-              run: |
-                  if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
-                    npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .prettierignore
-                  else
-                    echo "No JS/TS files found"
-                  fi
-
       - name: ESLint
         run: |
           if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
@@ -33,7 +24,7 @@ jobs:
               npm install --no-audit --no-fund
             fi
             if [ -f eslint.config.js ] || [ -f eslint.config.mjs ] || [ -f eslint.config.cjs ] || [ -f .eslintrc ] || [ -f .eslintrc.js ] || [ -f .eslintrc.cjs ] || [ -f .eslintrc.json ] || [ -f .eslintrc.yaml ] || [ -f .eslintrc.yml ]; then
-                      npx --yes eslint . && echo "ESLint passed" || echo "ESLint failed"
+              npx --yes eslint .
             else
               echo "No eslint config found"
             fi

.gitea/workflows/lint-python.yml

@@ -1,12 +1,12 @@
-name: Lint & Format (Python)
+name: Lint (Python)
 
 on:
   pull_request:
 
 jobs:
-    lint-format:
+  lint:
     runs-on: alpine
-        container: node:26-alpine
+    container: node:20-alpine
 
     steps:
       - name: Checkout
@@ -18,17 +18,10 @@ jobs:
             git \
             python3 \
             py3-pip
+
+      - name: Ruff
+        run: |
           python3 -m venv .venv
           . .venv/bin/activate
           pip install --no-cache-dir ruff
-
-            - name: Format check
-              continue-on-error: true
-              run: |
-                  . .venv/bin/activate
-                  ruff format --check .
-
-            - name: Lint
-              run: |
-                  . .venv/bin/activate
           ruff check .

.gitea/workflows/lint-rust.yml

@@ -1,69 +1,31 @@
-name: Lint & Format (Rust)
+name: Lint (Rust)
 
 on:
   pull_request:
 
 jobs:
-    lint-format:
+  lint:
     runs-on: alpine
-        container: node:26-alpine
+    container: node:20-alpine
-        env:
-            CARGO_HOME: ${{ github.workspace }}/.cargo
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-            - name: Cache cargo packages
-              uses: actions/cache@v4
-              env:
-                  cache-name: cache-cargo-packages
-              with:
-                  path: |
-                      .cargo/registry
-                      .cargo/git
-                      target
-                  key: rust-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-                  restore-keys: |
-                      rust-${{ runner.os }}-build-${{ env.cache-name }}-
-                      rust-${{ runner.os }}-build-
-                      rust-
-
       - name: Install tools
         run: |
           apk add --no-cache \
             git \
             cargo \
             rust \
-                    rustfmt \
             rust-clippy
 
-            - name: Format check
-              continue-on-error: true
-              run: |
-                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
-                    for manifest in $(find . -name "Cargo.toml"); do
-                      cargo fmt --manifest-path "$manifest" --check && \
-                        echo "$manifest: formatting OK" || \
-                        echo "$manifest: needs formatting"
-                    done
-                  elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
-                    echo "Rust files found but no Cargo.toml"
-                    exit 1
-                  else
-                    echo "No Rust project found"
-                  fi
-
       - name: Clippy
         run: |
           if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
-                    status=0
+            find . -name "Cargo.toml" -print0 | while IFS= read -r -d '' manifest; do
-                    for manifest in $(find . -name "Cargo.toml"); do
+              cargo clippy --manifest-path "$manifest" -- -D warnings
-                      cargo clippy --manifest-path "$manifest" --all-targets --all-features -- -D warnings && \
-                        echo "$manifest: Clippy passed" || \
-                        { echo "$manifest: Clippy failed"; status=1; }
             done
-                    exit $status
           elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
             echo "Rust files found but no Cargo.toml"
             exit 1

.prettierignore

@@ -1,3 +0,0 @@
-.venv/
-scripts/fzf.js
-scripts/fuzzysort.js

Config/BackgroundConfig.qml

@@ -7,8 +7,4 @@ JsonObject {
 	property real alignX: 0.5
 	property real alignY: 0.5
 	property real zoom: 1.0
-	property real sourceClipX: 0
-	property real sourceClipY: 0
-	property real sourceClipW: 0
-	property real sourceClipH: 0
 }

Config/BarConfig.qml

@@ -58,7 +58,6 @@ JsonObject {
 	property Popouts popouts: Popouts {
 	}
 	property int rounding: 8
-	property int smoothing: 32
 
 	component Popouts: JsonObject {
 		property bool activeWindow: true

Config/Config.qml

@@ -83,10 +83,6 @@ Singleton {
 			wallFadeDuration: background.wallFadeDuration,
 			enabled: background.enabled,
 			alignX: background.alignX,
-			sourceClipX: background.sourceClipX,
-			sourceClipY: background.sourceClipY,
-			sourceClipW: background.sourceClipW,
-			sourceClipH: background.sourceClipH,
 			alignY: background.alignY,
 			zoom: background.zoom
 		};
@@ -98,7 +94,6 @@ Singleton {
 			hideWhenNotif: barConfig.hideWhenNotif,
 			rounding: barConfig.rounding,
 			border: barConfig.border,
-			smoothing: barConfig.smoothing,
 			height: barConfig.height,
 			popouts: {
 				tray: barConfig.popouts.tray,
@@ -241,7 +236,6 @@ Singleton {
 		return {
 			recolorLogo: lock.recolorLogo,
 			enableFprint: lock.enableFprint,
-			showNotifContent: lock.showNotifContent,
 			maxFprintTries: lock.maxFprintTries,
 			blurAmount: lock.blurAmount,
 			sizes: {

Config/DynamicColors.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import Quickshell.Io
-import Quickshell.Hyprland
 import QtQuick
 import ZShell
 import qs.Helpers
@@ -80,32 +79,10 @@ Singleton {
 	}
 
 	function reloadHyprRules(): void {
-		const blur = transparency.enabled ? 1 : 0;
+		const barStr = "keyword layerrule %1 %2, match:namespace ZShell-Bar";
-		const alpha = transparency.base - 0.03;
+		const authStr = "keyword layerrule %1 %2, match:namespace ZShell-Auth";
-
+		Hypr.extras.batchMessage([barStr.arg("blur").arg(transparency.enabled ? 1 : 0), barStr.arg("ignore_alpha").arg(transparency.base - 0.03)]);
-		const rules = `
+		Hypr.extras.batchMessage([authStr.arg("blur").arg(transparency.enabled ? 1 : 0), authStr.arg("ignore_alpha").arg(transparency.base - 0.03)]);
-			hl.layer_rule({
-				match = { namespace = "ZShell-Bar" },
-				blur = ${blur}
-			})
-
-			hl.layer_rule({
-				match = { namespace = "ZShell-Bar" },
-				ignore_alpha = ${alpha}
-			})
-
-			hl.layer_rule({
-				match = { namespace = "ZShell-Auth" },
-				blur = ${blur}
-			})
-
-			hl.layer_rule({
-				match = { namespace = "ZShell-Auth" },
-				ignore_alpha = ${alpha}
-			})
-		`;
-
-		Hypr.extras.message(`eval ${rules}`);
 	}
 
 	function setMode(mode: string): void {
@@ -116,14 +93,6 @@ Singleton {
 
 	Component.onCompleted: debounceTimer.triggered()
 
-	Connections {
-		function onUsingLuaChanged(): void {
-			root.reloadHyprRules();
-		}
-
-		target: Hyprland
-	}
-
 	Connections {
 		function onConfigReloaded(): void {
 			root.reloadHyprRules();

Config/LockConf.qml

@@ -5,7 +5,6 @@ JsonObject {
 	property bool enableFprint: true
 	property int maxFprintTries: 3
 	property bool recolorLogo: false
-	property bool showNotifContent: false
 	property Sizes sizes: Sizes {
 	}
 

Drawers/Drawing.qml

@@ -3,33 +3,184 @@ import QtQuick
 Canvas {
 	id: root
 
+	property rect dirtyRect: Qt.rect(0, 0, 0, 0)
+	property bool frameQueued: false
+	property bool fullRepaintPending: true
+	property point lastPoint: Qt.point(0, 0)
+	property real minPointDistance: 2.0
 	property color penColor: "white"
 	property real penWidth: 4
-	property var points: []
+	property var pendingSegments: []
+	property bool strokeActive: false
+	property var strokes: []
 
-	function clear(): void {
+	function appendPoint(x, y) {
-		var ctx = getContext('2d');
+		if (!strokeActive || strokes.length === 0)
-		root.points = [];
-		ctx.reset();
-		root.requestPaint();
-	}
-
-	renderStrategy: Canvas.Cooperative
-
-	onPaint: {
-		if (points.length < 2)
 			return;
-		var ctx = root.getContext('2d');
+		const dx = x - lastPoint.x;
-		ctx.save();
+		const dy = y - lastPoint.y;
-		ctx.lineWidth = root.penWidth;
+
-		ctx.strokeStyle = root.penColor;
+		if ((dx * dx + dy * dy) < (minPointDistance * minPointDistance))
-		ctx.lineCap = "round";
+			return;
+		const x1 = lastPoint.x;
+		const y1 = lastPoint.y;
+		const x2 = x;
+		const y2 = y;
+
+		strokes[strokes.length - 1].push(Qt.point(x2, y2));
+
+		pendingSegments.push({
+			dot: false,
+			x1: x1,
+			y1: y1,
+			x2: x2,
+			y2: y2
+		});
+
+		lastPoint = Qt.point(x2, y2);
+		queueDirty(segmentDirtyRect(x1, y1, x2, y2));
+	}
+
+	function beginStroke(x, y) {
+		const p = Qt.point(x, y);
+		strokes.push([p]);
+		lastPoint = p;
+		strokeActive = true;
+
+		pendingSegments.push({
+			dot: true,
+			x: x,
+			y: y
+		});
+
+		queueDirty(pointDirtyRect(x, y));
+	}
+
+	function clear() {
+		strokes = [];
+		pendingSegments = [];
+		dirtyRect = Qt.rect(0, 0, 0, 0);
+		fullRepaintPending = true;
+		markDirty(Qt.rect(0, 0, width, height));
+	}
+
+	function drawDot(ctx, x, y) {
 		ctx.beginPath();
-		ctx.moveTo(points[0].x, points[0].y);
+		ctx.arc(x, y, penWidth / 2, 0, Math.PI * 2);
-		for (var i = 1; i < points.length; i++)
+		ctx.fill();
-			ctx.lineTo(points[i].x, points[i].y);
+	}
+
+	function drawSegment(ctx, x1, y1, x2, y2) {
+		ctx.beginPath();
+		ctx.moveTo(x1, y1);
+		ctx.lineTo(x2, y2);
+		ctx.stroke();
+	}
+
+	function endStroke() {
+		strokeActive = false;
+	}
+
+	function pointDirtyRect(x, y) {
+		const pad = penWidth + 2;
+		return Qt.rect(x - pad, y - pad, pad * 2, pad * 2);
+	}
+
+	function queueDirty(r) {
+		dirtyRect = unionRects(dirtyRect, r);
+
+		if (frameQueued)
+			return;
+		frameQueued = true;
+
+		requestAnimationFrame(function () {
+			frameQueued = false;
+
+			if (dirtyRect.width > 0 && dirtyRect.height > 0) {
+				markDirty(dirtyRect);
+				dirtyRect = Qt.rect(0, 0, 0, 0);
+			}
+		});
+	}
+
+	function replayAll(ctx) {
+		ctx.clearRect(0, 0, width, height);
+
+		for (const stroke of strokes) {
+			if (!stroke || stroke.length === 0)
+				continue;
+			if (stroke.length === 1) {
+				const p = stroke[0];
+				drawDot(ctx, p.x, p.y);
+				continue;
+			}
+
+			ctx.beginPath();
+			ctx.moveTo(stroke[0].x, stroke[0].y);
+			for (let i = 1; i < stroke.length; ++i)
+				ctx.lineTo(stroke[i].x, stroke[i].y);
 			ctx.stroke();
-		points = points.slice(points.length - 2);
-		ctx.restore();
 		}
 	}
+
+	function requestFullRepaint() {
+		fullRepaintPending = true;
+		markDirty(Qt.rect(0, 0, width, height));
+	}
+
+	function segmentDirtyRect(x1, y1, x2, y2) {
+		const pad = penWidth + 2;
+		const left = Math.min(x1, x2) - pad;
+		const top = Math.min(y1, y2) - pad;
+		const right = Math.max(x1, x2) + pad;
+		const bottom = Math.max(y1, y2) + pad;
+		return Qt.rect(left, top, right - left, bottom - top);
+	}
+
+	function unionRects(a, b) {
+		if (a.width <= 0 || a.height <= 0)
+			return b;
+		if (b.width <= 0 || b.height <= 0)
+			return a;
+
+		const left = Math.min(a.x, b.x);
+		const top = Math.min(a.y, b.y);
+		const right = Math.max(a.x + a.width, b.x + b.width);
+		const bottom = Math.max(a.y + a.height, b.y + b.height);
+
+		return Qt.rect(left, top, right - left, bottom - top);
+	}
+
+	anchors.fill: parent
+	contextType: "2d"
+	renderStrategy: Canvas.Threaded
+	renderTarget: Canvas.Image
+
+	onHeightChanged: requestFullRepaint()
+	onPaint: region => {
+		const ctx = getContext("2d");
+
+		ctx.lineCap = "round";
+		ctx.lineJoin = "round";
+		ctx.lineWidth = penWidth;
+		ctx.strokeStyle = penColor;
+		ctx.fillStyle = penColor;
+
+		if (fullRepaintPending) {
+			fullRepaintPending = false;
+			replayAll(ctx);
+			pendingSegments = [];
+			return;
+		}
+
+		for (const seg of pendingSegments) {
+			if (seg.dot)
+				drawDot(ctx, seg.x, seg.y);
+			else
+				drawSegment(ctx, seg.x1, seg.y1, seg.x2, seg.y2);
+		}
+
+		pendingSegments = [];
+	}
+	onWidthChanged: requestFullRepaint()
+}

Drawers/DrawingInput.qml

@@ -30,10 +30,8 @@ CustomMouseArea {
 		const x = event.x;
 		const y = event.y;
 
-		if (root.visibilities.isDrawing && (event.buttons & Qt.LeftButton)) {
+		if (event.buttons & Qt.LeftButton)
-			root.drawing.points.push(Qt.point(x, y));
+			root.drawing.appendPoint(x, y);
-			root.drawing.requestPaint();
-		}
 
 		if (root.inLeftPanel(root.popout, x, y)) {
 			root.z = -2;
@@ -46,8 +44,7 @@ CustomMouseArea {
 
 		if (root.visibilities.isDrawing && (event.buttons & Qt.LeftButton)) {
 			root.panels.drawing.expanded = false;
-			root.drawing.points.push(Qt.point(x, y));
+			root.drawing.beginStroke(x, y);
-			root.drawing.requestPaint();
 			return;
 		}
 
@@ -55,6 +52,7 @@ CustomMouseArea {
 			root.drawing.clear();
 	}
 	onReleased: {
-		root.drawing.points = [];
+		if (root.visibilities.isDrawing)
+			root.drawing.endStroke();
 	}
 }

Drawers/Interactions.qml

@@ -78,7 +78,7 @@ CustomMouseArea {
 		const dragY = y - dragStart.y;
 
 		if (root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, x, y)) {
-			// root.input.z = 2;
+			root.input.z = 2;
 			root.panels.drawing.expanded = false;
 		}
 

Drawers/Panels.qml

@@ -13,7 +13,6 @@ import qs.Modules.Resources as Resources
 import qs.Modules.Settings as Settings
 import qs.Modules.Drawing as Drawing
 import qs.Modules.Dock as Dock
-import qs.Modules.SysTray.Popouts as SysPopouts
 import qs.Config
 
 Item {
@@ -35,10 +34,8 @@ Item {
 	readonly property alias resourcesWrapper: resourcesWrapper
 	required property ShellScreen screen
 	readonly property alias settings: settings
-	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
-	readonly property alias traySubmenus: traySubmenus
 	readonly property alias utilities: utilities
 	required property PersistentProperties visibilities
 
@@ -95,79 +92,6 @@ Item {
 		visibilities: root.visibilities
 	}
 
-	Item {
-		id: traySubmenus
-
-		Repeater {
-			model: popouts.content.state.submenus
-
-			CustomClippingRect {
-				id: subMenuWrapper
-
-				required property int index
-				required property var modelData
-				property real targetX: 0
-				property real targetY: 0
-
-				function updatePosition() {
-					let sourceItem = modelData.sourceItem;
-					if (!sourceItem || !sourceItem.parent)
-						return;
-
-					let mapped = sourceItem.mapToItem(root, 0, -Appearance.padding.small);
-
-					let rightX = mapped.x + modelData.sourceWidth + Config.barConfig.border;
-					let leftX = mapped.x - implicitWidth - Config.barConfig.border;
-
-					if (rightX + implicitWidth > root.width) {
-						targetX = leftX;
-					} else {
-						targetX = rightX;
-					}
-
-					targetY = mapped.y;
-
-					if (targetY + implicitHeight > root.height) {
-						targetY = root.height - implicitHeight;
-					}
-					if (targetY < 0)
-						targetY = 0;
-				}
-
-				implicitHeight: subMenuContent.implicitHeight + Appearance.padding.small * 2
-				implicitWidth: subMenuContent.implicitWidth + Appearance.padding.small * 2
-				radius: Appearance.rounding.normal
-				x: targetX
-				y: targetY
-
-				Behavior on implicitHeight {
-					Anim {
-					}
-				}
-				Behavior on implicitWidth {
-					Anim {
-					}
-				}
-
-				Component.onCompleted: {
-					updatePosition();
-				}
-				onImplicitHeightChanged: updatePosition()
-				onImplicitWidthChanged: updatePosition()
-
-				SysPopouts.SubMenu {
-					id: subMenuContent
-
-					anchors.centerIn: parent
-					handle: subMenuWrapper.modelData.handle
-					level: subMenuWrapper.index + 1
-					popouts: root.popouts.state
-					screen: root.screen
-				}
-			}
-		}
-	}
-
 	Modules.ClipWrapper {
 		id: popouts
 
@@ -252,15 +176,6 @@ Item {
 		visibilities: root.visibilities
 	}
 
-	Item {
-		id: settingsWrapper
-
-		anchors.horizontalCenter: parent.horizontalCenter
-		anchors.top: parent.top
-		clip: true
-		implicitHeight: settings.implicitHeight * (1 - settings.offsetScale)
-		implicitWidth: settings.implicitWidth
-
 	Settings.Wrapper {
 		id: settings
 
@@ -271,7 +186,6 @@ Item {
 		screen: root.screen
 		visibilities: root.visibilities
 	}
-	}
 
 	Dock.Wrapper {
 		id: dock

Drawers/Windows.qml

@@ -64,7 +64,7 @@ Variants {
 
 				height: win.height - bar.implicitHeight - Config.barConfig.border
 				intersection: Intersection.Xor
-				regions: [...popoutRegions.instances, ...subMenuRegions.instances]
+				regions: popoutRegions.instances
 				width: win.width - Config.barConfig.border * 2
 				x: Config.barConfig.border
 				y: bar.implicitHeight
@@ -93,22 +93,6 @@ Variants {
 				}
 			}
 
-			Variants {
-				id: subMenuRegions
-
-				model: panels.traySubmenus.children
-
-				Region {
-					required property Item modelData
-
-					height: modelData.height
-					intersection: Intersection.Subtract
-					width: modelData.width
-					x: modelData.x + panels.traySubmenus.x + Config.barConfig.border
-					y: modelData.y + panels.traySubmenus.y + bar.implicitHeight
-				}
-			}
-
 			HyprlandFocusGrab {
 				id: focusGrab
 
@@ -174,7 +158,6 @@ Variants {
 					id: blobGroup
 
 					color: DynamicColors.palette.m3surface
-					smoothing: Config.barConfig.smoothing
 
 					Behavior on color {
 						CAnim {
@@ -196,34 +179,28 @@ Variants {
 				PanelBg {
 					id: dashBg
 
-					property real extraHeight: 0.2
+					deformAmount: 0.08 * Config.appearance.deform.scale
-
+					implicitHeight: panels.dashboard.height
-					deformAmount: 0.06
-					implicitHeight: panels.dashboard.height * (1 + extraHeight)
 					implicitWidth: panels.dashboard.width
-					panel: panels.dashboardWrapper
+					panel: panels.dashboard
 					radius: Appearance.rounding.normal
 					x: panels.dashboardWrapper.x + panels.dashboard.x + Config.barConfig.border
-					y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight - panels.dashboard.height * extraHeight
+					y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight
 				}
 
 				PanelBg {
 					id: launcherBg
 
-					property real extraHeight: 0.2
+					deformAmount: 0.08 * Config.appearance.deform.scale
-
-					deformAmount: 0.06
-					implicitHeight: panels.launcher.height * (1 + extraHeight)
 					panel: panels.launcher
 					radius: Appearance.rounding.smallest + 5
-					y: panels.launcher.y + bar.implicitHeight
 				}
 
 				PanelBg {
 					id: sidebarBg
 
 					bottomLeftRadius: 0
-					deformAmount: 0.04
+					deformAmount: 0.08 * Config.appearance.deform.scale
 					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
 					implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
 					panel: panels.sidebar
@@ -232,10 +209,10 @@ Variants {
 				PanelBg {
 					id: osdBg
 
-					deformAmount: 0.1
+					deformAmount: 0.1 * Config.appearance.deform.scale
 					implicitHeight: panels.osd.height
 					implicitWidth: panels.osd.width
-					panel: panels.osdWrapper
+					panel: panels.osd
 					radius: 20
 					x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
 					y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
@@ -250,7 +227,7 @@ Variants {
 				PanelBg {
 					id: utilsBg
 
-					deformAmount: panels.sidebar.visible ? (0.1) : (0.1)
+					deformAmount: panels.sidebar.visible ? (0.1 * Config.appearance.deform.scale) : (0.1 * Config.appearance.deform.scale)
 					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg]
 					panel: panels.utilities
 					topLeftRadius: 0
@@ -261,10 +238,12 @@ Variants {
 
 					property real extraHeight: panels.popouts.isDetached ? 0 : 0.2
 
-					deformAmount: panels.popouts.isDetached ? 0.05 : panels.popouts.hasCurrent ? 0.15 : 0.1
+					deformAmount: panels.popouts.isDetached ? 0.05 * Config.appearance.deform.scale : panels.popouts.hasCurrent ? 0.15 * Config.appearance.deform.scale : 0.1 * Config.appearance.deform.scale
+					targetHeight: panels.popouts.height * (1 + extraHeight)
+					targetWidth: panels.popouts.width
 					implicitHeight: panels.popouts.height * (1 + extraHeight)
 					implicitWidth: panels.popouts.width
-					panel: panels.popoutsWrapper
+					panel: panels.popouts
 					radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : 20 * Appearance.rounding.scale
 					x: panels.popoutsWrapper.x + panels.popouts.x + Config.barConfig.border
 					y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
@@ -278,10 +257,10 @@ Variants {
 				PanelBg {
 					id: resourcesBg
 
-					deformAmount: 0.05
+					deformAmount: 0.08 * Config.appearance.deform.scale
 					implicitHeight: panels.resources.height
 					implicitWidth: panels.resources.width
-					panel: panels.resourcesWrapper
+					panel: panels.resources
 					radius: Appearance.rounding.normal
 					x: panels.resourcesWrapper.x + panels.resources.x + Config.barConfig.border
 					y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
@@ -290,23 +269,17 @@ Variants {
 				PanelBg {
 					id: settingsBg
 
-					property real extraHeight: 0.2
+					deformAmount: 0.08 * Config.appearance.deform.scale
-
-					deformAmount: 0.03
-					implicitHeight: panels.settings.height * (1 + extraHeight)
-					implicitWidth: panels.settings.width
 					panel: panels.settings
 					radius: Appearance.rounding.large
 					topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller
 					topRightRadius: Appearance.rounding.large + Appearance.padding.smaller
-					x: panels.settingsWrapper.x + panels.settings.x + Config.barConfig.border
-					y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight - panels.settings.height * extraHeight
 				}
 
 				PanelBg {
 					id: dockBg
 
-					deformAmount: 0.08
+					deformAmount: 0.08 * Config.appearance.deform.scale
 					panel: panels.dock
 					radius: Appearance.rounding.normal
 				}
@@ -314,22 +287,10 @@ Variants {
 				PanelBg {
 					id: drawingBg
 
-					deformAmount: 0.08
+					deformAmount: 0.08 * Config.appearance.deform.scale
 					panel: panels.drawing
 					radius: Appearance.rounding.normal
 				}
-
-				Repeater {
-					model: panels.traySubmenus.children
-
-					PanelBg {
-						required property Item modelData
-
-						deformAmount: 0.1
-						panel: modelData
-						radius: 20 * Appearance.rounding.scale
-					}
-				}
 			}
 
 			Drawing {
@@ -421,7 +382,9 @@ Variants {
 		property real deformAmount: 0.15
 		required property Item panel
 
-		deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
+		targetHeight: panel.height
+		targetWidth: panel.width
+		deformScale: deformAmount / 10000
 		group: blobGroup
 		implicitHeight: panel.height
 		implicitWidth: panel.width

Greeter/Helpers/SystemUsage.qml

@@ -346,6 +346,7 @@ Singleton {
 
 		stdout: StdioCollector {
 			onStreamFinished: {
+				console.log("this is running");
 				if (root.gpuType === "GENERIC") {
 					const percs = text.trim().split("\n");
 					const sum = percs.reduce((acc, d) => acc + parseInt(d, 10), 0);

Greeter/Helpers/Users.qml

@@ -7,30 +7,23 @@ import QtQuick
 Singleton {
 	id: root
 
-	readonly property string defaultUserFile: "/etc/zshell-greeter/default-user"
+	// The list of users that can log in graphically
-	property int selectedIndex: 0
+	// Each user object has: username, uid, home, shell, gecos (full name), face (avatar path)
-	readonly property var selectedUser: selectedIndex >= 0 && selectedIndex < users.length ? users[selectedIndex] : null
-	readonly property string selectedUsername: selectedUser ? selectedUser.username : ""
 	property var users: []
 
-	function saveDefaultUser(): void {
+	// The currently selected user index
-		if (selectedUser) {
+	property int selectedIndex: 0
-			defaultUserStorage.setText(selectedUser.username);
-		}
-	}
 
-	function selectNext(): void {
+	// The currently selected user object (or null if none)
-		if (users.length === 0)
+	readonly property var selectedUser: selectedIndex >= 0 && selectedIndex < users.length ? users[selectedIndex] : null
-			return;
-		selectedIndex = (selectedIndex + 1) % users.length;
-	}
 
-	function selectPrevious(): void {
+	// Convenience property for the selected username
-		if (users.length === 0)
+	readonly property string selectedUsername: selectedUser ? selectedUser.username : ""
-			return;
-		selectedIndex = (selectedIndex - 1 + users.length) % users.length;
-	}
 
+	// Path to store the default user preference
+	readonly property string defaultUserFile: "/etc/zshell-greeter/default-user"
+
+	// Select a user by username
 	function selectUser(username: string): bool {
 		for (let i = 0; i < users.length; i++) {
 			if (users[i].username === username) {
@@ -41,6 +34,28 @@ Singleton {
 		return false;
 	}
 
+	// Select the next user in the list (wraps around)
+	function selectNext(): void {
+		if (users.length === 0)
+			return;
+		selectedIndex = (selectedIndex + 1) % users.length;
+	}
+
+	// Select the previous user in the list (wraps around)
+	function selectPrevious(): void {
+		if (users.length === 0)
+			return;
+		selectedIndex = (selectedIndex - 1 + users.length) % users.length;
+	}
+
+	// Save the current user as the default for next login
+	function saveDefaultUser(): void {
+		if (selectedUser) {
+			defaultUserStorage.setText(selectedUser.username);
+		}
+	}
+
+	// Process to fetch the list of graphical users
 	Process {
 		id: userLister
 
@@ -52,10 +67,13 @@ Singleton {
 				try {
 					root.users = JSON.parse(text);
 
+					// If we have users and no selection yet, try to select the default user
 					if (root.users.length > 0) {
+						// Try to load the default user
 						if (defaultUserStorage.loaded) {
 							const defaultUsername = defaultUserStorage.text().trim();
 							if (defaultUsername && !root.selectUser(defaultUsername)) {
+								// Default user not found, select first user
 								root.selectedIndex = 0;
 							}
 						} else {
@@ -69,14 +87,15 @@ Singleton {
 		}
 	}
 
+	// FileView for persisting the default user
 	FileView {
 		id: defaultUserStorage
 
 		path: root.defaultUserFile
 		preload: true
 
-		onLoadFailed: {}
 		onLoaded: {
+			// If users are already loaded, try to select the default user
 			if (root.users.length > 0) {
 				const defaultUsername = text().trim();
 				if (defaultUsername) {
@@ -84,5 +103,10 @@ Singleton {
 				}
 			}
 		}
+
+		onLoadFailed: {
+			// File doesn't exist yet, that's fine - we'll create it on first save
+			console.log("No default user file found, will use first user");
+		}
 	}
 }

Helpers/GameMode.qml

@@ -13,11 +13,11 @@ Singleton {
 
 	function setHyprConf(): void {
 		Hypr.extras.applyOptions({
-			"animations.enabled": 0,
+			"animations:enabled": 0,
-			"decoration.shadow.enabled": 0,
+			"decoration:shadow:enabled": 0,
-			"decoration.blur.enabled": 0,
+			"decoration:blur:enabled": 0,
-			"general.border_size": 0,
+			"general:border_size": 0,
-			"decoration.rounding": 0
+			"decoration:rounding": 0
 		});
 	}
 

Helpers/Wallpapers.qml

@@ -14,7 +14,6 @@ Searcher {
 	property string actualCurrent: WallpaperPath.currentWallpaperPath
 	readonly property string current: showPreview ? previewPath : actualCurrent
 	property string previewPath
-	property bool recentlyChanged
 	property bool showPreview: false
 
 	function preview(path: string): void {

Modules/Content.qml

@@ -16,7 +16,6 @@ Item {
 	readonly property Item current: currentPopout?.item ?? null
 	readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null
 	required property PopoutState popouts
-	required property ShellScreen screen
 
 	implicitHeight: (currentPopout?.implicitHeight ?? 0) + 5 * 2
 	implicitWidth: (currentPopout?.implicitWidth ?? 0) + 5 * 2
@@ -64,7 +63,6 @@ Item {
 
 					TrayMenuPopout {
 						popouts: root.popouts
-						screen: root.screen
 						trayItem: trayMenu.modelData.menu
 					}
 				}

Modules/Drawing/Wrapper.qml

@@ -12,29 +12,90 @@ Item {
 
 	required property Canvas drawing
 	property bool expanded: true
-	property real offsetScale: shouldBeActive ? 0 : 1
 	required property ShellScreen screen
 	readonly property bool shouldBeActive: visibilities.isDrawing
 	required property var visibilities
 
-	anchors.leftMargin: (-implicitWidth - 5) * offsetScale
 	implicitHeight: content.implicitHeight
-	implicitWidth: root.expanded ? content.implicitWidth : icon.implicitWidth
+	implicitWidth: 0
-	opacity: 1 - offsetScale
+	visible: width > 0
-	visible: offsetScale < 1
 
-	Behavior on implicitWidth {
+	states: [
+		State {
+			name: "hidden"
+			when: !root.shouldBeActive
+
+			PropertyChanges {
+				root.implicitWidth: 0
+			}
+
+			PropertyChanges {
+				icon.opacity: 0
+			}
+
+			PropertyChanges {
+				content.opacity: 0
+			}
+		},
+		State {
+			name: "collapsed"
+			when: root.shouldBeActive && !root.expanded
+
+			PropertyChanges {
+				root.implicitWidth: icon.implicitWidth
+			}
+
+			PropertyChanges {
+				icon.opacity: 1
+			}
+
+			PropertyChanges {
+				content.opacity: 0
+			}
+		},
+		State {
+			name: "visible"
+			when: root.shouldBeActive && root.expanded
+
+			PropertyChanges {
+				root.implicitWidth: content.implicitWidth
+			}
+
+			PropertyChanges {
+				icon.opacity: 0
+			}
+
+			PropertyChanges {
+				content.opacity: 1
+			}
+		}
+	]
+	transitions: [
+		Transition {
+			from: "*"
+			to: "*"
+
+			ParallelAnimation {
 				Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
+					easing.bezierCurve: MaterialEasing.expressiveEffects
-			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+					property: "implicitWidth"
+					target: root
 				}
-	}
+
-	Behavior on offsetScale {
 				Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
+					duration: Appearance.anim.durations.small
-			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+					property: "opacity"
+					target: icon
+				}
+
+				Anim {
+					duration: Appearance.anim.durations.small
+					property: "opacity"
+					target: content
 				}
 			}
+		}
+	]
 
 	onVisibleChanged: {
 		if (!visible)
@@ -48,12 +109,8 @@ Item {
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
 		height: content.contentItem.height
-		opacity: root.expanded ? 0 : 1
+		opacity: 1
 
-		Behavior on opacity {
-			Anim {
-			}
-		}
 		sourceComponent: MaterialIcon {
 			font.pointSize: Appearance.font.size.larger
 			text: "arrow_forward_ios"
@@ -65,12 +122,7 @@ Item {
 
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
-		opacity: root.expanded ? 1 : 0
 
-		Behavior on opacity {
-			Anim {
-			}
-		}
 		sourceComponent: Content {
 			drawing: root.drawing
 			visibilities: root.visibilities

Modules/Launcher/Services/Apps.qml

@@ -13,6 +13,7 @@ Searcher {
 
 	function launch(entry: DesktopEntry): void {
 		appDb.incrementFrequency(entry.id);
+		console.log(root.command);
 
 		if (entry.runInTerminal)
 			Quickshell.execDetached({

Modules/Lock/NotifGroup.qml

@@ -284,8 +284,6 @@ CustomRect {
 		Layout.fillWidth: true
 		color: root.urgency === "critical" ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
 		text: {
-			if (!Config.lock.showNotifContent)
-				return "Unlock to view";
 			const summary = modelData.summary.replace(/\n/g, " ");
 			const body = modelData.body.replace(/\n/g, " ");
 			const color = root.urgency === "critical" ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3outline;

Modules/PopoutState.qml

@@ -1,36 +1,8 @@
 import QtQuick
 
 QtObject {
-	id: root
-
 	property string currentName
 	property bool hasCurrent
-	property var submenus: []
 
 	signal detachRequested(mode: string)
-
-	function clearSubmenus(): void {
-		submenus = [];
-	}
-
-	function closeSubmenus(level: int): void {
-		submenus = submenus.slice(0, level);
-	}
-
-	function pushSubmenu(level: int, handle: var, sourceItem: var, sourceWidth: int): void {
-		let newSubmenus = submenus.slice(0, level);
-		newSubmenus.push({
-			"handle": handle,
-			"sourceItem": sourceItem,
-			"sourceWidth": sourceWidth
-		});
-		submenus = newSubmenus;
-	}
-
-	onCurrentNameChanged: {
-		root.clearSubmenus();
-	}
-	onHasCurrentChanged: {
-		root.clearSubmenus();
-	}
 }

Modules/Settings/Categories/Background.qml

@@ -29,13 +29,13 @@ SettingsPage {
 			step: 50
 		}
 
-		Separator {
+		// Separator {
-		}
+		// }
-
+		//
-		WallpaperCropper {
+		// WallpaperCropper {
-			Layout.fillWidth: true
+		// 	Layout.fillWidth: true
-			Layout.preferredHeight: 600
+		// 	Layout.preferredHeight: 300
-		}
+		// }
 	}
 
 	SettingsSection {

Modules/Settings/Categories/Bar.qml

@@ -19,8 +19,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			min: 1
 			name: "Height"
+			min: 1
 			object: Config.barConfig
 			setting: "height"
 		}
@@ -29,8 +29,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			min: 0
 			name: "Rounding"
+			min: 0
 			object: Config.barConfig
 			setting: "rounding"
 		}
@@ -39,21 +39,11 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			min: 0
 			name: "Border"
+			min: 0
 			object: Config.barConfig
 			setting: "border"
 		}
-
-		Separator {
-		}
-
-		SettingSpinBox {
-			min: 0
-			name: "Smoothing"
-			object: Config.barConfig
-			setting: "smoothing"
-		}
 	}
 
 	SettingsSection {
@@ -155,8 +145,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			min: 1
 			name: "Dock height"
+			min: 1
 			object: Config.dock
 			setting: "height"
 		}
@@ -183,8 +173,8 @@ SettingsPage {
 		}
 
 		SettingStringList {
-			addLabel: qsTr("Add pinned app")
 			name: "Pinned apps"
+			addLabel: qsTr("Add pinned app")
 			object: Config.dock
 			setting: "pinnedApps"
 		}
@@ -193,8 +183,8 @@ SettingsPage {
 		}
 
 		SettingStringList {
-			addLabel: qsTr("Add ignored regex")
 			name: "Ignored app regexes"
+			addLabel: qsTr("Add ignored regex")
 			object: Config.dock
 			setting: "ignoredAppRegexes"
 		}

Modules/Settings/Categories/Lockscreen.qml

@@ -31,8 +31,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			min: 1
 			name: "Max fingerprint tries"
+			min: 1
 			object: Config.lock
 			setting: "maxFprintTries"
 			step: 1
@@ -41,18 +41,9 @@ SettingsPage {
 		Separator {
 		}
 
-		SettingSwitch {
-			name: "Show notification details"
-			object: Config.lock
-			setting: "showNotifContent"
-		}
-
-		Separator {
-		}
-
 		SettingSpinBox {
-			min: 0
 			name: "Blur amount"
+			min: 0
 			object: Config.lock
 			setting: "blurAmount"
 			step: 1
@@ -62,9 +53,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
+			name: "Height multiplier"
 			max: 2
 			min: 0.1
-			name: "Height multiplier"
 			object: Config.lock.sizes
 			setting: "heightMult"
 			step: 0.05
@@ -74,9 +65,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
+			name: "Aspect ratio"
 			max: 4
 			min: 0.5
-			name: "Aspect ratio"
 			object: Config.lock.sizes
 			setting: "ratio"
 			step: 0.05
@@ -86,8 +77,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			min: 100
 			name: "Center width"
+			min: 100
 			object: Config.lock.sizes
 			setting: "centerWidth"
 			step: 10

Modules/Settings/Controls/WallpaperCropper.qml

@@ -6,109 +6,97 @@ import qs.Config
 import qs.Components
 import qs.Helpers
 
-Item {
+ColumnLayout {
 	id: root
 
-	Image {
+	spacing: 15
-		id: imageView
+	width: Math.min(parent ? parent.width : 600, 600)
 
-		property real displayH: paintedHeight
+	Rectangle {
-		property real displayW: paintedWidth
+		id: previewContainer
-		property real displayX: (width - paintedWidth) * 0.5
+
-		property real displayY: (height - paintedHeight) * 0.5
+		Layout.fillHeight: true
-		property real scaleX: sourceW / displayW
+		Layout.preferredWidth: height * (Quickshell.screens.length > 0 ? (Quickshell.screens[0].height / Math.max(1, Quickshell.screens[0].width)) : 16 / 9)
-		property real scaleY: sourceH / displayH
+		clip: true
-		property real sourceH: Quickshell.screens[0].height
+		color: DynamicColors.palette.m3surfaceContainer
-		property real sourceW: Quickshell.screens[0].width
+		radius: Config.appearance.rounding.scale * 10
+
+		Image {
+			id: img
 
 			anchors.fill: parent
+			asynchronous: true
 			fillMode: Image.PreserveAspectFit
-		smooth: true
 			source: Wallpapers.current
-	}
 
-	Item {
+			Rectangle {
-		id: overlay
-
-		clip: true
-		height: imageView.displayH
-		width: imageView.displayW
-		x: imageView.displayX
-		y: imageView.displayY
-
-		CustomRect {
 				id: cropRect
 
-			property real aspectRatio: Quickshell.screens[0].width / Quickshell.screens[0].height
+				property real cropHeight: (imageAspect > screenAspect ? paintedHeight : paintedWidth / screenAspect) / Config.background.zoom
-			readonly property rect sourceRect: Qt.rect(x * imageView.scaleX, y * imageView.scaleY, width * imageView.scaleX, height * imageView.scaleY)
+				property real cropWidth: (imageAspect > screenAspect ? paintedHeight * screenAspect : paintedWidth) / Config.background.zoom
-			property real zoom: Config.background.zoom
+				property real imageAspect: Math.max(1, paintedWidth) / Math.max(1, paintedHeight)
-
+				property real paintedHeight: img.paintedHeight > 0 ? img.paintedHeight : img.height
-			function clampToBounds() {
+				property real paintedWidth: img.paintedWidth > 0 ? img.paintedWidth : img.width
-				x = Math.max(0, Math.min(x, overlay.width - width));
+				property real paintedX: (img.width - paintedWidth) / 2
-
+				property real paintedY: (img.height - paintedHeight) / 2
-				y = Math.max(0, Math.min(y, overlay.height - height));
+				property real screenAspect: Quickshell.screens.length > 0 ? (Quickshell.screens[0].width / Math.max(1, Quickshell.screens[0].height)) : 16 / 9
-			}
 
 				border.color: DynamicColors.palette.m3primary
 				border.width: 2
-			color: DynamicColors.tPalette.m3primary
+				color: Qt.alpha(DynamicColors.palette.m3primaryContainer, 0.3)
-			height: width / aspectRatio
+				height: cropHeight
-			radius: Appearance.rounding.small
+				width: cropWidth
-			visible: imageView.status === Image.Ready
+				x: paintedX + (paintedWidth - width) * Config.background.alignX
-			width: Math.min(overlay.width / zoom, overlay.height * aspectRatio / zoom)
+				y: paintedY + (paintedHeight - height) * Config.background.alignY
-			x: Config.background.sourceClipX / imageView.scaleX
-			y: Config.background.sourceClipY / imageView.scaleY
-		}
 
-		MouseArea {
+				DragHandler {
-			function updateCrop(mouseX, mouseY) {
+					target: null
-				let nx = mouseX - cropRect.width * 0.5;
-				let ny = mouseY - cropRect.height * 0.5;
 
-				nx = Math.max(0, Math.min(nx, overlay.width - cropRect.width));
+					onActiveTranslationChanged: {
+						if (active) {
+							let newX = cropRect.x - cropRect.paintedX + translation.x;
+							let newY = cropRect.y - cropRect.paintedY + translation.y;
 
-				ny = Math.max(0, Math.min(ny, overlay.height - cropRect.height));
+							let rangeX = cropRect.paintedWidth - cropRect.width;
+							let rangeY = cropRect.paintedHeight - cropRect.height;
 
-				cropRect.x = nx;
+							if (rangeX > 0) {
-				cropRect.y = ny;
+								let valX = newX / rangeX;
-			}
+								Config.background.alignX = Math.max(0.0, Math.min(1.0, valX));
-
-			anchors.fill: parent
-			hoverEnabled: true
-			preventStealing: true
-
-			onPositionChanged: mouse => {
-				if (pressed)
-					updateCrop(mouse.x, mouse.y);
-			}
-			onPressed: mouse => {
-				updateCrop(mouse.x, mouse.y);
-			}
-			onReleased: {
-				Wallpapers.recentlyChanged = false;
-				Config.background.sourceClipX = cropRect.sourceRect.x;
-				Config.background.sourceClipY = cropRect.sourceRect.y;
-				Config.background.sourceClipW = cropRect.sourceRect.width;
-				Config.background.sourceClipH = cropRect.sourceRect.height;
 								Config.save();
 							}
-			onWheel: wheel => {
-				let oldCenterX = cropRect.x + cropRect.width * 0.5;
-				let oldCenterY = cropRect.y + cropRect.height * 0.5;
 
-				if (wheel.angleDelta.y > 0)
+							if (rangeY > 0) {
-					cropRect.zoom *= 1.1;
+								let valY = newY / rangeY;
-				else
+								Config.background.alignY = Math.max(0.0, Math.min(1.0, valY));
-					cropRect.zoom /= 1.1;
+								Config.save();
-
-				cropRect.zoom = Math.max(1.0, Math.min(cropRect.zoom, 10.0));
-				Config.background.zoom = cropRect.zoom;
-
-				cropRect.x = oldCenterX - cropRect.width * 0.5;
-				cropRect.y = oldCenterY - cropRect.height * 0.5;
-
-				cropRect.clampToBounds();
 							}
 						}
 					}
 				}
+
+				PinchHandler {
+					maximumScale: 5.0
+					minimumScale: 1.0
+					target: null
+
+					onActiveScaleChanged: {
+						if (active) {
+							let newZoom = Config.background.zoom * (1 / (1 + (activeScale - 1) * 0.1));
+							Config.background.zoom = Math.max(1.0, Math.min(newZoom, 5.0));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	SettingSpinBox {
+		max: 5.0
+		min: 1.0
+		name: "Zoom"
+		object: Config.background
+		setting: "zoom"
+		step: 0.1
+	}
+}

Modules/Settings/SettingsSearch.qml

@@ -6,7 +6,7 @@ import QtQuick.Controls
 import qs.Components
 import qs.Config
 import "../../scripts/fuzzysort.js" as Fuzzy
-import "../../scripts/SettingsIndex.mjs" as SettingsIndex
+import "./SettingsIndex.mjs" as SettingsIndex
 
 Item {
 	id: root
@@ -53,10 +53,11 @@ Item {
 
 	Shortcut {
 		sequence: "/"
-
 		onActivated: searchField.forceActiveFocus()
 	}
 
+	Component.onCompleted: console.log(root.height)
+
 	ListModel {
 		id: resultsModel
 	}

Modules/Settings/Wrapper.qml

@@ -7,24 +7,45 @@ import qs.Helpers
 Item {
 	id: root
 
-	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: visibilities.settings
 	required property PersistentProperties visibilities
 
-	anchors.topMargin: (-implicitHeight - 5) * offsetScale
+	implicitHeight: 0
-	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth
-	opacity: 1 - offsetScale
+	visible: height > 0
-	visible: offsetScale < 1
+
+	states: State {
+		name: "visible"
+		when: root.visibilities.settings
+
+		PropertyChanges {
+			root.implicitHeight: content.implicitHeight
+		}
+	}
+	transitions: [
+		Transition {
+			from: ""
+			to: "visible"
 
-	Behavior on offsetScale {
 			Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
+				duration: MaterialEasing.expressiveEffectsTime
-			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+				easing.bezierCurve: MaterialEasing.expressiveEffects
+				property: "implicitHeight"
+				target: root
+			}
+		},
+		Transition {
+			from: "visible"
+			to: ""
+
+			Anim {
+				easing.bezierCurve: MaterialEasing.expressiveEffects
+				property: "implicitHeight"
+				target: root
 			}
 		}
+	]
 
 	CustomClippingRect {
 		anchors.fill: parent

Modules/Shortcuts.qml

@@ -19,6 +19,7 @@ Scope {
 			if (!root.launcherInterrupted && !root.hasFullscreen) {
 				const visibilities = Visibilities.getForActive();
 				visibilities.launcher = !visibilities.launcher;
+				console.log(root.launcherInterrupted);
 			}
 			root.launcherInterrupted = false;
 		}

Modules/SysTray/Popouts/SubMenu.qml

@@ -1,158 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import Quickshell
-import Quickshell.Widgets
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Effects
-import qs.Components
-import qs.Modules
-import qs.Config
-
-Column {
-	id: menu
-
-	property int biggestWidth: 0
-	required property QsMenuHandle handle
-	required property int level
-	required property PopoutState popouts
-	required property ShellScreen screen
-	property bool shown: true
-
-	height: childrenRect.height
-	opacity: shown ? 1 : 0
-	padding: 0
-	scale: shown ? 1 : 0.8
-	spacing: 4
-	width: biggestWidth
-
-	Behavior on opacity {
-		Anim {
-		}
-	}
-	Behavior on scale {
-		Anim {
-		}
-	}
-
-	QsMenuOpener {
-		id: menuOpener
-
-		menu: menu.handle
-	}
-
-	Repeater {
-		model: menuOpener.children
-
-		CustomRect {
-			id: item
-
-			required property int index
-			required property QsMenuEntry modelData
-
-			color: modelData.isSeparator ? DynamicColors.palette.m3outlineVariant : "transparent"
-			implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight
-			implicitWidth: menu.biggestWidth
-			radius: Appearance.rounding.full
-			visible: index !== (menuOpener.children.values.length - 1) ? true : (modelData.isSeparator ? false : true)
-
-			Loader {
-				id: children
-
-				active: !item.modelData.isSeparator
-				anchors.left: parent.left
-				anchors.right: parent.right
-				asynchronous: true
-
-				sourceComponent: Item {
-					implicitHeight: 30
-
-					StateLayer {
-						function onClicked(): void {
-							const entry = item.modelData;
-							if (entry.hasChildren) {
-								menu.popouts.pushSubmenu(menu.level, entry, item, menu.biggestWidth);
-							} else {
-								entry.triggered();
-								menu.popouts.hasCurrent = false;
-							}
-						}
-
-						disabled: !item.modelData.enabled
-						radius: item.radius
-					}
-
-					Loader {
-						id: icon
-
-						active: item.modelData.icon !== ""
-						anchors.right: parent.right
-						anchors.rightMargin: 10
-						anchors.verticalCenter: parent.verticalCenter
-						asynchronous: true
-
-						sourceComponent: Item {
-							implicitHeight: label.implicitHeight
-							implicitWidth: label.implicitHeight
-
-							IconImage {
-								id: iconImage
-
-								implicitSize: parent.implicitHeight
-								source: item.modelData.icon
-								visible: false
-							}
-
-							MultiEffect {
-								anchors.fill: iconImage
-								colorization: 1.0
-								colorizationColor: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
-								source: iconImage
-							}
-						}
-					}
-
-					CustomText {
-						id: label
-
-						anchors.left: parent.left
-						anchors.leftMargin: 10
-						anchors.verticalCenter: parent.verticalCenter
-						color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
-						text: labelMetrics.elidedText
-					}
-
-					TextMetrics {
-						id: labelMetrics
-
-						font.family: label.font.family
-						font.pointSize: label.font.pointSize
-						text: item.modelData.text
-
-						Component.onCompleted: {
-							var biggestWidth = menu.biggestWidth;
-							var currentWidth = labelMetrics.width + (item.modelData.icon ?? "" ? 30 : 0) + (item.modelData.hasChildren ? 30 : 0) + 20;
-							if (currentWidth > biggestWidth) {
-								menu.biggestWidth = currentWidth;
-							}
-						}
-					}
-
-					Loader {
-						id: expand
-
-						active: item.modelData.hasChildren
-						anchors.right: parent.right
-						anchors.verticalCenter: parent.verticalCenter
-						asynchronous: true
-
-						sourceComponent: MaterialIcon {
-							color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
-							text: "chevron_right"
-						}
-					}
-				}
-			}
-		}
-	}
-}

Modules/SysTray/Popouts/TrayMenuPopout.qml

@@ -1,16 +1,251 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
+import Quickshell.Widgets
 import QtQuick
+import QtQuick.Controls
+import QtQuick.Effects
 import qs.Components
 import qs.Modules
 import qs.Config
 
-SubMenu {
+StackView {
 	id: root
 
-	handle: trayItem
+	property int biggestWidth: 0
-	level: 0
+	required property PopoutState popouts
-
+	property int rootWidth: 0
 	required property QsMenuHandle trayItem
+
+	implicitHeight: currentItem.implicitHeight
+	implicitWidth: currentItem.implicitWidth
+
+	initialItem: SubMenu {
+		handle: root.trayItem
+	}
+	popEnter: NoAnim {
+	}
+	popExit: NoAnim {
+	}
+	pushEnter: NoAnim {
+	}
+	pushExit: NoAnim {
+	}
+
+	Component {
+		id: subMenuComp
+
+		SubMenu {
+		}
+	}
+
+	component NoAnim: Transition {
+		NumberAnimation {
+			duration: 0
+		}
+	}
+	component SubMenu: Column {
+		id: menu
+
+		required property QsMenuHandle handle
+		property bool isSubMenu
+		property bool shown
+
+		opacity: shown ? 1 : 0
+		padding: 0
+		scale: shown ? 1 : 0.8
+		spacing: 4
+
+		Behavior on opacity {
+			Anim {
+			}
+		}
+		Behavior on scale {
+			Anim {
+			}
+		}
+
+		Component.onCompleted: shown = true
+		StackView.onActivating: shown = true
+		StackView.onDeactivating: shown = false
+		StackView.onRemoved: destroy()
+
+		QsMenuOpener {
+			id: menuOpener
+
+			menu: menu.handle
+		}
+
+		Repeater {
+			model: menuOpener.children
+
+			CustomRect {
+				id: item
+
+				required property int index
+				required property QsMenuEntry modelData
+
+				color: modelData.isSeparator ? DynamicColors.palette.m3outlineVariant : "transparent"
+				implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight
+				implicitWidth: root.biggestWidth
+				radius: Appearance.rounding.full
+				visible: index !== (menuOpener.children.values.length - 1) ? true : (modelData.isSeparator ? false : true)
+
+				Loader {
+					id: children
+
+					active: !item.modelData.isSeparator
+					anchors.left: parent.left
+					anchors.right: parent.right
+					asynchronous: true
+
+					sourceComponent: Item {
+						implicitHeight: 30
+
+						StateLayer {
+							function onClicked(): void {
+								const entry = item.modelData;
+								if (entry.hasChildren) {
+									root.rootWidth = root.biggestWidth;
+									root.biggestWidth = 0;
+									root.push(subMenuComp.createObject(null, {
+										handle: entry,
+										isSubMenu: true
+									}));
+								} else {
+									item.modelData.triggered();
+									root.popouts.hasCurrent = false;
+								}
+							}
+
+							disabled: !item.modelData.enabled
+							radius: item.radius
+						}
+
+						Loader {
+							id: icon
+
+							active: item.modelData.icon !== ""
+							anchors.right: parent.right
+							anchors.rightMargin: 10
+							anchors.verticalCenter: parent.verticalCenter
+							asynchronous: true
+
+							sourceComponent: Item {
+								implicitHeight: label.implicitHeight
+								implicitWidth: label.implicitHeight
+
+								IconImage {
+									id: iconImage
+
+									implicitSize: parent.implicitHeight
+									source: item.modelData.icon
+									visible: false
+								}
+
+								MultiEffect {
+									anchors.fill: iconImage
+									colorization: 1.0
+									colorizationColor: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+									source: iconImage
+								}
+							}
+						}
+
+						CustomText {
+							id: label
+
+							anchors.left: parent.left
+							anchors.leftMargin: 10
+							anchors.verticalCenter: parent.verticalCenter
+							color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+							text: labelMetrics.elidedText
+						}
+
+						TextMetrics {
+							id: labelMetrics
+
+							font.family: label.font.family
+							font.pointSize: label.font.pointSize
+							text: item.modelData.text
+
+							Component.onCompleted: {
+								var biggestWidth = root.biggestWidth;
+								var currentWidth = labelMetrics.width + (item.modelData.icon ?? "" ? 30 : 0) + (item.modelData.hasChildren ? 30 : 0) + 20;
+								if (currentWidth > biggestWidth) {
+									root.biggestWidth = currentWidth;
+								}
+							}
+						}
+
+						Loader {
+							id: expand
+
+							active: item.modelData.hasChildren
+							anchors.right: parent.right
+							anchors.verticalCenter: parent.verticalCenter
+							asynchronous: true
+
+							sourceComponent: MaterialIcon {
+								color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+								text: "chevron_right"
+							}
+						}
+					}
+				}
+			}
+		}
+
+		Loader {
+			id: loader
+
+			active: menu.isSubMenu
+			asynchronous: true
+
+			sourceComponent: Item {
+				implicitHeight: 30
+				implicitWidth: back.implicitWidth
+
+				Item {
+					anchors.bottom: parent.bottom
+					implicitHeight: 30
+					implicitWidth: root.biggestWidth
+
+					CustomRect {
+						anchors.fill: parent
+						color: DynamicColors.palette.m3secondaryContainer
+						radius: Appearance.rounding.full
+
+						StateLayer {
+							function onClicked(): void {
+								root.pop();
+								root.biggestWidth = root.rootWidth;
+							}
+
+							color: DynamicColors.palette.m3onSecondaryContainer
+							radius: parent.radius
+						}
+					}
+
+					Row {
+						id: back
+
+						anchors.verticalCenter: parent.verticalCenter
+
+						MaterialIcon {
+							anchors.verticalCenter: parent.verticalCenter
+							color: DynamicColors.palette.m3onSecondaryContainer
+							text: "chevron_left"
+						}
+
+						CustomText {
+							anchors.verticalCenter: parent.verticalCenter
+							color: DynamicColors.palette.m3onSecondaryContainer
+							text: qsTr("Back")
+						}
+					}
+				}
+			}
+		}
+	}
 }

Modules/Wallpaper/WallBackground-old.qml

@@ -1,80 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Components
-import qs.Helpers
-import qs.Config
-
-Item {
-	id: root
-
-	property Image current: one
-	property string source: Wallpapers.current
-
-	anchors.fill: parent
-
-	Component.onCompleted: {
-		if (source)
-			Qt.callLater(() => one.update());
-	}
-	onSourceChanged: {
-		if (!source) {
-			current = null;
-		} else if (current === one) {
-			two.update();
-		} else {
-			one.update();
-		}
-	}
-
-	Img {
-		id: one
-	}
-
-	Img {
-		id: two
-	}
-
-	component Img: Image {
-		id: img
-
-		function update(): void {
-			if (source === root.source) {
-				root.current = this;
-			} else {
-				source = root.source;
-			}
-		}
-
-		anchors.fill: parent
-		asynchronous: true
-		fillMode: Image.PreserveAspectCrop
-		opacity: 0
-		retainWhileLoading: true
-		scale: Wallpapers.showPreview ? 1 : 0.8
-		sourceClipRect: Qt.rect(Config.background.sourceClipX, Config.background.sourceClipY, Config.background.sourceClipW, Config.background.sourceClipH)
-
-		states: State {
-			name: "visible"
-			when: root.current === img
-
-			PropertyChanges {
-				img.opacity: 1
-				img.scale: 1
-			}
-		}
-		transitions: Transition {
-			Anim {
-				duration: Config.background.wallFadeDuration
-				properties: "opacity,scale"
-				target: img
-			}
-		}
-
-		onStatusChanged: {
-			if (status === Image.Ready) {
-				root.current = this;
-			}
-		}
-	}
-}

Modules/Wallpaper/WallBackground.qml

@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import Quickshell
 import QtQuick
 import qs.Components
 import qs.Helpers
@@ -9,34 +8,79 @@ import qs.Config
 Item {
 	id: root
 
-	required property ShellScreen screen
+	property Image current: one
 	property string source: Wallpapers.current
 
 	anchors.fill: parent
 
-	Image {
+	Component.onCompleted: {
+		if (source)
+			Qt.callLater(() => one.update());
+	}
+	onSourceChanged: {
+		if (!source) {
+			current = null;
+		} else if (current === one) {
+			two.update();
+		} else {
+			one.update();
+		}
+	}
+
+	Img {
+		id: one
+	}
+
+	Img {
+		id: two
+	}
+
+	component Img: CachingImage {
 		id: img
 
-		anchors.fill: parent
+		property real imageRatio: Math.max(1, sourceSize.width) / Math.max(1, sourceSize.height)
+		property bool isValid: sourceSize.width > 0 && sourceSize.height > 0 && root.width > 0 && root.height > 0
+		property real windowRatio: root.width / Math.max(1, root.height)
+
+		function update(): void {
+			if (path === root.source) {
+				root.current = this;
+			} else {
+				path = root.source;
+			}
+		}
+
+		anchors.fill: undefined
 		asynchronous: true
 		fillMode: Image.PreserveAspectCrop
-		opacity: 1
+		height: isValid ? (imageRatio > windowRatio ? root.height : root.width / imageRatio) * Config.background.zoom : root.height
-		retainWhileLoading: true
+		opacity: 0
-		source: root.source
+		scale: Wallpapers.showPreview ? 1 : 0.8
-		sourceClipRect: Wallpapers.recentlyChanged ? null : Qt.rect(Config.background.sourceClipX, Config.background.sourceClipY, Config.background.sourceClipW, Config.background.sourceClipH)
+		width: isValid ? (imageRatio > windowRatio ? root.height * imageRatio : root.width) * Config.background.zoom : root.width
-		sourceSize.height: root.screen.height
+		x: isValid ? (root.width - width) * Config.background.alignX : 0
-		sourceSize.width: root.screen.width
+		y: isValid ? (root.height - height) * Config.background.alignY : 0
 
-		onSourceChanged: {
+		states: State {
-			if (Wallpapers.recentlyChanged) {
+			name: "visible"
-				Config.background.sourceClipH = 0;
+			when: root.current === img
-				Config.background.sourceClipW = 0;
+
-				Config.background.sourceClipY = 0;
+			PropertyChanges {
-				Config.background.sourceClipX = 0;
+				img.opacity: 1
-				Config.background.zoom = 1.0;
+				img.scale: 1
-				Config.save();
+			}
+		}
+		transitions: Transition {
+			Anim {
+				duration: Config.background.wallFadeDuration
+				properties: "opacity,scale"
+				target: img
+			}
+		}
+
+		onStatusChanged: {
+			if (status === Image.Ready) {
+				root.current = this;
 			}
-			Wallpapers.recentlyChanged = true;
 		}
 	}
 }

Modules/Wallpaper/Wallpaper.qml

@@ -30,7 +30,6 @@ Loader {
 			}
 
 			WallBackground {
-				screen: root.screen
 			}
 
 			Loader {

Modules/Workspaces.qml

@@ -79,8 +79,7 @@ Item {
 					}
 
 					onPressed: {
-						const ws = button.modelData.name;
+						Hyprland.dispatch(`workspace ${button.modelData.name}`);
-						Hyprland.dispatch(Hyprland.usingLua ? `hl.dsp.focus({ workspace= "${ws}"})` : `workspace ${ws}`);
 					}
 				}
 			}

Modules/Wrapper.qml

@@ -15,14 +15,13 @@ Item {
 	property real currentCenter
 	property alias currentName: popoutState.currentName
 	property string detachedMode
-	property alias hasCurrent: popoutState.hasCurrent
 	readonly property bool isDetached: detachedMode.length > 0
+	property alias hasCurrent: popoutState.hasCurrent
 	readonly property real nonAnimHeight: children.find(c => c.shouldBeActive)?.implicitHeight ?? content.implicitHeight
 	readonly property real nonAnimWidth: children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth
 	required property real offsetScale
 	property string queuedMode
 	required property ShellScreen screen
-	property alias state: popoutState
 
 	function close(): void {
 		hasCurrent = false;
@@ -80,7 +79,6 @@ Item {
 
 		sourceComponent: Content {
 			popouts: popoutState
-			screen: root.screen
 		}
 	}
 

Plugins/ZShell/Blobs/blobshape.cpp

@@ -59,6 +59,20 @@ void BlobShape::setRadius(qreal r) {
 		m_group->markDirty();
 }
 
+void BlobShape::setTargetWidth(qreal w) {
+	if (qFuzzyCompare(m_targetWidth, w))
+		return;
+	m_targetWidth = w;
+	emit targetWidthChanged();
+}
+
+void BlobShape::setTargetHeight(qreal h) {
+	if (qFuzzyCompare(m_targetHeight, h))
+		return;
+	m_targetHeight = h;
+	emit targetHeightChanged();
+}
+
 void BlobShape::componentComplete() {
 	QQuickItem::componentComplete();
 	if (m_group)
@@ -72,17 +86,11 @@ void BlobShape::geometryChange(const QRectF& newGeometry, const QRectF& oldGeome
 		// Accumulate sub-pixel drift so slow movements don't desync the shader
 		m_pendingDx += static_cast<float>(newGeometry.x() - oldGeometry.x());
 		m_pendingDy += static_cast<float>(newGeometry.y() - oldGeometry.y());
-		// Accumulate size delta across multiple frames so incremental size
+		const auto dw = std::abs(newGeometry.width() - oldGeometry.width());
-		// changes that are each below the threshold still trigger a dirty
+		const auto dh = std::abs(newGeometry.height() - oldGeometry.height());
-		// mark once their accumulated delta exceeds it.
+		if (std::abs(m_pendingDx) > 0.5f || std::abs(m_pendingDy) > 0.5f || dw > 0.5 || dh > 0.5) {
-		m_pendingDw += static_cast<float>(newGeometry.width() - oldGeometry.width());
-		m_pendingDh += static_cast<float>(newGeometry.height() - oldGeometry.height());
-		if (std::abs(m_pendingDx) > 0.5f || std::abs(m_pendingDy) > 0.5f ||
-		    std::abs(m_pendingDw) > 0.5f || std::abs(m_pendingDh) > 0.5f) {
 			m_pendingDx = 0;
 			m_pendingDy = 0;
-			m_pendingDw = 0;
-			m_pendingDh = 0;
 			m_group->markShapeDirty(this);
 		}
 	}
@@ -124,6 +132,17 @@ void BlobShape::updatePolish() {
 	if (!m_group)
 		return;
 
+	// Check if target dimensions (panel size) have changed since last polish.
+	// This catches cases where the panel's implicit size changes but the
+	// BlobRect's geometry doesn't update (e.g. parent Rectangle doesn't
+	// respect implicit sizes), which would otherwise skip dirty marking.
+	if (!qFuzzyCompare(m_targetWidth, m_lastPolishTargetWidth) ||
+	    !qFuzzyCompare(m_targetHeight, m_lastPolishTargetHeight)) {
+		m_lastPolishTargetWidth = m_targetWidth;
+		m_lastPolishTargetHeight = m_targetHeight;
+		m_group->markDirty();
+	}
+
 	// Ensure all shapes have up-to-date physics (only once per frame)
 	m_group->ensurePhysicsUpdated();
 

Plugins/ZShell/Blobs/blobshape.hpp

@@ -14,6 +14,8 @@ Q_PROPERTY(BlobGroup* group READ group WRITE setGroup NOTIFY groupChanged)
 Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged)
 Q_PROPERTY(QMatrix4x4 deformMatrix READ deformMatrix NOTIFY deformMatrixChanged)
 Q_PROPERTY(QMatrix4x4 rawDeformMatrix READ rawDeformMatrix NOTIFY rawDeformMatrixChanged)
+Q_PROPERTY(qreal targetWidth READ targetWidth WRITE setTargetWidth NOTIFY targetWidthChanged)
+Q_PROPERTY(qreal targetHeight READ targetHeight WRITE setTargetHeight NOTIFY targetHeightChanged)
 
 friend class BlobGroup;
 
@@ -46,6 +48,19 @@ void groupChanged();
 	void radiusChanged();
 	void deformMatrixChanged();
 	void rawDeformMatrixChanged();
+	void targetWidthChanged();
+	void targetHeightChanged();
+
+public:
+	qreal targetWidth() const {
+		return m_targetWidth;
+	}
+	void setTargetWidth(qreal w);
+
+	qreal targetHeight() const {
+		return m_targetHeight;
+	}
+	void setTargetHeight(qreal h);
 
 protected:
 void componentComplete() override;
@@ -85,8 +100,10 @@ QVector<BlobRectData> m_cachedRects;
 int m_cachedMyIndex = -2;
 float m_pendingDx = 0;
 	float m_pendingDy = 0;
-	float m_pendingDw = 0;
+	qreal m_targetWidth = 0;
-	float m_pendingDh = 0;
+	qreal m_targetHeight = 0;
+	qreal m_lastPolishTargetWidth = -1;
+	qreal m_lastPolishTargetHeight = -1;
 	bool m_cachedHasInverted = false;
 float m_cachedInvertedRadius = 0;
 float m_cachedInvertedOuter[4] = {};

Plugins/ZShell/Internal/hyprextras.cpp

@@ -1,170 +1,12 @@
 #include "hyprextras.hpp"
-#include "hyprdevices.hpp"
 
 #include <qdir.h>
 #include <qjsonarray.h>
 #include <qlocalsocket.h>
-#include <qloggingcategory.h>
-#include <qmetatype.h>
-#include <qregularexpression.h>
 #include <qvariant.h>
 
-Q_LOGGING_CATEGORY(lcHypr, "ZShell.internal.hypr", QtInfoMsg)
-
 namespace ZShell::internal::hypr {
 
-namespace {
-
-static QString luaEscapeString(const QString& s) {
-	QString out;
-	out.reserve(s.size() + 2);
-	out += QLatin1Char('"');
-
-	for (const QChar c : s) {
-		switch (c.unicode()) {
-		case '\\':
-			out += QLatin1String(R"(\\)");
-			break;
-		case '"':
-			out += QLatin1String(R"(\")");
-			break;
-		case '\n':
-			out += QLatin1String(R"(\n)");
-			break;
-		case '\r':
-			out += QLatin1String(R"(\r)");
-			break;
-		case '\t':
-			out += QLatin1String(R"(\t)");
-			break;
-		default:
-			out += c;
-			break;
-		}
-	}
-
-	out += QLatin1Char('"');
-	return out;
-}
-
-static QString luaValue(const QVariant& v);
-
-static QString luaArray(const QVariantList& list) {
-	QStringList parts;
-	parts.reserve(list.size());
-
-	for (const auto& item : list) {
-		parts << luaValue(item);
-	}
-
-	return QLatin1String("{ ") + parts.join(QLatin1String(", ")) + QLatin1String(" }");
-}
-
-static QString luaArray(const QStringList& list) {
-	QStringList parts;
-	parts.reserve(list.size());
-
-	for (const auto& item : list) {
-		parts << luaEscapeString(item);
-	}
-
-	return QLatin1String("{ ") + parts.join(QLatin1String(", ")) + QLatin1String(" }");
-}
-
-static QString luaMapFromHash(const QVariantHash& hash) {
-	QStringList parts;
-	parts.reserve(hash.size());
-
-	for (auto it = hash.cbegin(); it != hash.cend(); ++it) {
-		parts << luaEscapeString(it.key()) + QLatin1String(" = ") + luaValue(it.value());
-	}
-
-	return QLatin1String("{ ") + parts.join(QLatin1String(", ")) + QLatin1String(" }");
-}
-
-static QString luaMap(const QVariantMap& map) {
-	QStringList parts;
-	parts.reserve(map.size());
-
-	for (auto it = map.cbegin(); it != map.cend(); ++it) {
-		parts << luaEscapeString(it.key()) + QLatin1String(" = ") + luaValue(it.value());
-	}
-
-	return QLatin1String("{ ") + parts.join(QLatin1String(", ")) + QLatin1String(" }");
-}
-
-static QString luaValue(const QVariant& v) {
-	if (!v.isValid() || v.isNull()) {
-		return QLatin1String("nil");
-	}
-
-	switch (v.metaType().id()) {
-	case QMetaType::Bool:
-		return v.toBool() ? QLatin1String("true") : QLatin1String("false");
-
-	case QMetaType::Int:
-	case QMetaType::UInt:
-	case QMetaType::LongLong:
-	case QMetaType::ULongLong:
-	case QMetaType::Double:
-		return v.toString();
-
-	case QMetaType::QString:
-		return luaEscapeString(v.toString());
-
-	case QMetaType::QStringList:
-		return luaArray(v.toStringList());
-
-	case QMetaType::QVariantList:
-		return luaArray(v.toList());
-
-	case QMetaType::QVariantMap:
-		return luaMap(v.toMap());
-
-	case QMetaType::QVariantHash:
-		return luaMapFromHash(v.toHash());
-
-	default:
-		return luaEscapeString(v.toString());
-	}
-}
-
-static QString normalizeOptionPath(QString key) {
-	key = key.trimmed();
-	key.replace(QLatin1Char(':'), QLatin1Char('.'));
-	return key;
-}
-
-static QString buildHlConfigCall(const QString& key, const QVariant& value) {
-	const auto parts = normalizeOptionPath(key).split(QLatin1Char('.'), Qt::SkipEmptyParts);
-	if (parts.isEmpty()) {
-		return {};
-	}
-
-	QString out;
-	out.reserve(32 + key.size() + value.toString().size());
-	out += QLatin1String("hl.config({ ");
-
-	for (int i = 0; i < parts.size(); ++i) {
-		out += parts.at(i);
-		out += QLatin1String(" = ");
-		if (i + 1 < parts.size()) {
-			out += QLatin1String("{ ");
-		}
-	}
-
-	out += luaValue(value);
-
-	for (int i = 0; i + 1 < parts.size(); ++i) {
-		out += QLatin1String(" }");
-	}
-
-	out += QLatin1String(" })");
-	return out;
-}
-
-} // namespace
-
 HyprExtras::HyprExtras(QObject* parent)
     : QObject(parent)
     , m_requestSocket("")
@@ -174,22 +16,24 @@ HyprExtras::HyprExtras(QObject* parent)
     , m_devices(new HyprDevices(this)) {
     const auto his = qEnvironmentVariable("HYPRLAND_INSTANCE_SIGNATURE");
     if (his.isEmpty()) {
-		qCWarning(lcHypr) << "$HYPRLAND_INSTANCE_SIGNATURE is unset. Unable to connect to Hyprland socket.";
+        qWarning()
+            << "HyprExtras::HyprExtras: $HYPRLAND_INSTANCE_SIGNATURE is unset. Unable to connect to Hyprland socket.";
         return;
     }
 
     auto hyprDir = QString("%1/hypr/%2").arg(qEnvironmentVariable("XDG_RUNTIME_DIR"), his);
     if (!QDir(hyprDir).exists()) {
-		hyprDir = QStringLiteral("/tmp/hypr/") + his;
+        hyprDir = "/tmp/hypr/" + his;
 
         if (!QDir(hyprDir).exists()) {
-			qCWarning(lcHypr) << "Hyprland socket directory does not exist. Unable to connect to Hyprland socket.";
+            qWarning() << "HyprExtras::HyprExtras: Hyprland socket directory does not exist. Unable to connect to "
+                          "Hyprland socket.";
             return;
         }
     }
 
-	m_requestSocket = hyprDir + QStringLiteral("/.socket.sock");
+    m_requestSocket = hyprDir + "/.socket.sock";
-	m_eventSocket = hyprDir + QStringLiteral("/.socket2.sock");
+    m_eventSocket = hyprDir + "/.socket2.sock";
 
     refreshOptions();
     refreshDevices();
@@ -218,7 +62,7 @@ void HyprExtras::message(const QString& message) {
 
     makeRequest(message, [](bool success, const QByteArray& res) {
         if (!success) {
-				qCWarning(lcHypr) << "message: request error:" << QString::fromUtf8(res);
+            qWarning() << "HyprExtras::message: request error:" << QString::fromUtf8(res);
         }
     });
 }
@@ -228,10 +72,9 @@ void HyprExtras::batchMessage(const QStringList& messages) {
         return;
     }
 
-	makeRequest(QStringLiteral("[[BATCH]]") + messages.join(QLatin1Char(';')),
+    makeRequest("[[BATCH]]" + messages.join(";"), [](bool success, const QByteArray& res) {
-	            [](bool success, const QByteArray& res) {
         if (!success) {
-				qCWarning(lcHypr) << "batchMessage: request error:" << QString::fromUtf8(res);
+            qWarning() << "HyprExtras::batchMessage: request error:" << QString::fromUtf8(res);
         }
     });
 }
@@ -241,25 +84,16 @@ void HyprExtras::applyOptions(const QVariantHash& options) {
         return;
     }
 
-	QStringList calls;
+    QString request = "[[BATCH]]";
-	calls.reserve(options.size());
-
     for (auto it = options.constBegin(); it != options.constEnd(); ++it) {
-		const auto call = buildHlConfigCall(it.key(), it.value());
+        request += QString("keyword %1 %2;").arg(it.key(), it.value().toString());
-		if (!call.isEmpty()) {
-			calls << call;
-		}
     }
 
-	if (calls.isEmpty()) {
+    makeRequest(request, [this](bool success, const QByteArray& res) {
-		return;
-	}
-
-	makeRequest(QStringLiteral("eval ") + calls.join(QLatin1String("; ")), [this](bool success, const QByteArray& res) {
         if (success) {
             refreshOptions();
         } else {
-				qCWarning(lcHypr) << "applyOptions: request error" << QString::fromUtf8(res);
+            qWarning() << "HyprExtras::applyOptions: request error" << QString::fromUtf8(res);
         }
     });
 }
@@ -269,7 +103,7 @@ void HyprExtras::refreshOptions() {
         m_optionsRefresh->close();
     }
 
-	m_optionsRefresh = makeRequestJson(QStringLiteral("descriptions"), [this](bool success, const QJsonDocument& response) {
+    m_optionsRefresh = makeRequestJson("descriptions", [this](bool success, const QJsonDocument& response) {
         m_optionsRefresh.reset();
         if (!success) {
             return;
@@ -280,9 +114,8 @@ void HyprExtras::refreshOptions() {
 
         for (const auto& o : std::as_const(options)) {
             const auto obj = o.toObject();
-				const auto key = obj.value(QStringLiteral("value")).toString();
+            const auto key = obj.value("value").toString();
-				const auto value = obj.value(QStringLiteral("data")).toObject().value(QStringLiteral("current")).toVariant();
+            const auto value = obj.value("data").toObject().value("current").toVariant();
-
             if (m_options.value(key) != value) {
                 dirty = true;
                 m_options.insert(key, value);
@@ -300,7 +133,7 @@ void HyprExtras::refreshDevices() {
         m_devicesRefresh->close();
     }
 
-	m_devicesRefresh = makeRequestJson(QStringLiteral("devices"), [this](bool success, const QJsonDocument& response) {
+    m_devicesRefresh = makeRequestJson("devices", [this](bool success, const QJsonDocument& response) {
         m_devicesRefresh.reset();
         if (success) {
             m_devices->updateLastIpcObject(response.object());
@@ -310,15 +143,15 @@ void HyprExtras::refreshDevices() {
 
 void HyprExtras::socketError(QLocalSocket::LocalSocketError error) const {
     if (!m_socketValid) {
-		qCWarning(lcHypr) << "socketError: unable to connect to Hyprland event socket:" << error;
+        qWarning() << "HyprExtras::socketError: unable to connect to Hyprland event socket:" << error;
     } else {
-		qCWarning(lcHypr) << "socketError: Hyprland event socket error:" << error;
+        qWarning() << "HyprExtras::socketError: Hyprland event socket error:" << error;
     }
 }
 
 void HyprExtras::socketStateChanged(QLocalSocket::LocalSocketState state) {
     if (state == QLocalSocket::UnconnectedState && m_socketValid) {
-		qCWarning(lcHypr) << "socketStateChanged: Hyprland event socket disconnected.";
+        qWarning() << "HyprExtras::socketStateChanged: Hyprland event socket disconnected.";
     }
 
     m_socketValid = state == QLocalSocket::ConnectedState;
@@ -330,23 +163,23 @@ void HyprExtras::readEvent() {
         if (rawEvent.isEmpty()) {
             break;
         }
-		rawEvent.truncate(rawEvent.length() - 1);
+        rawEvent.truncate(rawEvent.length() - 1); // Remove trailing \n
         const auto event = QByteArrayView(rawEvent.data(), rawEvent.indexOf(">>"));
         handleEvent(QString::fromUtf8(event));
     }
 }
 
 void HyprExtras::handleEvent(const QString& event) {
-	if (event == QStringLiteral("configreloaded")) {
+    if (event == "configreloaded") {
         refreshOptions();
-	} else if (event == QStringLiteral("activelayout")) {
+    } else if (event == "activelayout") {
         refreshDevices();
     }
 }
 
 HyprExtras::SocketPtr HyprExtras::makeRequestJson(
     const QString& request, const std::function<void(bool, QJsonDocument)>& callback) {
-	return makeRequest(QStringLiteral("j/") + request, [callback](bool success, const QByteArray& response) {
+    return makeRequest("j/" + request, [callback](bool success, const QByteArray& response) {
         callback(success, QJsonDocument::fromJson(response));
     });
 }
@@ -371,7 +204,7 @@ HyprExtras::SocketPtr HyprExtras::makeRequest(
     });
 
     QObject::connect(socket.data(), &QLocalSocket::errorOccurred, this, [=](QLocalSocket::LocalSocketError err) {
-			qCWarning(lcHypr) << "makeRequest: error making request:" << err << "| request:" << request;
+        qWarning() << "HyprExtras::makeRequest: error making request:" << err << "| request:" << request;
         callback(false, {});
         socket->close();
     });

Plugins/ZShell/Internal/hyprextras.hpp

@@ -1,19 +1,15 @@
 #pragma once
 
+#include "hyprdevices.hpp"
 #include <qlocalsocket.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
-#include <qsharedpointer.h>
-#include <qvariant.h>
 
 namespace ZShell::internal::hypr {
 
-class HyprDevices;
-
 class HyprExtras : public QObject {
     Q_OBJECT
     QML_ELEMENT
-        Q_MOC_INCLUDE("hyprdevices.hpp")
 
     Q_PROPERTY(QVariantHash options READ options NOTIFY optionsChanged)
     Q_PROPERTY(ZShell::internal::hypr::HyprDevices* devices READ devices CONSTANT)

cli/src/zshell/assets/schemes/catppuccin/catppuccin.py

@@ -9,8 +9,14 @@ _data = {
     "variants": {
         "type": "multi",
         "defaults": {
-            "dark": {"m3flavor": "mocha", "m3accent": "mauve"},
+            "dark": {
-            "light": {"m3flavor": "latte", "m3accent": "mauve"},
+                "m3flavor": "mocha",
+                "m3accent": "mauve"
+            },
+            "light": {
+                "m3flavor": "latte",
+                "m3accent": "mauve"
+            }
         },
         "flavors": [
             {
@@ -29,8 +35,8 @@ _data = {
                     "m3surfaceContainerHighest": "#dce0e8",
                     "m3error": "#d20f39",
                     "m3warning": "#fe640b",
-                    "m3info": "#1e66f5",
+                    "m3info": "#1e66f5"
-                },
+                }
             },
             {
                 "id": "frappe",
@@ -48,8 +54,8 @@ _data = {
                     "m3surfaceContainerHighest": "#232634",
                     "m3error": "#e78284",
                     "m3warning": "#ef9f76",
-                    "m3info": "#8caaee",
+                    "m3info": "#8caaee"
-                },
+                }
             },
             {
                 "id": "macchiato",
@@ -67,8 +73,8 @@ _data = {
                     "m3surfaceContainerHighest": "#181926",
                     "m3error": "#ed8796",
                     "m3warning": "#f5a97f",
-                    "m3info": "#8aadf4",
+                    "m3info": "#8aadf4"
-                },
+                }
             },
             {
                 "id": "mocha",
@@ -86,9 +92,9 @@ _data = {
                     "m3surfaceContainerHighest": "#11111b",
                     "m3error": "#f38ba8",
                     "m3warning": "#fab387",
-                    "m3info": "#89b4fa",
+                    "m3info": "#89b4fa"
-                },
+                }
-            },
+            }
         ],
         "accents": [
             {
@@ -99,29 +105,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#e1a99d",
                     "m3secondary": "#d8c7c4",
-                    "m3surfaceTint": "#e1a99d",
+                    "m3surfaceTint": "#e1a99d"
                 },
                 "frappe": {
                     "m3primary": "#f2d5cf",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#b8a5a6",
                     "m3secondary": "#a2748b",
-                    "m3surfaceTint": "#b8a5a6",
+                    "m3surfaceTint": "#b8a5a6"
                 },
                 "macchiato": {
                     "m3primary": "#f4dbd6",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#b6a6a7",
                     "m3secondary": "#9f6f8d",
-                    "m3surfaceTint": "#b6a6a7",
+                    "m3surfaceTint": "#b6a6a7"
                 },
                 "mocha": {
                     "m3primary": "#f5e0dc",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#b5a6a8",
                     "m3secondary": "#9d6d87",
-                    "m3surfaceTint": "#b5a6a8",
+                    "m3surfaceTint": "#b5a6a8"
-                },
+                }
             },
             {
                 "id": "flamingo",
@@ -131,29 +137,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#e29c9d",
                     "m3secondary": "#d7c3c4",
-                    "m3surfaceTint": "#e29c9d",
+                    "m3surfaceTint": "#e29c9d"
                 },
                 "frappe": {
                     "m3primary": "#eebebe",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#b5949a",
                     "m3secondary": "#9d6b80",
-                    "m3surfaceTint": "#b5949a",
+                    "m3surfaceTint": "#b5949a"
                 },
                 "macchiato": {
                     "m3primary": "#f0c6c6",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#b3979c",
                     "m3secondary": "#996780",
-                    "m3surfaceTint": "#b3979c",
+                    "m3surfaceTint": "#b3979c"
                 },
                 "mocha": {
                     "m3primary": "#f2cdcd",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#b3999e",
                     "m3secondary": "#98667c",
-                    "m3surfaceTint": "#b3999e",
+                    "m3surfaceTint": "#b3999e"
-                },
+                }
             },
             {
                 "id": "pink",
@@ -163,29 +169,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#eb9bd7",
                     "m3secondary": "#d9c7d5",
-                    "m3surfaceTint": "#eb9bd7",
+                    "m3surfaceTint": "#eb9bd7"
                 },
                 "frappe": {
                     "m3primary": "#f4b8e4",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#b990b5",
                     "m3secondary": "#996e9e",
-                    "m3surfaceTint": "#b990b5",
+                    "m3surfaceTint": "#b990b5"
                 },
                 "macchiato": {
                     "m3primary": "#f5bde6",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#b791b2",
                     "m3secondary": "#95689a",
-                    "m3surfaceTint": "#b791b2",
+                    "m3surfaceTint": "#b791b2"
                 },
                 "mocha": {
                     "m3primary": "#f5c2e7",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#b591b0",
                     "m3secondary": "#966597",
-                    "m3surfaceTint": "#b591b0",
+                    "m3surfaceTint": "#b591b0"
-                },
+                }
             },
             {
                 "id": "mauve",
@@ -195,29 +201,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#a670f1",
                     "m3secondary": "#c2b8d0",
-                    "m3surfaceTint": "#a670f1",
+                    "m3surfaceTint": "#a670f1"
                 },
                 "frappe": {
                     "m3primary": "#ca9ee6",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#9c7eb6",
                     "m3secondary": "#7d6799",
-                    "m3surfaceTint": "#9c7eb6",
+                    "m3surfaceTint": "#9c7eb6"
                 },
                 "macchiato": {
                     "m3primary": "#c6a0f6",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#967cbe",
                     "m3secondary": "#766597",
-                    "m3surfaceTint": "#967cbe",
+                    "m3surfaceTint": "#967cbe"
                 },
                 "mocha": {
                     "m3primary": "#cba6f7",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#977ebb",
                     "m3secondary": "#756294",
-                    "m3surfaceTint": "#977ebb",
+                    "m3surfaceTint": "#977ebb"
-                },
+                }
             },
             {
                 "id": "red",
@@ -227,29 +233,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#da5371",
                     "m3secondary": "#c0a0a8",
-                    "m3surfaceTint": "#da5371",
+                    "m3surfaceTint": "#da5371"
                 },
                 "frappe": {
                     "m3primary": "#e78284",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#b06a72",
                     "m3secondary": "#8b5d66",
-                    "m3surfaceTint": "#b06a72",
+                    "m3surfaceTint": "#b06a72"
                 },
                 "macchiato": {
                     "m3primary": "#ed8796",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#b16b7a",
                     "m3secondary": "#865a69",
-                    "m3surfaceTint": "#b16b7a",
+                    "m3surfaceTint": "#b16b7a"
                 },
                 "mocha": {
                     "m3primary": "#f38ba8",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#b46b84",
                     "m3secondary": "#85596b",
-                    "m3surfaceTint": "#b46b84",
+                    "m3surfaceTint": "#b46b84"
-                },
+                }
             },
             {
                 "id": "maroon",
@@ -259,29 +265,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#e87883",
                     "m3secondary": "#cfb7ba",
-                    "m3surfaceTint": "#e87883",
+                    "m3surfaceTint": "#e87883"
                 },
                 "frappe": {
                     "m3primary": "#ea999c",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#b27a83",
                     "m3secondary": "#92626f",
-                    "m3surfaceTint": "#b27a83",
+                    "m3surfaceTint": "#b27a83"
                 },
                 "macchiato": {
                     "m3primary": "#ee99a0",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#b27781",
                     "m3secondary": "#8c5e6c",
-                    "m3surfaceTint": "#b27781",
+                    "m3surfaceTint": "#b27781"
                 },
                 "mocha": {
                     "m3primary": "#eba0ac",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#ae7987",
                     "m3secondary": "#895b6c",
-                    "m3surfaceTint": "#ae7987",
+                    "m3surfaceTint": "#ae7987"
-                },
+                }
             },
             {
                 "id": "peach",
@@ -291,29 +297,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#f98e51",
                     "m3secondary": "#c9b7ad",
-                    "m3surfaceTint": "#f98e51",
+                    "m3surfaceTint": "#f98e51"
                 },
                 "frappe": {
                     "m3primary": "#ef9f76",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#b67f68",
                     "m3secondary": "#8f6a5f",
-                    "m3surfaceTint": "#b67f68",
+                    "m3surfaceTint": "#b67f68"
                 },
                 "macchiato": {
                     "m3primary": "#f5a97f",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#b7836a",
                     "m3secondary": "#8c695e",
-                    "m3surfaceTint": "#b7836a",
+                    "m3surfaceTint": "#b7836a"
                 },
                 "mocha": {
                     "m3primary": "#fab387",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#b8876d",
                     "m3secondary": "#8b6a5d",
-                    "m3surfaceTint": "#b8876d",
+                    "m3surfaceTint": "#b8876d"
-                },
+                }
             },
             {
                 "id": "yellow",
@@ -323,29 +329,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#e4ac5d",
                     "m3secondary": "#c6baaa",
-                    "m3surfaceTint": "#e4ac5d",
+                    "m3surfaceTint": "#e4ac5d"
                 },
                 "frappe": {
                     "m3primary": "#e5c890",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#af9b7a",
                     "m3secondary": "#948062",
-                    "m3surfaceTint": "#af9b7a",
+                    "m3surfaceTint": "#af9b7a"
                 },
                 "macchiato": {
                     "m3primary": "#eed49f",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#b2a181",
                     "m3secondary": "#947e62",
-                    "m3surfaceTint": "#b2a181",
+                    "m3surfaceTint": "#b2a181"
                 },
                 "mocha": {
                     "m3primary": "#f9e2af",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#b8a889",
                     "m3secondary": "#978265",
-                    "m3surfaceTint": "#b8a889",
+                    "m3surfaceTint": "#b8a889"
-                },
+                }
             },
             {
                 "id": "green",
@@ -355,29 +361,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#74b867",
                     "m3secondary": "#9fbd9b",
-                    "m3surfaceTint": "#74b867",
+                    "m3surfaceTint": "#74b867"
                 },
                 "frappe": {
                     "m3primary": "#a6d189",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#83a275",
                     "m3secondary": "#648e5e",
-                    "m3surfaceTint": "#83a275",
+                    "m3surfaceTint": "#83a275"
                 },
                 "macchiato": {
                     "m3primary": "#a6da95",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#80a57a",
                     "m3secondary": "#5c8a61",
-                    "m3surfaceTint": "#80a57a",
+                    "m3surfaceTint": "#80a57a"
                 },
                 "mocha": {
                     "m3primary": "#a6e3a1",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#7ea87f",
                     "m3secondary": "#5b8964",
-                    "m3surfaceTint": "#7ea87f",
+                    "m3surfaceTint": "#7ea87f"
-                },
+                }
             },
             {
                 "id": "teal",
@@ -387,29 +393,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#57aeb4",
                     "m3secondary": "#93b4b7",
-                    "m3surfaceTint": "#57aeb4",
+                    "m3surfaceTint": "#57aeb4"
                 },
                 "frappe": {
                     "m3primary": "#81c8be",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#699b9a",
                     "m3secondary": "#588084",
-                    "m3surfaceTint": "#699b9a",
+                    "m3surfaceTint": "#699b9a"
                 },
                 "macchiato": {
                     "m3primary": "#8bd5ca",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#6da29f",
                     "m3secondary": "#577e83",
-                    "m3surfaceTint": "#6da29f",
+                    "m3surfaceTint": "#6da29f"
                 },
                 "mocha": {
                     "m3primary": "#94e2d5",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#71a8a4",
                     "m3secondary": "#588284",
-                    "m3surfaceTint": "#71a8a4",
+                    "m3surfaceTint": "#71a8a4"
-                },
+                }
             },
             {
                 "id": "sky",
@@ -419,29 +425,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#4abcea",
                     "m3secondary": "#a4b9c2",
-                    "m3surfaceTint": "#4abcea",
+                    "m3surfaceTint": "#4abcea"
                 },
                 "frappe": {
                     "m3primary": "#99d1db",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#79a2af",
                     "m3secondary": "#628494",
-                    "m3surfaceTint": "#79a2af",
+                    "m3surfaceTint": "#79a2af"
                 },
                 "macchiato": {
                     "m3primary": "#91d7e3",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#71a3b0",
                     "m3secondary": "#5e7e8c",
-                    "m3surfaceTint": "#71a3b0",
+                    "m3surfaceTint": "#71a3b0"
                 },
                 "mocha": {
                     "m3primary": "#89dceb",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#69a3b3",
                     "m3secondary": "#5a7b88",
-                    "m3surfaceTint": "#69a3b3",
+                    "m3surfaceTint": "#69a3b3"
-                },
+                }
             },
             {
                 "id": "sapphire",
@@ -451,29 +457,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#5db8c8",
                     "m3secondary": "#9eb9be",
-                    "m3surfaceTint": "#5db8c8",
+                    "m3surfaceTint": "#5db8c8"
                 },
                 "frappe": {
                     "m3primary": "#85c1dc",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#6b96af",
                     "m3secondary": "#5e7b8e",
-                    "m3surfaceTint": "#6b96af",
+                    "m3surfaceTint": "#6b96af"
                 },
                 "macchiato": {
                     "m3primary": "#7dc4e4",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#6396b1",
                     "m3secondary": "#5a7486",
-                    "m3surfaceTint": "#6396b1",
+                    "m3surfaceTint": "#6396b1"
                 },
                 "mocha": {
                     "m3primary": "#74c7ec",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#5a95b4",
                     "m3secondary": "#567080",
-                    "m3surfaceTint": "#5a95b4",
+                    "m3surfaceTint": "#5a95b4"
-                },
+                }
             },
             {
                 "id": "blue",
@@ -483,29 +489,29 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#5c90f5",
                     "m3secondary": "#b1bacb",
-                    "m3surfaceTint": "#5c90f5",
+                    "m3surfaceTint": "#5c90f5"
                 },
                 "frappe": {
                     "m3primary": "#8caaee",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#7086bc",
                     "m3secondary": "#637195",
-                    "m3surfaceTint": "#7086bc",
+                    "m3surfaceTint": "#7086bc"
                 },
                 "macchiato": {
                     "m3primary": "#8aadf4",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#6c85bc",
                     "m3secondary": "#5f6d8f",
-                    "m3surfaceTint": "#6c85bc",
+                    "m3surfaceTint": "#6c85bc"
                 },
                 "mocha": {
                     "m3primary": "#89b4fa",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#6987bd",
                     "m3secondary": "#5d6c8b",
-                    "m3surfaceTint": "#6987bd",
+                    "m3surfaceTint": "#6987bd"
-                },
+                }
             },
             {
                 "id": "lavender",
@@ -515,30 +521,30 @@ _data = {
                     "m3primaryText": "#eff1f5",
                     "m3primaryContainer": "#97a7fb",
                     "m3secondary": "#cdcfdd",
-                    "m3surfaceTint": "#97a7fb",
+                    "m3surfaceTint": "#97a7fb"
                 },
                 "frappe": {
                     "m3primary": "#babbf1",
                     "m3primaryText": "#303446",
                     "m3primaryContainer": "#9192be",
                     "m3secondary": "#7175a1",
-                    "m3surfaceTint": "#9192be",
+                    "m3surfaceTint": "#9192be"
                 },
                 "macchiato": {
                     "m3primary": "#b7bdf8",
                     "m3primaryText": "#24273a",
                     "m3primaryContainer": "#8b91bf",
                     "m3secondary": "#6b709d",
-                    "m3surfaceTint": "#8b91bf",
+                    "m3surfaceTint": "#8b91bf"
                 },
                 "mocha": {
                     "m3primary": "#b4befe",
                     "m3primaryText": "#1e1e2e",
                     "m3primaryContainer": "#878ec0",
                     "m3secondary": "#676d99",
-                    "m3surfaceTint": "#878ec0",
+                    "m3surfaceTint": "#878ec0"
-                },
+                }
-            },
+            }
-        ],
+        ]
-    },
+    }
 }

cli/src/zshell/subcommands/preset.py

@@ -1,13 +1,11 @@
-# import json
+import json
-# import typer
+import typer
-# from zshell.assets.schemes.catppuccin import catppuccin
+from zshell.assets.schemes.catppuccin import catppuccin
-#
-# app = typer.Typer()
-#
-# SCHEMES = catppuccin.variants.flavors
-#
-#
-# @app.command()
-# def set():
 
-# TODO: Currently unsused
+app = typer.Typer()
+
+SCHEMES = catppuccin.variants.flavors
+
+
+@app.command()
+def set():

cli/src/zshell/subcommands/record.py

@@ -1,16 +1,14 @@
-# import typer
+import typer
-# import subprocess
+import subprocess
-#
-# from typing import Optional
-#
-# app = typer.Typer()
-#
-# RECORDER = "gpu-screen-recorder"
-# HOME = str(os.getenv("HOME"))
-# CONFIG = Path(HOME + "/.config/zshell/config.json")
-#
-#
-# @app.command()
-# def start():
 
-# TODO: Currently unused
+from typing import Optional
+
+app = typer.Typer()
+
+RECORDER = "gpu-screen-recorder"
+HOME = str(os.getenv("HOME"))
+CONFIG = Path(HOME + "/.config/zshell/config.json")
+
+
+@app.command()
+def start():

cli/src/zshell/subcommands/scheme.py

@@ -23,71 +23,64 @@ app = typer.Typer()
 @app.command()
 def generate(
     # image inputs (optional - used for image mode)
-    image_path: Optional[Path] = typer.Option(None, help="Path to source image. Required for image mode."),
+    image_path: Optional[Path] = typer.Option(
+        None, help="Path to source image. Required for image mode."),
     scheme: Optional[str] = typer.Option(
-        None, help="Color scheme algorithm to use for image mode. Ignored in preset mode."
+        None, help="Color scheme algorithm to use for image mode. Ignored in preset mode."),
-    ),
     # preset inputs (optional - used for preset mode)
     preset: Optional[str] = typer.Option(
-        None, help="Name of a premade scheme in this format: <preset_name>:<preset_flavor>"
+        None, help="Name of a premade scheme in this format: <preset_name>:<preset_flavor>"),
-    ),
+    mode: Optional[str] = typer.Option(
-    mode: Optional[str] = typer.Option(None, help="Mode of the preset scheme (dark or light)."),
+        None, help="Mode of the preset scheme (dark or light)."),
 ):
 
     HOME = str(os.getenv("HOME"))
     OUTPUT = Path(HOME + "/.local/state/zshell/scheme.json")
     SEQ_STATE = Path(HOME + "/.local/state/zshell/sequences.txt")
-    THUMB_PATH = Path(HOME + "/.cache/zshell/imagecache/thumbnail.jpg")
+    THUMB_PATH = Path(HOME +
-    WALL_DIR_PATH = Path(HOME + "/.local/state/zshell/wallpaper_path.json")
+                      "/.cache/zshell/imagecache/thumbnail.jpg")
+    WALL_DIR_PATH = Path(HOME +
+                         "/.local/state/zshell/wallpaper_path.json")
 
     TEMPLATE_DIR = Path(HOME + "/.config/zshell/templates")
     WALL_PATH = Path()
     CONFIG = Path(HOME + "/.config/zshell/config.json")
 
     if preset is not None and image_path is not None:
-        raise typer.BadParameter("Use either --image-path or --preset, not both.")
+        raise typer.BadParameter(
+            "Use either --image-path or --preset, not both.")
 
     def get_scheme_class(scheme_name: str):
         match scheme_name:
             case "fruit-salad":
                 from materialyoucolor.scheme.scheme_fruit_salad import SchemeFruitSalad
-
                 return SchemeFruitSalad
             case "expressive":
                 from materialyoucolor.scheme.scheme_expressive import SchemeExpressive
-
                 return SchemeExpressive
             case "monochrome":
                 from materialyoucolor.scheme.scheme_monochrome import SchemeMonochrome
-
                 return SchemeMonochrome
             case "rainbow":
                 from materialyoucolor.scheme.scheme_rainbow import SchemeRainbow
-
                 return SchemeRainbow
             case "tonal-spot":
                 from materialyoucolor.scheme.scheme_tonal_spot import SchemeTonalSpot
-
                 return SchemeTonalSpot
             case "neutral":
                 from materialyoucolor.scheme.scheme_neutral import SchemeNeutral
-
                 return SchemeNeutral
             case "fidelity":
                 from materialyoucolor.scheme.scheme_fidelity import SchemeFidelity
-
                 return SchemeFidelity
             case "content":
                 from materialyoucolor.scheme.scheme_content import SchemeContent
-
                 return SchemeContent
             case "vibrant":
                 from materialyoucolor.scheme.scheme_vibrant import SchemeVibrant
-
                 return SchemeVibrant
             case _:
                 from materialyoucolor.scheme.scheme_fruit_salad import SchemeFruitSalad
-
                 return SchemeFruitSalad
 
     def hex_to_hct(hex_color: str) -> Hct:
@@ -170,11 +163,16 @@ def generate(
     def harmonize(from_hct: Hct, to_hct: Hct, tone_boost: float) -> Hct:
         diff = difference_degrees(from_hct.hue, to_hct.hue)
         rotation = min(diff * 0.8, 100)
-        output_hue = sanitize_degrees_double(from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue))
+        output_hue = sanitize_degrees_double(
+            from_hct.hue
+            + rotation * rotation_direction(from_hct.hue, to_hct.hue)
+        )
         tone = max(0.0, min(100.0, from_hct.tone * (1 + tone_boost)))
         return Hct.from_hct(output_hue, from_hct.chroma, tone)
 
-    def terminal_palette(colors: dict[str, str], mode: str, variant: str) -> dict[str, str]:
+    def terminal_palette(
+        colors: dict[str, str], mode: str, variant: str
+    ) -> dict[str, str]:
         light = mode.lower() == "light"
 
         key_hex = (
@@ -309,7 +307,7 @@ def generate(
             "seed": seed.to_int(),
             "flavor": flavor,
             "variant": variant,
-            "colors": colors,
+            "colors": colors
         }
 
         for k, v in colors.items():
@@ -408,7 +406,8 @@ def generate(
                 template = env.from_string(body)
                 text = template.render(**context)
             except Exception as e:
-                raise RuntimeError(f"Template render failed for '{rel}': {e}") from e
+                raise RuntimeError(
+                    f"Template render failed for '{rel}': {e}") from e
 
             out_path.write_text(text, encoding="utf-8")
 
@@ -436,13 +435,18 @@ def generate(
         try:
             return PRESETS[name].primary
         except KeyError:
-            raise typer.BadParameter(f"Preset '{name}' not found. Available presets: {', '.join(PRESETS.keys())}")
+            raise typer.BadParameter(
+                f"Preset '{name}' not found. Available presets: {', '.join(PRESETS.keys())}")
 
     def generate_color_scheme(seed: Hct, mode: str, scheme_class) -> dict[str, str]:
 
         is_dark = mode.lower() == "dark"
 
-        scheme = scheme_class(seed, is_dark, 0.0)
+        scheme = scheme_class(
+            seed,
+            is_dark,
+            0.0
+        )
 
         color_dict = {}
         for color in vars(MaterialDynamicColors).keys():
@@ -495,7 +499,7 @@ def generate(
             "mode": effective_mode,
             "variant": scheme,
             "colors": colors,
-            "seed": seed.to_int(),
+            "seed": seed.to_int()
         }
 
         if TEMPLATE_DIR is not None:
@@ -507,7 +511,7 @@ def generate(
                 wallpaper_path=wp,
                 name=name,
                 flavor=flavor,
-                variant=scheme,
+                variant=scheme
             )
 
             rendered = render_all_templates(

cli/src/zshell/subcommands/screenshot.py

@@ -8,9 +8,11 @@ app = typer.Typer()
 
 @app.command()
 def start():
-    subprocess.run(args + ["ipc"] + ["call"] + ["picker"] + ["open"], check=True)
+    subprocess.run(args + ["ipc"] + ["call"] +
+                   ["picker"] + ["open"], check=True)
 
 
 @app.command()
 def start_freeze():
-    subprocess.run(args + ["ipc"] + ["call"] + ["picker"] + ["openFreeze"], check=True)
+    subprocess.run(args + ["ipc"] + ["call"] +
+                   ["picker"] + ["openFreeze"], check=True)

cli/src/zshell/subcommands/shell.py

@@ -33,4 +33,5 @@ def lock():
 
 @app.command()
 def call(target: str, method: str, method_args: list[str] = typer.Argument(None)):
-    subprocess.run(args + ["ipc"] + ["call"] + [target] + [method] + method_args, check=True)
+    subprocess.run(args + ["ipc"] + ["call"] + [target] +
+                   [method] + method_args, check=True)

cli/src/zshell/subcommands/wallpaper.py

@@ -12,7 +12,8 @@ app = typer.Typer()
 
 @app.command()
 def set(wallpaper: Path):
-    subprocess.run(args + ["ipc"] + ["call"] + ["wallpaper"] + ["set"] + [wallpaper], check=True)
+    subprocess.run(args + ["ipc"] + ["call"] +
+                   ["wallpaper"] + ["set"] + [wallpaper], check=True)
 
 
 @app.command()
@@ -25,15 +26,15 @@ def lockscreen(
             Path,
             typer.Option(),
         ],
-    blur_amount: int = 20,
+        blur_amount: int = 20
 ):
     img = Image.open(input_image)
     size = img.size
-    if blur_amount == 0:
+    if (blur_amount == 0):
         img.save(output_path, "PNG")
         return
 
-    if size[0] < 3840 or size[1] < 2160:
+    if (size[0] < 3840 or size[1] < 2160):
         img = img.resize((size[0] // 2, size[1] // 2), Image.NEAREST)
     else:
         img = img.resize((size[0] // 4, size[1] // 4), Image.NEAREST)

eslint.config.js

@@ -1,16 +1,14 @@
 export default [
-    {
-        ignores: ["scripts/fzf.js", "scripts/fuzzysort.js"],
-    },
   {
     files: ["**/*.{js,jsx,ts,tsx,mjs,cjs}"],
     languageOptions: {
       ecmaVersion: 2021,
-            sourceType: "module",
+      sourceType: "module"
     },
     linterOptions: {
-            reportUnusedDisableDirectives: true,
+      reportUnusedDisableDirectives: true
-        },
-        rules: {},
     },
+    rules: {
+    }
+  }
 ];

zshell-img-tools/src/effects.rs

@@ -39,10 +39,8 @@ pub fn apply_rounded_corners(img: RgbaImage, radius: f32) -> RgbaImage {
     );
 
     let mut pixmap = rgba_image_to_pixmap(&img);
-    let dst_paint = PixmapPaint {
+    let mut dst_paint = PixmapPaint::default();
-        blend_mode: BlendMode::DestinationIn,
+    dst_paint.blend_mode = BlendMode::DestinationIn;
-        ..Default::default()
-    };
     pixmap.draw_pixmap(0, 0, mask.as_ref(), &dst_paint, Transform::identity(), None);
     pixmap_to_rgba_image(pixmap)
 }
@@ -71,10 +69,8 @@ pub fn apply_drop_shadow(
     let shadow_x = (extra_left as f32 + offset_x) as i32;
     let shadow_y = (extra_top as f32 + offset_y) as i32;
 
-    let sp = PixmapPaint {
+    let mut sp = PixmapPaint::default();
-        blend_mode: BlendMode::Source,
+    sp.blend_mode = BlendMode::Source;
-        ..Default::default()
-    };
     shadow_pixmap.draw_pixmap(
         shadow_x,
         shadow_y,
@@ -91,10 +87,8 @@ pub fn apply_drop_shadow(
     let blurred_pixmap = rgba_image_to_pixmap(&blurred);
 
     let mut canvas = Pixmap::new(canvas_w, canvas_h).expect("canvas pixmap");
-    let p = PixmapPaint {
+    let mut p = PixmapPaint::default();
-        blend_mode: BlendMode::Source,
+    p.blend_mode = BlendMode::Source;
-        ..Default::default()
-    };
     canvas.draw_pixmap(
         0,
         0,
@@ -104,10 +98,8 @@ pub fn apply_drop_shadow(
         None,
     );
 
-    let p2 = PixmapPaint {
+    let mut p2 = PixmapPaint::default();
-        blend_mode: BlendMode::SourceOver,
+    p2.blend_mode = BlendMode::SourceOver;
-        ..Default::default()
-    };
     canvas.draw_pixmap(
         extra_left as i32,
         extra_top as i32,

zshell-img-tools/src/main.rs

@@ -1,7 +1,7 @@
 mod config;
 mod effects;
 
-use anyhow::{Context, Result, bail};
+use anyhow::{bail, Context, Result};
 use std::io::Write as _;
 use std::process::{Command, Stdio};