initial commit, primitive loading of QML code outside of shell directory

Reviewed-on: #98
Reviewed-by: AramJonghu <2+aramjonghu@noreply.git.zach-dev.cc>

.gitea/workflows/lint-js.yml

@@ -0,0 +1,42 @@
+name: Lint & Format (JS/TS)
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  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
+                    if [ -f package.json ]; then
+                      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"
+                    else
+                      echo "No eslint config found"
+                    fi
+                  else
+                    echo "No JS/TS files found"
+                  fi

.gitea/workflows/lint-python.yml

@@ -0,0 +1,65 @@
+name: Python
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git \
+                    python3 \
+                    py3-pip
+                  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 .
+
+    test:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git \
+                    python3 \
+                    py3-pip \
+                    py3-pillow \
+                    build-base
+                  python3 -m venv .venv
+                  . .venv/bin/activate
+                  pip install --no-cache-dir \
+                    typer \
+                    pillow \
+                    materialyoucolor \
+                    jinja2 \
+                    pytest
+
+            - name: Test
+              run: |
+                  . .venv/bin/activate
+                  cd cli
+                  python -m pytest tests/ -v

.gitea/workflows/lint-rust.yml

@@ -0,0 +1,72 @@
+name: Lint & Format (Rust)
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-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
+                    for manifest in $(find . -name "Cargo.toml"); do
+                      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
+                  else
+                    echo "No Rust project found"
+                  fi

.prettierignore

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

.prettierrc.json

@@ -0,0 +1,13 @@
+{
+    "semi": true,
+    "singleQuote": false,
+    "jsxSingleQuote": false,
+    "tabWidth": 4,
+    "printWidth": 80,
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "bracketSameLine": false,
+    "arrowParens": "always",
+    "endOfLine": "lf",
+    "proseWrap": "preserve"
+}

CMakeLists.txt

@@ -31,6 +31,13 @@ if("shell" IN_LIST ENABLE_MODULES)
 	foreach(dir assets scripts Components Config Modules Daemons Drawers Effects Helpers Paths)
         install(DIRECTORY ${dir} DESTINATION "${INSTALL_QSCONFDIR}")
     endforeach()
-	install(FILES shell.qml DESTINATION "${INSTALL_QSCONFDIR}")
+
+	# Disable watching for changes
+	file(READ shell.qml SHELL_QML)
+	string(REPLACE "settings.watchFiles: true" "settings.watchFiles: false" SHELL_QML "${SHELL_QML}")
+	file(WRITE "${CMAKE_BINARY_DIR}/qml/shell.qml" "${SHELL_QML}")
+	install(FILES "${CMAKE_BINARY_DIR}/qml/shell.qml" DESTINATION "${INSTALL_QSCONFDIR}")
+
+	# Greeter
 	install(DIRECTORY Greeter/ DESTINATION "${INSTALL_GREETERCONFDIR}")
 endif()

Components/CustomSplitButtonRow.qml

@@ -8,20 +8,34 @@ Item {
 	id: root
 
 	property alias active: splitButton.active
+	property alias buttonAlias: splitButton
 	property bool enabled: true
 	property alias expanded: splitButton.expanded
 	property int expandedZ: 100
 	required property string label
 	property alias menuItems: splitButton.menuItems
+	property bool shouldBeActive: true
 	property alias type: splitButton.type
 
 	signal selected(item: MenuItem)
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
 	clip: false
+	implicitHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
 	z: root.expanded ? expandedZ : -1
 
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+
 	RowLayout {
 		id: row
 

Components/CustomText.qml

@@ -15,6 +15,7 @@ Text {
 	color: DynamicColors.palette.m3onSurface
 	font.family: Appearance.font.family.sans
 	font.pointSize: Appearance.font.size.normal
+	linkColor: DynamicColors.palette.m3onPrimaryFixedVariant
 	renderType: Text.NativeRendering
 	textFormat: Text.PlainText
 

Components/HoverIconButton.qml

@@ -0,0 +1,33 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Config
+
+IconButton {
+	id: root
+
+	required property bool shouldBeVisible
+
+	opacity: 0
+	scale: 0
+	visible: root.scale > 0
+
+	Behavior on opacity {
+		Anim {
+			duration: Appearance.anim.durations.small
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+
+	onShouldBeVisibleChanged: {
+		if (root.shouldBeVisible) {
+			root.opacity = 1;
+			root.scale = 1;
+		} else {
+			root.opacity = 0;
+			root.scale = 0;
+		}
+	}
+}

Components/IconButton.qml

@@ -41,12 +41,11 @@ CustomRect {
 	color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
 	implicitHeight: label.implicitHeight + padding * 2
 	implicitWidth: implicitHeight
-	radius: internalChecked ? 6 : implicitHeight / 2 * Math.min(1, 1)
+	radius: internalChecked ? 6 : (implicitHeight / 2 * Math.min(1, 1)) * Appearance.rounding.scale
 
 	Behavior on radius {
 		Anim {
 			id: radiusAnim
-
 		}
 	}
 

Config/BackgroundConfig.qml

@@ -7,4 +7,8 @@ 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,6 +58,7 @@ JsonObject {
 	property Popouts popouts: Popouts {
 	}
 	property int rounding: 8
+	property int smoothing: 32
 
 	component Popouts: JsonObject {
 		property bool activeWindow: true

Config/Colors.qml

@@ -1,5 +1,13 @@
 import Quickshell.Io
 
 JsonObject {
+	property Presets presets: Presets {
+	}
 	property string schemeType: "vibrant"
+
+	component Presets: JsonObject {
+		property string accent: ""
+		property string name: ""
+		property string variant: ""
+	}
 }

Config/Config.qml

@@ -22,6 +22,7 @@ Singleton {
 	property alias notifs: adapter.notifs
 	property alias osd: adapter.osd
 	property alias overview: adapter.overview
+	property alias plugins: adapter.plugins
 	property bool recentlySaved: false
 	property alias screenshot: adapter.screenshot
 	property alias services: adapter.services
@@ -83,6 +84,10 @@ 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
 		};
@@ -94,6 +99,7 @@ Singleton {
 			hideWhenNotif: barConfig.hideWhenNotif,
 			rounding: barConfig.rounding,
 			border: barConfig.border,
+			smoothing: barConfig.smoothing,
 			height: barConfig.height,
 			popouts: {
 				tray: barConfig.popouts.tray,
@@ -110,7 +116,12 @@ Singleton {
 
 	function serializeColors(): var {
 		return {
-			schemeType: colors.schemeType
+			schemeType: colors.schemeType,
+			presets: {
+				name: colors.presets.name,
+				variant: colors.presets.variant,
+				accent: colors.presets.accent
+			}
 		};
 	}
 
@@ -130,7 +141,8 @@ Singleton {
 			launcher: serializeLauncher(),
 			colors: serializeColors(),
 			dock: serializeDock(),
-			screenshot: serializeScreenshot()
+			screenshot: serializeScreenshot(),
+			plugins: serializePlugins()
 		};
 	}
 
@@ -236,6 +248,8 @@ Singleton {
 		return {
 			recolorLogo: lock.recolorLogo,
 			enableFprint: lock.enableFprint,
+			showNotifContent: lock.showNotifContent,
+			showNotifIcon: lock.showNotifIcon,
 			maxFprintTries: lock.maxFprintTries,
 			blurAmount: lock.blurAmount,
 			sizes: {
@@ -277,6 +291,13 @@ Singleton {
 		};
 	}
 
+	function serializePlugins(): var {
+		return {
+			enabled: plugins.enabled,
+			entries: plugins.entries
+		};
+	}
+
 	function serializeScreenshot(): var {
 		return {
 			enable_pp: screenshot.enable_pp,
@@ -446,6 +467,8 @@ Singleton {
 			}
 			property Overview overview: Overview {
 			}
+			property PluginConfig plugins: PluginConfig {
+			}
 			property Screenshot screenshot: Screenshot {
 			}
 			property Services services: Services {

Config/DynamicColors.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import Quickshell.Io
+import Quickshell.Hyprland
 import QtQuick
 import ZShell
 import qs.Helpers
@@ -29,9 +30,10 @@ Singleton {
 	readonly property alias wallLuminance: analyser.luminance
 
 	function alterColor(c: color, a: real, layer: int): color {
-		const luminance = getLuminance(c);
+		const initLuminance = getLuminance(c);
+		const luminance = Math.max(initLuminance, 0.001);
 
-		const offset = (!light || layer == 1 ? 1 : -layer / 2) * (light ? 0.2 : 0.3) * (1 - transparency.base) * (1 + wallLuminance * (light ? (layer == 1 ? 3 : 1) : 2.5));
+		const offset = (!light || layer == 1 ? 1 : -layer / 2) * (light ? 0.2 : 0.3) * (0.2 + 0.3 * (1 - transparency.base)) * (1 + wallLuminance * (light ? (layer == 1 ? 3 : 1) : 2.5));
 		const scale = (luminance + offset) / luminance;
 		const r = Math.max(0, Math.min(1, c.r * scale));
 		const g = Math.max(0, Math.min(1, c.g * scale));
@@ -79,10 +81,32 @@ Singleton {
 	}
 
 	function reloadHyprRules(): void {
-		const barStr = "keyword layerrule %1 %2, match:namespace ZShell-Bar";
-		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)]);
-		Hypr.extras.batchMessage([authStr.arg("blur").arg(transparency.enabled ? 1 : 0), authStr.arg("ignore_alpha").arg(transparency.base - 0.03)]);
+		const blur = transparency.enabled ? 1 : 0;
+		const alpha = transparency.base - 0.03;
+
+		const rules = `
+			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 {
@@ -93,6 +117,14 @@ Singleton {
 
 	Component.onCompleted: debounceTimer.triggered()
 
+	Connections {
+		function onUsingLuaChanged(): void {
+			root.reloadHyprRules();
+		}
+
+		target: Hyprland
+	}
+
 	Connections {
 		function onConfigReloaded(): void {
 			root.reloadHyprRules();

Config/LockConf.qml

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

Config/PluginConfig.qml

@@ -0,0 +1,11 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool enabled: false
+	property list<var> entries: [
+		{
+			id: "Plugin",
+			enabled: false
+		},
+	]
+}

Drawers/Drawing.qml

@@ -3,184 +3,33 @@ 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 pendingSegments: []
-	property bool strokeActive: false
-	property var strokes: []
+	property var points: []
 
-	function appendPoint(x, y) {
-		if (!strokeActive || strokes.length === 0)
+	function clear(): void {
+		var ctx = getContext('2d');
+		root.points = [];
+		ctx.reset();
+		root.requestPaint();
+	}
+
+	renderStrategy: Canvas.Cooperative
+
+	onPaint: {
+		if (points.length < 2)
 			return;
-		const dx = x - lastPoint.x;
-		const dy = y - lastPoint.y;
-
-		if ((dx * dx + dy * dy) < (minPointDistance * minPointDistance))
-			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.arc(x, y, penWidth / 2, 0, Math.PI * 2);
-		ctx.fill();
-	}
-
-	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();
-		}
-	}
-
-	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");
-
+		var ctx = root.getContext('2d');
+		ctx.save();
+		ctx.lineWidth = root.penWidth;
+		ctx.strokeStyle = root.penColor;
 		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 = [];
+		ctx.beginPath();
+		ctx.moveTo(points[0].x, points[0].y);
+		for (var i = 1; i < points.length; i++)
+			ctx.lineTo(points[i].x, points[i].y);
+		ctx.stroke();
+		points = points.slice(points.length - 2);
+		ctx.restore();
 	}
-	onWidthChanged: requestFullRepaint()
 }

Drawers/DrawingInput.qml

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

Drawers/Exclusions.qml

@@ -12,22 +12,37 @@ Scope {
 	required property ShellScreen screen
 
 	ExclusionZone {
+		id: top
+
 		anchors.top: true
 		exclusiveZone: root.bar.exclusiveZone
 	}
 
 	ExclusionZone {
+		id: left
+
 		anchors.left: true
 	}
 
 	ExclusionZone {
+		id: right
+
 		anchors.right: true
 	}
 
 	ExclusionZone {
+		id: bottom
+
 		anchors.bottom: true
 	}
 
+	Timer {
+		interval: 5000
+		running: true
+
+		onTriggered: console.log("top height:", top.exclusiveZone, "left width:", left.exclusiveZone, "right width:", right.exclusiveZone, "bottom height:", bottom.exclusiveZone)
+	}
+
 	component ExclusionZone: CustomWindow {
 		exclusiveZone: Config.barConfig.border
 		implicitHeight: 1

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;
 		}
 
@@ -96,25 +96,25 @@ CustomMouseArea {
 			if (dragY < -10)
 				visibilities.dock = true;
 
-			if (panels.sidebar.width === 0) {
-				const showOsd = inRightPanel(panels.osdWrapper, x, y);
+		if (panels.sidebar.width === 0) {
+			const showOsd = inRightPanel(panels.osdWrapper, x, y);
 
-				if (showOsd) {
-					osdShortcutActive = false;
-					root.panels.osd.hovered = true;
-				}
-			} else {
-				const outOfSidebar = x < width - panels.sidebar.width;
-				const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
-
-				if (!osdShortcutActive) {
-					visibilities.osd = showOsd;
-					root.panels.osd.hovered = showOsd;
-				} else if (showOsd) {
-					osdShortcutActive = false;
-					root.panels.osd.hovered = true;
-				}
+			if (showOsd) {
+				osdShortcutActive = false;
+				root.panels.osd.hovered = true;
 			}
+		} else {
+			const outOfSidebar = x < width - panels.sidebar.width;
+			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
+
+			if (!osdShortcutActive) {
+				visibilities.osd = showOsd;
+				root.panels.osd.hovered = showOsd;
+			} else if (showOsd) {
+				osdShortcutActive = false;
+				root.panels.osd.hovered = true;
+			}
+		}
 
 		if (Config.dock.enable && !Config.dock.hoverToReveal && !visibilities.dock && !visibilities.launcher && inBottomPanel(panels.dock, x, y))
 			visibilities.dock = true;

Drawers/Panels.qml

@@ -34,6 +34,7 @@ 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 utilities: utilities
@@ -176,15 +177,25 @@ Item {
 		visibilities: root.visibilities
 	}
 
-	Settings.Wrapper {
-		id: settings
+	Item {
+		id: settingsWrapper
 
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
-		// anchors.centerIn: parent
-		panels: root
-		screen: root.screen
-		visibilities: root.visibilities
+		clip: true
+		implicitHeight: settings.implicitHeight * (1 - settings.offsetScale)
+		implicitWidth: settings.implicitWidth
+
+		Settings.Wrapper {
+			id: settings
+
+			anchors.horizontalCenter: parent.horizontalCenter
+			anchors.top: parent.top
+			// anchors.centerIn: parent
+			panels: root
+			screen: root.screen
+			visibilities: root.visibilities
+		}
 	}
 
 	Dock.Wrapper {

Drawers/Windows.qml

@@ -158,6 +158,7 @@ Variants {
 					id: blobGroup
 
 					color: DynamicColors.palette.m3surface
+					smoothing: Config.barConfig.smoothing
 
 					Behavior on color {
 						CAnim {
@@ -179,28 +180,34 @@ Variants {
 				PanelBg {
 					id: dashBg
 
-					deformAmount: 0.08 * Config.appearance.deform.scale
-					implicitHeight: panels.dashboard.height
+					property real extraHeight: 0.2
+
+					deformAmount: 0.06
+					implicitHeight: panels.dashboard.height * (1 + extraHeight)
 					implicitWidth: panels.dashboard.width
-					panel: panels.dashboard
+					panel: panels.dashboardWrapper
 					radius: Appearance.rounding.normal
 					x: panels.dashboardWrapper.x + panels.dashboard.x + Config.barConfig.border
-					y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight
+					y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight - panels.dashboard.height * extraHeight
 				}
 
 				PanelBg {
 					id: launcherBg
 
-					deformAmount: 0.08 * Config.appearance.deform.scale
+					property real extraHeight: 0.2
+
+					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.08 * Config.appearance.deform.scale
+					deformAmount: 0.04
 					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
 					implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
 					panel: panels.sidebar
@@ -209,10 +216,10 @@ Variants {
 				PanelBg {
 					id: osdBg
 
-					deformAmount: 0.1 * Config.appearance.deform.scale
+					deformAmount: 0.1
 					implicitHeight: panels.osd.height
 					implicitWidth: panels.osd.width
-					panel: panels.osd
+					panel: panels.osdWrapper
 					radius: 20
 					x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
 					y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
@@ -227,7 +234,7 @@ Variants {
 				PanelBg {
 					id: utilsBg
 
-					deformAmount: panels.sidebar.visible ? (0.1 * Config.appearance.deform.scale) : (0.1 * Config.appearance.deform.scale)
+					deformAmount: panels.sidebar.visible ? (0.1) : (0.1)
 					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg]
 					panel: panels.utilities
 					topLeftRadius: 0
@@ -238,11 +245,11 @@ Variants {
 
 					property real extraHeight: panels.popouts.isDetached ? 0 : 0.2
 
-					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
+					deformAmount: panels.popouts.isDetached ? 0.05 : panels.popouts.hasCurrent ? 0.15 : 0.1
 					implicitHeight: panels.popouts.height * (1 + extraHeight)
 					implicitWidth: panels.popouts.width
-					panel: panels.popouts
-					radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : Appearance.rounding.smallest
+					panel: panels.popoutsWrapper
+					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
 
@@ -255,10 +262,10 @@ Variants {
 				PanelBg {
 					id: resourcesBg
 
-					deformAmount: 0.08 * Config.appearance.deform.scale
+					deformAmount: 0.05
 					implicitHeight: panels.resources.height
 					implicitWidth: panels.resources.width
-					panel: panels.resources
+					panel: panels.resourcesWrapper
 					radius: Appearance.rounding.normal
 					x: panels.resourcesWrapper.x + panels.resources.x + Config.barConfig.border
 					y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
@@ -267,17 +274,23 @@ Variants {
 				PanelBg {
 					id: settingsBg
 
-					deformAmount: 0.08 * Config.appearance.deform.scale
+					property real extraHeight: 0.2
+
+					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 * Config.appearance.deform.scale
+					deformAmount: 0.08
 					panel: panels.dock
 					radius: Appearance.rounding.normal
 				}
@@ -285,7 +298,7 @@ Variants {
 				PanelBg {
 					id: drawingBg
 
-					deformAmount: 0.08 * Config.appearance.deform.scale
+					deformAmount: 0.08
 					panel: panels.drawing
 					radius: Appearance.rounding.normal
 				}
@@ -380,7 +393,7 @@ Variants {
 		property real deformAmount: 0.15
 		required property Item panel
 
-		deformScale: deformAmount / 10000
+		deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
 		group: blobGroup
 		implicitHeight: panel.height
 		implicitWidth: panel.width

Extensions/FetchPlugins.qml

@@ -0,0 +1,18 @@
+pragma Singleton
+
+import Quickshell
+import ZShell.Models
+
+Singleton {
+	id: root
+
+	property alias plugins: plugins.entries
+
+	FileSystemModel {
+		id: plugins
+
+		nameFilters: ["*.qml"]
+		path: Quickshell.env("HOME") + "/.config/zshell"
+		recursive: false
+	}
+}

Extensions/LoadExtensions.qml

@@ -0,0 +1,17 @@
+import Quickshell
+import QtQuick
+import ZShell.Models
+import qs.Config
+
+Repeater {
+	model: FetchPlugins.plugins
+
+	LazyLoader {
+		required property FileSystemEntry modelData
+
+		activeAsync: Config.plugins.entries.some(p => {
+			return p.id === modelData.baseName && p.enabled;
+		})
+		source: modelData.path
+	}
+}

Greeter/GreeterState.qml

@@ -16,27 +16,14 @@ Scope {
 	property bool launching: false
 	property string promptMessage: ""
 	readonly property var selectedSession: sessionIndex >= 0 ? sessions[sessionIndex] : null
+	readonly property var selectedUser: Users.selectedUser
 	property int sessionIndex: sessions.length > 0 ? 0 : -1
 	property var sessions: []
+	readonly property string userFace: selectedUser ? selectedUser.face : ""
+	readonly property string username: Users.selectedUsername
 
 	// User handling - now uses the Users singleton
 	readonly property var users: Users.users
-	readonly property var selectedUser: Users.selectedUser
-	readonly property string username: Users.selectedUsername
-	readonly property string userFace: selectedUser ? selectedUser.face : ""
-
-	// User selection functions (delegate to Users singleton)
-	function selectUser(username: string): bool {
-		return Users.selectUser(username);
-	}
-
-	function selectNextUser(): void {
-		Users.selectNext();
-	}
-
-	function selectPreviousUser(): void {
-		Users.selectPrevious();
-	}
 
 	signal flashMsg
 
@@ -58,11 +45,11 @@ Scope {
 
 			event.accepted = true;
 			return;
-		}
-
-		if (event.text && !/[\r\n]/.test(event.text)) {
+		} else if (event.key === Qt.Key_Escape) {
+			buffer = "";
+		} else if (" abcdefghijklmnopqrstuvwxyz1234567890`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?".includes(event.text.toLowerCase())) {
+			// No illegal characters (you are insane if you use unicode in your password)
 			buffer += event.text;
-			event.accepted = true;
 		}
 	}
 
@@ -81,6 +68,19 @@ Scope {
 		Greetd.launch(selectedSession.command, [], true);
 	}
 
+	function selectNextUser(): void {
+		Users.selectNext();
+	}
+
+	function selectPreviousUser(): void {
+		Users.selectPrevious();
+	}
+
+	// User selection functions (delegate to Users singleton)
+	function selectUser(username: string): bool {
+		return Users.selectUser(username);
+	}
+
 	function submit(): void {
 		errorMessage = "";
 

Greeter/Helpers/SystemUsage.qml

@@ -346,7 +346,6 @@ 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,23 +7,30 @@ import QtQuick
 Singleton {
 	id: root
 
-	// The list of users that can log in graphically
-	// Each user object has: username, uid, home, shell, gecos (full name), face (avatar path)
+	readonly property string defaultUserFile: "/etc/zshell-greeter/default-user"
+	property int selectedIndex: 0
+	readonly property var selectedUser: selectedIndex >= 0 && selectedIndex < users.length ? users[selectedIndex] : null
+	readonly property string selectedUsername: selectedUser ? selectedUser.username : ""
 	property var users: []
 
-	// The currently selected user index
-	property int selectedIndex: 0
+	function saveDefaultUser(): void {
+		if (selectedUser) {
+			defaultUserStorage.setText(selectedUser.username);
+		}
+	}
 
-	// The currently selected user object (or null if none)
-	readonly property var selectedUser: selectedIndex >= 0 && selectedIndex < users.length ? users[selectedIndex] : null
+	function selectNext(): void {
+		if (users.length === 0)
+			return;
+		selectedIndex = (selectedIndex + 1) % users.length;
+	}
 
-	// Convenience property for the selected username
-	readonly property string selectedUsername: selectedUser ? selectedUser.username : ""
+	function selectPrevious(): void {
+		if (users.length === 0)
+			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) {
@@ -34,28 +41,6 @@ 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
 
@@ -67,13 +52,10 @@ 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 {
@@ -87,15 +69,14 @@ 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) {
@@ -103,10 +84,5 @@ 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/FetchPresets.qml

@@ -0,0 +1,63 @@
+// FetchPresets.qml
+pragma Singleton
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+Singleton {
+	id: root
+
+	property var parsedPresets: ({})
+	readonly property var presets: parsedPresets
+	property bool ready: false
+
+	function accents(presetName, variantName) {
+		const variant = parsedPresets[presetName]?.variants?.[variantName];
+
+		return variant?.accents ?? [];
+	}
+
+	function defaultAccent(presetName, variantName) {
+		const variant = parsedPresets[presetName]?.variants?.[variantName];
+
+		return variant?.default_accent ?? "";
+	}
+
+	function modes(presetName, variantName) {
+		const variant = parsedPresets[presetName]?.variants?.[variantName];
+
+		return variant?.modes ?? [];
+	}
+
+	function presetNames() {
+		return Object.keys(parsedPresets);
+	}
+
+	function variantNames(presetName) {
+		const preset = parsedPresets[presetName];
+
+		if (!preset || !preset.variants)
+			return [];
+
+		return Object.keys(preset.variants);
+	}
+
+	Process {
+		command: ["zshell-cli", "scheme", "list-presets", "--json"]
+		running: true
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				try {
+					const parsed = JSON.parse(text);
+
+					root.parsedPresets = parsed.presets ?? {};
+					root.ready = true;
+				} catch (e) {
+					console.error("Failed to parse presets JSON:", e);
+				}
+			}
+		}
+	}
+}

Helpers/GameMode.qml

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

Helpers/ModeScheduler.qml

@@ -12,7 +12,7 @@ Singleton {
 
 	readonly property int darkEnd: Config.general.color.scheduleDarkEnd
 	readonly property int darkStart: Config.general.color.scheduleDarkStart
-	readonly property bool enabled: Config.general.color.scheduleDark
+	readonly property bool enabled: Config.general.color.scheduleDark && Config.general.color.schemeGeneration
 
 	function applyDarkMode() {
 		Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--mode", "dark"]);

Helpers/Recorder.qml

@@ -1,41 +1,82 @@
-// pragma Singleton
-//
-// import Quickshell
-// import QtQuick
-//
-// Singleton {
-// 	id: root
-//
-// 	function start(extraArgs = []): void {
-// 		needsStart = true;
-// 		startArgs = extraArgs;
-// 		checkProc.running = true;
-// 	}
-//
-// 	PersistentProperties {
-// 		id: props
-//
-// 		property real elapsed: 0
-// 		property bool paused: false
-// 		property bool running: false
-//
-// 		reloadableId: "recorder"
-// 	}
-//
-// 	Process {
-// 		id: checkProc
-//
-// 		command: ["pidof", "gpu-screen-recorder"]
-// 		running: true
-//
-// 		onExited: code => {
-// 			props.running = code === 0;
-//
-// 			if (code === 0) {
-// 				if (root.needsStop) {
-// 					Quickshell.execDetached(["zshell-cli"]);
-// 				}
-// 			}
-// 		}
-// 	}
-// }
+pragma Singleton
+
+import Quickshell
+import Quickshell.Io
+import QtQuick
+
+Singleton {
+	id: root
+
+	readonly property alias elapsed: props.elapsed
+	property bool needsPause
+	property bool needsStart
+	property bool needsStop
+	readonly property alias paused: props.paused
+	readonly property alias running: props.running
+	property list<string> startArgs
+
+	function start(extraArgs = []): void {
+		needsStart = true;
+		startArgs = extraArgs;
+		checkProc.running = true;
+	}
+
+	function stop(): void {
+		needsStop = true;
+		checkProc.running = true;
+	}
+
+	function togglePause(): void {
+		needsPause = true;
+		checkProc.running = true;
+	}
+
+	PersistentProperties {
+		id: props
+
+		property real elapsed: 0
+		property bool paused: false
+		property bool running: false
+
+		reloadableId: "recorder"
+	}
+
+	Process {
+		id: checkProc
+
+		command: ["pidof", "gpu-screen-recorder"]
+		running: true
+
+		onExited: code => {
+			props.running = code === 0;
+
+			if (code === 0) {
+				if (root.needsStop) {
+					Quickshell.execDetached(["zshell-cli", "record", "record"]);
+					props.running = false;
+					props.paused = false;
+				} else if (root.needsPause) {
+					Quickshell.execDetached(["zshell-cli", "record", "record", "-p"]);
+					props.paused = !props.paused;
+				}
+			} else if (root.needsStart) {
+				Quickshell.execDetached(["zshell-cli", "record", "record", ...root.startArgs]);
+				props.running = true;
+				props.paused = false;
+				props.elapsed = 0;
+			}
+
+			root.needsStart = false;
+			root.needsStop = false;
+			root.needsPause = false;
+		}
+	}
+
+	Connections {
+		function onSecondsChanged(): void {
+			props.elapsed++;
+		}
+
+		target: Time // qmllint disable incompatible-type
+	}
+}

Helpers/Searcher.qml

@@ -1,7 +1,7 @@
-import Quickshell
 import "../scripts/fzf.js" as Fzf
 import "../scripts/fuzzysort.js" as Fuzzy
 import QtQuick
+import Quickshell
 
 Singleton {
 	property var extraOpts: ({})

Helpers/UPower.qml

@@ -6,7 +6,21 @@ import Quickshell.Services.UPower
 Singleton {
 	id: root
 
+	readonly property real batteryPercent: UPower.displayDevice.percentage
 	readonly property list<UPowerDevice> devices: UPower.devices.values
 	readonly property UPowerDevice displayDevice: UPower.displayDevice
 	readonly property bool onBattery: UPower.onBattery
+	// property bool toastShown
+	//
+	// Connections {
+	// 	target: UPower
+	//
+	// 	function onPercentageChanged(): {
+	// 		if (root.batteryPercent >= 0.2 && toastShown)
+	// 			return;
+	//
+	// 		root.toastShown = true;
+	// 		Toaster.toast(qsTr("Battery "))
+	// 	}
+	// }
 }

Helpers/Wallpapers.qml

@@ -1,7 +1,9 @@
 pragma Singleton
+pragma ComponentBehavior: Bound
 
 import Quickshell
 import Quickshell.Io
+import QtQuick
 import ZShell.Models
 import qs.Config
 import qs.Modules
@@ -12,10 +14,17 @@ Searcher {
 	id: root
 
 	property string actualCurrent: WallpaperPath.currentWallpaperPath
+	property alias crops: adapter.monitorCrops
 	readonly property string current: showPreview ? previewPath : actualCurrent
+	property alias monitorCrops: monitorCrops
 	property string previewPath
+	property bool recentlyChanged
 	property bool showPreview: false
 
+	function getCrop(screen: string): var {
+		return root.crops[screen];
+	}
+
 	function preview(path: string): void {
 		previewPath = path;
 		if (Config.general.color.schemeGeneration)
@@ -23,9 +32,35 @@ Searcher {
 		showPreview = true;
 	}
 
+	function setCrop(screen: string, rect: rect, scaledRect: rect, zoom: real): void {
+		let updated = Object.assign({}, root.crops);
+
+		if (zoom <= 0)
+			zoom = 1.0;
+		else if (zoom > 5.0)
+			zoom = 5.0;
+
+		updated[screen] = {
+			x: rect.x,
+			y: rect.y,
+			width: rect.width,
+			height: rect.height,
+			scaledX: scaledRect.x,
+			scaledY: scaledRect.y,
+			scaledWidth: scaledRect.width,
+			scaledHeight: scaledRect.height,
+			zoom: zoom
+		};
+
+		root.crops = updated;
+		monitorCrops.writeAdapter();
+		monitorCrops.reload();
+	}
+
 	function setWallpaper(path: string): void {
 		actualCurrent = path;
 		WallpaperPath.currentWallpaperPath = path;
+		Quickshell.screens.forEach(n => setCrop(n.name, Qt.rect(0, 0, 0, 0), Qt.rect(0, 0, 0, 0), 1.0));
 		Quickshell.execDetached(["zshell-cli", "wallpaper", "lockscreen", "--input-image", `${root.actualCurrent}`, "--output-path", `${Paths.state}/lockscreen_bg.png`, "--blur-amount", `${Config.lock.blurAmount}`]);
 		if (Config.general.color.schemeGeneration)
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]);
@@ -52,6 +87,22 @@ Searcher {
 		target: "wallpaper"
 	}
 
+	FileView {
+		id: monitorCrops
+
+		path: `${Paths.state}/wallpaper-crops.json`
+		watchChanges: true
+
+		onAdapterUpdated: writeAdapter()
+		onFileChanged: reload()
+
+		JsonAdapter {
+			id: adapter
+
+			property var monitorCrops: ({})
+		}
+	}
+
 	FileSystemModel {
 		id: wallpapers
 

Modules/DashWidget.qml

@@ -1,31 +0,0 @@
-import Quickshell
-import QtQuick
-import qs.Config
-import qs.Helpers
-import qs.Components
-
-CustomRect {
-	id: root
-
-	required property PersistentProperties visibilities
-
-	anchors.bottom: parent.bottom
-	anchors.bottomMargin: 6
-	anchors.top: parent.top
-	anchors.topMargin: 6
-	color: DynamicColors.tPalette.m3surfaceContainer
-	implicitWidth: 40
-	radius: Appearance.rounding.full
-
-	StateLayer {
-		onClicked: {
-			root.visibilities.dashboard = !root.visibilities.dashboard;
-		}
-	}
-
-	MaterialIcon {
-		anchors.centerIn: parent
-		color: DynamicColors.palette.m3onSurface
-		text: "widgets"
-	}
-}

Modules/Drawing/Wrapper.qml

@@ -12,90 +12,29 @@ 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: 0
-	visible: width > 0
+	implicitWidth: root.expanded ? content.implicitWidth : icon.implicitWidth
+	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
-	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
-			}
+	Behavior on implicitWidth {
+		Anim {
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
 		}
-	]
-	transitions: [
-		Transition {
-			from: "*"
-			to: "*"
-
-			ParallelAnimation {
-				Anim {
-					easing.bezierCurve: MaterialEasing.expressiveEffects
-					property: "implicitWidth"
-					target: root
-				}
-
-				Anim {
-					duration: Appearance.anim.durations.small
-					property: "opacity"
-					target: icon
-				}
-
-				Anim {
-					duration: Appearance.anim.durations.small
-					property: "opacity"
-					target: content
-				}
-			}
+	}
+	Behavior on offsetScale {
+		Anim {
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
 		}
-	]
+	}
 
 	onVisibleChanged: {
 		if (!visible)
@@ -109,8 +48,12 @@ Item {
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
 		height: content.contentItem.height
-		opacity: 1
+		opacity: root.expanded ? 0 : 1
 
+		Behavior on opacity {
+			Anim {
+			}
+		}
 		sourceComponent: MaterialIcon {
 			font.pointSize: Appearance.font.size.larger
 			text: "arrow_forward_ios"
@@ -122,7 +65,12 @@ 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,7 +13,6 @@ Searcher {
 
 	function launch(entry: DesktopEntry): void {
 		appDb.incrementFrequency(entry.id);
-		console.log(root.command);
 
 		if (entry.runInTerminal)
 			Quickshell.execDetached({

Modules/Lock/NotifGroup.qml

@@ -58,6 +58,7 @@ CustomRect {
 					fillMode: Image.PreserveAspectCrop
 					height: Config.notifs.sizes.image
 					source: Qt.resolvedUrl(root.image)
+					visible: Config.lock.showNotifIcon
 					width: Config.notifs.sizes.image
 				}
 			}
@@ -284,6 +285,8 @@ 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/Lock/Pam.qml

@@ -30,6 +30,8 @@ Scope {
 			} else {
 				buffer = buffer.slice(0, -1);
 			}
+		} else if (event.key === Qt.Key_Escape) {
+			buffer = "";
 		} else if (" abcdefghijklmnopqrstuvwxyz1234567890`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?".includes(event.text.toLowerCase())) {
 			// No illegal characters (you are insane if you use unicode in your password)
 			buffer += event.text;

Modules/Notifications/Sidebar/Notif.qml

@@ -136,7 +136,10 @@ CustomRect {
 				wrapMode: Text.WordWrap
 
 				onLinkActivated: link => {
-					Quickshell.execDetached(["app2unit", "-O", "--", link]);
+					if (Config.launcher.uwsm)
+						Quickshell.execDetached(["app2unit", "-O", "--", link]);
+					else
+						Quickshell.execDetached(["xdg-open", link]);
 					root.visibilities.sidebar = false;
 				}
 			}

Modules/Notifications/Sidebar/Utils/Cards/Record.qml

@@ -0,0 +1,290 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import qs.Components
+import qs.Config
+import qs.Helpers
+
+CustomRect {
+	id: root
+
+	required property var props
+	required property PersistentProperties visibilities
+
+	Layout.fillWidth: true
+	color: DynamicColors.tPalette.m3surfaceContainer
+	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
+	radius: Appearance.rounding.smallest
+
+	ColumnLayout {
+		id: layout
+
+		anchors.fill: parent
+		anchors.margins: Appearance.padding.large
+		spacing: Appearance.spacing.normal
+
+		RowLayout {
+			spacing: Appearance.spacing.normal
+			z: 1
+
+			CustomRect {
+				color: Recorder.running ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3secondaryContainer
+				implicitHeight: {
+					const h = icon.implicitHeight + Appearance.padding.smaller * 2;
+					return h - (h % 2);
+				}
+				implicitWidth: implicitHeight
+				radius: Appearance.rounding.full
+
+				MaterialIcon {
+					id: icon
+
+					anchors.centerIn: parent
+					anchors.horizontalCenterOffset: -0.5
+					anchors.verticalCenterOffset: 1.5
+					color: Recorder.running ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3onSecondaryContainer
+					font.pointSize: Appearance.font.size.large
+					text: "screen_record"
+				}
+			}
+
+			ColumnLayout {
+				Layout.fillWidth: true
+				spacing: 0
+
+				CustomText {
+					Layout.fillWidth: true
+					elide: Text.ElideRight
+					font.pointSize: Appearance.font.size.normal
+					text: qsTr("Screen Recorder")
+				}
+
+				CustomText {
+					Layout.fillWidth: true
+					color: DynamicColors.palette.m3onSurfaceVariant
+					elide: Text.ElideRight
+					font.pointSize: Appearance.font.size.small
+					text: Recorder.paused ? qsTr("Recording paused") : Recorder.running ? qsTr("Recording running") : qsTr("Recording off")
+				}
+			}
+
+			CustomSplitButton {
+				active: menuItems.find(m => root.props.recordingMode === m.icon + m.text) ?? menuItems[0]
+				disabled: Recorder.running
+
+				menuItems: [
+					MenuItem {
+						activeText: qsTr("Fullscreen")
+						icon: "fullscreen"
+						text: qsTr("Record fullscreen")
+
+						onClicked: Recorder.start()
+					},
+					MenuItem {
+						activeText: qsTr("Region")
+						icon: "screenshot_region"
+						text: qsTr("Record region")
+
+						onClicked: Recorder.start(["-r"])
+					},
+					MenuItem {
+						activeText: qsTr("Fullscreen")
+						icon: "select_to_speak"
+						text: qsTr("Record fullscreen with sound")
+
+						onClicked: Recorder.start(["-s"])
+					},
+					MenuItem {
+						activeText: qsTr("Region")
+						icon: "volume_up"
+						text: qsTr("Record region with sound")
+
+						onClicked: Recorder.start(["-s", "-r"])
+					}
+				]
+
+				menu.onItemSelected: item => root.props.recordingMode = item.icon + item.text
+			}
+		}
+
+		Loader {
+			id: listOrControls
+
+			property bool running: Recorder.running
+
+			Layout.fillWidth: true
+			Layout.preferredHeight: implicitHeight
+			asynchronous: true
+			sourceComponent: running ? recordingControls : recordingList
+
+			Behavior on Layout.preferredHeight {
+				id: locHeightAnim
+
+				enabled: false
+
+				Anim {
+				}
+			}
+			Behavior on running {
+				SequentialAnimation {
+					ParallelAnimation {
+						Anim {
+							duration: Appearance.anim.durations.small
+							easing: Appearance.anim.curves.standardAccel
+							property: "scale"
+							target: listOrControls
+							to: 0.7
+						}
+
+						Anim {
+							duration: Appearance.anim.durations.small
+							easing: Appearance.anim.curves.standardAccel
+							property: "opacity"
+							target: listOrControls
+							to: 0
+						}
+					}
+
+					PropertyAction {
+						property: "enabled"
+						target: locHeightAnim
+						value: true
+					}
+
+					PropertyAction {
+					}
+
+					PropertyAction {
+						property: "enabled"
+						target: locHeightAnim
+						value: false
+					}
+
+					ParallelAnimation {
+						Anim {
+							duration: Appearance.anim.durations.small
+							easing: Appearance.anim.curves.standardDecel
+							property: "scale"
+							target: listOrControls
+							to: 1
+						}
+
+						Anim {
+							duration: Appearance.anim.durations.small
+							easing: Appearance.anim.curves.standardDecel
+							property: "opacity"
+							target: listOrControls
+							to: 1
+						}
+					}
+				}
+			}
+		}
+	}
+
+	Component {
+		id: recordingList
+
+		RecordingList {
+			props: root.props
+			visibilities: root.visibilities
+		}
+	}
+
+	Component {
+		id: recordingControls
+
+		RowLayout {
+			spacing: Appearance.spacing.normal
+
+			CustomRect {
+				color: Recorder.paused ? DynamicColors.palette.m3tertiary : DynamicColors.palette.m3error
+				implicitHeight: recText.implicitHeight + Appearance.padding.smaller * 2
+				implicitWidth: recText.implicitWidth + Appearance.padding.normal * 2
+				radius: Appearance.rounding.full
+
+				Behavior on implicitWidth {
+					Anim {
+					}
+				}
+				SequentialAnimation on opacity {
+					alwaysRunToEnd: true
+					loops: Animation.Infinite
+					running: !Recorder.paused
+
+					Anim {
+						duration: Appearance.anim.durations.large
+						easing: Appearance.anim.curves.emphasizedAccel
+						from: 1
+						to: 0
+					}
+
+					Anim {
+						duration: Appearance.anim.durations.extraLarge
+						easing: Appearance.anim.curves.emphasizedDecel
+						from: 0
+						to: 1
+					}
+				}
+
+				CustomText {
+					id: recText
+
+					anchors.centerIn: parent
+					animate: true
+					color: Recorder.paused ? DynamicColors.palette.m3onTertiary : DynamicColors.palette.m3onError
+					font.family: Appearance.font.family.mono
+					text: Recorder.paused ? "PAUSED" : "REC"
+				}
+			}
+
+			CustomText {
+				font.pointSize: Appearance.font.size.normal
+				text: {
+					const elapsed = Recorder.elapsed;
+
+					const hours = Math.floor(elapsed / 3600);
+					const mins = Math.floor((elapsed % 3600) / 60);
+					const secs = Math.floor(elapsed % 60).toString().padStart(2, "0");
+
+					let time;
+					if (hours > 0)
+						time = `${hours}:${mins.toString().padStart(2, "0")}:${secs}`;
+					else
+						time = `${mins}:${secs}`;
+
+					return qsTr("Recording for %1").arg(time);
+				}
+			}
+
+			Item {
+				Layout.fillWidth: true
+			}
+
+			IconButton {
+				checked: Recorder.paused
+				font.pointSize: Appearance.font.size.large
+				icon: Recorder.paused ? "play_arrow" : "pause"
+				label.animate: true
+				toggle: true
+				type: IconButton.Tonal
+
+				onClicked: {
+					Recorder.togglePause();
+					internalChecked = Recorder.paused;
+				}
+			}
+
+			IconButton {
+				font.pointSize: Appearance.font.size.large
+				icon: "stop"
+				inactiveColour: DynamicColors.palette.m3error
+				inactiveOnColour: DynamicColors.palette.m3onError
+
+				onClicked: Recorder.stop()
+			}
+		}
+	}
+}

Modules/Notifications/Sidebar/Utils/Cards/RecordingList.qml

@@ -0,0 +1,226 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Widgets
+import ZShell.Models
+import qs.Components
+import qs.Helpers
+import qs.Paths
+import qs.Config
+
+ColumnLayout {
+	id: root
+
+	required property var props
+	required property PersistentProperties visibilities
+
+	spacing: 0
+
+	WrapperMouseArea {
+		Layout.fillWidth: true
+		cursorShape: Qt.PointingHandCursor
+
+		onClicked: root.props.recordingListExpanded = !root.props.recordingListExpanded
+
+		RowLayout {
+			spacing: Appearance.spacing.smaller
+
+			MaterialIcon {
+				Layout.alignment: Qt.AlignVCenter
+				font.pointSize: Appearance.font.size.large
+				text: "list"
+			}
+
+			CustomText {
+				Layout.alignment: Qt.AlignVCenter
+				Layout.fillWidth: true
+				font.pointSize: Appearance.font.size.normal
+				text: qsTr("Recordings")
+			}
+
+			IconButton {
+				icon: root.props.recordingListExpanded ? "unfold_less" : "unfold_more"
+				label.animate: true
+				type: IconButton.Text
+
+				onClicked: root.props.recordingListExpanded = !root.props.recordingListExpanded
+			}
+		}
+	}
+
+	CustomListView {
+		id: list
+
+		Layout.fillWidth: true
+		Layout.rightMargin: -Appearance.spacing.small
+		clip: true
+		implicitHeight: (Appearance.font.size.larger + Appearance.padding.small) * (root.props.recordingListExpanded ? 10 : 3)
+
+		CustomScrollBar.vertical: CustomScrollBar {
+			flickable: list
+		}
+		add: Transition {
+			Anim {
+				from: 0
+				property: "opacity"
+				to: 1
+			}
+
+			Anim {
+				from: 0.5
+				property: "scale"
+				to: 1
+			}
+		}
+		delegate: RowLayout {
+			id: recording
+
+			property string baseName
+			required property FileSystemEntry modelData
+
+			anchors.left: list.contentItem.left
+			anchors.right: list.contentItem.right
+			anchors.rightMargin: Appearance.spacing.small
+			spacing: Appearance.spacing.small / 2
+
+			Component.onCompleted: baseName = modelData.baseName
+
+			CustomText {
+				Layout.fillWidth: true
+				Layout.rightMargin: Appearance.spacing.small / 2
+				color: DynamicColors.palette.m3onSurfaceVariant
+				elide: Text.ElideRight
+				text: {
+					const time = recording.baseName;
+					const matches = time.match(/^recording_(\d{4})(\d{2})(\d{2})_(\d{2})-(\d{2})-(\d{2})/);
+					if (!matches)
+						return time;
+					const date = new Date(...matches.slice(1));
+					date.setMonth(date.getMonth() - 1);
+					return qsTr("Recording at %1").arg(Qt.formatDateTime(date, Qt.locale()));
+				}
+			}
+
+			IconButton {
+				icon: "play_arrow"
+				type: IconButton.Text
+
+				onClicked: {
+					root.visibilities.sidebar = false;
+					Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.playback, recording.modelData.path]);
+				}
+			}
+
+			IconButton {
+				icon: "folder"
+				type: IconButton.Text
+
+				onClicked: {
+					root.visibilities.sidebar = false;
+					Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.explorer, recording.modelData.path]);
+				}
+			}
+		}
+		displaced: Transition {
+			Anim {
+				properties: "opacity,scale"
+				to: 1
+			}
+
+			Anim {
+				property: "y"
+			}
+		}
+		Behavior on implicitHeight {
+			Anim {
+			}
+		}
+		model: FileSystemModel {
+			nameFilters: ["recording_*.mp4"]
+			path: Paths.recsdir
+			sortReverse: true
+		}
+		remove: Transition {
+			Anim {
+				property: "opacity"
+				to: 0
+			}
+
+			Anim {
+				property: "scale"
+				to: 0.5
+			}
+		}
+
+		Loader {
+			active: opacity > 0
+			anchors.centerIn: parent
+			asynchronous: true
+			opacity: list.count === 0 ? 1 : 0
+
+			Behavior on opacity {
+				Anim {
+				}
+			}
+			sourceComponent: ColumnLayout {
+				spacing: Appearance.spacing.small
+
+				MaterialIcon {
+					Layout.alignment: Qt.AlignHCenter
+					Layout.preferredHeight: root.props.recordingListExpanded ? implicitHeight : 0
+					color: DynamicColors.palette.m3outline
+					font.pointSize: Appearance.font.size.extraLarge
+					opacity: root.props.recordingListExpanded ? 1 : 0
+					scale: root.props.recordingListExpanded ? 1 : 0
+					text: "scan_delete"
+
+					Behavior on Layout.preferredHeight {
+						Anim {
+						}
+					}
+					Behavior on opacity {
+						Anim {
+						}
+					}
+					Behavior on scale {
+						Anim {
+						}
+					}
+				}
+
+				RowLayout {
+					spacing: Appearance.spacing.smaller
+
+					MaterialIcon {
+						Layout.alignment: Qt.AlignHCenter
+						Layout.preferredWidth: !root.props.recordingListExpanded ? implicitWidth : 0
+						color: DynamicColors.palette.m3outline
+						opacity: !root.props.recordingListExpanded ? 1 : 0
+						scale: !root.props.recordingListExpanded ? 1 : 0
+						text: "scan_delete"
+
+						Behavior on Layout.preferredWidth {
+							Anim {
+							}
+						}
+						Behavior on opacity {
+							Anim {
+							}
+						}
+						Behavior on scale {
+							Anim {
+							}
+						}
+					}
+
+					CustomText {
+						color: DynamicColors.palette.m3outline
+						text: qsTr("No recordings found")
+					}
+				}
+			}
+		}
+	}
+}

Modules/Notifications/Sidebar/Utils/Content.qml

@@ -1,13 +1,14 @@
-import qs.Modules.Notifications.Sidebar.Utils.Cards
-import qs.Config
+import Quickshell
 import QtQuick
 import QtQuick.Layouts
+import qs.Modules.Notifications.Sidebar.Utils.Cards
+import qs.Config
 
 Item {
 	id: root
 
 	required property Item popouts
-	required property var props
+	required property PersistentProperties props
 	required property var visibilities
 
 	implicitHeight: layout.implicitHeight
@@ -22,6 +23,12 @@ Item {
 		IdleInhibit {
 		}
 
+		Record {
+			props: root.props
+			visibilities: root.visibilities
+			z: 1
+		}
+
 		Toggles {
 			popouts: root.popouts
 			visibilities: root.visibilities

Modules/Osd/Content.qml

@@ -100,12 +100,14 @@ Item {
 					icon: `brightness_${(Math.round(value * 6) + 1)}`
 					value: root.brightness
 
-					onMoved: {
-						if (Config.osd.allMonBrightness) {
-							root.monitor?.setBrightness(value);
-						} else {
-							for (const mon of Brightness.monitors) {
-								mon.setBrightness(value);
+					onPressedChanged: {
+						if (!pressed) {
+							if (Config.osd.allMonBrightness) {
+								for (const mon of Brightness.monitors) {
+									mon.setBrightness(value);
+								}
+							} else {
+								root.monitor?.setBrightness(value);
 							}
 						}
 					}

Modules/Resources.qml

@@ -17,7 +17,7 @@ CustomRect {
 	color: visibilities.resources ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
 	implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
 	implicitWidth: rowLayout.implicitWidth + Appearance.padding.normal * 2
-	radius: height / 2
+	radius: Appearance.rounding.full
 
 	StateLayer {
 		onClicked: root.visibilities.resources = !root.visibilities.resources

Modules/Settings/Categories.qml

@@ -116,6 +116,12 @@ Item {
 			key: "updates"
 			name: "Updates"
 		}
+
+		ListElement {
+			icon: "extension"
+			key: "plugins"
+			name: "Extensions"
+		}
 	}
 
 	CustomClippingRect {

Modules/Settings/Categories/Appearance.qml

@@ -1,3 +1,4 @@
+import QtQuick
 import qs.Modules.Settings.Controls
 import qs.Config
 
@@ -80,6 +81,7 @@ SettingsPage {
 			name: "Sans family"
 			object: Config.appearance.font.family
 			setting: "sans"
+			stringList: Qt.fontFamilies()
 		}
 
 		Separator {
@@ -89,6 +91,7 @@ SettingsPage {
 			name: "Monospace family"
 			object: Config.appearance.font.family
 			setting: "mono"
+			stringList: Qt.fontFamilies()
 		}
 	}
 

Modules/Settings/Categories/Background.qml

@@ -1,3 +1,4 @@
+import Quickshell
 import QtQuick.Layouts
 import qs.Modules.Settings.Controls
 import qs.Config
@@ -5,6 +6,8 @@ import qs.Config
 SettingsPage {
 	id: root
 
+	required property ShellScreen screen
+
 	SettingsSection {
 		sectionId: "Wallpaper"
 
@@ -29,20 +32,17 @@ SettingsPage {
 			step: 50
 		}
 
-		// Separator {
-		// }
-		//
-		// WallpaperCropper {
-		// 	Layout.fillWidth: true
-		// 	Layout.preferredHeight: 300
-		// }
+		Separator {
+		}
+
+		WallpaperCropper {
+		}
 	}
 
 	SettingsSection {
 		sectionId: "Wallpapers"
 
 		WallpaperGrid {
-			Layout.fillWidth: true
 		}
 	}
 }

Modules/Settings/Categories/Bar.qml

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

Modules/Settings/Categories/Dashboard.qml

@@ -19,8 +19,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Media update interval"
 			min: 0
+			name: "Media update interval"
 			object: Config.dashboard
 			setting: "mediaUpdateInterval"
 			step: 50
@@ -30,8 +30,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Resource update interval"
 			min: 0
+			name: "Resource update interval"
 			object: Config.dashboard
 			setting: "resourceUpdateInterval"
 			step: 50
@@ -41,8 +41,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Drag threshold"
 			min: 0
+			name: "Drag threshold"
 			object: Config.dashboard
 			setting: "dragThreshold"
 		}
@@ -107,112 +107,112 @@ SettingsPage {
 		}
 	}
 
-	SettingsSection {
-		sectionId: "Layout Sizes"
-
-		SettingsHeader {
-			name: "Layout Sizes"
-		}
-
-		SettingReadOnly {
-			name: "Tab indicator height"
-			value: String(Config.dashboard.sizes.tabIndicatorHeight)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Tab indicator spacing"
-			value: String(Config.dashboard.sizes.tabIndicatorSpacing)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Info width"
-			value: String(Config.dashboard.sizes.infoWidth)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Info icon size"
-			value: String(Config.dashboard.sizes.infoIconSize)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Date time width"
-			value: String(Config.dashboard.sizes.dateTimeWidth)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Media width"
-			value: String(Config.dashboard.sizes.mediaWidth)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Media progress sweep"
-			value: String(Config.dashboard.sizes.mediaProgressSweep)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Media progress thickness"
-			value: String(Config.dashboard.sizes.mediaProgressThickness)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Resource progress thickness"
-			value: String(Config.dashboard.sizes.resourceProgessThickness)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Weather width"
-			value: String(Config.dashboard.sizes.weatherWidth)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Media cover art size"
-			value: String(Config.dashboard.sizes.mediaCoverArtSize)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Media visualiser size"
-			value: String(Config.dashboard.sizes.mediaVisualiserSize)
-		}
-
-		Separator {
-		}
-
-		SettingReadOnly {
-			name: "Resource size"
-			value: String(Config.dashboard.sizes.resourceSize)
-		}
-	}
+	// SettingsSection {
+	// 	sectionId: "Layout Sizes"
+	//
+	// 	SettingsHeader {
+	// 		name: "Layout Sizes"
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Tab indicator height"
+	// 		value: String(Config.dashboard.sizes.tabIndicatorHeight)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Tab indicator spacing"
+	// 		value: String(Config.dashboard.sizes.tabIndicatorSpacing)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Info width"
+	// 		value: String(Config.dashboard.sizes.infoWidth)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Info icon size"
+	// 		value: String(Config.dashboard.sizes.infoIconSize)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Date time width"
+	// 		value: String(Config.dashboard.sizes.dateTimeWidth)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Media width"
+	// 		value: String(Config.dashboard.sizes.mediaWidth)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Media progress sweep"
+	// 		value: String(Config.dashboard.sizes.mediaProgressSweep)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Media progress thickness"
+	// 		value: String(Config.dashboard.sizes.mediaProgressThickness)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Resource progress thickness"
+	// 		value: String(Config.dashboard.sizes.resourceProgessThickness)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Weather width"
+	// 		value: String(Config.dashboard.sizes.weatherWidth)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Media cover art size"
+	// 		value: String(Config.dashboard.sizes.mediaCoverArtSize)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Media visualiser size"
+	// 		value: String(Config.dashboard.sizes.mediaVisualiserSize)
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingReadOnly {
+	// 		name: "Resource size"
+	// 		value: String(Config.dashboard.sizes.resourceSize)
+	// 	}
+	// }
 }

Modules/Settings/Categories/General.qml

@@ -1,4 +1,6 @@
 import Quickshell
+import QtQuick
+import QtQuick.Layouts
 import qs.Modules.Settings.Controls
 import qs.Config
 import qs.Components
@@ -67,6 +69,7 @@ SettingsPage {
 
 		CustomSplitButtonRow {
 			active: Config.general.color.mode === "light" ? menuItems[0] : menuItems[1]
+			buttonAlias.disabled: !Config.general.color.schemeGeneration
 			label: qsTr("Scheme mode")
 
 			menuItems: [
@@ -100,6 +103,7 @@ SettingsPage {
 			id: schemeType
 
 			active: root.schemeTypeItem(menuItems, Config.colors.schemeType)
+			buttonAlias.disabled: !Config.general.color.schemeGeneration
 			label: qsTr("Scheme type")
 			z: 2
 
@@ -169,21 +173,69 @@ SettingsPage {
 		}
 
 		Separator {
+			shouldBeActive: Config.general.color.schemeGeneration ? 0 : 1
+		}
+
+		SchemesListView {
+			name: "Color scheme presets"
+			object: Config.colors.presets
+			setting: "name"
+			shouldBeActive: Config.general.color.schemeGeneration ? 0 : 1
+			stringList: FetchPresets.presetNames()
+		}
+
+		Separator {
+			shouldBeActive: Config.colors.presets.name !== "" && !Config.general.color.schemeGeneration
+		}
+
+		SchemesListView {
+			name: "Preset variant"
+			object: Config.colors.presets
+			setting: "variant"
+			shouldBeActive: Config.colors.presets.name !== "" && !Config.general.color.schemeGeneration
+			stringList: FetchPresets.variantNames(Config.colors.presets.name)
+
+			onOptionSet: item => {
+				Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--preset", `${Config.colors.presets.name.toLowerCase()}:${item}`]);
+			}
+		}
+
+		Separator {
+			shouldBeActive: Config.colors.presets.variant !== "" && FetchPresets.accents(Config.colors.presets.name, Config.colors.presets.variant).length > 0 && !Config.general.color.schemeGeneration
+		}
+
+		SchemesListView {
+			name: "Preset accent"
+			object: Config.colors.presets
+			setting: "accent"
+			shouldBeActive: Config.colors.presets.variant !== "" && FetchPresets.accents(Config.colors.presets.name, Config.colors.presets.variant).length > 0 && !Config.general.color.schemeGeneration
+			stringList: FetchPresets.accents(Config.colors.presets.name, Config.colors.presets.variant)
+
+			onOptionSet: item => {
+				Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--preset", `${Config.colors.presets.name.toLowerCase()}:${Config.colors.presets.variant}`, "--accent", `${item}`]);
+			}
+		}
+
+		Separator {
+			shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
 		}
 
 		SettingSwitch {
 			name: "Smart color scheme"
 			object: Config.general.color
 			setting: "smart"
+			shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
 		}
 
 		Separator {
+			shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
 		}
 
 		SettingSpinner {
 			name: "Schedule dark mode"
 			object: Config.general.color
 			settings: ["scheduleDarkStart", "scheduleDarkEnd", "scheduleDark"]
+			shouldBeActive: Config.general.color.schemeGeneration ? 1 : 0
 		}
 
 		Separator {

Modules/Settings/Categories/Lockscreen.qml

@@ -31,8 +31,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max fingerprint tries"
 			min: 1
+			name: "Max fingerprint tries"
 			object: Config.lock
 			setting: "maxFprintTries"
 			step: 1
@@ -41,9 +41,27 @@ SettingsPage {
 		Separator {
 		}
 
+		SettingSwitch {
+			name: "Show notification details"
+			object: Config.lock
+			setting: "showNotifContent"
+		}
+
+		Separator {
+		}
+
+		SettingSwitch {
+			name: "Show notification icon"
+			object: Config.lock
+			setting: "showNotifIcon"
+		}
+
+		Separator {
+		}
+
 		SettingSpinBox {
-			name: "Blur amount"
 			min: 0
+			name: "Blur amount"
 			object: Config.lock
 			setting: "blurAmount"
 			step: 1
@@ -53,9 +71,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Height multiplier"
 			max: 2
 			min: 0.1
+			name: "Height multiplier"
 			object: Config.lock.sizes
 			setting: "heightMult"
 			step: 0.05
@@ -65,9 +83,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Aspect ratio"
 			max: 4
 			min: 0.5
+			name: "Aspect ratio"
 			object: Config.lock.sizes
 			setting: "ratio"
 			step: 0.05
@@ -77,14 +95,26 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Center width"
 			min: 100
+			name: "Center width"
 			object: Config.lock.sizes
 			setting: "centerWidth"
 			step: 10
 		}
 	}
 
+	SettingsSection {
+		sectionId: "Greeter"
+
+		SettingsHeader {
+			name: "Greeter"
+		}
+
+		SettingsIconButton {
+			name: "Install wallpaper and color scheme to greeter"
+		}
+	}
+
 	SettingsSection {
 		sectionId: "Idle"
 

Modules/Settings/Categories/Lockscreen/Idle.qml

@@ -9,6 +9,8 @@ import qs.Modules.Settings.Controls
 ColumnLayout {
 	id: root
 
+	property bool shouldBeActive: true
+
 	function addTimeoutEntry() {
 		let list = [...Config.general.idle.timeouts];
 
@@ -22,6 +24,13 @@ ColumnLayout {
 		Config.save();
 	}
 
+	function deleteTimeoutEntry(index) {
+		let list = [...Config.general.idle.timeouts];
+		list.splice(index, 1);
+		Config.general.idle.timeouts = list;
+		Config.save();
+	}
+
 	function updateTimeoutEntry(i, key, value) {
 		const list = [...Config.general.idle.timeouts];
 		let entry = list[i];
@@ -33,8 +42,26 @@ ColumnLayout {
 		Config.save();
 	}
 
-	Layout.fillWidth: true
+	anchors.left: parent.left
+	anchors.right: parent.right
+	height: shouldBeActive ? implicitHeight : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
 	spacing: Appearance.spacing.smaller
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Settings {
 		name: "Idle Monitors"
@@ -45,10 +72,15 @@ ColumnLayout {
 
 		SettingList {
 			Layout.fillWidth: true
+			anchors.left: undefined
+			anchors.right: undefined
 
 			onAddActiveActionRequested: {
 				root.updateTimeoutEntry(index, "activeAction", "");
 			}
+			onDeleteRequested: function (index) {
+				root.deleteTimeoutEntry(index);
+			}
 			onFieldEdited: function (key, value) {
 				root.updateTimeoutEntry(index, key, value);
 			}

Modules/Settings/Categories/Plugins.qml

@@ -0,0 +1,18 @@
+import qs.Modules.Settings.Controls
+import qs.Config
+
+SettingsPage {
+	SettingsSection {
+		sectionId: "Plugins"
+
+		SettingsHeader {
+			name: "Plugins"
+		}
+
+		SettingBarEntryList {
+			name: "Enable or disable plugins"
+			object: Config.plugins
+			setting: "entries"
+		}
+	}
+}

Modules/Settings/Categories/Utilities.qml

@@ -19,8 +19,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max toasts"
 			min: 1
+			name: "Max toasts"
 			object: Config.utilities
 			setting: "maxToasts"
 		}
@@ -29,8 +29,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Panel width"
 			min: 1
+			name: "Panel width"
 			object: Config.utilities.sizes
 			setting: "width"
 		}
@@ -39,8 +39,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Toast width"
 			min: 1
+			name: "Toast width"
 			object: Config.utilities.sizes
 			setting: "toastWidth"
 		}
@@ -77,100 +77,100 @@ SettingsPage {
 			setting: "gameModeChanged"
 		}
 
-		Separator {
-		}
-
-		SettingSwitch {
-			name: "Do not disturb changed"
-			object: Config.utilities.toasts
-			setting: "dndChanged"
-		}
-
-		Separator {
-		}
-
-		SettingSwitch {
-			name: "Audio output changed"
-			object: Config.utilities.toasts
-			setting: "audioOutputChanged"
-		}
-
-		Separator {
-		}
-
-		SettingSwitch {
-			name: "Audio input changed"
-			object: Config.utilities.toasts
-			setting: "audioInputChanged"
-		}
-
-		Separator {
-		}
-
-		SettingSwitch {
-			name: "Caps lock changed"
-			object: Config.utilities.toasts
-			setting: "capsLockChanged"
-		}
-
-		Separator {
-		}
-
-		SettingSwitch {
-			name: "Num lock changed"
-			object: Config.utilities.toasts
-			setting: "numLockChanged"
-		}
-
-		Separator {
-		}
-
-		SettingSwitch {
-			name: "Keyboard layout changed"
-			object: Config.utilities.toasts
-			setting: "kbLayoutChanged"
-		}
-
-		Separator {
-		}
-
-		SettingSwitch {
-			name: "VPN changed"
-			object: Config.utilities.toasts
-			setting: "vpnChanged"
-		}
-
-		Separator {
-		}
-
-		SettingSwitch {
-			name: "Now playing"
-			object: Config.utilities.toasts
-			setting: "nowPlaying"
-		}
+		// Separator {
+		// }
+		//
+		// SettingSwitch {
+		// 	name: "Do not disturb changed"
+		// 	object: Config.utilities.toasts
+		// 	setting: "dndChanged"
+		// }
+		//
+		// Separator {
+		// }
+		//
+		// SettingSwitch {
+		// 	name: "Audio output changed"
+		// 	object: Config.utilities.toasts
+		// 	setting: "audioOutputChanged"
+		// }
+		//
+		// Separator {
+		// }
+		//
+		// SettingSwitch {
+		// 	name: "Audio input changed"
+		// 	object: Config.utilities.toasts
+		// 	setting: "audioInputChanged"
+		// }
+		//
+		// Separator {
+		// }
+		//
+		// SettingSwitch {
+		// 	name: "Caps lock changed"
+		// 	object: Config.utilities.toasts
+		// 	setting: "capsLockChanged"
+		// }
+		//
+		// Separator {
+		// }
+		//
+		// SettingSwitch {
+		// 	name: "Num lock changed"
+		// 	object: Config.utilities.toasts
+		// 	setting: "numLockChanged"
+		// }
+		//
+		// Separator {
+		// }
+		//
+		// SettingSwitch {
+		// 	name: "Keyboard layout changed"
+		// 	object: Config.utilities.toasts
+		// 	setting: "kbLayoutChanged"
+		// }
+		//
+		// Separator {
+		// }
+		//
+		// SettingSwitch {
+		// 	name: "VPN changed"
+		// 	object: Config.utilities.toasts
+		// 	setting: "vpnChanged"
+		// }
+		//
+		// Separator {
+		// }
+		//
+		// SettingSwitch {
+		// 	name: "Now playing"
+		// 	object: Config.utilities.toasts
+		// 	setting: "nowPlaying"
+		// }
 	}
 
-	SettingsSection {
-		sectionId: "VPN"
-
-		SettingsHeader {
-			name: "VPN"
-		}
-
-		SettingSwitch {
-			name: "Enable VPN integration"
-			object: Config.utilities.vpn
-			setting: "enabled"
-		}
-
-		Separator {
-		}
-
-		SettingStringList {
-			name: "Provider"
-			addLabel: qsTr("Add VPN provider")
-			object: Config.utilities.vpn
-			setting: "provider"
-		}
-	}
+	// SettingsSection {
+	// 	sectionId: "VPN"
+	//
+	// 	SettingsHeader {
+	// 		name: "VPN"
+	// 	}
+	//
+	// 	SettingSwitch {
+	// 		name: "Enable VPN integration"
+	// 		object: Config.utilities.vpn
+	// 		setting: "enabled"
+	// 	}
+	//
+	// 	Separator {
+	// 	}
+	//
+	// 	SettingStringList {
+	// 		name: "Provider"
+	// 		addLabel: qsTr("Add VPN provider")
+	// 		object: Config.utilities.vpn
+	// 		setting: "provider"
+	// 	}
+	// }
 }

Modules/Settings/Content.qml

@@ -1,3 +1,5 @@
+pragma ComponentBehavior: Bound
+
 import Quickshell
 import Quickshell.Widgets
 import QtQuick
@@ -20,7 +22,6 @@ Item {
 	required property PersistentProperties visibilities
 
 	function scrollToSetting(section: string, settingName: string) {
-		// Wait for the StackView transition to complete, then scroll
 		root.pendingSection = section;
 		root.pendingSetting = settingName;
 		scrollTimer.restart();
@@ -78,6 +79,8 @@ Item {
 				stack.push(screenshot);
 			else if (currentCategory === "updates")
 				stack.push(updates);
+			else if (currentCategory === "plugins")
+				stack.push(plugins);
 		}
 
 		target: root
@@ -133,7 +136,7 @@ Item {
 			anchors.right: parent.right
 			anchors.top: searchBar.bottom
 			anchors.topMargin: Appearance.spacing.smaller
-			color: DynamicColors.tPalette.m3surfaceContainer
+			color: DynamicColors.tPalette.m3surfaceContainerLowest
 			radius: Appearance.rounding.normal
 
 			StackView {
@@ -157,6 +160,7 @@ Item {
 		id: background
 
 		Cat.Background {
+			screen: root.screen
 		}
 	}
 
@@ -243,4 +247,11 @@ Item {
 		Cat.SystemUpdates {
 		}
 	}
+
+	Component {
+		id: plugins
+
+		Cat.Plugins {
+		}
+	}
 }

Modules/Settings/Controls/SchemesListView.qml

@@ -0,0 +1,161 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import qs.Config
+import qs.Components
+
+Item {
+	id: root
+
+	required property string name
+	required property var object
+	property alias row: row
+	required property string setting
+	property bool shouldBeActive: true
+	required property list<var> stringList
+
+	signal optionSet(option: string)
+
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.height : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
+
+	RowLayout {
+		id: row
+
+		anchors.left: parent.left
+		anchors.margins: Appearance.padding.small
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+
+		CustomText {
+			id: text
+
+			Layout.fillWidth: true
+			font.pointSize: Appearance.font.size.larger
+			text: root.name
+		}
+
+		CustomClippingRect {
+			Layout.preferredHeight: 42 * 6 + Appearance.padding.normal * 2 + Appearance.spacing.small * 5
+			Layout.preferredWidth: 500
+			color: DynamicColors.tPalette.m3surfaceContainer
+			radius: (21 + Appearance.padding.normal) * Appearance.rounding.scale
+
+			CustomRect {
+				id: searchBox
+
+				anchors.left: parent.left
+				anchors.margins: Appearance.padding.normal
+				anchors.right: parent.right
+				anchors.top: parent.top
+				color: DynamicColors.tPalette.m3surfaceContainer
+				implicitHeight: 42
+				radius: Appearance.rounding.full
+
+				MaterialIcon {
+					id: searchIcon
+
+					anchors.bottom: parent.bottom
+					anchors.left: parent.left
+					anchors.leftMargin: Appearance.padding.large
+					anchors.top: parent.top
+					font.pointSize: Appearance.font.size.large
+					text: "search"
+					verticalAlignment: Text.AlignVCenter
+				}
+
+				CustomTextField {
+					id: textSearch
+
+					anchors.left: searchIcon.right
+					anchors.leftMargin: Appearance.spacing.small
+					anchors.right: parent.right
+					anchors.rightMargin: Appearance.spacing.normal
+					anchors.verticalCenter: parent.verticalCenter
+					placeholderText: "Search..."
+				}
+			}
+
+			CustomClippingRect {
+				anchors.bottom: parent.bottom
+				anchors.left: parent.left
+				anchors.margins: Appearance.padding.normal
+				anchors.right: parent.right
+				anchors.top: searchBox.bottom
+				bottomLeftRadius: 21
+				bottomRightRadius: 21
+
+				CustomListView {
+					anchors.fill: parent
+					clip: true
+					spacing: Appearance.spacing.small
+
+					delegate: CustomRect {
+						id: delegate
+
+						required property string modelData
+
+						anchors.left: parent.left
+						anchors.right: parent.right
+						implicitHeight: 42
+						radius: Appearance.rounding.smallest
+
+						CustomText {
+							anchors.fill: parent
+							anchors.leftMargin: Appearance.padding.normal
+							text: modelData
+							verticalAlignment: Text.AlignVCenter
+						}
+
+						MaterialIcon {
+							anchors.fill: parent
+							anchors.rightMargin: Appearance.padding.normal
+							color: DynamicColors.palette.m3primary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignRight
+							text: "check_circle"
+							verticalAlignment: Text.AlignVCenter
+							visible: root.object[root.setting] === delegate.modelData
+						}
+
+						StateLayer {
+							onClicked: {
+								root.object[root.setting] = delegate.modelData;
+								root.optionSet(delegate.modelData);
+								Config.save();
+							}
+						}
+					}
+					model: ScriptModel {
+						values: {
+							const values = root.stringList;
+							const search = textSearch.text;
+							var regex = new RegExp(search, "i");
+
+							return values.filter(n => regex.test(n));
+						}
+					}
+				}
+			}
+		}
+	}
+}

Modules/Settings/Controls/Separator.qml

@@ -6,7 +6,26 @@ import qs.Config
 CustomRect {
 	id: root
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: 1
+	property bool shouldBeActive: true
+
+	anchors.left: parent.left
+	anchors.right: parent.right
 	color: DynamicColors.tPalette.m3outlineVariant
+	implicitHeight: shouldBeActive ? 1 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 }

Modules/Settings/Controls/SettingActionList.qml

@@ -13,6 +13,7 @@ ColumnLayout {
 	required property string name
 	required property var object
 	required property string setting
+	property bool shouldBeActive: true
 
 	function addAction() {
 		const list = [...root.object[root.setting]];
@@ -44,8 +45,26 @@ ColumnLayout {
 		Config.save();
 	}
 
-	Layout.fillWidth: true
+	anchors.left: parent.left
+	anchors.right: parent.right
+	height: shouldBeActive ? implicitHeight : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
 	spacing: Appearance.spacing.smaller
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent
@@ -108,6 +127,9 @@ ColumnLayout {
 				}
 
 				Separator {
+					Layout.fillWidth: true
+					anchors.left: undefined
+					anchors.right: undefined
 				}
 
 				RowLayout {
@@ -188,6 +210,8 @@ ColumnLayout {
 				StringListEditor {
 					Layout.fillWidth: true
 					addLabel: qsTr("Add command argument")
+					anchors.left: undefined
+					anchors.right: undefined
 					values: [...(modelData.command ?? [])]
 
 					onListEdited: function (values) {
@@ -196,6 +220,9 @@ ColumnLayout {
 				}
 
 				Separator {
+					Layout.fillWidth: true
+					anchors.left: undefined
+					anchors.right: undefined
 				}
 
 				RowLayout {
@@ -214,6 +241,9 @@ ColumnLayout {
 				}
 
 				Separator {
+					Layout.fillWidth: true
+					anchors.left: undefined
+					anchors.right: undefined
 				}
 
 				RowLayout {

Modules/Settings/Controls/SettingAliasList.qml

@@ -6,13 +6,14 @@ import qs.Components
 import qs.Config
 import qs.Helpers
 
-ColumnLayout {
+CustomRect {
 	id: root
 
 	readonly property bool highlighted: SettingsHighlight.highlightedSetting === name
 	required property string name
 	required property var object
 	required property string setting
+	property bool shouldBeActive: true
 
 	function addAlias() {
 		const list = [...root.object[root.setting]];
@@ -40,8 +41,25 @@ ColumnLayout {
 		Config.save();
 	}
 
-	Layout.fillWidth: true
-	spacing: Appearance.spacing.smaller
+	anchors.left: parent.left
+	anchors.right: parent.right
+	height: shouldBeActive ? layout.implicitHeight : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent
@@ -58,115 +76,128 @@ ColumnLayout {
 		}
 	}
 
-	CustomText {
-		Layout.fillWidth: true
-		font.pointSize: Appearance.font.size.larger
-		text: root.name
-	}
+	ColumnLayout {
+		id: layout
 
-	Repeater {
-		model: [...root.object[root.setting]]
-
-		Item {
-			required property int index
-			required property var modelData
-
-			Layout.fillWidth: true
-			Layout.preferredHeight: layout.implicitHeight + Appearance.padding.smaller * 2
-
-			CustomRect {
-				anchors.left: parent.left
-				anchors.right: parent.right
-				anchors.top: parent.top
-				anchors.topMargin: -(Appearance.spacing.smaller / 2)
-				color: DynamicColors.tPalette.m3outlineVariant
-				implicitHeight: 1
-				visible: index !== 0
-			}
-
-			ColumnLayout {
-				id: layout
-
-				anchors.left: parent.left
-				anchors.margins: Appearance.padding.small
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: Appearance.spacing.small
-
-				RowLayout {
-					Layout.fillWidth: true
-
-					CustomText {
-						Layout.fillWidth: true
-						text: qsTr("From")
-					}
-
-					CustomRect {
-						Layout.fillWidth: true
-						Layout.preferredHeight: 33
-						color: DynamicColors.tPalette.m3surfaceContainerHigh
-						radius: Appearance.rounding.full
-
-						CustomTextField {
-							anchors.fill: parent
-							anchors.leftMargin: Appearance.padding.normal
-							anchors.rightMargin: Appearance.padding.normal
-							text: modelData.from ?? ""
-
-							onEditingFinished: root.updateAlias(index, "from", text)
-						}
-					}
-
-					IconButton {
-						font.pointSize: Appearance.font.size.large
-						icon: "delete"
-						type: IconButton.Tonal
-
-						onClicked: root.removeAlias(index)
-					}
-				}
-
-				RowLayout {
-					Layout.fillWidth: true
-
-					CustomText {
-						Layout.fillWidth: true
-						text: qsTr("To")
-					}
-
-					CustomRect {
-						Layout.fillWidth: true
-						Layout.preferredHeight: 33
-						color: DynamicColors.tPalette.m3surface
-						radius: Appearance.rounding.small
-
-						CustomTextField {
-							anchors.fill: parent
-							anchors.leftMargin: Appearance.padding.normal
-							anchors.rightMargin: Appearance.padding.normal
-							text: modelData.to ?? ""
-
-							onEditingFinished: root.updateAlias(index, "to", text)
-						}
-					}
-				}
-			}
-		}
-	}
-
-	RowLayout {
-		Layout.fillWidth: true
-
-		IconButton {
-			font.pointSize: Appearance.font.size.large
-			icon: "add"
-
-			onClicked: root.addAlias()
-		}
+		anchors.left: parent.left
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+		spacing: Appearance.spacing.smaller
 
 		CustomText {
 			Layout.fillWidth: true
-			text: qsTr("Add alias")
+			font.pointSize: Appearance.font.size.larger
+			text: root.name
+		}
+
+		Repeater {
+			model: [...root.object[root.setting]]
+
+			Item {
+				required property int index
+				required property var modelData
+
+				Layout.fillWidth: true
+				Layout.preferredHeight: layout.implicitHeight + Appearance.padding.smaller * 2
+
+				CustomRect {
+					anchors.left: parent.left
+					anchors.right: parent.right
+					anchors.top: parent.top
+					anchors.topMargin: -(Appearance.spacing.smaller / 2)
+					color: DynamicColors.tPalette.m3outlineVariant
+					implicitHeight: 1
+					visible: index !== 0
+				}
+
+				ColumnLayout {
+					id: layout
+
+					anchors.left: parent.left
+					anchors.margins: Appearance.padding.small
+					anchors.right: parent.right
+					anchors.verticalCenter: parent.verticalCenter
+					spacing: Appearance.spacing.small
+
+					RowLayout {
+						Layout.fillWidth: true
+
+						CustomText {
+							Layout.fillWidth: true
+							text: qsTr("From")
+						}
+
+						CustomRect {
+							Layout.preferredHeight: 33
+							Layout.preferredWidth: Math.max(Math.min(fromTextField.contentWidth + Appearance.padding.large * 2, 550), 50)
+							color: DynamicColors.tPalette.m3surfaceContainerHigh
+							radius: Appearance.rounding.full
+
+							CustomTextField {
+								id: fromTextField
+
+								anchors.centerIn: parent
+								horizontalAlignment: Text.AlignHCenter
+								implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, 550)
+								text: modelData.from ?? ""
+
+								onEditingFinished: root.updateAlias(index, "from", text)
+							}
+						}
+
+						IconButton {
+							font.pointSize: Appearance.font.size.large
+							icon: "delete"
+							type: IconButton.Tonal
+
+							onClicked: root.removeAlias(index)
+						}
+					}
+
+					RowLayout {
+						Layout.fillWidth: true
+
+						CustomText {
+							Layout.fillWidth: true
+							text: qsTr("To")
+						}
+
+						CustomRect {
+							Layout.preferredHeight: 33
+							Layout.preferredWidth: Math.max(Math.min(toTextField.contentWidth + Appearance.padding.large * 2, 550), 50)
+							color: DynamicColors.tPalette.m3surfaceContainerHigh
+							radius: Appearance.rounding.full
+
+							CustomTextField {
+								id: toTextField
+
+								anchors.centerIn: parent
+								horizontalAlignment: Text.AlignHCenter
+								implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, 550)
+								text: modelData.to ?? ""
+
+								onEditingFinished: root.updateAlias(index, "to", text)
+							}
+						}
+					}
+				}
+			}
+		}
+
+		RowLayout {
+			Layout.fillWidth: true
+
+			IconButton {
+				font.pointSize: Appearance.font.size.large
+				icon: "add"
+
+				onClicked: root.addAlias()
+			}
+
+			CustomText {
+				Layout.fillWidth: true
+				text: qsTr("Add alias")
+			}
 		}
 	}
 }

Modules/Settings/Controls/SettingBarEntryList.qml

@@ -25,6 +25,7 @@ Item {
 	required property var object
 	property var pendingCommitEntries: []
 	required property string setting
+	property bool shouldBeActive: true
 	property int uidCounter: 0
 	property var visualEntries: []
 
@@ -146,8 +147,25 @@ Item {
 		Config.save();
 	}
 
-	Layout.fillWidth: true
-	implicitHeight: layout.implicitHeight
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? layout.implicitHeight : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Component.onCompleted: root.rebuildVisualEntries()
 

Modules/Settings/Controls/SettingHyprSpinner.qml

@@ -11,6 +11,7 @@ Item {
 	required property string name
 	required property var object
 	required property list<string> settings
+	property bool shouldBeActive: true
 
 	function commitChoice(choice: int, setting: string): void {
 		root.object[setting] = choice;
@@ -32,8 +33,25 @@ Item {
 		return Qt.formatTime(d, "h AP");
 	}
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent

Modules/Settings/Controls/SettingInput.qml

@@ -11,6 +11,7 @@ Item {
 	required property string name
 	required property var object
 	required property string setting
+	property bool shouldBeActive: true
 
 	function formattedValue(): string {
 		const value = root.object[root.setting];
@@ -21,8 +22,25 @@ Item {
 		return String(value);
 	}
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent

Modules/Settings/Controls/SettingList.qml

@@ -8,12 +8,31 @@ Item {
 
 	required property int index
 	required property var modelData
+	property bool shouldBeActive: true
 
 	signal addActiveActionRequested
+	signal deleteRequested(int index)
 	signal fieldEdited(string key, var value)
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	CustomRect {
 		anchors.left: parent.left
@@ -65,42 +84,64 @@ Item {
 
 			HoverHandler {
 				id: nameHover
+			}
 
+			HoverIconButton {
+				id: editButton
+
+				anchors.left: parent.left
+				anchors.verticalCenter: parent.verticalCenter
+				font.pointSize: Appearance.font.size.large
+				icon: "edit"
+				shouldBeVisible: nameHover.hovered && !nameCell.editing
+
+				onClicked: nameCell.beginEdit()
 			}
 
 			CustomText {
 				anchors.left: parent.left
-				anchors.right: editButton.left
+				anchors.leftMargin: nameHover.hovered ? editButton.width + Appearance.spacing.smaller * 2 : 0
+				anchors.right: deleteButton.left
 				anchors.rightMargin: Appearance.spacing.small
 				anchors.verticalCenter: parent.verticalCenter
 				elide: Text.ElideRight    // enable if CustomText supports it
 				font.pointSize: Appearance.font.size.larger
 				text: root.modelData.name
 				visible: !nameCell.editing
+
+				Behavior on anchors.leftMargin {
+					Anim {
+					}
+				}
 			}
 
-			IconButton {
-				id: editButton
+			HoverIconButton {
+				id: deleteButton
 
 				anchors.right: parent.right
 				anchors.verticalCenter: parent.verticalCenter
 				font.pointSize: Appearance.font.size.large
-				icon: "edit"
-				visible: nameHover.hovered && !nameCell.editing
+				icon: "delete"
+				shouldBeVisible: nameHover.hovered && !nameCell.editing
 
-				onClicked: nameCell.beginEdit()
+				onClicked: root.deleteRequested(root.index)
 			}
 
 			CustomRect {
-				anchors.fill: parent
+				anchors.left: parent.left
+				anchors.verticalCenter: parent.verticalCenter
 				color: DynamicColors.tPalette.m3surface
+				implicitHeight: nameEditor.implicitHeight + (Appearance.padding.normal * 2)
+				implicitWidth: Math.min(nameEditor.contentWidth + (Appearance.padding.normal * 2), parent.width - Appearance.padding.normal)
 				radius: Appearance.rounding.small
 				visible: nameCell.editing
 
 				CustomTextField {
 					id: nameEditor
 
-					anchors.fill: parent
+					anchors.centerIn: parent
+					horizontalAlignment: Text.AlignHCenter
+					implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, nameCell.width - Appearance.padding.normal)
 					text: nameCell.draftName
 
 					Keys.onEscapePressed: {
@@ -153,6 +194,9 @@ Item {
 			}
 
 			Separator {
+				Layout.fillWidth: true
+				anchors.left: undefined
+				anchors.right: undefined
 			}
 
 			RowLayout {
@@ -184,6 +228,9 @@ Item {
 			}
 
 			Separator {
+				Layout.fillWidth: true
+				anchors.left: undefined
+				anchors.right: undefined
 			}
 
 			Item {

Modules/Settings/Controls/SettingListView.qml

@@ -11,10 +11,32 @@ Item {
 
 	required property string name
 	required property var object
+	property alias row: row
 	required property string setting
+	property bool shouldBeActive: true
+	required property list<var> stringList
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.height
+	signal optionSet
+
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.height : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	RowLayout {
 		id: row
@@ -38,7 +60,7 @@ Item {
 			Layout.preferredHeight: 42 * 6 + Appearance.padding.normal * 2 + Appearance.spacing.small * 5
 			Layout.preferredWidth: 500
 			color: DynamicColors.tPalette.m3surfaceContainer
-			radius: 21 + Appearance.padding.normal
+			radius: (21 + Appearance.padding.normal) * Appearance.rounding.scale
 
 			CustomRect {
 				id: searchBox
@@ -120,17 +142,18 @@ Item {
 						StateLayer {
 							onClicked: {
 								root.object[root.setting] = fontDelegate.modelData;
+								root.optionSet();
 								Config.save();
 							}
 						}
 					}
 					model: ScriptModel {
 						values: {
-							const fonts = Qt.fontFamilies();
+							const values = root.stringList;
 							const search = fontSearch.text;
 							var regex = new RegExp(search, "i");
 
-							return fonts.filter(n => regex.test(n));
+							return values.filter(n => regex.test(n));
 						}
 					}
 				}

Modules/Settings/Controls/SettingReadOnly.qml

@@ -9,10 +9,28 @@ Item {
 
 	readonly property bool highlighted: SettingsHighlight.highlightedSetting === name
 	required property string name
+	property bool shouldBeActive: true
 	required property string value
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent

Modules/Settings/Controls/SettingSpinBox.qml

@@ -13,10 +13,28 @@ Item {
 	required property string name
 	required property var object
 	required property string setting
+	property bool shouldBeActive: true
 	property real step: 1
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent

Modules/Settings/Controls/SettingSpinner.qml

@@ -11,6 +11,7 @@ Item {
 	required property string name
 	required property var object
 	required property list<string> settings
+	property bool shouldBeActive: true
 
 	function commitChoice(choice: int, setting: string): void {
 		root.object[setting] = choice;
@@ -32,8 +33,25 @@ Item {
 		return Qt.formatTime(d, "h AP");
 	}
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent

Modules/Settings/Controls/SettingStringList.qml

@@ -12,9 +12,27 @@ Item {
 	required property string name
 	required property var object
 	required property string setting
+	property bool shouldBeActive: true
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: layout.implicitHeight
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? layout.implicitHeight : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent
@@ -46,6 +64,9 @@ Item {
 		StringListEditor {
 			Layout.fillWidth: true
 			addLabel: root.addLabel
+			anchors.left: undefined
+			anchors.right: undefined
+			anchors.verticalCenter: undefined
 			values: [...(root.object[root.setting] ?? [])]
 
 			onListEdited: function (values) {

Modules/Settings/Controls/SettingSwitch.qml

@@ -11,9 +11,27 @@ Item {
 	required property string name
 	required property var object
 	required property string setting
+	property bool shouldBeActive: true
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: row.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Rectangle {
 		anchors.fill: parent

Modules/Settings/Controls/SettingsHeader.qml

@@ -7,9 +7,13 @@ CustomRect {
 	id: root
 
 	required property string name
+	property bool shouldBeActive: true
 
-	Layout.preferredHeight: 60
-	Layout.preferredWidth: 200
+	implicitHeight: 60
+	implicitWidth: 200
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
 
 	CustomText {
 		anchors.fill: parent

Modules/Settings/Controls/SettingsIconButton.qml

@@ -0,0 +1,83 @@
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import qs.Paths
+import qs.Components
+import qs.Config
+import qs.Helpers
+
+Item {
+	id: root
+
+	property alias button: iButton
+	readonly property bool highlighted: SettingsHighlight.highlightedSetting === name
+	required property string name
+	property bool shouldBeActive: true
+
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? row.implicitHeight + Appearance.padding.smaller * 2 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
+
+	Rectangle {
+		anchors.fill: parent
+		anchors.margins: -Appearance.padding.smaller
+		color: DynamicColors.palette.m3primaryContainer
+		opacity: root.highlighted ? 0.5 : 0
+		radius: Appearance.rounding.small
+
+		Behavior on opacity {
+			Anim {
+				duration: Appearance.anim.durations.normal
+			}
+		}
+	}
+
+	RowLayout {
+		id: row
+
+		anchors.left: parent.left
+		anchors.margins: Appearance.padding.small
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+
+		CustomText {
+			id: text
+
+			Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+			Layout.fillWidth: true
+			font.pointSize: Appearance.font.size.larger
+			text: root.name
+		}
+
+		IconButton {
+			id: iButton
+
+			Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+			icon: "download"
+
+			onClicked: {
+				const lockBg = `${Paths.state}/lockscreen_bg.png`;
+				const scheme = `${Paths.state}/scheme.json`;
+				const face = `${Paths.home}/.face`;
+				const destination = "/etc/zshell-greeter/images";
+				Quickshell.execDetached(["pkexec", "sh", "-c", `mkdir -p ${destination}; cp ${lockBg} ${destination}; cp ${scheme} /etc/zshell-greeter; cp ${face} ${destination}`]);
+			}
+		}
+	}
+}

Modules/Settings/Controls/SettingsPage.qml

@@ -60,12 +60,18 @@ CustomClippingRect {
 			}
 		}
 
-		ColumnLayout {
+		Column {
 			id: clayout
 
 			anchors.left: parent.left
 			anchors.right: parent.right
 			spacing: Appearance.spacing.small
+
+			// move: Transition {
+			// 	Anim {
+			// 		properties: "y"
+			// 	}
+			// }
 		}
 	}
 }

Modules/Settings/Controls/SettingsSection.qml

@@ -10,18 +10,39 @@ CustomRect {
 	property real contentPadding: Appearance.padding.large
 	property string sectionId: ""
 
-	Layout.fillWidth: true
-	Layout.preferredHeight: layout.implicitHeight + contentPadding * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
 	color: DynamicColors.tPalette.m3surfaceContainer
+	implicitHeight: layout.height + contentPadding * 2
 	radius: Appearance.rounding.normal - Appearance.padding.smaller
 
-	ColumnLayout {
+	Behavior on implicitHeight {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
+
+	Column {
 		id: layout
 
 		anchors.left: parent.left
 		anchors.margins: root.contentPadding
 		anchors.right: parent.right
-		anchors.verticalCenter: parent.verticalCenter
+		anchors.top: parent.top
+		// anchors.verticalCenter: parent.verticalCenter
 		spacing: Appearance.spacing.normal
+
+		Behavior on height {
+			Anim {
+			}
+		}
+		move: Transition {
+			Anim {
+				properties: "y"
+			}
+		}
 	}
 }

Modules/Settings/Controls/SpinnerButton.qml

@@ -12,12 +12,29 @@ CustomRect {
 	property alias expanded: menu.expanded
 	property alias label: label
 	property alias menu: menu
+	property bool shouldBeActive: true
 	property alias text: label.text
 
 	color: enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
+	opacity: shouldBeActive ? 1 : 0
 	radius: Appearance.rounding.full
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
 	z: expanded ? 100 : 0
 
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
+
 	CustomText {
 		id: label
 

Modules/Settings/Controls/StringListEditor.qml

@@ -9,6 +9,7 @@ ColumnLayout {
 	id: root
 
 	property string addLabel: qsTr("Add entry")
+	property bool shouldBeActive: true
 	property var values: []
 
 	signal listEdited(var values)
@@ -31,8 +32,26 @@ ColumnLayout {
 		root.listEdited(list);
 	}
 
-	Layout.fillWidth: true
+	anchors.left: parent.left
+	anchors.right: parent.right
+	height: shouldBeActive ? implicitHeight : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
 	spacing: Appearance.spacing.smaller
+	visible: opacity > 0
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
 	Repeater {
 		model: [...root.values]

Modules/Settings/Controls/WallpaperCropper.qml

@@ -1,102 +1,279 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
 import Quickshell
+import Quickshell.Hyprland
+import ZShell.Internal
 import qs.Config
 import qs.Components
 import qs.Helpers
 
-ColumnLayout {
-	id: root
+Item {
+	id: wrapper
 
-	spacing: 15
-	width: Math.min(parent ? parent.width : 600, 600)
+	property bool changesMade: false
+	property bool shouldBeActive: true
 
-	Rectangle {
-		id: previewContainer
+	signal requestCrop
 
-		Layout.fillHeight: true
-		Layout.preferredWidth: height * (Quickshell.screens.length > 0 ? (Quickshell.screens[0].height / Math.max(1, Quickshell.screens[0].width)) : 16 / 9)
-		clip: true
-		color: DynamicColors.palette.m3surfaceContainer
-		radius: Config.appearance.rounding.scale * 10
+	anchors.left: parent.left
+	anchors.right: parent.right
+	implicitHeight: shouldBeActive ? 400 : 0
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
 
-		Image {
-			id: img
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
+		}
+	}
 
-			anchors.fill: parent
-			asynchronous: true
-			fillMode: Image.PreserveAspectFit
-			source: Wallpapers.current
+	IconButton {
+		anchors.margins: Appearance.padding.normal
+		anchors.right: parent.right
+		anchors.top: parent.top
+		icon: "check"
+		opacity: wrapper.changesMade ? 1 : 0
+		scale: wrapper.changesMade ? 1 : 0
+		z: 2
 
-			Rectangle {
-				id: cropRect
+		Behavior on opacity {
+			Anim {
+			}
+		}
+		Behavior on scale {
+			Anim {
+			}
+		}
 
-				property real cropHeight: (imageAspect > screenAspect ? paintedHeight : paintedWidth / screenAspect) / Config.background.zoom
-				property real cropWidth: (imageAspect > screenAspect ? paintedHeight * screenAspect : paintedWidth) / Config.background.zoom
-				property real imageAspect: Math.max(1, paintedWidth) / Math.max(1, paintedHeight)
-				property real paintedHeight: img.paintedHeight > 0 ? img.paintedHeight : img.height
-				property real paintedWidth: img.paintedWidth > 0 ? img.paintedWidth : img.width
-				property real paintedX: (img.width - paintedWidth) / 2
-				property real paintedY: (img.height - paintedHeight) / 2
-				property real screenAspect: Quickshell.screens.length > 0 ? (Quickshell.screens[0].width / Math.max(1, Quickshell.screens[0].height)) : 16 / 9
+		onClicked: {
+			wrapper.requestCrop();
+			wrapper.changesMade = false;
+		}
+	}
 
-				border.color: DynamicColors.palette.m3primary
-				border.width: 2
-				color: Qt.alpha(DynamicColors.palette.m3primaryContainer, 0.3)
-				height: cropHeight
-				width: cropWidth
-				x: paintedX + (paintedWidth - width) * Config.background.alignX
-				y: paintedY + (paintedHeight - height) * Config.background.alignY
+	RowLayout {
+		id: root
 
-				DragHandler {
-					target: null
+		anchors.fill: parent
+		spacing: Appearance.spacing.normal
 
-					onActiveTranslationChanged: {
-						if (active) {
-							let newX = cropRect.x - cropRect.paintedX + translation.x;
-							let newY = cropRect.y - cropRect.paintedY + translation.y;
+		Repeater {
+			model: ScriptModel {
+				values: [...Quickshell.screens].sort((a, b) => {
+					return a.x - b.x;
+				})
+			}
 
-							let rangeX = cropRect.paintedWidth - cropRect.width;
-							let rangeY = cropRect.paintedHeight - cropRect.height;
+			Item {
+				id: delegate
 
-							if (rangeX > 0) {
-								let valX = newX / rangeX;
-								Config.background.alignX = Math.max(0.0, Math.min(1.0, valX));
-								Config.save();
-							}
+				required property ShellScreen modelData
 
-							if (rangeY > 0) {
-								let valY = newY / rangeY;
-								Config.background.alignY = Math.max(0.0, Math.min(1.0, valY));
-								Config.save();
-							}
+				function applyCrop(): void {
+					const croprect = cropRect.mapToItem(scaledImg, 0, 0, cropRect.width, cropRect.height);
+					const upscaledRect = Qt.rect((croprect.x - cropRect.imageX) / scaledImg.paintedWidth, (croprect.y - cropRect.imageY) / scaledImg.paintedHeight, croprect.width / scaledImg.paintedWidth, croprect.height / scaledImg.paintedHeight);
+					Wallpapers.setCrop(delegate.modelData.name, upscaledRect, croprect, cropRect.zoom);
+				}
+
+				function zoomClipRect(zoom: real): void {
+					let oldCenterX = cropRect.x + cropRect.width * 0.5;
+					let oldCenterY = cropRect.y + cropRect.height * 0.5;
+
+					cropRect.zoom = zoom;
+
+					cropRect.x = oldCenterX - cropRect.width * 0.5;
+					cropRect.y = oldCenterY - cropRect.height * 0.5;
+
+					cropRect.clampToBounds();
+				}
+
+				Layout.fillHeight: true
+				Layout.fillWidth: true
+
+				Connections {
+					function onRequestCrop(): void {
+						delegate.applyCrop();
+					}
+
+					target: wrapper
+				}
+
+				RowLayout {
+					id: sliderLayout
+
+					anchors.bottom: parent.bottom
+					anchors.left: parent.left
+					anchors.right: parent.right
+					implicitHeight: 30
+					spacing: Appearance.spacing.large
+
+					CustomText {
+						text: qsTr("Crop scale")
+					}
+
+					CustomSlider {
+						id: zoomSlider
+
+						Layout.fillWidth: true
+						Layout.preferredHeight: 10
+						from: 1.0
+						to: 5.0
+						value: cropRect.zoom
+
+						onMoved: {
+							delegate.zoomClipRect(value);
+							wrapper.changesMade = true;
 						}
 					}
 				}
 
-				PinchHandler {
-					maximumScale: 5.0
-					minimumScale: 1.0
-					target: null
+				CachingImage {
+					id: scaledImg
 
-					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));
+					property var displayData
+					property real monitorScale: 1.0
+
+					anchors.bottom: sliderLayout.top
+					anchors.bottomMargin: Appearance.spacing.normal
+					anchors.left: parent.left
+					anchors.right: parent.right
+					anchors.top: parent.top
+					asynchronous: true
+					fillMode: Image.PreserveAspectFit
+					// retainWhileLoading: true
+					source: Wallpapers.current
+					sourceSize.height: parent.height
+					sourceSize.width: parent.width
+
+					onPaintedWidthChanged: {
+						if (paintedWidth > 0) {
+							scaledImg.displayData = Wallpapers.getCrop(delegate.modelData.name);
+							cropRect.zoom = Wallpapers.getCrop(delegate.modelData.name).zoom;
+							cropRect.restoreFromData();
+						}
+					}
+					onSourceChanged: cropRect.clampToBounds()
+					onStatusChanged: if (scaledImg.status == Image.Ready)
+						cropRect.clampToBounds()
+
+					CustomText {
+						id: monitorId
+
+						anchors.centerIn: parent
+						color: Qt.alpha(DynamicColors.palette.m3surface, 0.85)
+						font.pointSize: Appearance.font.size.large * 4
+						style: Text.Outline
+						styleColor: DynamicColors.palette.m3onSurface
+						text: delegate.modelData.name
+					}
+
+					CustomRect {
+						id: cropRect
+
+						property real aspectRatio: delegate.modelData.width / delegate.modelData.height
+						readonly property real baseHeight: baseWidth / aspectRatio
+						readonly property real baseWidth: {
+							let fittedHeight = scaledImg.paintedHeight;
+							let fittedWidth = fittedHeight * aspectRatio;
+
+							if (fittedWidth > scaledImg.paintedWidth) {
+								fittedWidth = scaledImg.paintedWidth;
+								fittedHeight = fittedWidth / aspectRatio;
+							}
+
+							return fittedWidth;
+						}
+						readonly property real imageX: (scaledImg.width - scaledImg.paintedWidth) / 2
+						readonly property real imageY: (scaledImg.height - scaledImg.paintedHeight) / 2
+						property real imgAspectRatio: scaledImg.paintedWidth / scaledImg.paintedHeight
+						property real zoom: scaledImg.displayData.zoom
+
+						function centerInImage() {
+							x = imageX + (scaledImg.paintedWidth - width) / 2;
+							y = imageY + (scaledImg.paintedHeight - height) / 2;
+						}
+
+						function clampToBounds() {
+							x = Math.max(imageX, Math.min(x, imageX + scaledImg.paintedWidth - width));
+
+							y = Math.max(imageY, Math.min(y, imageY + scaledImg.paintedHeight - height));
+						}
+
+						function restoreFromData() {
+							let data = scaledImg.displayData;
+
+							if (data && data.scaledX !== 0 || data.scaledY !== 0 || data.scaledWidth !== 0 || data.scaledHeight !== 0) {
+								x = data.scaledX;
+								y = data.scaledY;
+
+								clampToBounds();
+							} else {
+								zoom = 1.0;
+								centerInImage();
+							}
+						}
+
+						border.color: DynamicColors.palette.m3primary
+						border.width: 2
+						height: baseHeight / zoom
+						opacity: 1
+						width: baseWidth / zoom
+
+						Behavior on opacity {
+							Anim {
+							}
+						}
+
+						Component.onCompleted: clampToBounds()
+						onHeightChanged: clampToBounds()
+						onWidthChanged: clampToBounds()
+					}
+
+					MouseArea {
+						id: mouse
+
+						function updateCrop(mouseX, mouseY) {
+							let nx = mouseX - cropRect.width * 0.5;
+							let ny = mouseY - cropRect.height * 0.5;
+
+							nx = Math.max(cropRect.imageX, Math.min(nx, cropRect.imageX + scaledImg.paintedWidth - cropRect.width));
+
+							ny = Math.max(cropRect.imageY, Math.min(ny, cropRect.imageY + scaledImg.paintedHeight - cropRect.height));
+
+							cropRect.x = nx;
+							cropRect.y = ny;
+						}
+
+						anchors.fill: parent
+						hoverEnabled: true
+						preventStealing: true
+
+						onPositionChanged: mouse => {
+							if (pressed) {
+								updateCrop(mouse.x, mouse.y);
+								wrapper.changesMade = true;
+							}
+						}
+						onPressed: mouse => {
+							updateCrop(mouse.x, mouse.y);
+							wrapper.changesMade = true;
+						}
+						onReleased: {
+							wrapper.changesMade = true;
 						}
 					}
 				}
 			}
 		}
 	}
-
-	SettingSpinBox {
-		max: 5.0
-		min: 1.0
-		name: "Zoom"
-		object: Config.background
-		setting: "zoom"
-		step: 0.1
-	}
 }

Modules/Settings/Controls/WallpaperGrid.qml

@@ -12,37 +12,30 @@ GridView {
 
 	readonly property int columnsCount: Math.max(1, Math.floor(width / minCellWidth))
 	readonly property int minCellWidth: 200 + Appearance.spacing.normal
+	property bool shouldBeActive: true
 
-	Layout.preferredHeight: contentHeight
+	anchors.left: parent.left
+	anchors.right: parent.right
 	cellHeight: 140 + Appearance.spacing.normal
 	cellWidth: width / columnsCount
 	clip: true
+	implicitHeight: shouldBeActive ? contentHeight : 0
 	interactive: false
 	model: Wallpapers.list
+	opacity: shouldBeActive ? 1 : 0
+	scale: shouldBeActive ? 1 : 0.8
+	visible: opacity > 0
 
 	delegate: Item {
 		required property int index
 		readonly property bool isCurrent: modelData && modelData.path === Wallpapers.actualCurrent
-		readonly property real itemMargin: Appearance.spacing.normal / 2
-		readonly property real itemRadius: Appearance.rounding.normal
+		readonly property real itemMargin: Appearance.spacing.normal
+		readonly property real itemRadius: Appearance.rounding.small
 		required property var modelData
 
 		height: root.cellHeight
 		width: root.cellWidth
 
-		StateLayer {
-			function onClicked(): void {
-				Wallpapers.setWallpaper(modelData.path);
-			}
-
-			anchors.bottomMargin: itemMargin
-			anchors.fill: parent
-			anchors.leftMargin: itemMargin
-			anchors.rightMargin: itemMargin
-			anchors.topMargin: itemMargin
-			radius: itemRadius
-		}
-
 		CustomClippingRect {
 			id: image
 
@@ -53,8 +46,6 @@ GridView {
 			anchors.topMargin: itemMargin
 			antialiasing: true
 			color: DynamicColors.tPalette.m3surfaceContainer
-			layer.enabled: true
-			layer.smooth: true
 			radius: itemRadius
 
 			CachingImage {
@@ -100,6 +91,33 @@ GridView {
 				}
 			}
 
+			Rectangle {
+				anchors.fill: parent
+				antialiasing: true
+				border.color: DynamicColors.palette.m3primary
+				border.width: isCurrent ? 2 : 0
+				color: "transparent"
+				radius: itemRadius + 2
+				smooth: true
+
+				Behavior on border.width {
+					NumberAnimation {
+						duration: 150
+						easing.type: Easing.OutQuad
+					}
+				}
+
+				MaterialIcon {
+					anchors.margins: Appearance.padding.small
+					anchors.right: parent.right
+					anchors.top: parent.top
+					color: DynamicColors.palette.m3primary
+					font.pointSize: Appearance.font.size.large
+					text: "check_circle"
+					visible: isCurrent
+				}
+			}
+
 			Timer {
 				id: fallbackTimer
 
@@ -112,35 +130,29 @@ GridView {
 			}
 		}
 
-		Rectangle {
+		StateLayer {
+			function onClicked(): void {
+				Wallpapers.setWallpaper(modelData.path);
+			}
+
 			anchors.bottomMargin: itemMargin
 			anchors.fill: parent
 			anchors.leftMargin: itemMargin
 			anchors.rightMargin: itemMargin
 			anchors.topMargin: itemMargin
-			antialiasing: true
-			border.color: DynamicColors.palette.m3primary
-			border.width: isCurrent ? 2 : 0
-			color: "transparent"
-			radius: itemRadius - border.width
-			smooth: true
-
-			Behavior on border.width {
-				NumberAnimation {
-					duration: 150
-					easing.type: Easing.OutQuad
-				}
-			}
-
-			MaterialIcon {
-				anchors.margins: Appearance.padding.small
-				anchors.right: parent.right
-				anchors.top: parent.top
-				color: DynamicColors.palette.m3primary
-				font.pointSize: Appearance.font.size.large
-				text: "check_circle"
-				visible: isCurrent
-			}
+			radius: itemRadius
+		}
+	}
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+	Behavior on y {
+		Anim {
 		}
 	}
 }

Modules/Settings/SettingsSearch.qml

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

Modules/Settings/Wrapper.qml

@@ -7,45 +7,24 @@ 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
 
-	implicitHeight: 0
+	anchors.topMargin: (-implicitHeight - 5) * offsetScale
+	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth
-	visible: height > 0
+	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
-	states: State {
-		name: "visible"
-		when: root.visibilities.settings
-
-		PropertyChanges {
-			root.implicitHeight: content.implicitHeight
+	Behavior on offsetScale {
+		Anim {
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
 		}
 	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
-
-			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				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,7 +19,6 @@ Scope {
 			if (!root.launcherInterrupted && !root.hasFullscreen) {
 				const visibilities = Visibilities.getForActive();
 				visibilities.launcher = !visibilities.launcher;
-				console.log(root.launcherInterrupted);
 			}
 			root.launcherInterrupted = false;
 		}

Modules/SysTray/Popouts/TrayMenuPopout.qml

@@ -82,12 +82,14 @@ StackView {
 			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.smallest / 2
+				radius: Appearance.rounding.full
+				visible: index !== (menuOpener.children.values.length - 1) ? true : (modelData.isSeparator ? false : true)
 
 				Loader {
 					id: children
@@ -201,18 +203,18 @@ StackView {
 			asynchronous: true
 
 			sourceComponent: Item {
-				implicitHeight: back.implicitHeight + 2 / 2
+				implicitHeight: 30
 				implicitWidth: back.implicitWidth
 
 				Item {
 					anchors.bottom: parent.bottom
-					implicitHeight: back.implicitHeight
-					implicitWidth: back.implicitWidth + 10
+					implicitHeight: 30
+					implicitWidth: root.biggestWidth
 
 					CustomRect {
 						anchors.fill: parent
 						color: DynamicColors.palette.m3secondaryContainer
-						radius: Appearance.rounding.smallest / 2
+						radius: Appearance.rounding.full
 
 						StateLayer {
 							function onClicked(): void {

Modules/SysTray/Popouts/UPowerPopout.qml

@@ -31,7 +31,7 @@ Item {
 		implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + 5 * 2 + saverLabel.contentHeight
 		implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + 8 * 2 + saverLabel.contentWidth
 		// color: "transparent"
-		radius: 6
+		radius: (20 - Appearance.padding.small) * Appearance.rounding.scale
 
 		CustomRect {
 			id: indicator

Modules/SysTray/TrayItem.qml

@@ -1,5 +1,6 @@
 import QtQuick.Layouts
 import QtQuick
+import QtQuick.VectorImage
 import Quickshell
 import Quickshell.Services.SystemTray
 import qs.Modules

Modules/Updates/UpdatesWidget.qml

@@ -14,7 +14,7 @@ CustomRect {
 	color: DynamicColors.tPalette.m3surfaceContainer
 	implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
 	implicitWidth: contentRow.implicitWidth + Appearance.spacing.small * 2
-	radius: height / 2
+	radius: Appearance.rounding.full
 
 	RowLayout {
 		id: contentRow

Modules/Wallpaper/WallBackground-old.qml

@@ -0,0 +1,80 @@
+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,5 +1,7 @@
 pragma ComponentBehavior: Bound
 
+import Quickshell
+import Quickshell.Hyprland
 import QtQuick
 import qs.Components
 import qs.Helpers
@@ -8,79 +10,76 @@ import qs.Config
 Item {
 	id: root
 
-	property Image current: one
+	required property ShellScreen screen
 	property string source: Wallpapers.current
 
+	function refreshData(): void {
+		Hyprland.refreshMonitors();
+		const scale = Hyprland.monitorFor(root.screen).scale;
+		if (scale > 0 && img.resScale !== scale) {
+			img.resScale = scale;
+			img.sourceSize.width = root.screen.width * scale;
+		}
+		const displayData = Wallpapers.getCrop(root.screen.name);
+		const displayRect = Qt.rect(img.sourceSize.width * displayData.x, img.implicitHeight * displayData.y, img.sourceSize.width * displayData.width, img.implicitHeight * displayData.height);
+		img.anchors.fill = null;
+		img.zoom = displayData.zoom;
+		img.x = -(displayRect.x * displayData.zoom / img.resScale);
+		img.y = -(displayRect.y * displayData.zoom / img.resScale);
+	}
+
 	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: CachingImage {
+	Image {
 		id: img
 
-		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)
+		property int displayH
+		property int displayW
+		property real resScale
+		property real zoom: 1.0
 
-		function update(): void {
-			if (path === root.source) {
-				root.current = this;
-			} else {
-				path = root.source;
-			}
-		}
-
-		anchors.fill: undefined
 		asynchronous: true
 		fillMode: Image.PreserveAspectCrop
-		height: isValid ? (imageRatio > windowRatio ? root.height : root.width / imageRatio) * Config.background.zoom : root.height
-		opacity: 0
-		scale: Wallpapers.showPreview ? 1 : 0.8
-		width: isValid ? (imageRatio > windowRatio ? root.height * imageRatio : root.width) * Config.background.zoom : root.width
-		x: isValid ? (root.width - width) * Config.background.alignX : 0
-		y: isValid ? (root.height - height) * Config.background.alignY : 0
+		height: implicitHeight * zoom / resScale
+		opacity: 1
+		retainWhileLoading: true
+		source: root.source
+		sourceSize.width: root.screen.width * resScale
+		width: implicitWidth * zoom / resScale
 
-		states: State {
-			name: "visible"
-			when: root.current === img
-
-			PropertyChanges {
-				img.opacity: 1
-				img.scale: 1
+		Behavior on height {
+			Anim {
 			}
 		}
-		transitions: Transition {
+		Behavior on width {
+			Anim {
+			}
+		}
+		Behavior on x {
+			Anim {
+			}
+		}
+		Behavior on y {
 			Anim {
-				duration: Config.background.wallFadeDuration
-				properties: "opacity,scale"
-				target: img
 			}
 		}
 
 		onStatusChanged: {
-			if (status === Image.Ready) {
-				root.current = this;
+			if (img.status == Image.Ready) {
+				root.refreshData();
 			}
 		}
+
+		Connections {
+			function onAdapterUpdated(): void {
+				root.refreshData();
+			}
+
+			function onLoaded(): void {
+				root.refreshData();
+			}
+
+			target: Wallpapers.monitorCrops
+		}
 	}
 }

Modules/Wallpaper/Wallpaper.qml

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

Modules/Workspaces.qml

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

Plugins/ZShell/Blobs/CMakeLists.txt

@@ -12,6 +12,7 @@ qml_module(ZShell-blobs
 
 qt_add_shaders(ZShell-blobs "blob_shaders"
     BATCHABLE OPTIMIZED NOHLSL NOMSL
+	GLSL "300es,330"
     PREFIX "/"
     FILES
         shaders/blob.frag

Plugins/ZShell/Blobs/blobmaterial.cpp

@@ -2,6 +2,9 @@
 
 #include <cstring>
 
+static_assert(sizeof(decltype(BlobRectData::excludeMask)) == sizeof(float),
+              "BlobMaterial packs excludeMask into a float slot via memcpy");
+
 QSGMaterialType* BlobMaterial::type() const {
 	static QSGMaterialType s_type;
 	return &s_type;
@@ -82,8 +85,11 @@ bool BlobMaterialShader::updateUniformData(RenderState& state, QSGMaterial* newM
 	for (int i = 0; i < count; ++i) {
 		const auto& r = mat->m_rects[i];
 		const int base = 160 + i * 80;
+		// Pack excludeMask into props.x via bit-cast (read in shader with floatBitsToInt)
+		float maskAsFloat;
+		memcpy(&maskAsFloat, &r.excludeMask, sizeof(float));
 		const float d0[4] = { r.cx, r.cy, r.hw, r.hh };
-		const float d1[4] = { 0.0f, r.offsetX, r.offsetY, r.minEig };
+		const float d1[4] = { maskAsFloat, r.offsetX, r.offsetY, r.minEig };
 		const float d3[4] = { r.screenHalfX, r.screenHalfY, 0.0f, 0.0f };
 		memcpy(buf->data() + base, d0, 16);
 		memcpy(buf->data() + base + 16, d1, 16);

Plugins/ZShell/Blobs/blobmaterial.hpp

@@ -14,6 +14,9 @@ struct BlobRectData {
 	float screenHalfX = 0, screenHalfY = 0;
 	// Effective per-corner radii (tr, br, bl, tl), pre-computed on CPU
 	float radius[4] = { 0, 0, 0, 0 };
+	// Bitmask of indices in this rect's m_cachedRects that mutually exclude (or are excluded by) this rect.
+	// Used by the shader to skip smin between excluded pairs.
+	int excludeMask = 0;
 };
 
 class BlobMaterial : public QSGMaterial {

Plugins/ZShell/Blobs/blobshape.cpp

@@ -72,11 +72,17 @@ 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());
-		const auto dw = std::abs(newGeometry.width() - oldGeometry.width());
-		const auto dh = std::abs(newGeometry.height() - oldGeometry.height());
-		if (std::abs(m_pendingDx) > 0.5f || std::abs(m_pendingDy) > 0.5f || dw > 0.5 || dh > 0.5) {
+		// Accumulate size delta across multiple frames so incremental size
+		// changes that are each below the threshold still trigger a dirty
+		// mark once their accumulated delta exceeds it.
+		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);
 		}
 	}
@@ -149,6 +155,10 @@ void BlobShape::updatePolish() {
 	const QRectF myPadded(static_cast<double>(m_cachedPaddedX), static_cast<double>(m_cachedPaddedY),
 	                      static_cast<double>(m_cachedPaddedW), static_cast<double>(m_cachedPaddedH));
 
+	// Track shape pointers parallel to m_cachedRects for pairwise exclusion lookups
+	QVector<BlobShape*> rectShapes;
+	rectShapes.reserve(m_group->shapes().size());
+
 	for (BlobShape* other : m_group->shapes()) {
 		if (other->isInvertedRect())
 			continue;
@@ -210,12 +220,29 @@ void BlobShape::updatePolish() {
 			r.screenHalfY = std::abs(b) * r.hw + std::abs(d) * r.hh;
 
 			m_cachedRects.append(r);
+			rectShapes.append(other);
 		}
 	}
 
 	if (isInvertedRect())
 		m_cachedMyIndex = -1;
 
+	// Compute pairwise exclude masks. Bit j in entry i is set iff rect i excludes rect j
+	// or rect j excludes rect i. The shader uses this to avoid smin between excluded pairs.
+	const auto cachedCount = m_cachedRects.size();
+	for (qsizetype i = 0; i < cachedCount; ++i) {
+		int mask = 0;
+		BlobShape* si = rectShapes[i];
+		for (qsizetype j = 0; j < cachedCount; ++j) {
+			if (j == i)
+				continue;
+			BlobShape* sj = rectShapes[j];
+			if (si->isExcluded(sj) || sj->isExcluded(si))
+				mask |= (1 << j);
+		}
+		m_cachedRects[i].excludeMask = mask;
+	}
+
 	// Cache inverted rect data
 	m_cachedHasInverted = false;
 	m_cachedInvertedRadius = 0;
@@ -270,6 +297,7 @@ void BlobShape::updatePolish() {
 	const auto rectCount = m_cachedRects.size();
 	for (qsizetype i = 0; i < rectCount; ++i) {
 		auto& ri = m_cachedRects[i];
+		const int riExcludeMask = ri.excludeMask;
 		float fTr = 1.0f, fBr = 1.0f, fBl = 1.0f, fTl = 1.0f;
 
 		const float cTrX = ri.cx + ri.hw, cTrY = ri.cy - ri.hh;
@@ -280,6 +308,8 @@ void BlobShape::updatePolish() {
 		for (qsizetype j = 0; j < rectCount; ++j) {
 			if (j == i)
 				continue;
+			if (riExcludeMask & (1 << j))
+				continue;
 			const auto& rj = m_cachedRects[j];
 			fTr = std::min(fTr, cpuSmoothstep(0.0f, smoothFactor, cpuSdBox(cTrX, cTrY, rj.cx, rj.cy, rj.hw, rj.hh)));
 			fBr = std::min(fBr, cpuSmoothstep(0.0f, smoothFactor, cpuSdBox(cBrX, cBrY, rj.cx, rj.cy, rj.hw, rj.hh)));

Plugins/ZShell/Blobs/blobshape.hpp

@@ -84,8 +84,10 @@ QRectF m_localPaddedRect;
 QVector<BlobRectData> m_cachedRects;
 int m_cachedMyIndex = -2;
 float m_pendingDx = 0;
-float m_pendingDy = 0;
-bool m_cachedHasInverted = false;
+	float m_pendingDy = 0;
+	float m_pendingDw = 0;
+	float m_pendingDh = 0;
+	bool m_cachedHasInverted = false;
 float m_cachedInvertedRadius = 0;
 float m_cachedInvertedOuter[4] = {};
 float m_cachedInvertedInner[4] = {};

Plugins/ZShell/Blobs/shaders/blob.frag

@@ -63,13 +63,17 @@ float smaxSharpA(float a, float b, float k) {
 void main() {
   vec2 pixel = vec2(paddedX, paddedY) + qt_TexCoord0 * vec2(paddedW, paddedH);
 
-  float mergedSdf = 1e10;
+  // Phase 1: compute per-rect SDF, track owner. We can't smin yet because
+  // excluded pairs need to skip the smooth blend, which requires pairwise pass
+  // below.
+  float dArr[16];
   int owner = -2;
   float minDist = 1e10;
 
   for (int i = 0; i < rectCount; i++) {
-    vec4 rect = rectData[i * 5];      // cx, cy, hw, hh
-    vec4 props = rectData[i * 5 + 1]; // radius, offsetX, offsetY, minEig
+    vec4 rect = rectData[i * 5]; // cx, cy, hw, hh
+    vec4 props =
+        rectData[i * 5 + 1]; // excludeMask(int bits), offsetX, offsetY, minEig
     vec4 invDm = rectData[i * 5 + 2]; // inverse deform matrix
     vec4 sh = rectData[i * 5 + 3];    // screenHalfX, screenHalfY, 0, 0
     vec4 radii =
@@ -81,8 +85,10 @@ void main() {
     // AABB early-out: skip rects far from this pixel
     vec2 extent = sh.xy + vec2(smoothFactor * 1.5);
     if (abs(pixel.x - center.x) > extent.x ||
-        abs(pixel.y - center.y) > extent.y)
+        abs(pixel.y - center.y) > extent.y) {
+      dArr[i] = 1e10;
       continue;
+    }
 
     // Apply pre-computed inverse deformation to the evaluation point
     mat2 invDeform = mat2(invDm.xy, invDm.zw);
@@ -138,13 +144,38 @@ void main() {
       d *= scale;
     }
 
-    mergedSdf = smin(mergedSdf, d, smoothFactor);
+    dArr[i] = d;
     if (d < smoothFactor && d < minDist) {
       minDist = d;
       owner = i;
     }
   }
 
+  // Phase 2: hard-min baseline over all rects.
+  float mergedSdf = 1e10;
+  for (int i = 0; i < rectCount; i++) {
+    mergedSdf = min(mergedSdf, dArr[i]);
+  }
+
+  // Phase 3: pair-wise smin contributions, skipping excluded pairs. Pair smin
+  // <= min, so taking the min over all non-excluded pair smins gives the
+  // smoothly-merged SDF.
+  for (int i = 0; i < rectCount; i++) {
+    if (dArr[i] >= 1e9)
+      continue;
+    int excludeMask = floatBitsToInt(rectData[i * 5 + 1].x);
+    for (int j = i + 1; j < rectCount; j++) {
+      if (dArr[j] >= 1e9)
+        continue;
+      if ((excludeMask & (1 << j)) != 0)
+        continue;
+      // smin only deviates from min within smoothFactor
+      if (abs(dArr[i] - dArr[j]) >= smoothFactor)
+        continue;
+      mergedSdf = min(mergedSdf, smin(dArr[i], dArr[j], smoothFactor));
+    }
+  }
+
   if (hasInverted != 0) {
     float dOuter = sdBox(pixel, invertedOuter.xy, invertedOuter.zw) - 1.0;
     float dInner =

Plugins/ZShell/Internal/hyprextras.cpp

@@ -1,217 +1,384 @@
 #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("")
-    , m_eventSocket("")
-    , m_socket(nullptr)
-    , m_socketValid(false)
-    , m_devices(new HyprDevices(this)) {
-    const auto his = qEnvironmentVariable("HYPRLAND_INSTANCE_SIGNATURE");
-    if (his.isEmpty()) {
-        qWarning()
-            << "HyprExtras::HyprExtras: $HYPRLAND_INSTANCE_SIGNATURE is unset. Unable to connect to Hyprland socket.";
-        return;
-    }
+	: QObject(parent)
+	, m_requestSocket("")
+	, m_eventSocket("")
+	, m_socket(nullptr)
+	, m_socketValid(false)
+	, 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.";
+		return;
+	}
 
-    auto hyprDir = QString("%1/hypr/%2").arg(qEnvironmentVariable("XDG_RUNTIME_DIR"), his);
-    if (!QDir(hyprDir).exists()) {
-        hyprDir = "/tmp/hypr/" + his;
+	auto hyprDir = QString("%1/hypr/%2").arg(qEnvironmentVariable("XDG_RUNTIME_DIR"), his);
+	if (!QDir(hyprDir).exists()) {
+		hyprDir = QStringLiteral("/tmp/hypr/") + his;
 
-        if (!QDir(hyprDir).exists()) {
-            qWarning() << "HyprExtras::HyprExtras: Hyprland socket directory does not exist. Unable to connect to "
-                          "Hyprland socket.";
-            return;
-        }
-    }
+		if (!QDir(hyprDir).exists()) {
+			qCWarning(lcHypr) << "Hyprland socket directory does not exist. Unable to connect to Hyprland socket.";
+			return;
+		}
+	}
 
-    m_requestSocket = hyprDir + "/.socket.sock";
-    m_eventSocket = hyprDir + "/.socket2.sock";
+	m_requestSocket = hyprDir + QStringLiteral("/.socket.sock");
+	m_eventSocket = hyprDir + QStringLiteral("/.socket2.sock");
 
-    refreshOptions();
-    refreshDevices();
+	refreshOptions();
+	refreshDevices();
 
-    m_socket = new QLocalSocket(this);
+	m_socket = new QLocalSocket(this);
 
-    QObject::connect(m_socket, &QLocalSocket::errorOccurred, this, &HyprExtras::socketError);
-    QObject::connect(m_socket, &QLocalSocket::stateChanged, this, &HyprExtras::socketStateChanged);
-    QObject::connect(m_socket, &QLocalSocket::readyRead, this, &HyprExtras::readEvent);
+	QObject::connect(m_socket, &QLocalSocket::errorOccurred, this, &HyprExtras::socketError);
+	QObject::connect(m_socket, &QLocalSocket::stateChanged, this, &HyprExtras::socketStateChanged);
+	QObject::connect(m_socket, &QLocalSocket::readyRead, this, &HyprExtras::readEvent);
 
-    m_socket->connectToServer(m_eventSocket, QLocalSocket::ReadOnly);
+	m_socket->connectToServer(m_eventSocket, QLocalSocket::ReadOnly);
 }
 
 QVariantHash HyprExtras::options() const {
-    return m_options;
+	return m_options;
 }
 
 HyprDevices* HyprExtras::devices() const {
-    return m_devices;
+	return m_devices;
 }
 
 void HyprExtras::message(const QString& message) {
-    if (message.isEmpty()) {
-        return;
-    }
+	if (message.isEmpty()) {
+		return;
+	}
 
-    makeRequest(message, [](bool success, const QByteArray& res) {
-        if (!success) {
-            qWarning() << "HyprExtras::message: request error:" << QString::fromUtf8(res);
-        }
-    });
+	makeRequest(message, [](bool success, const QByteArray& res) {
+			if (!success) {
+				qCWarning(lcHypr) << "message: request error:" << QString::fromUtf8(res);
+			}
+		});
 }
 
 void HyprExtras::batchMessage(const QStringList& messages) {
-    if (messages.isEmpty()) {
-        return;
-    }
+	if (messages.isEmpty()) {
+		return;
+	}
 
-    makeRequest("[[BATCH]]" + messages.join(";"), [](bool success, const QByteArray& res) {
-        if (!success) {
-            qWarning() << "HyprExtras::batchMessage: request error:" << QString::fromUtf8(res);
-        }
-    });
+	makeRequest(QStringLiteral("[[BATCH]]") + messages.join(QLatin1Char(';')),
+	            [](bool success, const QByteArray& res) {
+			if (!success) {
+				qCWarning(lcHypr) << "batchMessage: request error:" << QString::fromUtf8(res);
+			}
+		});
 }
 
 void HyprExtras::applyOptions(const QVariantHash& options) {
-    if (options.isEmpty()) {
-        return;
-    }
+	if (options.isEmpty()) {
+		return;
+	}
 
-    QString request = "[[BATCH]]";
-    for (auto it = options.constBegin(); it != options.constEnd(); ++it) {
-        request += QString("keyword %1 %2;").arg(it.key(), it.value().toString());
-    }
+	QStringList calls;
+	calls.reserve(options.size());
 
-    makeRequest(request, [this](bool success, const QByteArray& res) {
-        if (success) {
-            refreshOptions();
-        } else {
-            qWarning() << "HyprExtras::applyOptions: request error" << QString::fromUtf8(res);
-        }
-    });
+	for (auto it = options.constBegin(); it != options.constEnd(); ++it) {
+		const auto call = buildHlConfigCall(it.key(), it.value());
+		if (!call.isEmpty()) {
+			calls << call;
+		}
+	}
+
+	if (calls.isEmpty()) {
+		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);
+			}
+		});
 }
 
 void HyprExtras::refreshOptions() {
-    if (!m_optionsRefresh.isNull()) {
-        m_optionsRefresh->close();
-    }
+	if (!m_optionsRefresh.isNull()) {
+		m_optionsRefresh->close();
+	}
 
-    m_optionsRefresh = makeRequestJson("descriptions", [this](bool success, const QJsonDocument& response) {
-        m_optionsRefresh.reset();
-        if (!success) {
-            return;
-        }
+	m_optionsRefresh = makeRequestJson(QStringLiteral("descriptions"), [this](bool success, const QJsonDocument& response) {
+			m_optionsRefresh.reset();
+			if (!success) {
+				return;
+			}
 
-        const auto options = response.array();
-        bool dirty = false;
+			const auto options = response.array();
+			bool dirty = false;
 
-        for (const auto& o : std::as_const(options)) {
-            const auto obj = o.toObject();
-            const auto key = obj.value("value").toString();
-            const auto value = obj.value("data").toObject().value("current").toVariant();
-            if (m_options.value(key) != value) {
-                dirty = true;
-                m_options.insert(key, value);
-            }
-        }
+			for (const auto& o : std::as_const(options)) {
+				const auto obj = o.toObject();
+				const auto key = obj.value(QStringLiteral("value")).toString();
+				const auto value = obj.value(QStringLiteral("data")).toObject().value(QStringLiteral("current")).toVariant();
 
-        if (dirty) {
-            emit optionsChanged();
-        }
-    });
+				if (m_options.value(key) != value) {
+					dirty = true;
+					m_options.insert(key, value);
+				}
+			}
+
+			if (dirty) {
+				emit optionsChanged();
+			}
+		});
 }
 
 void HyprExtras::refreshDevices() {
-    if (!m_devicesRefresh.isNull()) {
-        m_devicesRefresh->close();
-    }
+	if (!m_devicesRefresh.isNull()) {
+		m_devicesRefresh->close();
+	}
 
-    m_devicesRefresh = makeRequestJson("devices", [this](bool success, const QJsonDocument& response) {
-        m_devicesRefresh.reset();
-        if (success) {
-            m_devices->updateLastIpcObject(response.object());
-        }
-    });
+	m_devicesRefresh = makeRequestJson(QStringLiteral("devices"), [this](bool success, const QJsonDocument& response) {
+			m_devicesRefresh.reset();
+			if (success) {
+				m_devices->updateLastIpcObject(response.object());
+			}
+		});
 }
 
 void HyprExtras::socketError(QLocalSocket::LocalSocketError error) const {
-    if (!m_socketValid) {
-        qWarning() << "HyprExtras::socketError: unable to connect to Hyprland event socket:" << error;
-    } else {
-        qWarning() << "HyprExtras::socketError: Hyprland event socket error:" << error;
-    }
+	if (!m_socketValid) {
+		qCWarning(lcHypr) << "socketError: unable to connect to Hyprland event socket:" << error;
+	} else {
+		qCWarning(lcHypr) << "socketError: Hyprland event socket error:" << error;
+	}
 }
 
 void HyprExtras::socketStateChanged(QLocalSocket::LocalSocketState state) {
-    if (state == QLocalSocket::UnconnectedState && m_socketValid) {
-        qWarning() << "HyprExtras::socketStateChanged: Hyprland event socket disconnected.";
-    }
+	if (state == QLocalSocket::UnconnectedState && m_socketValid) {
+		qCWarning(lcHypr) << "socketStateChanged: Hyprland event socket disconnected.";
+	}
 
-    m_socketValid = state == QLocalSocket::ConnectedState;
+	m_socketValid = state == QLocalSocket::ConnectedState;
 }
 
 void HyprExtras::readEvent() {
-    while (true) {
-        auto rawEvent = m_socket->readLine();
-        if (rawEvent.isEmpty()) {
-            break;
-        }
-        rawEvent.truncate(rawEvent.length() - 1); // Remove trailing \n
-        const auto event = QByteArrayView(rawEvent.data(), rawEvent.indexOf(">>"));
-        handleEvent(QString::fromUtf8(event));
-    }
+	while (true) {
+		auto rawEvent = m_socket->readLine();
+		if (rawEvent.isEmpty()) {
+			break;
+		}
+		rawEvent.truncate(rawEvent.length() - 1);
+		const auto event = QByteArrayView(rawEvent.data(), rawEvent.indexOf(">>"));
+		handleEvent(QString::fromUtf8(event));
+	}
 }
 
 void HyprExtras::handleEvent(const QString& event) {
-    if (event == "configreloaded") {
-        refreshOptions();
-    } else if (event == "activelayout") {
-        refreshDevices();
-    }
+	if (event == QStringLiteral("configreloaded")) {
+		refreshOptions();
+	} else if (event == QStringLiteral("activelayout")) {
+		refreshDevices();
+	}
 }
 
 HyprExtras::SocketPtr HyprExtras::makeRequestJson(
-    const QString& request, const std::function<void(bool, QJsonDocument)>& callback) {
-    return makeRequest("j/" + request, [callback](bool success, const QByteArray& response) {
-        callback(success, QJsonDocument::fromJson(response));
-    });
+	const QString& request, const std::function<void(bool, QJsonDocument)>& callback) {
+	return makeRequest(QStringLiteral("j/") + request, [callback](bool success, const QByteArray& response) {
+			callback(success, QJsonDocument::fromJson(response));
+		});
 }
 
 HyprExtras::SocketPtr HyprExtras::makeRequest(
-    const QString& request, const std::function<void(bool, QByteArray)>& callback) {
-    if (m_requestSocket.isEmpty()) {
-        return SocketPtr();
-    }
+	const QString& request, const std::function<void(bool, QByteArray)>& callback) {
+	if (m_requestSocket.isEmpty()) {
+		return SocketPtr();
+	}
 
-    auto socket = SocketPtr::create(this);
+	auto socket = SocketPtr::create(this);
 
-    QObject::connect(socket.data(), &QLocalSocket::connected, this, [=, this]() {
-        QObject::connect(socket.data(), &QLocalSocket::readyRead, this, [socket, callback]() {
-            const auto response = socket->readAll();
-            callback(true, std::move(response));
-            socket->close();
-        });
+	QObject::connect(socket.data(), &QLocalSocket::connected, this, [=, this]() {
+			QObject::connect(socket.data(), &QLocalSocket::readyRead, this, [socket, callback]() {
+				const auto response = socket->readAll();
+				callback(true, std::move(response));
+				socket->close();
+			});
 
-        socket->write(request.toUtf8());
-        socket->flush();
-    });
+			socket->write(request.toUtf8());
+			socket->flush();
+		});
 
-    QObject::connect(socket.data(), &QLocalSocket::errorOccurred, this, [=](QLocalSocket::LocalSocketError err) {
-        qWarning() << "HyprExtras::makeRequest: error making request:" << err << "| request:" << request;
-        callback(false, {});
-        socket->close();
-    });
+	QObject::connect(socket.data(), &QLocalSocket::errorOccurred, this, [=](QLocalSocket::LocalSocketError err) {
+			qCWarning(lcHypr) << "makeRequest: error making request:" << err << "| request:" << request;
+			callback(false, {});
+			socket->close();
+		});
 
-    socket->connectToServer(m_requestSocket);
+	socket->connectToServer(m_requestSocket);
 
-    return socket;
+	return socket;
 }
 
 } // namespace ZShell::internal::hypr

Plugins/ZShell/Internal/hyprextras.hpp

@@ -1,56 +1,60 @@
 #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 HyprExtras : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
+class HyprDevices;
 
-    Q_PROPERTY(QVariantHash options READ options NOTIFY optionsChanged)
-    Q_PROPERTY(ZShell::internal::hypr::HyprDevices* devices READ devices CONSTANT)
+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)
 
 public:
-    explicit HyprExtras(QObject* parent = nullptr);
+explicit HyprExtras(QObject* parent = nullptr);
 
-    [[nodiscard]] QVariantHash options() const;
-    [[nodiscard]] HyprDevices* devices() const;
+[[nodiscard]] QVariantHash options() const;
+[[nodiscard]] HyprDevices* devices() const;
 
-    Q_INVOKABLE void message(const QString& message);
-    Q_INVOKABLE void batchMessage(const QStringList& messages);
-    Q_INVOKABLE void applyOptions(const QVariantHash& options);
+Q_INVOKABLE void message(const QString& message);
+Q_INVOKABLE void batchMessage(const QStringList& messages);
+Q_INVOKABLE void applyOptions(const QVariantHash& options);
 
-    Q_INVOKABLE void refreshOptions();
-    Q_INVOKABLE void refreshDevices();
+Q_INVOKABLE void refreshOptions();
+Q_INVOKABLE void refreshDevices();
 
 signals:
-    void optionsChanged();
+void optionsChanged();
 
 private:
-    using SocketPtr = QSharedPointer<QLocalSocket>;
+using SocketPtr = QSharedPointer<QLocalSocket>;
 
-    QString m_requestSocket;
-    QString m_eventSocket;
-    QLocalSocket* m_socket;
-    bool m_socketValid;
+QString m_requestSocket;
+QString m_eventSocket;
+QLocalSocket* m_socket;
+bool m_socketValid;
 
-    QVariantHash m_options;
-    HyprDevices* const m_devices;
+QVariantHash m_options;
+HyprDevices* const m_devices;
 
-    SocketPtr m_optionsRefresh;
-    SocketPtr m_devicesRefresh;
+SocketPtr m_optionsRefresh;
+SocketPtr m_devicesRefresh;
 
-    void socketError(QLocalSocket::LocalSocketError error) const;
-    void socketStateChanged(QLocalSocket::LocalSocketState state);
-    void readEvent();
-    void handleEvent(const QString& event);
+void socketError(QLocalSocket::LocalSocketError error) const;
+void socketStateChanged(QLocalSocket::LocalSocketState state);
+void readEvent();
+void handleEvent(const QString& event);
 
-    SocketPtr makeRequestJson(const QString& request, const std::function<void(bool, QJsonDocument)>& callback);
-    SocketPtr makeRequest(const QString& request, const std::function<void(bool, QByteArray)>& callback);
+SocketPtr makeRequestJson(const QString& request, const std::function<void(bool, QJsonDocument)>& callback);
+SocketPtr makeRequest(const QString& request, const std::function<void(bool, QByteArray)>& callback);
 };
 
 } // namespace ZShell::internal::hypr

Plugins/ZShell/Models/filesystemmodel.cpp

@@ -7,473 +7,464 @@
 namespace ZShell::models {
 
 FileSystemEntry::FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent)
-    : QObject(parent)
-    , m_fileInfo(path)
-    , m_path(path)
-    , m_relativePath(relativePath)
-    , m_isImageInitialised(false)
-    , m_mimeTypeInitialised(false) {}
+	: QObject(parent)
+	, m_fileInfo(path)
+	, m_path(path)
+	, m_relativePath(relativePath)
+	, m_isImageInitialised(false)
+	, m_mimeTypeInitialised(false) {
+}
 
 QString FileSystemEntry::path() const {
-    return m_path;
+	return m_path;
 };
 
 QString FileSystemEntry::relativePath() const {
-    return m_relativePath;
+	return m_relativePath;
 };
 
 QString FileSystemEntry::name() const {
-    return m_fileInfo.fileName();
+	return m_fileInfo.fileName();
 };
 
 QString FileSystemEntry::baseName() const {
-    return m_fileInfo.baseName();
+	return m_fileInfo.baseName();
 };
 
 QString FileSystemEntry::parentDir() const {
-    return m_fileInfo.absolutePath();
+	return m_fileInfo.absolutePath();
 };
 
 QString FileSystemEntry::suffix() const {
-    return m_fileInfo.completeSuffix();
+	return m_fileInfo.completeSuffix();
 };
 
 qint64 FileSystemEntry::size() const {
-    return m_fileInfo.size();
+	return m_fileInfo.size();
 };
 
 bool FileSystemEntry::isDir() const {
-    return m_fileInfo.isDir();
+	return m_fileInfo.isDir();
 };
 
 bool FileSystemEntry::isImage() const {
-    if (!m_isImageInitialised) {
-        QImageReader reader(m_path);
-        m_isImage = reader.canRead();
-        m_isImageInitialised = true;
-    }
-    return m_isImage;
+	if (!m_isImageInitialised) {
+		QImageReader reader(m_path);
+		m_isImage = reader.canRead();
+		m_isImageInitialised = true;
+	}
+	return m_isImage;
 }
 
 QString FileSystemEntry::mimeType() const {
-    if (!m_mimeTypeInitialised) {
-        const QMimeDatabase db;
-        m_mimeType = db.mimeTypeForFile(m_path).name();
-        m_mimeTypeInitialised = true;
-    }
-    return m_mimeType;
+	if (!m_mimeTypeInitialised) {
+		static const QMimeDatabase s_db;
+		m_mimeType = s_db.mimeTypeForFile(m_path).name();
+		m_mimeTypeInitialised = true;
+	}
+	return m_mimeType;
 }
 
 void FileSystemEntry::updateRelativePath(const QDir& dir) {
-    const auto relPath = dir.relativeFilePath(m_path);
-    if (m_relativePath != relPath) {
-        m_relativePath = relPath;
-        emit relativePathChanged();
-    }
+	const auto relPath = dir.relativeFilePath(m_path);
+	if (m_relativePath != relPath) {
+		m_relativePath = relPath;
+		emit relativePathChanged();
+	}
 }
 
 FileSystemModel::FileSystemModel(QObject* parent)
-    : QAbstractListModel(parent)
-    , m_recursive(false)
-    , m_watchChanges(true)
-    , m_showHidden(false)
-    , m_filter(NoFilter) {
-    connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::watchDirIfRecursive);
-    connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::updateEntriesForDir);
+	: QAbstractListModel(parent)
+	, m_recursive(false)
+	, m_watchChanges(true)
+	, m_showHidden(false)
+	, m_filter(NoFilter) {
+	connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::watchDirIfRecursive);
+	connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemModel::updateEntriesForDir);
 }
 
 int FileSystemModel::rowCount(const QModelIndex& parent) const {
-    if (parent != QModelIndex()) {
-        return 0;
-    }
-    return static_cast<int>(m_entries.size());
+	if (parent != QModelIndex()) {
+		return 0;
+	}
+	return static_cast<int>(m_entries.size());
 }
 
 QVariant FileSystemModel::data(const QModelIndex& index, int role) const {
-    if (role != Qt::UserRole || !index.isValid() || index.row() >= m_entries.size()) {
-        return QVariant();
-    }
-    return QVariant::fromValue(m_entries.at(index.row()));
+	if (role != Qt::UserRole || !index.isValid() || index.row() >= m_entries.size()) {
+		return QVariant();
+	}
+	return QVariant::fromValue(m_entries.at(index.row()));
 }
 
 QHash<int, QByteArray> FileSystemModel::roleNames() const {
-    return { { Qt::UserRole, "modelData" } };
+	return { { Qt::UserRole, "modelData" } };
 }
 
 QString FileSystemModel::path() const {
-    return m_path;
+	return m_path;
 }
 
 void FileSystemModel::setPath(const QString& path) {
-    if (m_path == path) {
-        return;
-    }
+	if (m_path == path) {
+		return;
+	}
 
-    m_path = path;
-    emit pathChanged();
+	m_path = path;
+	emit pathChanged();
 
-    m_dir.setPath(m_path);
+	m_dir.setPath(m_path);
 
-    for (const auto& entry : std::as_const(m_entries)) {
-        entry->updateRelativePath(m_dir);
-    }
+	for (const auto& entry : std::as_const(m_entries)) {
+		entry->updateRelativePath(m_dir);
+	}
 
-    update();
+	update();
 }
 
 bool FileSystemModel::recursive() const {
-    return m_recursive;
+	return m_recursive;
 }
 
 void FileSystemModel::setRecursive(bool recursive) {
-    if (m_recursive == recursive) {
-        return;
-    }
+	if (m_recursive == recursive) {
+		return;
+	}
 
-    m_recursive = recursive;
-    emit recursiveChanged();
+	m_recursive = recursive;
+	emit recursiveChanged();
 
-    update();
+	update();
 }
 
 bool FileSystemModel::watchChanges() const {
-    return m_watchChanges;
+	return m_watchChanges;
 }
 
 void FileSystemModel::setWatchChanges(bool watchChanges) {
-    if (m_watchChanges == watchChanges) {
-        return;
-    }
+	if (m_watchChanges == watchChanges) {
+		return;
+	}
 
-    m_watchChanges = watchChanges;
-    emit watchChangesChanged();
+	m_watchChanges = watchChanges;
+	emit watchChangesChanged();
 
-    update();
+	update();
 }
 
 bool FileSystemModel::showHidden() const {
-    return m_showHidden;
+	return m_showHidden;
 }
 
 void FileSystemModel::setShowHidden(bool showHidden) {
-    if (m_showHidden == showHidden) {
-        return;
-    }
+	if (m_showHidden == showHidden) {
+		return;
+	}
 
-    m_showHidden = showHidden;
-    emit showHiddenChanged();
+	m_showHidden = showHidden;
+	emit showHiddenChanged();
 
-    update();
+	update();
 }
 
 bool FileSystemModel::sortReverse() const {
-    return m_sortReverse;
+	return m_sortReverse;
 }
 
 void FileSystemModel::setSortReverse(bool sortReverse) {
-    if (m_sortReverse == sortReverse) {
-        return;
-    }
+	if (m_sortReverse == sortReverse) {
+		return;
+	}
 
-    m_sortReverse = sortReverse;
-    emit sortReverseChanged();
+	m_sortReverse = sortReverse;
+	emit sortReverseChanged();
 
-    update();
+	update();
 }
 
 FileSystemModel::Filter FileSystemModel::filter() const {
-    return m_filter;
+	return m_filter;
 }
 
 void FileSystemModel::setFilter(Filter filter) {
-    if (m_filter == filter) {
-        return;
-    }
+	if (m_filter == filter) {
+		return;
+	}
 
-    m_filter = filter;
-    emit filterChanged();
+	m_filter = filter;
+	emit filterChanged();
 
-    update();
+	update();
 }
 
 QStringList FileSystemModel::nameFilters() const {
-    return m_nameFilters;
+	return m_nameFilters;
 }
 
 void FileSystemModel::setNameFilters(const QStringList& nameFilters) {
-    if (m_nameFilters == nameFilters) {
-        return;
-    }
+	if (m_nameFilters == nameFilters) {
+		return;
+	}
 
-    m_nameFilters = nameFilters;
-    emit nameFiltersChanged();
+	m_nameFilters = nameFilters;
+	emit nameFiltersChanged();
 
-    update();
+	update();
 }
 
 QQmlListProperty<FileSystemEntry> FileSystemModel::entries() {
-    return QQmlListProperty<FileSystemEntry>(this, &m_entries);
+	return QQmlListProperty<FileSystemEntry>(this, &m_entries);
 }
 
 void FileSystemModel::watchDirIfRecursive(const QString& path) {
-    if (m_recursive && m_watchChanges) {
-        const auto currentDir = m_dir;
-        const bool showHidden = m_showHidden;
-        const auto future = QtConcurrent::run([showHidden, path]() {
-            QDir::Filters filters = QDir::Dirs | QDir::NoDotAndDotDot;
-            if (showHidden) {
-                filters |= QDir::Hidden;
-            }
+	if (m_recursive && m_watchChanges) {
+		const auto currentDir = m_dir;
+		const bool showHidden = m_showHidden;
+		auto future = QtConcurrent::run([showHidden, path]() {
+				QDir::Filters filters = QDir::Dirs | QDir::NoDotAndDotDot;
+				if (showHidden) {
+					filters |= QDir::Hidden;
+				}
 
-            QDirIterator iter(path, filters, QDirIterator::Subdirectories);
-            QStringList dirs;
-            while (iter.hasNext()) {
-                dirs << iter.next();
-            }
-            return dirs;
-        });
-        const auto watcher = new QFutureWatcher<QStringList>(this);
-        connect(watcher, &QFutureWatcher<QStringList>::finished, this, [currentDir, showHidden, watcher, this]() {
-            const auto paths = watcher->result();
-            if (currentDir == m_dir && showHidden == m_showHidden && !paths.isEmpty()) {
-                // Ignore if dir or showHidden has changed
-                m_watcher.addPaths(paths);
-            }
-            watcher->deleteLater();
-        });
-        watcher->setFuture(future);
-    }
+				QDirIterator iter(path, filters, QDirIterator::Subdirectories);
+				QStringList dirs;
+				while (iter.hasNext()) {
+					dirs << iter.next();
+				}
+				return dirs;
+			});
+		future.then(this, [currentDir, showHidden, this](const QStringList& paths) {
+				if (currentDir == m_dir && showHidden == m_showHidden && !paths.isEmpty()) {
+					// Ignore if dir or showHidden has changed
+					m_watcher.addPaths(paths);
+				}
+			});
+	}
 }
 
 void FileSystemModel::update() {
-    updateWatcher();
-    updateEntries();
+	updateWatcher();
+	updateEntries();
 }
 
 void FileSystemModel::updateWatcher() {
-    if (!m_watcher.directories().isEmpty()) {
-        m_watcher.removePaths(m_watcher.directories());
-    }
+	if (!m_watcher.directories().isEmpty()) {
+		m_watcher.removePaths(m_watcher.directories());
+	}
 
-    if (!m_watchChanges || m_path.isEmpty()) {
-        return;
-    }
+	if (!m_watchChanges || m_path.isEmpty()) {
+		return;
+	}
 
-    m_watcher.addPath(m_path);
-    watchDirIfRecursive(m_path);
+	m_watcher.addPath(m_path);
+	watchDirIfRecursive(m_path);
 }
 
 void FileSystemModel::updateEntries() {
-    if (m_path.isEmpty()) {
-        if (!m_entries.isEmpty()) {
-            beginResetModel();
-            qDeleteAll(m_entries);
-            m_entries.clear();
-            endResetModel();
-            emit entriesChanged();
-        }
+	if (m_path.isEmpty()) {
+		if (!m_entries.isEmpty()) {
+			beginResetModel();
+			qDeleteAll(m_entries);
+			m_entries.clear();
+			endResetModel();
+			emit entriesChanged();
+		}
 
-        return;
-    }
+		return;
+	}
 
-    for (auto& future : m_futures) {
-        future.cancel();
-    }
-    m_futures.clear();
+	for (auto& future : m_futures) {
+		future.cancel();
+	}
+	m_futures.clear();
 
-    updateEntriesForDir(m_path);
+	updateEntriesForDir(m_path);
 }
 
 void FileSystemModel::updateEntriesForDir(const QString& dir) {
-    const auto recursive = m_recursive;
-    const auto showHidden = m_showHidden;
-    const auto filter = m_filter;
-    const auto nameFilters = m_nameFilters;
+	const auto recursive = m_recursive;
+	const auto showHidden = m_showHidden;
+	const auto filter = m_filter;
+	const auto nameFilters = m_nameFilters;
 
-    QSet<QString> oldPaths;
-    for (const auto& entry : std::as_const(m_entries)) {
-        oldPaths << entry->path();
-    }
+	QSet<QString> oldPaths;
+	for (const auto& entry : std::as_const(m_entries)) {
+		oldPaths << entry->path();
+	}
 
-    const auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString>>>& promise) {
-        const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags;
+	auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString> > >& promise) {
+			const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags;
 
-        std::optional<QDirIterator> iter;
+			std::optional<QDirIterator> iter;
 
-        if (filter == Images) {
-            QStringList extraNameFilters = nameFilters;
-            const auto formats = QImageReader::supportedImageFormats();
-            for (const auto& format : formats) {
-                extraNameFilters << "*." + format;
-            }
+			if (filter == Images) {
+				QStringList extraNameFilters = nameFilters;
+				const auto formats = QImageReader::supportedImageFormats();
+				for (const auto& format : formats) {
+					extraNameFilters << "*." + format;
+				}
 
-            QDir::Filters filters = QDir::Files;
-            if (showHidden) {
-                filters |= QDir::Hidden;
-            }
+				QDir::Filters filters = QDir::Files;
+				if (showHidden) {
+					filters |= QDir::Hidden;
+				}
 
-            iter.emplace(dir, extraNameFilters, filters, flags);
-        } else {
-            QDir::Filters filters;
+				iter.emplace(dir, extraNameFilters, filters, flags);
+			} else {
+				QDir::Filters filters;
 
-            if (filter == Files) {
-                filters = QDir::Files;
-            } else if (filter == Dirs) {
-                filters = QDir::Dirs | QDir::NoDotAndDotDot;
-            } else {
-                filters = QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot;
-            }
+				if (filter == Files) {
+					filters = QDir::Files;
+				} else if (filter == Dirs) {
+					filters = QDir::Dirs | QDir::NoDotAndDotDot;
+				} else {
+					filters = QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot;
+				}
 
-            if (showHidden) {
-                filters |= QDir::Hidden;
-            }
+				if (showHidden) {
+					filters |= QDir::Hidden;
+				}
 
-            if (nameFilters.isEmpty()) {
-                iter.emplace(dir, filters, flags);
-            } else {
-                iter.emplace(dir, nameFilters, filters, flags);
-            }
-        }
+				if (nameFilters.isEmpty()) {
+					iter.emplace(dir, filters, flags);
+				} else {
+					iter.emplace(dir, nameFilters, filters, flags);
+				}
+			}
 
-        QSet<QString> newPaths;
-        while (iter->hasNext()) {
-            if (promise.isCanceled()) {
-                return;
-            }
+			QSet<QString> newPaths;
+			while (iter->hasNext()) {
+				if (promise.isCanceled()) {
+					return;
+				}
 
-            QString path = iter->next();
+				QString path = iter->next();
 
-            if (filter == Images) {
-                QImageReader reader(path);
-                if (!reader.canRead()) {
-                    continue;
-                }
-            }
+				if (filter == Images) {
+					QImageReader reader(path);
+					if (!reader.canRead()) {
+						continue;
+					}
+				}
 
-            newPaths.insert(path);
-        }
+				newPaths.insert(path);
+			}
 
-        if (promise.isCanceled() || newPaths == oldPaths) {
-            return;
-        }
+			if (promise.isCanceled()) {
+				return;
+			}
 
-        promise.addResult(qMakePair(oldPaths - newPaths, newPaths - oldPaths));
-    });
+			promise.addResult(qMakePair(oldPaths - newPaths, newPaths - oldPaths));
+		});
 
-    if (m_futures.contains(dir)) {
-        m_futures[dir].cancel();
-    }
-    m_futures.insert(dir, future);
+	if (m_futures.contains(dir)) {
+		m_futures[dir].cancel();
+	}
+	m_futures.insert(dir, future);
 
-    const auto watcher = new QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>(this);
-
-    connect(watcher, &QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>::finished, this, [dir, watcher, this]() {
-        m_futures.remove(dir);
-
-        if (!watcher->future().isResultReadyAt(0)) {
-            watcher->deleteLater();
-            return;
-        }
-
-        const auto result = watcher->result();
-        applyChanges(result.first, result.second);
-
-        watcher->deleteLater();
-    });
-
-    watcher->setFuture(future);
+	future
+	.then(this,
+	      [dir, this](QPair<QSet<QString>, QSet<QString> > result) {
+			m_futures.remove(dir);
+			if (!result.first.isEmpty() || !result.second.isEmpty()) {
+				applyChanges(result.first, result.second);
+			}
+		})
+	.onCanceled(this, [dir, this]() {
+			m_futures.remove(dir);
+		});
 }
 
 void FileSystemModel::applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths) {
-    QList<int> removedIndices;
-    for (int i = 0; i < m_entries.size(); ++i) {
-        if (removedPaths.contains(m_entries[i]->path())) {
-            removedIndices << i;
-        }
-    }
-    std::sort(removedIndices.begin(), removedIndices.end(), std::greater<int>());
+	QList<int> removedIndices;
+	for (int i = 0; i < m_entries.size(); ++i) {
+		if (removedPaths.contains(m_entries[i]->path())) {
+			removedIndices << i;
+		}
+	}
+	std::sort(removedIndices.begin(), removedIndices.end(), std::greater<int>());
 
-    // Batch remove old entries
-    int start = -1;
-    int end = -1;
-    for (int idx : std::as_const(removedIndices)) {
-        if (start == -1) {
-            start = idx;
-            end = idx;
-        } else if (idx == end - 1) {
-            end = idx;
-        } else {
-            beginRemoveRows(QModelIndex(), end, start);
-            for (int i = start; i >= end; --i) {
-                m_entries.takeAt(i)->deleteLater();
-            }
-            endRemoveRows();
+	// Batch remove old entries
+	int start = -1;
+	int end = -1;
+	for (int idx : std::as_const(removedIndices)) {
+		if (start == -1) {
+			start = idx;
+			end = idx;
+		} else if (idx == end - 1) {
+			end = idx;
+		} else {
+			beginRemoveRows(QModelIndex(), end, start);
+			for (int i = start; i >= end; --i) {
+				m_entries.takeAt(i)->deleteLater();
+			}
+			endRemoveRows();
 
-            start = idx;
-            end = idx;
-        }
-    }
-    if (start != -1) {
-        beginRemoveRows(QModelIndex(), end, start);
-        for (int i = start; i >= end; --i) {
-            m_entries.takeAt(i)->deleteLater();
-        }
-        endRemoveRows();
-    }
+			start = idx;
+			end = idx;
+		}
+	}
+	if (start != -1) {
+		beginRemoveRows(QModelIndex(), end, start);
+		for (int i = start; i >= end; --i) {
+			m_entries.takeAt(i)->deleteLater();
+		}
+		endRemoveRows();
+	}
 
-    // Create new entries
-    QList<FileSystemEntry*> newEntries;
-    for (const auto& path : addedPaths) {
-        newEntries << new FileSystemEntry(path, m_dir.relativeFilePath(path), this);
-    }
-    std::sort(newEntries.begin(), newEntries.end(), [this](const FileSystemEntry* a, const FileSystemEntry* b) {
-        return compareEntries(a, b);
-    });
+	// Create new entries
+	QList<FileSystemEntry*> newEntries;
+	for (const auto& path : addedPaths) {
+		newEntries << new FileSystemEntry(path, m_dir.relativeFilePath(path), this);
+	}
+	std::sort(newEntries.begin(), newEntries.end(), [this](const FileSystemEntry* a, const FileSystemEntry* b) {
+			return compareEntries(a, b);
+		});
 
-    // Batch insert new entries
-    int insertStart = -1;
-    QList<FileSystemEntry*> batchItems;
-    for (const auto& entry : std::as_const(newEntries)) {
-        const auto it = std::lower_bound(
-            m_entries.begin(), m_entries.end(), entry, [this](const FileSystemEntry* a, const FileSystemEntry* b) {
-                return compareEntries(a, b);
-            });
-        const auto row = static_cast<int>(it - m_entries.begin());
+	// Batch insert new entries
+	int insertStart = -1;
+	QList<FileSystemEntry*> batchItems;
+	for (const auto& entry : std::as_const(newEntries)) {
+		const auto it = std::lower_bound(
+			m_entries.begin(), m_entries.end(), entry, [this](const FileSystemEntry* a, const FileSystemEntry* b) {
+				return compareEntries(a, b);
+			});
+		const auto row = static_cast<int>(it - m_entries.begin());
 
-        if (insertStart == -1) {
-            insertStart = row;
-            batchItems << entry;
-        } else if (row == insertStart + batchItems.size()) {
-            batchItems << entry;
-        } else {
-            beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
-            for (int i = 0; i < batchItems.size(); ++i) {
-                m_entries.insert(insertStart + i, batchItems[i]);
-            }
-            endInsertRows();
+		if (insertStart == -1) {
+			insertStart = row;
+			batchItems << entry;
+		} else if (row == insertStart + batchItems.size()) {
+			batchItems << entry;
+		} else {
+			beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
+			for (int i = 0; i < batchItems.size(); ++i) {
+				m_entries.insert(insertStart + i, batchItems[i]);
+			}
+			endInsertRows();
 
-            insertStart = row;
-            batchItems.clear();
-            batchItems << entry;
-        }
-    }
-    if (!batchItems.isEmpty()) {
-        beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
-        for (int i = 0; i < batchItems.size(); ++i) {
-            m_entries.insert(insertStart + i, batchItems[i]);
-        }
-        endInsertRows();
-    }
+			insertStart = row;
+			batchItems.clear();
+			batchItems << entry;
+		}
+	}
+	if (!batchItems.isEmpty()) {
+		beginInsertRows(QModelIndex(), insertStart, insertStart + static_cast<int>(batchItems.size()) - 1);
+		for (int i = 0; i < batchItems.size(); ++i) {
+			m_entries.insert(insertStart + i, batchItems[i]);
+		}
+		endInsertRows();
+	}
 
-    emit entriesChanged();
+	emit entriesChanged();
 }
 
 bool FileSystemModel::compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const {
-    if (a->isDir() != b->isDir()) {
-        return m_sortReverse ^ a->isDir();
-    }
-    const auto cmp = a->relativePath().localeAwareCompare(b->relativePath());
-    return m_sortReverse ? cmp > 0 : cmp < 0;
+	if (a->isDir() != b->isDir()) {
+		return m_sortReverse ^ a->isDir();
+	}
+	const auto cmp = a->relativePath().localeAwareCompare(b->relativePath());
+	return m_sortReverse ? cmp > 0 : cmp < 0;
 }
 
 } // namespace ZShell::models