init(new branch): New branch

.gitea/workflows/ci-image.yml

@@ -2,7 +2,7 @@ name: Rebuild CI Image
 
 on:
     schedule:
-        - cron: "0 6 * * 1"
+        - cron: '0 6 * * 1'
     workflow_dispatch:
 
 jobs:
@@ -11,7 +11,7 @@ jobs:
         container:
             image: node:26-alpine
         env:
-            IMAGE: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
+            IMAGE: git.aramjonghu.nl/aramjonghu/zshell-ci:latest
 
         steps:
             - name: Checkout
@@ -21,7 +21,7 @@ jobs:
               run: apk add --no-cache docker-cli
 
             - name: Login to registry
-              run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login git.aramjonghu.dev --username aramjonghu --password-stdin
+              run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login git.aramjonghu.nl --username aramjonghu --password-stdin
 
             - name: Build image
               run: docker build -t "$IMAGE" -f ci/Dockerfile .

.gitea/workflows/cpp.yml

@@ -4,43 +4,10 @@ on:
     pull_request:
 
 jobs:
-    fmt:
-        runs-on: alpine
-        container:
-            image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Format check
-              run: |
-                  find . \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) \
-                    -not -path './build/*' \
-                    -exec clang-format -i --style=file {} +
-                  git diff --exit-code && echo "clang-format: passed"
-
     build:
         runs-on: alpine
         container:
-            image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
+            image: git.aramjonghu.nl/aramjonghu/zshell-ci:latest
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0
-
-            - name: Configure
-              run: cmake -B build -G Ninja -DENABLE_MODULES=plugin -DCMAKE_BUILD_TYPE=Release
-
-            - name: Build
-              run: ninja -C build
-
-    clang-tidy:
-        runs-on: alpine
-        container:
-            image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
 
         steps:
             - name: Checkout

.gitea/workflows/lint-js.yml

@@ -1,10 +1,10 @@
-name: JS/TS
+name: Lint & Format (JS/TS)
 
 on:
     pull_request:
 
 jobs:
-    fmt:
+    lint-format:
         runs-on: alpine
         container: node:26-alpine
 
@@ -18,6 +18,7 @@ jobs:
                     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
@@ -25,19 +26,6 @@ jobs:
                     echo "No JS/TS files found"
                   fi
 
-    lint:
-        runs-on: alpine
-        container: node:26-alpine
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install tools
-              run: |
-                  apk add --no-cache \
-                    git
-
             - 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

.gitea/workflows/lint-python.yml

@@ -4,7 +4,7 @@ on:
     pull_request:
 
 jobs:
-    fmt:
+    lint-format:
         runs-on: alpine
         container: node:26-alpine
 
@@ -23,28 +23,11 @@ jobs:
                   pip install --no-cache-dir ruff
 
             - name: Format check
+              continue-on-error: true
               run: |
                   . .venv/bin/activate
                   ruff format --check .
 
-    lint:
-        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: Lint
               run: |
                   . .venv/bin/activate
@@ -80,30 +63,3 @@ jobs:
                   . .venv/bin/activate
                   cd cli
                   python -m pytest tests/ -v
-
-    buildcheck:
-        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 \
-                    build-base \
-                    python3-dev \
-                    gcc \
-                    g++
-                  python3 -m venv .venv
-                  . .venv/bin/activate
-                  pip install --no-cache-dir nuitka
-
-            - name: Nuitka module check
-              run: |
-                  . .venv/bin/activate
-                  nuitka --module --include-package=zshell cli/src/zshell/

.gitea/workflows/lint-rust.yml

@@ -0,0 +1,85 @@
+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
+
+            - id: format-check
+              name: Format check
+              continue-on-error: true
+              run: |
+                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
+                    status=0
+                    for manifest in $(find . -name "Cargo.toml"); do
+                      cargo fmt --manifest-path "$manifest" --check && \
+                        echo "$manifest: formatting OK" || \
+                        { echo "$manifest: needs formatting"; 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
+
+            - id: clippy
+              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
+
+            - name: Check results
+              if: always()
+              run: |
+                  if [ "${{ steps.format-check.outcome }}" = "failure" ] || [ "${{ steps.clippy.outcome }}" = "failure" ]; then
+                    echo "One or more checks failed"
+                    exit 1
+                  fi
+                  echo "All checks passed"

.gitea/workflows/rust.yml

@@ -1,152 +0,0 @@
-name: Rust
-
-on:
-    pull_request:
-
-jobs:
-    build:
-        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-build-${{ runner.os }}-${{ 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
-
-            - name: Cargo check
-              run: |
-                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
-                    for manifest in $(find . -name "Cargo.toml"); do
-                      cargo check --manifest-path "$manifest" && \
-                        echo "$manifest: check passed" || \
-                        { echo "$manifest: check failed"; exit 1; }
-                    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
-
-    fmt:
-        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-fmt-${{ runner.os }}-${{ 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
-
-            - name: Format check
-              run: |
-                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
-                    status=0
-                    for manifest in $(find . -name "Cargo.toml"); do
-                      cargo fmt --manifest-path "$manifest" --check && \
-                        echo "$manifest: formatting OK" || \
-                        { echo "$manifest: needs formatting"; 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
-
-    clippy:
-        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-clippy-${{ runner.os }}-${{ 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 \
-                    rust-clippy
-
-            - 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

CMakeLists.txt

@@ -36,15 +36,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(ENABLE_MODULES "plugin;shell;m3shapes" CACHE STRING "Modules to build/install")
+set(ENABLE_MODULES "plugin;shell" CACHE STRING "Modules to build/install")
 
 set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir")
 set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
 set(INSTALL_QSCONFDIR "etc/xdg/quickshell/zshell" CACHE STRING "Quickshell config install dir")
 set(INSTALL_GREETERCONFDIR "etc/xdg/quickshell/zshell-greeter" CACHE STRING "Quickshell greeter install dir")
 
-set(CMAKE_INSTALL_MESSAGE NEVER)
-
 add_compile_options(
 	-Wall -Wextra -Wpedantic -Wshadow -Wconversion
 	-Wold-style-cast -Wnull-dereference -Wdouble-promotion
@@ -53,9 +51,7 @@ add_compile_options(
 	-Wunreachable-code
 )
 
-
 if("shell" IN_LIST ENABLE_MODULES)
-	# Build settings index
 	find_package(Python3 COMPONENTS Interpreter REQUIRED)
 	set(SETTINGS_INDEX_JSON "${CMAKE_BINARY_DIR}/settings-index.json")
 	execute_process(
@@ -68,90 +64,11 @@ if("shell" IN_LIST ENABLE_MODULES)
 	if(NOT SETTINGS_INDEX_RESULT EQUAL 0)
 		message(FATAL_ERROR "Failed to build settings search index")
 	endif()
-
-	# Nuitka compilation
-	set(ZSHELL_CLI_BUILD_DIR "${CMAKE_BINARY_DIR}/zshell-cli")
-	set(ZSHELL_CLI_DIST "${ZSHELL_CLI_BUILD_DIR}/zshell.dist")
-	set(ZSHELL_CLI_SRC "${CMAKE_SOURCE_DIR}/cli/src/zshell")
-
-	find_program(NUITKA_EXECUTABLE nuitka)
-
-	if(NUITKA_EXECUTABLE)
-		file(GLOB_RECURSE ZSHELL_CLI_SOURCES CONFIGURE_DEPENDS
-			"${ZSHELL_CLI_SRC}/*.py"
-		)
-		file(GLOB_RECURSE ZSHELL_CLI_ASSETS CONFIGURE_DEPENDS
-			"${ZSHELL_CLI_SRC}/assets/*"
-		)
-
-		add_custom_command(
-			OUTPUT "${ZSHELL_CLI_DIST}/zshell-cli"
-			COMMAND ${CMAKE_COMMAND} -E make_directory "${ZSHELL_CLI_BUILD_DIR}"
-			COMMAND ${CMAKE_COMMAND} -E rm -rf "${ZSHELL_CLI_DIST}"
-
-			COMMAND
-				${NUITKA_EXECUTABLE}
-				--standalone
-				--include-data-dir=${CMAKE_SOURCE_DIR}/cli/src/zshell/assets=zshell/assets
-				--output-dir=${ZSHELL_CLI_BUILD_DIR}
-				--output-filename=zshell-cli
-				${CMAKE_SOURCE_DIR}/cli/src/zshell/
-
-			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cli
-			DEPENDS ${ZSHELL_CLI_SOURCES} ${ZSHELL_CLI_ASSETS}
-		)
-
-		add_custom_target(zshell-cli ALL DEPENDS "${ZSHELL_CLI_DIST}/zshell-cli")
-
-		install(PROGRAMS "${ZSHELL_CLI_DIST}/zshell-cli" DESTINATION "${INSTALL_LIBDIR}/zshell-cli")
-		install(DIRECTORY "${ZSHELL_CLI_DIST}/" DESTINATION "${INSTALL_LIBDIR}/zshell-cli" PATTERN "zshell-cli" EXCLUDE)
-
-		configure_file(
-			"${CMAKE_SOURCE_DIR}/Plugins/cmake/zshell-cli.cmake.in"
-			"${CMAKE_BINARY_DIR}/Plugins/cmake/zshell-cli.cmake"
-			@ONLY
-		)
-		install(SCRIPT "${CMAKE_BINARY_DIR}/Plugins/cmake/zshell-cli.cmake")
-	else()
-		message(STATUS "Nuitka not found, building zshell-cli as a Python wheel instead")
-
-		find_package(Python3 COMPONENTS Interpreter REQUIRED)
-
-		set(ZSHELL_CLI_DIR "${CMAKE_SOURCE_DIR}")
-		set(ZSHELL_CLI_DIST_DIR "${ZSHELL_CLI_DIR}/dist")
-		set(ZSHELL_CLI_WHEEL_STAMP "${CMAKE_BINARY_DIR}/zshell-cli/wheel.stamp")
-
-		file(GLOB_RECURSE ZSHELL_CLI_SOURCES CONFIGURE_DEPENDS
-			"${ZSHELL_CLI_DIR}/src/zshell/*.py"
-		)
-		file(GLOB_RECURSE ZSHELL_CLI_ASSETS CONFIGURE_DEPENDS
-			"${ZSHELL_CLI_DIR}/src/zshell/assets/*"
-		)
-
-		add_custom_command(
-			OUTPUT "${ZSHELL_CLI_WHEEL_STAMP}"
-			COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/zshell-cli"
-			COMMAND ${CMAKE_COMMAND} -E rm -rf "${ZSHELL_CLI_DIST_DIR}"
-			COMMAND ${Python3_EXECUTABLE} -m build --wheel --no-isolation
-			COMMAND ${CMAKE_COMMAND} -E touch "${ZSHELL_CLI_WHEEL_STAMP}"
-			WORKING_DIRECTORY "${ZSHELL_CLI_DIR}"
-			DEPENDS ${ZSHELL_CLI_SOURCES} ${ZSHELL_CLI_ASSETS}
-			COMMENT "Building zshell-cli python wheel"
-		)
-
-		add_custom_target(zshell-cli ALL DEPENDS "${ZSHELL_CLI_WHEEL_STAMP}")
-
-		configure_file(
-			"${CMAKE_SOURCE_DIR}/Plugins/cmake/zshell-cli-python.cmake.in"
-			"${CMAKE_BINARY_DIR}/Plugins/cmake/zshell-cli-python.cmake"
-			@ONLY
-		)
-		install(SCRIPT "${CMAKE_BINARY_DIR}/Plugins/cmake/zshell-cli-python.cmake")
-	endif()
 endif()
 
 if("plugin" IN_LIST ENABLE_MODULES)
 	add_subdirectory(Plugins)
+
 endif()
 
 if("shell" IN_LIST ENABLE_MODULES)
@@ -168,22 +85,3 @@ if("shell" IN_LIST ENABLE_MODULES)
 	# Greeter
 	install(DIRECTORY Greeter/ DESTINATION "${INSTALL_GREETERCONFDIR}")
 endif()
-
-if("m3shapes" IN_LIST ENABLE_MODULES)
-	message(STATUS "Fetching M3Shapes module")
-	include(FetchContent)
-	set(M3SHAPES_REV bdc327b29f95394a732baf3c9b19658ba23755b6)
-	FetchContent_Declare(
-		m3shapes_external
-		GIT_REPOSITORY https://github.com/soramanew/m3shapes.git
-		GIT_TAG        ${M3SHAPES_REV}
-		SOURCE_DIR     "${CMAKE_BINARY_DIR}/_deps/m3shapes-${M3SHAPES_REV}"
-	)
-	FetchContent_MakeAvailable(m3shapes_external)
-	message(STATUS "Done fetching M3Shapes module")
-
-	# Fix m3shapes wrong rpath
-	if(TARGET m3shapesplugin)
-		set_target_properties(m3shapesplugin PROPERTIES INSTALL_RPATH "$ORIGIN")
-	endif()
-endif()

Components/CustomListView.qml

@@ -6,7 +6,7 @@ ListView {
 
 	property bool doneFakeFlick
 
-	interactive: !Visibilities.getForActive()?.isDrawing
+	interactive: !Visibilities.getForActive().isDrawing
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {

Components/LoadingIndicator.qml

@@ -1,114 +0,0 @@
-import QtQuick
-import Quickshell
-import M3Shapes
-import qs.Config
-
-MaterialShape {
-	id: root
-
-	property bool animated: true
-	property real cRotation
-	property bool containsIcon
-	property real dampingRatio: 0.6
-	property real lRotation
-	property int morphAnimRotation: 60
-	property real morphScale: 0.14
-	property alias rotateAnimDuration: rotateAnim.duration
-	property int shapeIndex
-	property list<int> shapes: {
-		if (containsIcon)
-			return [MaterialShape.SoftBurst, MaterialShape.Cookie9Sided, MaterialShape.Pill, MaterialShape.Sunny, MaterialShape.Cookie4Sided, MaterialShape.Oval];
-		return [MaterialShape.SoftBurst, MaterialShape.Cookie9Sided, MaterialShape.Pentagon, MaterialShape.Pill, MaterialShape.Sunny, MaterialShape.Cookie4Sided, MaterialShape.Oval];
-	}
-	readonly property real springDuration: {
-		const wn = Math.sqrt(stiffness);
-		const r = -dampingRatio * wn;
-		const c = 1 / Math.sqrt(1 - dampingRatio * dampingRatio);
-		return Math.log(visibilityThreshold / c) / r;
-	}
-	readonly property real springMaxVelocity: {
-		const wn = Math.sqrt(stiffness);
-		const factor = Math.exp(-z * Math.acos(z) / Math.sqrt(1 - z * z));
-		return wn * factor;
-	}
-	property bool springSettled: true
-	property real stiffness: 180
-	property real thisLRotation
-	property real visibilityThreshold: 0.075
-
-	function spring(t: real): var {
-		const wn = Math.sqrt(stiffness);
-		const za = dampingRatio * wn;
-
-		const wd = wn * Math.sqrt(1 - dampingRatio * dampingRatio);
-		const r = za / wd;
-		const pos = 1 - Math.exp(-za * t) * (Math.cos(wd * t) + r * Math.sin(wd * t));
-		const vel = Math.exp(-za * t) * (wn * wn / wd) * Math.sin(wd * t);
-
-		return [pos, vel];
-	}
-
-	color: DynamicColors.palette.m3primary
-	implicitSize: 38
-	toShape: shapes[0]
-
-	RotationAnimation on cRotation {
-		id: rotateAnim
-
-		duration: 4666
-		easing.type: Easing.Linear
-		from: 0
-		loops: Animation.Infinite
-		running: root.animated
-		to: 360
-	}
-	Behavior on color {
-		CAnim {
-		}
-	}
-
-	ElapsedTimer {
-		id: timer
-	}
-
-	FrameAnimation {
-		running: root.animated && !root.springSettled
-
-		onTriggered: {
-			const t = timer.elapsed();
-
-			if (t >= root.springDuration) {
-				root.springSettled = true;
-			} else {
-				const [pos, vel] = root.spring(t);
-				root.morphProgress = Math.min(1, pos); // Overshooting the morph looks weird
-				root.thisLRotation = pos * root.morphAnimRotation;
-				root.scale = 1 + vel * root.morphScale / root.springMaxVelocity;
-			}
-		}
-	}
-
-	Timer {
-		interval: 650
-		repeat: true
-		running: root.animated
-		triggeredOnStart: true
-
-		onTriggered: {
-			root.beginBatchUpdate();
-			root.fromShape = root.toShape;
-			root.shapeIndex = (root.shapeIndex + 1) % root.shapes.length;
-			root.toShape = root.shapes[root.shapeIndex];
-			root.morphProgress = 0;
-
-			root.rotation = root.rotation;
-			root.lRotation = (root.lRotation + root.thisLRotation) % 360;
-			root.thisLRotation = 0;
-			root.rotation = Qt.binding(() => root.cRotation + root.lRotation + root.thisLRotation);
-
-			root.springSettled = false;
-			timer.restart();
-			root.endBatchUpdate();
-		}
-	}
-}

Components/StateLayer.qml

@@ -52,7 +52,7 @@ MouseArea {
 
 	anchors.fill: parent
 	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
-	enabled: parent.enabled && !Visibilities.getForActive()?.isDrawing
+	enabled: parent.enabled && !Visibilities.getForActive().isDrawing
 	hoverEnabled: true
 
 	Behavior on stateOpacity {

Components/VerticalFadeListView.qml

@@ -6,55 +6,25 @@ import qs.Effects
 CustomListView {
 	id: root
 
-	property real endFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
+	property real bottomFadeOpacity: fadeShouldBeActive(false) ? 0 : 1
 	property real fadeAmount: 0.1
-	readonly property bool horizontal: orientation === ListView.Horizontal
+	property real topFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
-	property real startFadeOpacity: fadeShouldBeActive(true) ? 0 : 1
-
-	function contentSize(): real {
-		return horizontal ? contentWidth : contentHeight;
-	}
 
 	function fadeShouldBeActive(isStart: bool): bool {
-		// When content is smaller than flickable size, hide fade when rebound starts.
+		// When content is smaller than flickable size, hide fade when rebound starts
-		if (contentSize() + marginStart() + marginEnd() < viewportSize() && rebound.running && ((isStart ? overshootStart() > 0 : overshootStart() < 0))) {
+		if (contentHeight + topMargin + bottomMargin < height && rebound.running && ((isStart ? verticalOvershoot > 0 : verticalOvershoot < 0)))
 			return false;
-		}
 
 		if (isStart)
-			return visibleStart() > 0;
+			return visibleArea.yPosition > 0;
-
+		return visibleArea.yPosition + visibleArea.heightRatio < 1;
-		return visibleStart() + visibleRatio() < 1;
 	}
 
-	function marginEnd(): real {
+	flickableDirection: Flickable.VerticalFlick
-		return horizontal ? rightMargin : bottomMargin;
-	}
-
-	function marginStart(): real {
-		return horizontal ? leftMargin : topMargin;
-	}
-
-	function overshootStart(): real {
-		return horizontal ? horizontalOvershoot : verticalOvershoot;
-	}
-
-	function viewportSize(): real {
-		return horizontal ? width : height;
-	}
-
-	function visibleRatio(): real {
-		return horizontal ? visibleArea.widthRatio : visibleArea.heightRatio;
-	}
-
-	function visibleStart(): real {
-		return horizontal ? visibleArea.xPosition : visibleArea.yPosition;
-	}
-
-	flickableDirection: horizontal ? Flickable.HorizontalFlick : Flickable.VerticalFlick
 	layer.enabled: true
+	orientation: ListView.Vertical
 
-	Behavior on endFadeOpacity {
+	Behavior on bottomFadeOpacity {
 		Anim {
 			type: Anim.SlowEffects
 		}
@@ -70,10 +40,10 @@ CustomListView {
 			visible: false
 
 			gradient: Gradient {
-				orientation: root.horizontal ? Gradient.Horizontal : Gradient.Vertical
+				orientation: Gradient.Vertical
 
 				GradientStop {
-					color: Qt.rgba(0, 0, 0, root.startFadeOpacity)
+					color: Qt.rgba(0, 0, 0, root.topFadeOpacity)
 					position: 0
 				}
 
@@ -88,13 +58,13 @@ CustomListView {
 				}
 
 				GradientStop {
-					color: Qt.rgba(0, 0, 0, root.endFadeOpacity)
+					color: Qt.rgba(0, 0, 0, root.bottomFadeOpacity)
 					position: 1
 				}
 			}
 		}
 	}
-	Behavior on startFadeOpacity {
+	Behavior on topFadeOpacity {
 		Anim {
 			type: Anim.SlowEffects
 		}

Components/WavyTopRect.qml

@@ -1,46 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import qs.Config
-
-Shape {
-	id: root
-
-	property real amplitude: 3
-	property color color: DynamicColors.palette.m3surfaceContainer
-	readonly property real waveHeight: amplitude * 2
-	property int waves: 4
-
-	asynchronous: true
-	preferredRendererType: Shape.CurveRenderer
-
-	ShapePath {
-		fillColor: root.color
-		strokeColor: "transparent"
-		strokeWidth: 0
-
-		Behavior on fillColor {
-			CAnim {
-			}
-		}
-
-		PathSvg {
-			path: {
-				const w = root.width;
-				const h = root.height;
-				const a = root.amplitude;
-				const n = Math.max(1, root.waves);
-				const wl = w / n;
-				const half = wl / 2;
-
-				let d = `M 0,${a} `;
-				for (let i = 0; i < n; ++i) {
-					const x = i * wl;
-					d += `Q ${x + half / 2},${-a} ${x + half},${a} `;
-					d += `Q ${x + half + half / 2},${3 * a} ${x + wl},${a} `;
-				}
-				d += `L ${w},${h} L 0,${h} Z`;
-				return d;
-			}
-		}
-	}
-}

Drawers/Interactions.qml

@@ -196,7 +196,7 @@ Item {
 			if (!root.visibilities.bar && Config.bar.autoHide && y < root.bar.implicitHeight)
 				root.bar.isHovered = true;
 
-			if (root.panels.sidebar.offsetScale === 1) {
+			if (root.panels.sidebar.width === 0) {
 				const showOsd = root.inRightPanel(root.panels.osdWrapper, x, y);
 
 				if (showOsd) {
@@ -204,7 +204,7 @@ Item {
 					root.panels.osd.hovered = true;
 				}
 			} else {
-				const outOfSidebar = x < root.width - root.panels.sidebar.width * (1 - root.panels.sidebar.offsetScale);
+				const outOfSidebar = x < root.width - root.panels.sidebar.width;
 				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);
 
 				if (!root.osdShortcutActive) {
@@ -311,6 +311,17 @@ Item {
 			}
 		}
 
+		function onUtilitiesChanged() {
+			if (root.visibilities.utilities) {
+				const inUtilitiesArea = root.inBottomPanel(root.panels.utilities, root.mouseX, root.mouseY);
+				if (!inUtilitiesArea) {
+					root.utilitiesShortcutActive = true;
+				}
+			} else {
+				root.utilitiesShortcutActive = false;
+			}
+		}
+
 		target: root.visibilities
 	}
 }

Drawers/Panels.qml

@@ -184,14 +184,18 @@ Item {
 	Item {
 		id: settingsWrapper
 
-		anchors.fill: parent
 		clip: true
+		implicitHeight: settings.implicitHeight
+		implicitWidth: settings.implicitWidth
+		x: (root.width - settings.implicitWidth) / 2
+		y: (settings.implicitHeight + (root.height - root.bar.implicitHeight - settings.implicitHeight) / 2) * (1 - settings.offsetScale) - settings.implicitHeight - 5
 
 		Settings.Wrapper {
 			id: settings
 
-			anchors.centerIn: parent
+			anchors.horizontalCenter: parent.horizontalCenter
-			anchors.verticalCenterOffset: (-implicitHeight - 5 - ((root.height - implicitHeight) / 2)) * offsetScale
+			anchors.top: parent.top
+			// anchors.centerIn: parent
 			panels: root
 			screen: root.screen
 			visibilities: root.visibilities

Drawers/Regions.qml

@@ -38,6 +38,7 @@ Region {
 	R {
 		panel: root.panels.osdWrapper
 		width: panel.width * (1 - root.panels.osd.offsetScale) + root.borderThickness
+		x: root.win.width - width
 	}
 
 	R {
@@ -59,7 +60,7 @@ Region {
 	}
 
 	R {
-		panel: root.panels.settings
+		panel: root.panels.settingsWrapper
 	}
 
 	R {

Drawers/Windows.qml

@@ -26,7 +26,7 @@ CustomWindow {
 		if (focusGrab.active)
 			return 0;
 
-		if (monitor?.lastIpcObject.specialWorkspace?.name || monitor?.activeWorkspace?.lastIpcObject.windows > 0)
+		if (monitor?.lastIpcObject.specialWorkspace?.name || monitor?.activeWorkspace.lastIpcObject.windows > 0)
 			return 0;
 
 		return 100;
@@ -162,6 +162,14 @@ CustomWindow {
 		Component.onCompleted: Visibilities.load(root.screen, this)
 	}
 
+	IpcHandler {
+		function toggleLauncher(fix: string): void {
+			visibilities.launcher = !visibilities.launcher;
+		}
+
+		target: "visibilities"
+	}
+
 	Binding {
 		property: "bar"
 		target: visibilities
@@ -298,9 +306,15 @@ CustomWindow {
 		PanelBg {
 			id: settingsBg
 
+			property real extraHeight: 0
+
 			deformAmount: 0.03
-			panel: panels.settings
+			implicitHeight: panels.settings.height * (1 + extraHeight)
+			implicitWidth: panels.settings.width
+			panel: panels.settingsWrapper
 			radius: Appearance.rounding.large + Appearance.padding.normal
+			x: panels.settingsWrapper.x + panels.settings.x + root.borderThickness
+			y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight - panels.settings.height * extraHeight
 		}
 
 		PanelBg {
@@ -408,7 +422,7 @@ CustomWindow {
 			resources.transform: Matrix4x4 {
 				matrix: resourcesBg.deformMatrix
 			}
-			settings.transform: Matrix4x4 {
+			settingsWrapper.transform: Matrix4x4 {
 				matrix: settingsBg.deformMatrix
 			}
 			sidebar.transform: Matrix4x4 {

Helpers/Brightness.qml

@@ -11,13 +11,8 @@ Singleton {
 	id: root
 
 	property bool appleDisplayPresent: false
-	readonly property var ddcMonitorMap: {
-		const map = {};
-		for (const m of ddcMonitors)
-			map[m.connector] = m;
-		return map;
-	}
 	property list<var> ddcMonitors: []
+	property list<var> ddcServiceMon: []
 	readonly property list<Monitor> monitors: variants.instances
 
 	function decreaseBrightness(): void {
@@ -61,6 +56,8 @@ Singleton {
 
 	onMonitorsChanged: {
 		ddcMonitors = [];
+		ddcServiceMon = [];
+		ddcServiceProc.running = true;
 		ddcProc.running = true;
 	}
 
@@ -95,6 +92,26 @@ Singleton {
 		}
 	}
 
+	Process {
+		id: ddcServiceProc
+
+		command: ["ddcutil-client", "detect"]
+
+		// running: true
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				const t = text.replace(/\r\n/g, "\n").trim();
+
+				const output = ("\n" + t).split(/\n(?=display:\s*\d+\s*\n)/).filter(b => b.startsWith("display:")).map(b => ({
+							display: Number(b.match(/^display:\s*(\d+)/m)?.[1] ?? -1),
+							name: (b.match(/^\s*product_name:\s*(.*)$/m)?.[1] ?? "").trim()
+						})).filter(d => d.display > 0);
+				root.ddcServiceMon = output;
+			}
+		}
+	}
+
 	CustomShortcut {
 		description: "Increase brightness"
 		name: "brightnessUp"
@@ -166,12 +183,16 @@ Singleton {
 		id: monitor
 
 		property real brightness
-		readonly property string busNum: ddcInfo?.busNum ?? ""
+		readonly property string busNum: root.ddcMonitors.find(m => m.connector === modelData.name)?.busNum ?? ""
-		readonly property var ddcInfo: root.ddcMonitorMap[modelData.name] ?? null
+		readonly property string displayNum: root.ddcServiceMon.find(m => m.name === modelData.model)?.display ?? ""
 		readonly property Process initProc: Process {
 			stdout: StdioCollector {
 				onStreamFinished: {
-					if (monitor.isAppleDisplay) {
+					if (monitor.isDdcService) {
+						const output = text.split("\n").filter(o => o.startsWith("vcp_current_value:"))[0].split(":")[1];
+						const val = parseInt(output.trim());
+						monitor.brightness = val / 100;
+					} else if (monitor.isAppleDisplay) {
 						const val = parseInt(text.trim());
 						monitor.brightness = val / 101;
 					} else {
@@ -182,11 +203,12 @@ Singleton {
 			}
 		}
 		readonly property bool isAppleDisplay: root.appleDisplayPresent && modelData.model.startsWith("StudioDisplay")
-		readonly property bool isDdc: ddcInfo !== null
+		readonly property bool isDdc: root.ddcMonitors.some(m => m.connector === modelData.name)
+		readonly property bool isDdcService: Config.services.ddcutilService
 		required property ShellScreen modelData
 		property real queuedBrightness: NaN
 		readonly property Timer timer: Timer {
-			interval: 400
+			interval: 500
 
 			onTriggered: {
 				if (!isNaN(monitor.queuedBrightness)) {
@@ -197,7 +219,9 @@ Singleton {
 		}
 
 		function initBrightness(): void {
-			if (isAppleDisplay)
+			if (isDdcService)
+				initProc.command = ["ddcutil-client", "-d", displayNum, "getvcp", "10"];
+			else if (isAppleDisplay)
 				initProc.command = ["asdbctl", "get"];
 			else if (isDdc)
 				initProc.command = ["ddcutil", "-b", busNum, "getvcp", "10", "--brief"];
@@ -213,25 +237,28 @@ Singleton {
 			if (Math.round(brightness * 100) === rounded)
 				return;
 
-			if (isDdc && timer.running) {
+			if ((isDdc || isDdcService) && timer.running) {
 				queuedBrightness = value;
 				return;
 			}
 
 			brightness = value;
 
-			if (isAppleDisplay)
+			if (isDdcService)
+				Quickshell.execDetached(["ddcutil-client", "-d", displayNum, "setvcp", "10", rounded]);
+			else if (isAppleDisplay)
 				Quickshell.execDetached(["asdbctl", "set", rounded]);
 			else if (isDdc)
 				Quickshell.execDetached(["ddcutil", "--disable-dynamic-sleep", "--sleep-multiplier", ".1", "--skip-ddc-checks", "-b", busNum, "setvcp", "10", rounded]);
 			else
 				Quickshell.execDetached(["brightnessctl", "s", `${rounded}%`]);
 
-			if (isDdc)
+			if (isDdc || isDdcService)
 				timer.restart();
 		}
 
 		Component.onCompleted: initBrightness()
 		onBusNumChanged: initBrightness()
+		onDisplayNumChanged: initBrightness()
 	}
 }

Helpers/Players.qml

@@ -1,12 +1,12 @@
 pragma Singleton
 
-import QtQml
 import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Mpris
+import QtQml
 import ZShell
-import qs.Components
 import qs.Config
+import qs.Components
 
 Singleton {
 	id: root
@@ -15,24 +15,7 @@ Singleton {
 	readonly property list<MprisPlayer> list: Mpris.players.values
 	property alias manualActive: props.manualActive
 
-	function getArtUrl(player: MprisPlayer): string {
-		if (!player)
-			return "";
-		if (player.trackArtUrl)
-			return player.trackArtUrl;
-
-		const url = player.metadata["xesam:url"] ?? "";
-		if (url.startsWith("https://www.youtube.com/watch")) {
-			// Fallback for youtube
-			const id = url.match(/[?&]v=([\w-]{11})/)?.[1];
-			return id ? `https://img.youtube.com/vi/${id}/hqdefault.jpg` : "";
-		}
-		return "";
-	}
-
 	function getIdentity(player: MprisPlayer): string {
-		if (!player)
-			return "";
 		const alias = Config.services.playerAliases.find(a => a.from === player.identity);
 		return alias?.to ?? player.identity;
 	}
@@ -42,12 +25,9 @@ Singleton {
 			if (!Config.utilities.toasts.nowPlaying) {
 				return;
 			}
-			if (root.active.trackArtist != "" && root.active.trackTitle != "") {
-				Toaster.toast(qsTr("Now Playing"), qsTr("%1 - %2").arg(root.active.trackArtist).arg(root.active.trackTitle), "music_note");
-			}
 		}
 
-		target: root.active
+		target: active
 	}
 
 	PersistentProperties {
@@ -58,10 +38,8 @@ Singleton {
 		reloadableId: "players"
 	}
 
-	// qmllint disable unresolved-type
 	CustomShortcut {
 		description: "Toggle media playback"
-		// qmllint enable unresolved-type
 		name: "mediaToggle"
 
 		onPressed: {
@@ -71,10 +49,8 @@ Singleton {
 		}
 	}
 
-	// qmllint disable unresolved-type
 	CustomShortcut {
 		description: "Previous track"
-		// qmllint enable unresolved-type
 		name: "mediaPrev"
 
 		onPressed: {
@@ -84,10 +60,8 @@ Singleton {
 		}
 	}
 
-	// qmllint disable unresolved-type
 	CustomShortcut {
 		description: "Next track"
-		// qmllint enable unresolved-type
 		name: "mediaNext"
 
 		onPressed: {
@@ -97,10 +71,8 @@ Singleton {
 		}
 	}
 
-	// qmllint disable unresolved-type
 	CustomShortcut {
 		description: "Stop media playback"
-		// qmllint enable unresolved-type
 		name: "mediaStop"
 
 		onPressed: root.active?.stop()

Helpers/Weather.qml

@@ -1,7 +1,7 @@
 pragma Singleton
 
-import QtQuick
 import Quickshell
+import QtQuick
 import ZShell
 import qs.Config
 
@@ -12,15 +12,15 @@ Singleton {
 	property var cc
 	property string city
 	readonly property string description: cc?.weatherDesc ?? qsTr("No weather")
-	readonly property string feelsLike: formatTemp(cc?.feelsLikeC)
+	readonly property string feelsLike: `${cc?.feelsLikeC ?? 0}°C`
 	property list<var> forecast
 	property list<var> hourlyForecast
 	readonly property int humidity: cc?.humidity ?? 0
 	readonly property string icon: cc ? Icons.getWeatherIcon(cc.weatherCode) : "cloud_alert"
 	property string loc
-	readonly property string sunrise: cc ? Qt.formatDateTime(new Date(cc.sunrise), Config.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--"
+	readonly property string sunrise: cc ? Qt.formatDateTime(new Date(cc.sunrise), "h:mm") : "--:--"
-	readonly property string sunset: cc ? Qt.formatDateTime(new Date(cc.sunset), Config.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--"
+	readonly property string sunset: cc ? Qt.formatDateTime(new Date(cc.sunset), "h:mm") : "--:--"
-	readonly property string temp: formatTemp(cc?.tempC)
+	readonly property string temp: `${cc?.tempC ?? 0}°C`
 	readonly property real windSpeed: cc?.windSpeed ?? 0
 
 	function fetchCityFromCoords(coords: string): void {
@@ -29,48 +29,29 @@ Singleton {
 			return;
 		}
 
-		const [lat, lon] = coords.split(",").map(s => s.trim());
+		const [lat, lon] = coords.split(",");
-		const lang = Qt.locale().name.split("_")[0] || "en";
+		const url = `https://nominatim.openstreetmap.org/reverse?lat=${lat}&lon=${lon}&format=geocodejson`;
-
+		Requests.get(url, text => {
-		const fallbackToBigDataCloud = () => {
+			const geo = JSON.parse(text).features?.[0]?.properties.geocoding;
-			const fallbackUrl = `https://api.bigdatacloud.net/data/reverse-geocode-client?latitude=${lat}&longitude=${lon}&localityLanguage=${lang}`;
+			if (geo) {
-			Requests.get(fallbackUrl, text => {
+				const geoCity = geo.type === "city" ? geo.name : geo.city;
-				const geo = JSON.parse(text);
+				city = geoCity;
-				const geoCity = geo.city || geo.locality;
+				cachedCities.set(coords, geoCity);
-				if (geoCity) {
-					city = fixCityName(geoCity);
-					cachedCities.set(coords, city);
 			} else {
 				city = "Unknown City";
 			}
 		});
-		};
-
-		const nominatimUrl = `https://nominatim.openstreetmap.org/reverse?lat=${lat}&lon=${lon}&format=geocodejson&accept-language=${lang}`;
-		Requests.get(nominatimUrl, text => {
-			const geo = JSON.parse(text).features?.[0]?.properties.geocoding;
-			if (geo) {
-				const geoCity = geo.type === "city" ? geo.name : geo.city;
-				if (geoCity) {
-					city = fixCityName(geoCity);
-					cachedCities.set(coords, city);
-					return;
-				}
-			}
-			fallbackToBigDataCloud();
-		}, fallbackToBigDataCloud);
 	}
 
 	function fetchCoordsFromCity(cityName: string): void {
-		const lang = Qt.locale().name.split("_")[0] || "en";
+		const url = `https://geocoding-api.open-meteo.com/v1/search?name=${encodeURIComponent(cityName)}&count=1&language=en&format=json`;
-		const url = `https://geocoding-api.open-meteo.com/v1/search?name=${encodeURIComponent(cityName)}&count=1&language=${lang}&format=json`;
 
 		Requests.get(url, text => {
 			const json = JSON.parse(text);
 			if (json.results && json.results.length > 0) {
 				const result = json.results[0];
 				loc = result.latitude + "," + result.longitude;
-				city = fixCityName(result.name);
+				city = result.name;
 			} else {
 				loc = "";
 				reload();
@@ -91,21 +72,25 @@ Singleton {
 			cc = {
 				weatherCode: json.current.weather_code,
 				weatherDesc: getWeatherCondition(json.current.weather_code),
-				tempC: json.current.temperature_2m,
+				tempC: Math.round(json.current.temperature_2m),
-				feelsLikeC: json.current.apparent_temperature,
+				tempF: Math.round(toFahrenheit(json.current.temperature_2m)),
+				feelsLikeC: Math.round(json.current.apparent_temperature),
+				feelsLikeF: Math.round(toFahrenheit(json.current.apparent_temperature)),
 				humidity: json.current.relative_humidity_2m,
 				windSpeed: json.current.wind_speed_10m,
 				isDay: json.current.is_day,
-				sunrise: json.daily.sunrise[0].replace("T", " "),
+				sunrise: json.daily.sunrise[0],
-				sunset: json.daily.sunset[0].replace("T", " ")
+				sunset: json.daily.sunset[0]
 			};
 
 			const forecastList = [];
 			for (let i = 0; i < json.daily.time.length; i++)
 				forecastList.push({
-					date: json.daily.time[i].replace(/-/g, "/"),
+					date: json.daily.time[i],
-					maxTempC: json.daily.temperature_2m_max[i],
+					maxTempC: Math.round(json.daily.temperature_2m_max[i]),
-					minTempC: json.daily.temperature_2m_min[i],
+					maxTempF: Math.round(toFahrenheit(json.daily.temperature_2m_max[i])),
+					minTempC: Math.round(json.daily.temperature_2m_min[i]),
+					minTempF: Math.round(toFahrenheit(json.daily.temperature_2m_min[i])),
 					weatherCode: json.daily.weather_code[i],
 					icon: Icons.getWeatherIcon(json.daily.weather_code[i])
 				});
@@ -114,8 +99,7 @@ Singleton {
 			const hourlyList = [];
 			const now = new Date();
 			for (let i = 0; i < json.hourly.time.length; i++) {
-				const time = new Date(json.hourly.time[i].replace("T", " "));
+				const time = new Date(json.hourly.time[i]);
-
 				if (time < now)
 					continue;
 
@@ -123,7 +107,7 @@ Singleton {
 					timestamp: json.hourly.time[i],
 					hour: time.getHours(),
 					tempC: Math.round(json.hourly.temperature_2m[i]),
-					precipChance: json.hourly.precipitation_probability[i],
+					tempF: Math.round(toFahrenheit(json.hourly.temperature_2m[i])),
 					weatherCode: json.hourly.weather_code[i],
 					icon: Icons.getWeatherIcon(json.hourly.weather_code[i])
 				});
@@ -132,59 +116,6 @@ Singleton {
 		});
 	}
 
-	function fixCityName(cityName: string): string {
-		if (!cityName)
-			return "";
-		const mapping = {
-			// Polish
-			"Poznan": "Poznań",
-			"Wroclaw": "Wrocław",
-			"Krakow": "Kraków",
-			"Gdansk": "Gdańsk",
-			"Lodz": "Łódź",
-			"Rzeszow": "Rzeszów",
-			"Torun": "Toruń",
-			"Bialystok": "Białystok",
-			"Czestochowa": "Częstochowa",
-			"Plock": "Płock",
-			"Ruda Slaska": "Ruda Śląska",
-			"Dabrowa Gornicza": "Dąbrowa Górnicza",
-			"Elblag": "Elbląg",
-			"Gorzow Wielkopolski": "Gorzów Wielkopolski",
-			"Zielona Gora": "Zielona Góra",
-			"Slupsk": "Słupsk",
-
-			// German
-			"Munchen": "München",
-			"Koln": "Köln",
-			"Dusseldorf": "Düsseldorf",
-			"Nurnberg": "Nürnberg",
-
-			// French & Spanish & Portuguese
-			"Sao Paulo": "São Paulo",
-			"Montreal": "Montréal",
-			"Quebec": "Québec",
-			"Bogota": "Bogotá",
-			"Medellin": "Medellín",
-			"Cordoba": "Córdoba",
-
-			// Turkish
-			"Istanbul": "İstanbul",
-			"Izmir": "İzmir",
-
-			// Scandinavian & others
-			"Malmo": "Malmö",
-			"Goteborg": "Göteborg",
-			"Zurich": "Zürich",
-			"Geneve": "Genève"
-		};
-		return mapping[cityName] || cityName;
-	}
-
-	function formatTemp(temp: var): string {
-		return Config.services.useFahrenheit ? `${temp !== undefined ? Math.round(toFahrenheit(temp)) : "--"}°F` : `${temp !== undefined ? Math.round(temp) : "--"}°C`;
-	}
-
 	function getWeatherCondition(code: string): string {
 		const conditions = {
 			"0": "Clear",
@@ -223,9 +154,9 @@ Singleton {
 		if (!loc || loc.indexOf(",") === -1)
 			return "";
 
-		const [lat, lon] = loc.split(",").map(s => s.trim());
+		const [lat, lon] = loc.split(",");
 		const baseUrl = "https://api.open-meteo.com/v1/forecast";
-		const params = ["latitude=" + lat, "longitude=" + lon, "hourly=weather_code,temperature_2m,precipitation_probability", "daily=weather_code,temperature_2m_max,temperature_2m_min,sunrise,sunset", "current=temperature_2m,relative_humidity_2m,apparent_temperature,is_day,weather_code,wind_speed_10m", "timezone=auto", "forecast_days=7"];
+		const params = ["latitude=" + lat, "longitude=" + lon, "hourly=weather_code,temperature_2m", "daily=weather_code,temperature_2m_max,temperature_2m_min,sunrise,sunset", "current=temperature_2m,relative_humidity_2m,apparent_temperature,is_day,weather_code,wind_speed_10m", "timezone=auto", "forecast_days=7"];
 
 		return baseUrl + "?" + params.join("&");
 	}
@@ -258,14 +189,7 @@ Singleton {
 
 	onLocChanged: fetchWeatherData()
 
-	Connections {
+	// Refresh current location hourly
-		function onWeatherLocationChanged(): void {
-			root.reload();
-		}
-
-		target: Config.services
-	}
-
 	Timer {
 		interval: 3600000 // 1 hour
 		repeat: true
@@ -276,5 +200,6 @@ Singleton {
 
 	ElapsedTimer {
 		id: timer
+
 	}
 }

Modules/Lock/Content.qml

@@ -4,46 +4,57 @@ import qs.Components
 import qs.Helpers
 import qs.Config
 
-CustomClippingRect {
+RowLayout {
 	id: root
 
 	required property var lock
 
-	implicitHeight: layout.implicitHeight
-	implicitWidth: layout.implicitWidth
-	radius: Appearance.rounding.large
-
-	RowLayout {
-		id: layout
-
-		anchors.fill: parent
 	spacing: Appearance.spacing.large * 2
 
 	ColumnLayout {
 		Layout.fillWidth: true
 		spacing: Appearance.spacing.normal
 
+		CustomRect {
+			Layout.fillWidth: true
+			color: DynamicColors.tPalette.m3surfaceContainer
+			implicitHeight: weather.implicitHeight
+			radius: Appearance.rounding.small
+			topLeftRadius: Appearance.rounding.large
+
 			WeatherInfo {
 				id: weather
 
-				Layout.fillWidth: true
 				rootHeight: root.height
 			}
+		}
+
+		CustomRect {
+			Layout.fillWidth: true
+			color: DynamicColors.tPalette.m3surfaceContainer
+			implicitHeight: resources.implicitHeight
+			radius: Appearance.rounding.small
 
 			Resources {
 				id: resources
 
-				Layout.fillWidth: true
 			}
+		}
+
+		CustomClippingRect {
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			bottomLeftRadius: Appearance.rounding.large
+			color: DynamicColors.tPalette.m3surfaceContainer
+			radius: Appearance.rounding.small
 
 			Media {
 				id: media
 
-				Layout.fillHeight: true
-				Layout.fillWidth: true
 				lock: root.lock
 			}
 		}
+	}
 
 	Center {
 		lock: root.lock
@@ -66,5 +77,4 @@ CustomClippingRect {
 			}
 		}
 	}
-	}
 }

Modules/Lock/LockSurface.qml

@@ -149,71 +149,36 @@ WlSessionLockSurface {
 	Image {
 		id: background
 
-		anchors.bottomMargin: -8 - lockContent.positions[lockContent.positionIndex].y
 		anchors.fill: parent
-		anchors.leftMargin: -8 + lockContent.positions[lockContent.positionIndex].x
-		anchors.rightMargin: -8 - lockContent.positions[lockContent.positionIndex].x
-		anchors.topMargin: -8 + lockContent.positions[lockContent.positionIndex].y
 		fillMode: Image.PreserveAspectCrop
 		source: WallpaperPath.lockscreenBg
-
-		Behavior on anchors.bottomMargin {
-			Anim {
-				duration: 5000
-			}
-		}
-		Behavior on anchors.leftMargin {
-			Anim {
-				duration: 5000
-			}
-		}
-		Behavior on anchors.rightMargin {
-			Anim {
-				duration: 5000
-			}
-		}
-		Behavior on anchors.topMargin {
-			Anim {
-				duration: 5000
-			}
-		}
 	}
 
 	Item {
 		id: lockContent
 
-		property int positionIndex: 0
-		readonly property var positions: [Qt.point(0, 0), Qt.point(4, 0), Qt.point(4, 4), Qt.point(0, 4), Qt.point(-4, 4), Qt.point(-4, 0), Qt.point(-4, -4), Qt.point(0, -4), Qt.point(4, -4),]
 		readonly property int radius: size / 4 * Appearance.rounding.scale
 		readonly property int size: lockIcon.implicitHeight + Appearance.padding.large * 4
 
 		anchors.centerIn: parent
-		anchors.horizontalCenterOffset: positions[positionIndex].x
-		anchors.verticalCenterOffset: positions[positionIndex].y
 		implicitHeight: size
 		implicitWidth: size
 		scale: 0
 
-		Behavior on anchors.horizontalCenterOffset {
+		// MultiEffect {
-			Anim {
+		// 	anchors.fill: lockBg
-				duration: 5000
+		// 	autoPaddingEnabled: false
-			}
+		// 	blur: 1
-		}
+		// 	blurEnabled: true
-		Behavior on anchors.verticalCenterOffset {
+		// 	blurMax: 64
-			Anim {
+		// 	maskEnabled: true
-				duration: 5000
+		// 	maskSource: lockBg
-			}
+		//
-		}
+		// 	source: ShaderEffectSource {
-
+		// 		sourceItem: background
-		Timer {
+		// 		sourceRect: Qt.rect(lockBg.x, lockBg.y, lockBg.width, lockBg, height)
-			interval: 120000
+		// 	}
-			repeat: true
+		// }
-			running: true
-
-			onTriggered: {
-				lockContent.positionIndex = (lockContent.positionIndex + 1) % lockContent.positions.length;
-			}
-		}
 
 		CustomRect {
 			id: lockBg

Modules/Lock/Media.qml

@@ -1,110 +1,201 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Layouts
-import Quickshell
+import qs.Modules
-import ZShell.Components
 import qs.Components
-import qs.Config
 import qs.Helpers
+import qs.Config
 
-CustomClippingRect {
+Item {
 	id: root
 
 	required property var lock
 
-	color: DynamicColors.tPalette.m3surfaceContainer
+	anchors.fill: parent
-	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
-	radius: Appearance.rounding.small
-
-	FadeImage {
-		id: image
 
+	Image {
 		anchors.fill: parent
 		asynchronous: true
 		fillMode: Image.PreserveAspectCrop
 		layer.enabled: true
 		opacity: status === Image.Ready ? 1 : 0
-		source: Players.getArtUrl(Players.active)
+		source: Players.active?.trackArtUrl ?? ""
-		sourceSize: {
+		sourceSize.height: height
-			const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
+		sourceSize.width: width
-			return Qt.size(width * dpr, height * dpr);
-		}
 
+		layer.effect: OpacityMask {
+			maskSource: mask
+		}
 		Behavior on opacity {
 			Anim {
-				type: Anim.StandardExtraLarge
+				duration: Appearance.anim.durations.extraLarge
+			}
 		}
 	}
 
-		CustomRect {
+	Rectangle {
+		id: mask
+
 		anchors.fill: parent
-			color: DynamicColors.palette.m3surface
+		layer.enabled: true
-			opacity: 0.7
+		visible: false
+
+		gradient: Gradient {
+			orientation: Gradient.Horizontal
+
+			GradientStop {
+				color: Qt.rgba(0, 0, 0, 0.5)
+				position: 0
+			}
+
+			GradientStop {
+				color: Qt.rgba(0, 0, 0, 0.2)
+				position: 0.4
+			}
+
+			GradientStop {
+				color: Qt.rgba(0, 0, 0, 0)
+				position: 0.8
+			}
 		}
 	}
 
 	ColumnLayout {
 		id: layout
 
-		anchors.left: parent.left
+		anchors.fill: parent
-		anchors.margins: Appearance.padding.extraLarge
+		anchors.margins: Appearance.padding.large
-		anchors.right: parent.right
+
-		anchors.verticalCenter: parent.verticalCenter
+		CustomText {
-		spacing: Appearance.spacing.extraSmall
+			Layout.bottomMargin: Appearance.spacing.larger
+			Layout.topMargin: Appearance.padding.large
+			color: DynamicColors.palette.m3onSurfaceVariant
+			font.family: Appearance.font.family.mono
+			font.weight: 500
+			text: qsTr("Now playing")
+		}
 
 		CustomText {
 			Layout.fillWidth: true
 			animate: true
 			color: DynamicColors.palette.m3primary
 			elide: Text.ElideRight
-			font.pointSize: Appearance.font.size.medium
+			font.family: Appearance.font.family.mono
+			font.pointSize: Appearance.font.size.large
+			font.weight: 600
 			horizontalAlignment: Text.AlignHCenter
-			text: (Players.active?.trackTitle ?? qsTr("Nothing playing")) || qsTr("Unknown track")
+			text: Players.active?.trackArtist ?? qsTr("No media")
 		}
 
 		CustomText {
 			Layout.fillWidth: true
 			animate: true
-			color: DynamicColors.palette.m3onSurfaceVariant
 			elide: Text.ElideRight
-			font.pointSize: Appearance.font.size.small
+			font.family: Appearance.font.family.mono
+			font.pointSize: Appearance.font.size.larger
 			horizontalAlignment: Text.AlignHCenter
-			text: (Players.active?.trackArtist ?? qsTr("Try playing some music!")) || qsTr("Unknown artist")
+			text: Players.active?.trackTitle ?? qsTr("No media")
 		}
 
-		ButtonRow {
+		RowLayout {
 			Layout.alignment: Qt.AlignHCenter
-			Layout.topMargin: Appearance.spacing.small
+			Layout.bottomMargin: Appearance.padding.large
-			spacing: Appearance.spacing.extraSmall
+			Layout.topMargin: Appearance.spacing.large * 1.2
+			spacing: Appearance.spacing.large
+
+			PlayerControl {
+				function onClicked(): void {
+					if (Players.active?.canGoPrevious)
+						Players.active.previous();
+				}
 
-			IconButton {
-				enabled: Players.active?.canGoPrevious
 				icon: "skip_previous"
-				isRound: true
-				shapeMorph: true
-				type: IconButton.Tonal
-
-				onClicked: Players.active?.previous()
 			}
 
-			IconButton {
+			PlayerControl {
-				checked: Players.active?.isPlaying ?? false
+				function onClicked(): void {
-				enabled: Players.active?.canTogglePlaying
+					if (Players.active?.canTogglePlaying)
-				icon: Players.active?.isPlaying ? "pause" : "play_arrow"
+						Players.active.togglePlaying();
-				implicitWidth: implicitHeight + Appearance.padding.largeIncreased * 2
+				}
-				isRound: true
+
-				shapeMorph: true
+				active: Players.active?.isPlaying ?? false
-
+				animate: true
-				onClicked: Players.active?.togglePlaying()
+				icon: active ? "pause" : "play_arrow"
+				level: active ? 2 : 1
+				set_color: "Primary"
+			}
+
+			PlayerControl {
+				function onClicked(): void {
+					if (Players.active?.canGoNext)
+						Players.active.next();
 				}
 
-			IconButton {
-				enabled: Players.active?.canGoNext
 				icon: "skip_next"
-				isRound: true
+			}
-				shapeMorph: true
+		}
-				type: IconButton.Tonal
+	}
 
-				onClicked: Players.active?.next()
+	component PlayerControl: CustomRect {
+		id: control
+
+		property bool active
+		property alias animate: controlIcon.animate
+		property alias icon: controlIcon.text
+		property int level: 1
+		property string set_color: "Secondary"
+
+		function onClicked(): void {
+		}
+
+		Layout.preferredWidth: implicitWidth + (controlState.pressed ? Appearance.padding.normal * 2 : active ? Appearance.padding.small * 2 : 0)
+		color: active ? DynamicColors.palette[`m3${set_color.toLowerCase()}`] : DynamicColors.palette[`m3${set_color.toLowerCase()}Container`]
+		implicitHeight: controlIcon.implicitHeight + Appearance.padding.normal * 2
+		implicitWidth: controlIcon.implicitWidth + Appearance.padding.large * 2
+		radius: active || controlState.pressed ? Appearance.rounding.small : Appearance.rounding.normal
+
+		Behavior on Layout.preferredWidth {
+			Anim {
+				duration: Appearance.anim.durations.expressiveFastSpatial
+				easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+			}
+		}
+		Behavior on radius {
+			Anim {
+				duration: Appearance.anim.durations.expressiveFastSpatial
+				easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+			}
+		}
+
+		Elevation {
+			anchors.fill: parent
+			level: controlState.containsMouse && !controlState.pressed ? control.level + 1 : control.level
+			radius: parent.radius
+			z: -1
+		}
+
+		StateLayer {
+			id: controlState
+
+			color: control.active ? DynamicColors.palette[`m3on${control.set_color}`] : DynamicColors.palette[`m3on${control.set_color}Container`]
+
+			onClicked: {
+				control.onClicked();
+			}
+		}
+
+		MaterialIcon {
+			id: controlIcon
+
+			anchors.centerIn: parent
+			color: control.active ? DynamicColors.palette[`m3on${control.set_color}`] : DynamicColors.palette[`m3on${control.set_color}Container`]
+			fill: control.active ? 1 : 0
+			font.pointSize: Appearance.font.size.large
+
+			Behavior on fill {
+				Anim {
+				}
 			}
 		}
 	}

Modules/Lock/Resources.qml

@@ -1,82 +1,81 @@
-pragma ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Layouts
-import M3Shapes
 import ZShell.Services
 import qs.Components
+import qs.Helpers
 import qs.Config
-import qs.Effects
 
-CustomRect {
+GridLayout {
 	id: root
 
-	readonly property real fontScale: {
+	anchors.left: parent.left
-		const diff = width / 391 - 1; // 391 is the width at 1080 height screen
+	anchors.margins: Appearance.padding.large
-		return 1 + Math.pow(Math.abs(diff), 0.8) * Math.sign(diff);
+	anchors.right: parent.right
-	}
+	columnSpacing: Appearance.spacing.large
-
+	columns: 2
-	color: DynamicColors.tPalette.m3surfaceContainer
+	rowSpacing: Appearance.spacing.large
-	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
+	rows: 1
-	radius: Appearance.rounding.small
-
-	ServiceRef {
-		service: Cpu
-	}
 
 	ServiceRef {
 		service: Memory
 	}
 
 	ServiceRef {
-		service: Storage
+		service: Cpu
 	}
 
-	RowLayout {
-		id: layout
-
-		anchors.fill: parent
-		anchors.margins: Appearance.padding.large
-		spacing: Appearance.spacing.large
-
 	Resource {
-			id: cpu
+		Layout.bottomMargin: Appearance.padding.large
-
+		Layout.topMargin: Appearance.padding.large
 		fgColor: DynamicColors.palette.m3primary
 		icon: "memory"
 		value: Cpu.percentage
 	}
 
 	Resource {
-			fgColor: DynamicColors.palette.m3tertiary
+		Layout.bottomMargin: Appearance.padding.large
+		Layout.topMargin: Appearance.padding.large
+		fgColor: DynamicColors.palette.m3secondary
 		icon: "memory_alt"
 		value: Memory.percentage
 	}
 
-		Resource {
+	component Resource: CustomRect {
-			fgColor: DynamicColors.palette.m3secondary
-			icon: "hard_disk"
-			value: Storage.percentage
-		}
-	}
-
-	component Resource: CircularProgress {
 		id: res
 
+		required property color fgColor
 		required property string icon
+		required property real value
 
 		Layout.fillWidth: true
-		implicitSize: width
+		color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
+		implicitHeight: width
+		radius: Appearance.rounding.large
 
-		Behavior on clampedVal {
+		Behavior on value {
 			Anim {
+				duration: Appearance.anim.durations.large
 			}
 		}
 
+		CircularProgress {
+			id: circ
+
+			anchors.fill: parent
+			bgColor: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 3)
+			fgColor: res.fgColor
+			padding: Appearance.padding.large * 3
+			strokeWidth: width < 200 ? Appearance.padding.smaller : Appearance.padding.normal
+			value: res.value
+		}
+
 		MaterialIcon {
+			id: icon
+
 			anchors.centerIn: parent
 			color: res.fgColor
-			font.pointSize: Appearance.font.size.extraLarge
+			font.pointSize: (circ.arcRadius * 0.7) || 1
+			font.weight: 600
 			text: res.icon
 		}
 	}

Modules/Lock/Weather/BriefInfo.qml

@@ -1,62 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import qs.Components
-import qs.Config
-import qs.Helpers
-
-ColumnLayout {
-	id: root
-
-	required property int rootHeight
-
-	spacing: Appearance.spacing.extraSmall
-
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter
-		animate: true
-		color: DynamicColors.palette.m3onSurfaceVariant
-		font.pointSize: Appearance.font.size.large
-		text: Weather.description
-	}
-
-	RowLayout {
-		Layout.alignment: Qt.AlignHCenter
-		spacing: Appearance.spacing.small
-
-		CustomText {
-			id: temp
-
-			animate: true
-			color: DynamicColors.palette.m3primary
-			font.pointSize: Appearance.font.size.large
-			text: Weather.temp
-		}
-
-		MaterialIcon {
-			animate: true
-			color: DynamicColors.palette.m3secondary
-			text: Weather.icon
-		}
-	}
-
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter
-		animate: true
-		color: DynamicColors.palette.m3onSurfaceVariant
-		font.pointSize: Appearance.font.size.large
-		text: qsTr("Feels like %1").arg(Weather.temp)
-		visible: root.rootHeight > 550
-	}
-
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter
-		animate: true
-		color: DynamicColors.palette.m3onSurfaceVariant
-		font.pointSize: Appearance.font.size.medium
-		text: {
-			const today = Weather.forecast[0];
-			return qsTr("High %1 • Low %2").arg(Weather.formatTemp(today?.maxTempC)).arg(Weather.formatTemp(today?.minTempC));
-		}
-		visible: root.rootHeight > 550
-	}
-}

Modules/Lock/Weather/Forecast.qml

@@ -1,103 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import M3Shapes
-import ZShell
-import qs.Components
-import qs.Helpers
-import qs.Config
-
-CustomRect {
-	id: root
-
-	color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
-	implicitHeight: header.anchors.margins + header.implicitHeight + Appearance.spacing.small + layout.implicitHeight + layout.anchors.bottomMargin
-	radius: Appearance.rounding.small
-
-	RowLayout {
-		id: header
-
-		anchors.left: parent.left
-		anchors.margins: Appearance.padding.largeIncreased
-		anchors.top: parent.top
-		spacing: Appearance.spacing.small
-
-		MaterialIcon {
-			Layout.topMargin: Math.round(fontInfo.pointSize * 0.12)
-			font.pointSize: Appearance.font.size.medium
-			text: "schedule"
-		}
-
-		CustomText {
-			id: title
-
-			font.pointSize: Appearance.font.size.medium
-			text: qsTr("Hourly forecast")
-		}
-	}
-
-	VerticalFadeListView {
-		id: layout
-
-		anchors.bottom: parent.bottom
-		anchors.bottomMargin: Appearance.padding.largeIncreased
-		anchors.left: parent.left
-		anchors.margins: Appearance.padding.large
-		anchors.right: parent.right
-		implicitHeight: contentItem.childrenRect.height
-		model: Weather.hourlyForecast
-		orientation: VerticalFadeListView.Horizontal
-		spacing: Appearance.spacing.normal
-
-		delegate: ColumnLayout {
-			id: hour
-
-			readonly property var cond: modelData
-			required property int index
-			required property var modelData
-
-			spacing: Appearance.spacing.extraSmall
-
-			MaterialShape {
-				Layout.alignment: Qt.AlignHCenter
-				color: Qt.alpha(DynamicColors.palette.m3primary, hour.index === 0 ? 1 : 0)
-				implicitSize: temp.implicitHeight + Appearance.padding.normal * 2
-				shape: MaterialShape.Cookie4Sided
-
-				Behavior on color {
-					CAnim {
-					}
-				}
-
-				CustomText {
-					id: temp
-
-					anchors.centerIn: parent
-					color: hour.index === 0 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
-					font.pointSize: Appearance.font.size.medium
-					text: Weather.formatTemp(hour.cond.tempC).slice(0, -1) // Remove C/F
-				}
-			}
-
-			MaterialIcon {
-				Layout.alignment: Qt.AlignHCenter
-				color: DynamicColors.palette.m3secondary
-				font.pointSize: Appearance.font.size.extraLarge
-				text: hour.cond.icon
-			}
-
-			CustomText {
-				Layout.alignment: Qt.AlignHCenter
-				color: DynamicColors.palette.m3primary
-				text: hour.cond.precipChance + "%"
-			}
-
-			CustomText {
-				Layout.alignment: Qt.AlignHCenter
-				Layout.topMargin: Appearance.spacing.extraSmall
-				color: DynamicColors.palette.m3onSurfaceVariant
-				font.pointSize: Appearance.font.size.small
-				text: hour.index === 0 ? qsTr("Now") : Qt.formatDateTime(new Date(hour.cond.timestamp.replace("T", " ")), Config.services.useTwelveHourClock ? "ha" : "hh:00")
-			}
-		}
-	}
-}

Modules/Lock/WeatherInfo.qml

@@ -1,23 +1,162 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
-import qs.Modules.Lock.Weather
+import QtQuick.Layouts
-import qs.Config
 import qs.Components
 import qs.Helpers
+import qs.Config
 
-CustomRect {
+ColumnLayout {
 	id: root
 
 	required property int rootHeight
-	readonly property bool showForecast: rootHeight >= 700
 
-	color: DynamicColors.tPalette.m3surfaceContainer
+	anchors.left: parent.left
-	implicitHeight: {
+	anchors.margins: Appearance.padding.large * 2
-		const base = brief.implicitHeight + brief.anchors.topMargin;
+	anchors.right: parent.right
-		if (showForecast)
+	spacing: Appearance.spacing.small
-			return base + Appearance.spacing.large + forecast.implicitHeight + forecast.anchors.margins;
+
-		return base + brief.anchors.topMargin;
+	Loader {
+		Layout.alignment: Qt.AlignHCenter
+		Layout.bottomMargin: -Appearance.padding.large
+		Layout.topMargin: Appearance.padding.large * 2
+		active: root.rootHeight > 610
+		visible: active
+
+		sourceComponent: CustomText {
+			color: DynamicColors.palette.m3primary
+			font.pointSize: Appearance.font.size.extraLarge
+			font.weight: 500
+			text: qsTr("Weather")
+		}
+	}
+
+	RowLayout {
+		Layout.fillWidth: true
+		spacing: Appearance.spacing.large
+
+		MaterialIcon {
+			animate: true
+			color: DynamicColors.palette.m3secondary
+			font.pointSize: Appearance.font.size.extraLarge * 2.5
+			text: Weather.icon
+		}
+
+		ColumnLayout {
+			spacing: Appearance.spacing.small
+
+			CustomText {
+				Layout.fillWidth: true
+				animate: true
+				color: DynamicColors.palette.m3secondary
+				elide: Text.ElideRight
+				font.pointSize: Appearance.font.size.large
+				font.weight: 500
+				text: Weather.description
+			}
+
+			CustomText {
+				Layout.fillWidth: true
+				animate: true
+				color: DynamicColors.palette.m3onSurfaceVariant
+				elide: Text.ElideRight
+				font.pointSize: Appearance.font.size.normal
+				text: qsTr("Humidity: %1%").arg(Weather.humidity)
+			}
+		}
+
+		Loader {
+			Layout.rightMargin: Appearance.padding.smaller
+			active: root.width > 400
+			visible: active
+
+			sourceComponent: ColumnLayout {
+				spacing: Appearance.spacing.small
+
+				CustomText {
+					Layout.fillWidth: true
+					animate: true
+					color: DynamicColors.palette.m3primary
+					elide: Text.ElideLeft
+					font.pointSize: Appearance.font.size.extraLarge
+					font.weight: 500
+					horizontalAlignment: Text.AlignRight
+					text: Weather.temp
+				}
+
+				CustomText {
+					Layout.fillWidth: true
+					animate: true
+					color: DynamicColors.palette.m3outline
+					elide: Text.ElideLeft
+					font.pointSize: Appearance.font.size.smaller
+					horizontalAlignment: Text.AlignRight
+					text: qsTr("Feels like: %1").arg(Weather.feelsLike)
+				}
+			}
+		}
+	}
+
+	Loader {
+		id: forecastLoader
+
+		Layout.bottomMargin: Appearance.padding.large * 2
+		Layout.fillWidth: true
+		Layout.topMargin: Appearance.spacing.smaller
+		active: root.rootHeight > 820
+		visible: active
+
+		sourceComponent: RowLayout {
+			spacing: Appearance.spacing.large
+
+			Repeater {
+				model: {
+					const forecast = Weather.hourlyForecast;
+					const count = root.width < 320 ? 3 : root.width < 400 ? 4 : 5;
+					if (!forecast)
+						return Array.from({
+							length: count
+						}, () => null);
+
+					return forecast.slice(0, count);
+				}
+
+				ColumnLayout {
+					id: forecastHour
+
+					required property var modelData
+
+					Layout.fillWidth: true
+					spacing: Appearance.spacing.small
+
+					CustomText {
+						Layout.fillWidth: true
+						color: DynamicColors.palette.m3outline
+						font.pointSize: Appearance.font.size.larger
+						horizontalAlignment: Text.AlignHCenter
+						text: {
+							const hour = forecastHour.modelData?.hour ?? 0;
+							return hour > 12 ? `${(hour - 12).toString().padStart(2, "0")} PM` : `${hour.toString().padStart(2, "0")} AM`;
+						}
+					}
+
+					MaterialIcon {
+						Layout.alignment: Qt.AlignHCenter
+						font.pointSize: Appearance.font.size.extraLarge * 1.5
+						font.weight: 500
+						text: forecastHour.modelData?.icon ?? "cloud_alert"
+					}
+
+					CustomText {
+						Layout.alignment: Qt.AlignHCenter
+						color: DynamicColors.palette.m3secondary
+						font.pointSize: Appearance.font.size.larger
+						text: Config.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C`
+					}
+				}
+			}
+		}
 	}
-	radius: Appearance.rounding.small
 
 	Timer {
 		interval: 900000 // 15 minutes
@@ -27,27 +166,4 @@ CustomRect {
 
 		onTriggered: Weather.reload()
 	}
-
-	BriefInfo {
-		id: brief
-
-		anchors.horizontalCenter: parent.horizontalCenter
-		anchors.top: parent.top
-		anchors.topMargin: Appearance.padding.extraLarge
-		rootHeight: root.rootHeight
-	}
-
-	Loader {
-		id: forecast
-
-		active: root.showForecast
-		anchors.bottom: parent.bottom
-		anchors.left: parent.left
-		anchors.margins: Appearance.padding.large
-		anchors.right: parent.right
-		asynchronous: true
-
-		sourceComponent: Forecast {
-		}
-	}
 }

Modules/Osd/Content.qml

@@ -102,7 +102,8 @@ Item {
 					to: 1.0
 					value: root.brightness
 
-					onMoved: {
+					onPressedChanged: {
+						if (!pressed) {
 							if (Config.osd.allMonBrightness) {
 								for (const mon of Brightness.monitors) {
 									mon.setBrightness(value);
@@ -115,6 +116,7 @@ Item {
 				}
 			}
 		}
+	}
 
 	component WrappedLoader: Loader {
 		required property bool shouldBeActive

Modules/Polkit/Polkit.qml

@@ -28,7 +28,9 @@ Scope {
 		visible: false
 
 		Connections {
-			function onShouldShowChanged(): void {
+			target: root
+
+			onShouldShowChanged: {
 				if (root.shouldShow) {
 					panelWindow.visible = true;
 					openAnim.start();
@@ -36,8 +38,6 @@ Scope {
 					closeAnim.start();
 				}
 			}
-
-			target: root
 		}
 
 		Anim {

Modules/Settings/Common/WallItem.qml

@@ -32,31 +32,6 @@ Item {
 			implicitHeight: width
 			radius: Appearance.rounding.large
 
-			Loader {
-				active: opacity > 0
-				anchors.centerIn: parent
-				opacity: img.status === Image.Ready ? 0 : 1
-
-				Behavior on opacity {
-					Anim {
-					}
-				}
-				sourceComponent: CustomRect {
-					color: DynamicColors.palette.m3primaryContainer
-					implicitHeight: loadingIndicator.implicitSize + Appearance.padding.large * 2
-					implicitWidth: loadingIndicator.implicitSize + Appearance.padding.large * 2
-					radius: Appearance.rounding.full
-
-					LoadingIndicator {
-						id: loadingIndicator
-
-						anchors.centerIn: parent
-						containsIcon: true
-						implicitSize: Math.min(imgWrapper.width, imgWrapper.height) * 0.3
-					}
-				}
-			}
-
 			Image {
 				id: img
 

Modules/Settings/Common/WallpaperCropper.qml

@@ -267,6 +267,8 @@ Item {
 					function restoreFromData() {
 						let data = Wallpapers.getCrop(wrapper.currentScreen.name);
 
+						console.log(data.x, data.y);
+
 						if (data && (Math.abs(data.x) > 0.001 || Math.abs(data.y) > 0.001 || Math.abs(data.width - 1.0) > 0.001 || Math.abs(data.height - 1.0) > 0.001)) {
 							zoom = data.zoom > 0 ? data.zoom : 1.0;
 							x = imageX + (data.x * scaledImg.paintedWidth);

Modules/Settings/NavPane/NavLocations.qml

@@ -148,39 +148,16 @@ VerticalFadeFlickable {
 			}
 		}
 
-		Column {
+		ListView {
 			id: resultList
 
 			Layout.fillWidth: true
+			cacheBuffer: 10000
+			implicitHeight: contentHeight
+			interactive: false
 			spacing: Appearance.padding.large
 
-			add: Transition {
+			delegate: ColumnLayout {
-				Anim {
-					from: 0
-					property: "opacity"
-					to: 1
-					type: Anim.DefaultEffects
-				}
-			}
-			move: Transition {
-				Anim {
-					properties: "x,y"
-				}
-
-				Anim {
-					property: "opacity"
-					to: 1
-					type: Anim.DefaultEffects
-				}
-			}
-
-			Repeater {
-				model: ScriptModel {
-					objectProp: "pageIdx"
-					values: root.groups
-				}
-
-				ColumnLayout {
 				id: group
 
 				required property int index
@@ -196,51 +173,25 @@ VerticalFadeFlickable {
 
 					MaterialIcon {
 						color: DynamicColors.palette.m3primary
-							fill: 1
 						font.pointSize: Appearance.font.size.large
 						text: group.modelData.icon
 					}
 
 					CustomText {
 						Layout.fillWidth: true
-							color: DynamicColors.palette.m3secondary
+						color: DynamicColors.palette.m3primary
 						elide: Text.ElideRight
 						font.pointSize: Appearance.font.size.large
 						text: group.modelData.page
 					}
 				}
 
-					Column {
+				ColumnLayout {
-						id: cardList
-
 					Layout.fillWidth: true
 					spacing: Appearance.spacing.extraSmall / 2
 
-						add: Transition {
-							Anim {
-								from: 0
-								property: "opacity"
-								to: 1
-								type: Anim.DefaultEffects
-							}
-						}
-						move: Transition {
-							Anim {
-								properties: "x,y"
-							}
-
-							Anim {
-								property: "opacity"
-								to: 1
-								type: Anim.DefaultEffects
-							}
-						}
-
 					Repeater {
-							model: ScriptModel {
+						model: group.modelData.entries
-								objectProp: "anchor"
-								values: group.modelData.entries
-							}
 
 						CustomRect {
 							id: result
@@ -250,6 +201,7 @@ VerticalFadeFlickable {
 							readonly property bool isLast: index === group.modelData.entries.length - 1
 							required property var modelData
 
+							Layout.fillWidth: true
 							bottomLeftRadius: layer.pressed ? Appearance.rounding.medium : isLast ? Appearance.rounding.large : Appearance.rounding.extraSmall
 							bottomRightRadius: layer.pressed ? Appearance.rounding.medium : isLast ? Appearance.rounding.large : Appearance.rounding.extraSmall
 							color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
@@ -259,7 +211,6 @@ VerticalFadeFlickable {
 							}
 							topLeftRadius: layer.pressed ? Appearance.rounding.medium : isFirst ? Appearance.rounding.large : Appearance.rounding.extraSmall
 							topRightRadius: layer.pressed ? Appearance.rounding.medium : isFirst ? Appearance.rounding.large : Appearance.rounding.extraSmall
-								width: cardList.width
 
 							RadiusBehavior on bottomLeftRadius {
 							}
@@ -298,7 +249,7 @@ VerticalFadeFlickable {
 									elide: Text.ElideRight
 									font.pointSize: Appearance.font.size.medium
 									text: SettingsSearcher.highlight(result.modelData.title, root.search, DynamicColors.palette.m3primary)
-										textFormat: text.includes("<font") ? Text.StyledText : Text.PlainText
+									textFormat: Text.StyledText
 								}
 
 								CustomText {
@@ -307,7 +258,7 @@ VerticalFadeFlickable {
 									elide: Text.ElideRight
 									font.pointSize: Appearance.font.size.small
 									text: SettingsSearcher.highlight(result.modelData.subtext, root.search, DynamicColors.palette.m3primary)
-										textFormat: text.includes("<font") ? Text.StyledText : Text.PlainText
+									textFormat: Text.StyledText
 									visible: result.modelData.subtext.length > 0
 								}
 							}
@@ -341,6 +292,9 @@ VerticalFadeFlickable {
 					}
 				}
 			}
+			model: ScriptModel {
+				objectProp: "pageIdx"
+				values: root.groups
 			}
 		}
 

Modules/Settings/Pages/Panels/Bar/BarClock.qml

@@ -48,6 +48,7 @@ PageBase {
 			Layout.topMargin: Appearance.spacing.extraSmall / 2 - parent.spacing
 			active: root.clockFormats.find(item => item.value === Config.general.dateFormat)
 			first: true
+			last: true
 			menuItems: root.clockFormats
 			settingAnchor: "bar-clock-format"
 			subtext: qsTr("Change how time is displayed in the widget")
@@ -57,15 +58,5 @@ PageBase {
 				Config.general.dateFormat = item.value;
 			}
 		}
-
-		ToggleRow {
-			checked: Config.services.useTwelveHourClock
-			last: true
-			settingAnchor: "bar-clock-twelve-hour"
-			subtext: qsTr("Format timestamps for twelve or twenty-four hours in UI")
-			text: qsTr("Twelve hour clock")
-
-			onToggled: Config.services.useTwelveHourClock = checked
-		}
 	}
 }

Modules/Settings/SettingsSearcher.qml

@@ -10,39 +10,16 @@ Singleton {
 	id: root
 
 	property var fzfFinder: null
-	readonly property var highlightCache: ({
-			"search": "",
-			"pattern": null
-		})
 	property var inverted: ({})
 	property var ranking: ({})
 
 	function highlight(text: string, search: string, colour: color): string {
 		const escaped = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-		if (search.length === 0)
-			return escaped;
-
-		const cache = root.highlightCache;
-		if (search !== cache.search) {
 		const tokens = tokenize(search);
-			cache.search = search;
 		if (tokens.length === 0)
-				cache.pattern = null;
+			return escaped;
-			else {
 		const escapedTokens = tokens.map(t => t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
-				cache.pattern = new RegExp("\\b(" + escapedTokens.join("|") + ")", "gi");
+		const pattern = new RegExp("\\b(" + escapedTokens.join("|") + ")", "gi");
-			}
-		}
-
-		const pattern = cache.pattern;
-		if (!pattern)
-			return escaped;
-
-		pattern.lastIndex = 0;
-		if (!pattern.test(escaped))
-			return escaped;
-
-		pattern.lastIndex = 0;
 		return escaped.replace(pattern, `<font color="${colour}">$1</font>`);
 	}
 

Modules/Settings/Wrapper.qml

@@ -39,6 +39,8 @@ Item {
 				sState.animatingContainer: content.opacity < 1
 				sState.currentPageIdx: ["wallpaper"][0]
 				sState.screen: root.screen
+
+				onClose: console.log("shouldclose")
 			}
 		}
 	}

Modules/Wallpaper/WallBackground.qml

@@ -12,10 +12,10 @@ Item {
 	id: root
 
 	property bool completed
-	property real cropHeight: displayData?.height ?? 1.0
+	property real cropHeight: displayData.height ?? 1.0
-	property real cropWidth: displayData?.width ?? 1.0
+	property real cropWidth: displayData.width ?? 1.0
-	property real cropX: displayData?.x ?? 0.0
+	property real cropX: displayData.x ?? 0.0
-	property real cropY: displayData?.y ?? 0.0
+	property real cropY: displayData.y ?? 0.0
 	property WallpaperImage current
 	readonly property var displayData: Wallpapers.getCrop(screen.name)
 	required property ShellScreen screen

Plugins/cmake/zshell-cli-python.cmake.in

@@ -1,19 +0,0 @@
-file(GLOB ZSHELL_CLI_WHEEL "@ZSHELL_CLI_DIST_DIR@/*.whl")
-if(NOT ZSHELL_CLI_WHEEL)
-	message(FATAL_ERROR "No zshell-cli wheel found in @ZSHELL_CLI_DIST_DIR@")
-endif()
-
-set(_zshell_installer_args "--prefix=@CMAKE_INSTALL_PREFIX@")
-if(DEFINED ENV{DESTDIR} AND NOT "$ENV{DESTDIR}" STREQUAL "")
-	list(APPEND _zshell_installer_args "--destdir=$ENV{DESTDIR}")
-endif()
-
-execute_process(
-	COMMAND "@Python3_EXECUTABLE@" -m installer
-		${_zshell_installer_args}
-		${ZSHELL_CLI_WHEEL}
-	RESULT_VARIABLE ZSHELL_CLI_INSTALL_RESULT
-)
-if(NOT ZSHELL_CLI_INSTALL_RESULT EQUAL 0)
-	message(FATAL_ERROR "zshell-cli wheel install failed")
-endif()

Plugins/cmake/zshell-cli.cmake.in

@@ -1,12 +0,0 @@
-set(ZSHELL_CLI_BIN_DIR "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/usr/bin")
-file(MAKE_DIRECTORY "${ZSHELL_CLI_BIN_DIR}")
-
-file(RELATIVE_PATH ZSHELL_CLI_TARGET
-	"${ZSHELL_CLI_BIN_DIR}"
-	"${CMAKE_INSTALL_PREFIX}/@INSTALL_LIBDIR@/zshell-cli/zshell-cli"
-)
-
-file(CREATE_LINK
-	"${ZSHELL_CLI_TARGET}"
-	"${ZSHELL_CLI_BIN_DIR}/zshell-cli" SYMBOLIC
-)

cli/bin/zshell

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd "$(dirname $0)/../src" || exit
+
+python3 -m zshell "$@"

cli/pyproject.toml

@@ -0,0 +1,32 @@
+[build-system]
+requires = ["hatchling >= 1.26"]
+build-backend = "hatchling.build"
+
+[project]
+name = "zshell"
+requires-python = ">=3.13"
+version = "0.1.0"
+dependencies = [
+	"typer",
+	"pillow",
+	"jinja2",
+	"materialyoucolor"
+]
+
+[project.scripts]
+zshell-cli = "zshell:main"
+
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.build.targets.sdist]
+only-include = [
+	"src",
+]
+
+[tool.ruff]
+line-length = 120
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+pythonpath = ["src"]

cli/src/zshell/__init__.py

@@ -1,14 +1,12 @@
 from __future__ import annotations
-
 import os
 import sys
 from pathlib import Path
 
 import typer
+from typer._completion_shared import install, _get_shell_name
 from typer._completion_classes import completion_init
-from typer._completion_shared import _get_shell_name, install
+from zshell.subcommands import shell, scheme, screenshot, wallpaper, record
-
-from zshell.subcommands import record, scheme, screenshot, shell, wallpaper
 
 app = typer.Typer(name="zshell-cli", add_completion=False)
 
@@ -25,17 +23,9 @@ def _completion_installed() -> bool:
         case "zsh":
             return (Path.home() / ".zfunc" / "_zshell-cli").exists()
         case "bash":
-			return (
+            return (Path.home() / ".bash_completions" / "zshell-cli.sh").exists()
-				Path.home() / ".bash_completions" / "zshell-cli.sh"
-			).exists()
         case "fish":
-			return (
+            return (Path.home() / ".config" / "fish" / "completions" / "zshell-cli.fish").exists()
-				Path.home()
-				/ ".config"
-				/ "fish"
-				/ "completions"
-				/ "zshell-cli.fish"
-			).exists()
     return False
 
 
@@ -50,15 +40,10 @@ def _install_completion() -> None:
     try:
         _, path = install(prog_name="zshell-cli")
         print(f"zshell-cli: Shell completion installed ({shell}: {path})")
-		print(
+        print("zshell-cli: Restart your shell or source the file to enable tab-completion.")
-			"zshell-cli: Restart your shell or source the file to enable tab-completion."
-		)
     except Exception as e:
-		print(
+        print(f"zshell-cli: Failed to install shell completion: {e}", file=sys.stderr)
-			f"zshell-cli: Failed to install shell completion: {e}",
+        raise typer.Exit(code=1)
-			file=sys.stderr,
-		)
-		raise typer.Exit(code=1) from None
 
 
 def main() -> None:
@@ -68,8 +53,5 @@ def main() -> None:
     if "_ZSHELL_CLI_COMPLETE" in os.environ:
         completion_init()
     if sys.stdout.isatty() and not _completion_installed():
-		print(
+        print("zshell-cli: Tip: run with --install-autocomplete for tab completion.", file=sys.stderr)
-			"zshell-cli: Tip: run with --install-autocomplete for tab completion.",
-			file=sys.stderr,
-		)
     app()

cli/src/zshell/__main__.py

@@ -1,4 +1,4 @@
-from zshell import main
+from . import main
 
 if __name__ == "__main__":
     main()

cli/src/zshell/subcommands/record.py

@@ -1,9 +1,9 @@
-import contextlib
-import json
 import os
+import json
 import subprocess
 import time
 from pathlib import Path
+from typing import Optional
 
 import typer
 
@@ -18,9 +18,7 @@ TEMP_RECORDING = STATE_DIR / "recording.mp4"
 REPLAY_RECORDING = STATE_DIR / "replay.mp4"
 NOTIF_ID_FILE = STATE_DIR / "notifid.txt"
 
-RECORDINGS_DIR = os.getenv(
+RECORDINGS_DIR = os.getenv("ZSHELL_RECORDINGS_DIR", str(Path(HOME) / "Videos/Recordings"))
-	"ZSHELL_RECORDINGS_DIR", str(Path(HOME) / "Videos/Recordings")
-)
 
 
 def _read_extra_args() -> list[str]:
@@ -34,54 +32,34 @@ def _read_extra_args() -> list[str]:
 
 
 def _is_recording() -> bool:
-	return (
+    return subprocess.run(["pidof", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0
-		subprocess.run(
-			["pidof", RECORDER],
-			stdout=subprocess.DEVNULL,
-			stderr=subprocess.DEVNULL,
-		).returncode
-		== 0
-	)
 
 
-def _notify(
+def _notify(summary: str, body: str = "", actions: list | None = None, timeout: int = 5000) -> Optional[int]:
-	summary: str,
-	body: str = "",
-	actions: list | None = None,
-	timeout: int = 5000,
-) -> int | None:
     args = ["notify-send", summary, body, "-t", str(timeout), "-p"]
     if actions:
         for action in actions:
             args.extend(["-A", action])
     try:
         proc = subprocess.run(args, capture_output=True, text=True)
-		return (
+        return int(proc.stdout.strip()) if proc.stdout.strip().isdigit() else None
-			int(proc.stdout.strip()) if proc.stdout.strip().isdigit() else None
-		)
     except Exception:
         return None
 
 
 def _close_notification(notif_id: int):
-	subprocess.run(
+    subprocess.run(["notify-send", "--close", str(notif_id)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-		["notify-send", "--close", str(notif_id)],
-		stdout=subprocess.DEVNULL,
-		stderr=subprocess.DEVNULL,
-	)
 
 
 def _get_monitors() -> list[dict]:
     try:
-		res = subprocess.run(
+        res = subprocess.run(["hyprctl", "monitors", "-j"], capture_output=True, text=True)
-			["hyprctl", "monitors", "-j"], capture_output=True, text=True
-		)
         return json.loads(res.stdout)
     except Exception:
         return []
 
 
-def _focused_monitor_name() -> str | None:
+def _focused_monitor_name() -> Optional[str]:
     for m in _get_monitors():
         if m.get("focused"):
             return m["name"]
@@ -93,12 +71,7 @@ def _monitors_intersecting_region(x: int, y: int, w: int, h: int) -> list[dict]:
     intersecting = []
     for m in _get_monitors():
         mx, my, mw, mh = m["x"], m["y"], m["width"], m["height"]
-		if not (
+        if not (region[2] <= mx or region[0] >= mx + mw or region[3] <= my or region[1] >= my + mh):
-			region[2] <= mx
-			or region[0] >= mx + mw
-			or region[3] <= my
-			or region[1] >= my + mh
-		):
             intersecting.append(m)
     return intersecting
 
@@ -107,30 +80,23 @@ def _highest_refresh(monitors: list[dict]) -> float:
     return max((m["refreshRate"] for m in monitors), default=60.0)
 
 
-def _slurp_region() -> str | None:
+def _slurp_region() -> Optional[str]:
     try:
-		return subprocess.check_output(
+        return subprocess.check_output(["slurp", "-f", "%wx%h+%x+%y"], text=True).strip()
-			["slurp", "-f", "%wx%h+%x+%y"], text=True
-		).strip()
     except subprocess.CalledProcessError:
         return None
 
 
-def _parse_geometry(geometry: str) -> tuple[int, int, int, int] | None:
+def _parse_geometry(geometry: str) -> Optional[tuple[int, int, int, int]]:
     import re
 
     match = re.match(r"(\d+)x(\d+)\+(\d+)\+(\d+)", geometry)
     if match:
-		return (
+        return int(match.group(3)), int(match.group(4)), int(match.group(1)), int(match.group(2))
-			int(match.group(3)),
-			int(match.group(4)),
-			int(match.group(1)),
-			int(match.group(2)),
-		)
     return None
 
 
-def start_recording(region: str | None, sound: bool):
+def start_recording(region: Optional[str], sound: bool):
     STATE_DIR.mkdir(parents=True, exist_ok=True)
     cmd = [RECORDER]
     extra_args = _read_extra_args()
@@ -152,9 +118,7 @@ def start_recording(region: str | None, sound: bool):
 
         monitors = _monitors_intersecting_region(x, y, w, h)
         framerate = _highest_refresh(monitors)
-		cmd.extend(
+        cmd.extend(["-w", "region", "-region", geometry, "-f", str(int(framerate))])
-			["-w", "region", "-region", geometry, "-f", str(int(framerate))]
-		)
 
     else:
         monitor_name = _focused_monitor_name()
@@ -173,12 +137,7 @@ def start_recording(region: str | None, sound: bool):
     cmd.extend(extra_args)
     cmd.extend(["-o", str(TEMP_RECORDING)])
 
-	subprocess.Popen(
+    subprocess.Popen(cmd, start_new_session=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-		cmd,
-		start_new_session=True,
-		stdout=subprocess.DEVNULL,
-		stderr=subprocess.DEVNULL,
-	)
 
     notif_id = _notify("Recording started", f"Saving to {TEMP_RECORDING}")
     if notif_id is not None:
@@ -186,20 +145,12 @@ def start_recording(region: str | None, sound: bool):
 
     time.sleep(1)
     if not _is_recording():
-		_notify(
+        _notify("Recording failed", "Check gpu-screen-recorder output.", timeout=5000)
-			"Recording failed",
-			"Check gpu-screen-recorder output.",
-			timeout=5000,
-		)
         raise typer.Exit(code=1)
 
 
 def stop_recording(clipboard: bool):
-	subprocess.run(
+    subprocess.run(["pkill", "-f", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-		["pkill", "-f", RECORDER],
-		stdout=subprocess.DEVNULL,
-		stderr=subprocess.DEVNULL,
-	)
 
     for _ in range(50):
         if not _is_recording():
@@ -215,8 +166,10 @@ def stop_recording(clipboard: bool):
         TEMP_RECORDING.rename(final_path)
 
     if NOTIF_ID_FILE.is_file():
-		with contextlib.suppress(Exception):
+        try:
             _close_notification(int(NOTIF_ID_FILE.read_text().strip()))
+        except Exception:
+            pass
         NOTIF_ID_FILE.unlink()
 
     if clipboard:
@@ -230,34 +183,21 @@ def stop_recording(clipboard: bool):
 
 
 def toggle_pause():
-	subprocess.run(
+    subprocess.run(["pkill", "-USR2", "-f", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-		["pkill", "-USR2", "-f", RECORDER],
-		stdout=subprocess.DEVNULL,
-		stderr=subprocess.DEVNULL,
-	)
     typer.echo("Toggled pause.")
 
 
 @app.command()
 def record(
-	region: str | None = typer.Option(
+    region: Optional[str] = typer.Option(
         None,
         "--region",
         "-r",
         help="Record a region. Use 'slurp' (or omit value) to select interactively, or give 'WxH+X+Y'.",
     ),
-	sound: bool = typer.Option(
+    sound: bool = typer.Option(False, "--sound", "-s", help="Record audio from default output."),
-		False, "--sound", "-s", help="Record audio from default output."
+    pause: bool = typer.Option(False, "--pause", "-p", help="Toggle pause/resume."),
-	),
+    clipboard: bool = typer.Option(False, "--clipboard", "-c", help="Copy the final recording path to clipboard."),
-	pause: bool = typer.Option(
-		False, "--pause", "-p", help="Toggle pause/resume."
-	),
-	clipboard: bool = typer.Option(
-		False,
-		"--clipboard",
-		"-c",
-		help="Copy the final recording path to clipboard.",
-	),
 ):
     """Start or stop a screen recording with gpu-screen-recorder."""
     if pause:

cli/src/zshell/subcommands/scheme.py

@@ -1,33 +1,26 @@
-import contextlib
-import json
-import os
-import re
-import shutil
-import subprocess
-import sys
-from pathlib import Path
-from typing import Any
-
 import typer
+import json
+import shutil
+import os
+import sys
+import re
+import subprocess
+
 from jinja2 import Environment, FileSystemLoader, StrictUndefined, Undefined
-from materialyoucolor.dynamiccolor.material_dynamic_colors import (
+from typing import Any, Optional, Tuple
-	MaterialDynamicColors,
+from zshell.utils.schemepalettes import get_palette, list_schemes, resolve_preset
-)
+from pathlib import Path
-from materialyoucolor.hct.hct import Hct
+from PIL import Image
 from materialyoucolor.quantize import QuantizeCelebi
 from materialyoucolor.score.score import Score
+from materialyoucolor.dynamiccolor.material_dynamic_colors import MaterialDynamicColors
+from materialyoucolor.hct.hct import Hct
 from materialyoucolor.utils.color_utils import argb_from_rgb
 from materialyoucolor.utils.math_utils import (
     difference_degrees,
     rotation_direction,
     sanitize_degrees_double,
 )
-from PIL import Image
-from zshell.utils.schemepalettes import (
-	get_palette,
-	list_schemes,
-	resolve_preset,
-)
 
 app = typer.Typer()
 
@@ -80,9 +73,7 @@ def _complete_accent(ctx, incomplete):
 
 @app.command()
 def list_presets(
-	json_format: bool = typer.Option(
+    json_format: bool = typer.Option(False, "--json", help="Output in JSON format"),
-		False, "--json", help="Output in JSON format"
-	),
 ):
     schemes = list_schemes()
     if json_format:
@@ -115,25 +106,25 @@ def list_presets(
 
 @app.command()
 def generate(
-	image_path: Path | None = typer.Option(
+    image_path: Optional[Path] = typer.Option(
         None, help="Path to source image. Required for image mode."
     ),
-	scheme: str | None = typer.Option(
+    scheme: Optional[str] = typer.Option(
         None,
         help="Color scheme algorithm to use for image mode. Ignored in preset mode.",
         autocompletion=_complete_scheme_name,
     ),
-	preset: str | None = typer.Option(
+    preset: Optional[str] = typer.Option(
         None,
         help="Name of a premade scheme in this format: <scheme>:<variant>",
         autocompletion=_complete_preset,
     ),
-	mode: str | None = typer.Option(
+    mode: Optional[str] = typer.Option(
         None,
         help="Mode of the preset scheme (dark or light).",
         autocompletion=_complete_mode,
     ),
-	accent: str | None = typer.Option(
+    accent: Optional[str] = typer.Option(
         None,
         help="Accent for schemes that support it (e.g. mauve).",
         autocompletion=_complete_accent,
@@ -148,7 +139,7 @@ def generate(
     HOME = str(os.getenv("HOME"))
     OUTPUT = Path(HOME + "/.local/state/zshell/scheme.json")
     SEQ_STATE = Path(HOME + "/.local/state/zshell/sequences.txt")
-	THUMB_DIR = Path(HOME + "/.cache/zshell/imagecache/thumbnails")
+    THUMB_PATH = Path(HOME + "/.cache/zshell/imagecache/thumbnail.jpg")
     WALL_DIR_PATH = Path(HOME + "/.local/state/zshell/wallpaper_path.json")
 
     TEMPLATE_DIR = Path(HOME + "/.config/zshell/templates")
@@ -156,28 +147,20 @@ def generate(
     CONFIG = Path(HOME + "/.config/zshell/config.json")
 
     if preset is not None and image_path is not None:
-		raise typer.BadParameter(
+        raise typer.BadParameter("Use either --image-path or --preset, not both.")
-			"Use either --image-path or --preset, not both."
-		)
 
     def get_scheme_class(scheme_name: str):
         match scheme_name:
             case "fruit-salad":
-				from materialyoucolor.scheme.scheme_fruit_salad import (
+                from materialyoucolor.scheme.scheme_fruit_salad import SchemeFruitSalad
-					SchemeFruitSalad,
-				)
 
                 return SchemeFruitSalad
             case "expressive":
-				from materialyoucolor.scheme.scheme_expressive import (
+                from materialyoucolor.scheme.scheme_expressive import SchemeExpressive
-					SchemeExpressive,
-				)
 
                 return SchemeExpressive
             case "monochrome":
-				from materialyoucolor.scheme.scheme_monochrome import (
+                from materialyoucolor.scheme.scheme_monochrome import SchemeMonochrome
-					SchemeMonochrome,
-				)
 
                 return SchemeMonochrome
             case "rainbow":
@@ -185,9 +168,7 @@ def generate(
 
                 return SchemeRainbow
             case "tonal-spot":
-				from materialyoucolor.scheme.scheme_tonal_spot import (
+                from materialyoucolor.scheme.scheme_tonal_spot import SchemeTonalSpot
-					SchemeTonalSpot,
-				)
 
                 return SchemeTonalSpot
             case "neutral":
@@ -195,9 +176,7 @@ def generate(
 
                 return SchemeNeutral
             case "fidelity":
-				from materialyoucolor.scheme.scheme_fidelity import (
+                from materialyoucolor.scheme.scheme_fidelity import SchemeFidelity
-					SchemeFidelity,
-				)
 
                 return SchemeFidelity
             case "content":
@@ -209,9 +188,7 @@ def generate(
 
                 return SchemeVibrant
             case _:
-				from materialyoucolor.scheme.scheme_fruit_salad import (
+                from materialyoucolor.scheme.scheme_fruit_salad import SchemeFruitSalad
-					SchemeFruitSalad,
-				)
 
                 return SchemeFruitSalad
 
@@ -296,8 +273,7 @@ def generate(
         diff = difference_degrees(from_hct.hue, to_hct.hue)
         rotation = min(diff * 0.8, 100)
         output_hue = sanitize_degrees_double(
-			from_hct.hue
+            from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue)
-			+ rotation * rotation_direction(from_hct.hue, to_hct.hue)
         )
         tone = max(0.0, min(100.0, from_hct.tone * (1 + tone_boost)))
         return Hct.from_hct(output_hue, from_hct.chroma, tone)
@@ -331,32 +307,17 @@ def generate(
 
         return out
 
-	def thumbnail_cache_path(image_path: Path, thumb_dir: Path) -> Path:
+    def generate_thumbnail(image_path, thumbnail_path, size=(128, 128)):
-		stat = image_path.stat()
+        thumbnail_file = Path(thumbnail_path)
-		key = f"{image_path.stem}_{stat.st_size}_{int(stat.st_mtime)}"
-		safe_key = re.sub(r"[^A-Za-z0-9._-]", "_", key)
-		return thumb_dir / f"{safe_key}_thumbnail.jpg"
-
-	def generate_thumbnail(
-		image_path: Path, thumb_dir: Path, size=(128, 128)
-	) -> Path:
-		thumb_dir.mkdir(parents=True, exist_ok=True)
-		cache_path = thumbnail_cache_path(image_path, thumb_dir)
-
-		if cache_path.exists():
-			return cache_path
 
         image = Image.open(image_path)
-		image.draft("RGB", size)
         image = image.convert("RGB")
         image.thumbnail(size, Image.Resampling.NEAREST)
-		image.save(cache_path, "JPEG")
 
-		return cache_path
+        thumbnail_file.parent.mkdir(parents=True, exist_ok=True)
+        image.save(thumbnail_path, "JPEG")
 
-	def apply_terms(
+    def apply_terms(sequences: str, sequences_tmux: str, state_path: Path) -> None:
-		sequences: str, sequences_tmux: str, state_path: Path
-	) -> None:
         state_path.parent.mkdir(parents=True, exist_ok=True)
         state_path.write_text(sequences, encoding="utf-8")
 
@@ -400,7 +361,7 @@ def generate(
         mode = mode.lower()
         preference = "prefer-dark" if mode == "dark" else "prefer-light"
 
-		with contextlib.suppress(FileNotFoundError):
+        try:
             subprocess.run(
                 [
                     "gsettings",
@@ -413,6 +374,8 @@ def generate(
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
             )
+        except FileNotFoundError:
+            pass
 
     def apply_qt_mode(mode: str, home: str) -> None:
         mode = mode.lower()
@@ -436,8 +399,10 @@ def generate(
         )
 
         if count > 0 and new_text != text:
-			with contextlib.suppress(OSError):
+            try:
                 qt_conf.write_text(new_text, encoding="utf-8")
+            except OSError:
+                pass
 
     def build_template_context(
         *,
@@ -501,7 +466,7 @@ def generate(
         ESC = "\x1b"
         return f"{ESC}Ptmux;{seq.replace(ESC, ESC + ESC)}{ESC}\\"
 
-	def parse_output_directive(first_line: str) -> Path | None:
+    def parse_output_directive(first_line: str) -> Optional[Path]:
         s = first_line.strip()
         if not s.startswith("#") or s.startswith("#!"):
             return None
@@ -513,7 +478,7 @@ def generate(
         expanded = os.path.expandvars(os.path.expanduser(target))
         return Path(expanded)
 
-	def split_directive_and_body(text: str) -> tuple[Path | None, str]:
+    def split_directive_and_body(text: str) -> Tuple[Optional[Path], str]:
         lines = text.splitlines(keepends=True)
         if not lines:
             return None, ""
@@ -541,9 +506,7 @@ def generate(
 
         rendered_outputs: list[Path] = []
 
-		for tpl_path in sorted(
+        for tpl_path in sorted(p for p in templates_dir.rglob("*") if p.is_file()):
-			p for p in templates_dir.rglob("*") if p.is_file()
-		):
             rel = tpl_path.relative_to(templates_dir)
 
             if any(part.startswith(".") for part in rel.parts):
@@ -560,14 +523,14 @@ def generate(
                 template = env.from_string(body)
                 text = template.render(**context)
             except Exception as e:
-				raise RuntimeError(
+                raise RuntimeError(f"Template render failed for '{rel}': {e}") from e
-					f"Template render failed for '{rel}': {e}"
-				) from e
 
             out_path.write_text(text, encoding="utf-8")
 
-			with contextlib.suppress(OSError):
+            try:
                 shutil.copymode(tpl_path, out_path)
+            except OSError:
+                pass
 
             rendered_outputs.append(out_path)
 
@@ -584,16 +547,14 @@ def generate(
         result = QuantizeCelebi(pixel_array, 128)
         return Hct.from_int(Score.score(result)[0])
 
-	def generate_color_scheme(
+    def generate_color_scheme(seed: Hct, mode: str, scheme_class) -> dict[str, str]:
-		seed: Hct, mode: str, scheme_class
-	) -> dict[str, str]:
 
         is_dark = mode.lower() == "dark"
 
         scheme = scheme_class(seed, is_dark, 0.0)
 
         color_dict = {}
-		for color in vars(MaterialDynamicColors):
+        for color in vars(MaterialDynamicColors).keys():
             color_name = getattr(MaterialDynamicColors, color)
             if hasattr(color_name, "get_hct"):
                 color_int = color_name.get_hct(scheme).to_int()
@@ -602,7 +563,7 @@ def generate(
         return color_dict
 
     def int_to_hex(argb_int):
-		return f"#{argb_int & 0xFFFFFF:06X}"
+        return "#{:06X}".format(argb_int & 0xFFFFFF)
 
     try:
         with CONFIG.open() as f:
@@ -625,9 +586,7 @@ def generate(
                     (v.accents for v in meta.variants if v.id == p_variant), ()
                 )
                 if accent not in var_accents:
-					available = (
+                    available = ", ".join(var_accents) if var_accents else "none"
-						", ".join(var_accents) if var_accents else "none"
-					)
                     raise typer.BadParameter(
                         f"Accent '{accent}' not available for '{p_scheme}:{p_variant}'. Available accents: {available}"
                     )
@@ -637,14 +596,9 @@ def generate(
             if p_scheme in schemes:
                 meta = schemes[p_scheme]
                 variant = next(
-					(vari for vari in meta.variants if vari.id == p_variant),
+                    (vari for vari in meta.variants if vari.id == p_variant), None
-					None,
                 )
-				if (
+                if variant and requested_mode not in variant.modes and variant.modes:
-					variant
-					and requested_mode not in variant.modes
-					and variant.modes
-				):
                     resolved_mode = sorted(variant.modes)[0]
 
             palette_obj = get_palette(
@@ -669,13 +623,13 @@ def generate(
             seed = hex_to_hct(colors.get("primary", "#000000").lstrip("#"))
         else:
             image_path = image_path or Path(WALL_PATH)
-			thumb_path = generate_thumbnail(image_path, THUMB_DIR)
+            generate_thumbnail(image_path, str(THUMB_PATH))
-			seed = seed_from_image(thumb_path)
+            seed = seed_from_image(THUMB_PATH)
             name = "dynamic"
             flavor = "default"
 
             if smart:
-				effective_mode = smart_mode(thumb_path)
+                effective_mode = smart_mode(THUMB_PATH)
             elif mode is not None:
                 effective_mode = mode
             else:
@@ -721,9 +675,7 @@ def generate(
                 print(f"rendered: {p}")
 
         OUTPUT.parent.mkdir(parents=True, exist_ok=True)
-		tmp_output = OUTPUT.with_suffix(".json.tmp")
+        with open(OUTPUT, "w") as f:
-		with open(tmp_output, "w") as f:
             json.dump(output_dict, f, indent=4)
-		os.replace(tmp_output, OUTPUT)
     except Exception as e:
         print(f"Error: {e}")

cli/src/zshell/subcommands/screenshot.py

@@ -1,5 +1,4 @@
 import subprocess
-
 import typer
 
 args = ["qs", "-c", "zshell"]
@@ -9,9 +8,9 @@ app = typer.Typer()
 
 @app.command()
 def start():
-	subprocess.run([*args, "ipc", "call", "picker", "open"], check=True)
+    subprocess.run(args + ["ipc"] + ["call"] + ["picker"] + ["open"], check=True)
 
 
 @app.command()
 def start_freeze():
-	subprocess.run([*args, "ipc", "call", "picker", "openFreeze"], check=True)
+    subprocess.run(args + ["ipc"] + ["call"] + ["picker"] + ["openFreeze"], check=True)

cli/src/zshell/subcommands/shell.py

@@ -11,7 +11,7 @@ app = typer.Typer()
 
 @app.command()
 def kill():
-	result = subprocess.run([*args, "kill"], capture_output=True)
+    result = subprocess.run(args + ["kill"], capture_output=True)
     if result.returncode != 0:
         sys.stderr.write("No running instance to kill.\n")
         sys.exit(1)
@@ -19,11 +19,10 @@ def kill():
 
 
 def start_instance(no_daemon: bool = False) -> None:
-	result = subprocess.run(
+    result = subprocess.run(args + ["-n"] + ([] if no_daemon else ["-d"]), capture_output=True)
-		args + ["-n"] + ([] if no_daemon else ["-d"]), capture_output=True
-	)
     stdout = result.stdout.decode().strip()
-	if stdout and "already running" in stdout.lower():
+    if stdout:
+        if "already running" in stdout.lower():
             sys.stderr.write(stdout + "\n")
             sys.exit(1)
     if result.returncode != 0:
@@ -39,10 +38,10 @@ def start(no_daemon: bool = False):
 
 @app.command()
 def restart(no_daemon: bool = False):
-	subprocess.run([*args, "kill"], capture_output=True)
+    subprocess.run(args + ["kill"], capture_output=True)
     deadline = time.monotonic() + 2.5
     while time.monotonic() < deadline:
-		result = subprocess.run([*args, "kill"], capture_output=True)
+        result = subprocess.run(args + ["kill"], capture_output=True)
         if result.returncode == 255:
             break
         time.sleep(0.25)
@@ -51,7 +50,7 @@ def restart(no_daemon: bool = False):
 
 @app.command()
 def show():
-	result = subprocess.run([*args, "ipc", "show"], capture_output=True)
+    result = subprocess.run(args + ["ipc"] + ["show"], capture_output=True)
     if result.returncode != 0:
         sys.stderr.write(result.stderr.decode())
         sys.exit(1)
@@ -61,7 +60,7 @@ def show():
 
 @app.command()
 def log():
-	result = subprocess.run([*args, "log"], capture_output=True)
+    result = subprocess.run(args + ["log"], capture_output=True)
     if result.returncode != 0:
         sys.stderr.write(result.stderr.decode())
         sys.exit(1)
@@ -71,9 +70,7 @@ def log():
 
 @app.command()
 def lock():
-	result = subprocess.run(
+    result = subprocess.run(args + ["ipc"] + ["call"] + ["lock"] + ["lock"], capture_output=True)
-		[*args, "ipc", "call", "lock", "lock"], capture_output=True
-	)
     if result.returncode != 0:
         sys.stderr.write(result.stderr.decode())
         sys.exit(1)
@@ -81,13 +78,8 @@ def lock():
 
 
 @app.command()
-def call(
+def call(target: str, method: str, method_args: list[str] = typer.Argument(None)):
-	target: str, method: str, method_args: list[str] = typer.Argument(None)
+    result = subprocess.run(args + ["ipc"] + ["call"] + [target] + [method] + (method_args or []), capture_output=True)
-):
-	result = subprocess.run(
-		args + ["ipc"] + ["call"] + [target] + [method] + (method_args or []),
-		capture_output=True,
-	)
     if result.returncode != 0:
         sys.stderr.write(result.stderr.decode())
         sys.exit(1)

cli/src/zshell/subcommands/wallpaper.py

@@ -1,9 +1,9 @@
 import subprocess
-from pathlib import Path
-from typing import Annotated
-
 import typer
+
+from typing import Annotated
 from PIL import Image, ImageFilter
+from pathlib import Path
 
 args = ["qs", "-c", "zshell"]
 
@@ -12,10 +12,7 @@ app = typer.Typer()
 
 @app.command()
 def set(wallpaper: Path):
-	subprocess.run(
+    subprocess.run(args + ["ipc"] + ["call"] + ["wallpaper"] + ["set"] + [wallpaper], check=True)
-		[*args, "ipc", "call", "wallpaper", "set", wallpaper],
-		check=True,
-	)
 
 
 @app.command()

cli/src/zshell/utils/schemepalettes.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from importlib.resources import files
+from pathlib import Path
-from importlib.resources.abc import Traversable
-from pathlib import PurePosixPath
 
-ASSETS: Traversable = files("zshell") / "assets" / "schemes"
+ASSETS = Path(__file__).resolve().parent.parent / "assets" / "schemes"
 
 
 @dataclass(frozen=True)
@@ -32,7 +30,7 @@ class Palette:
     accent: str | None = None
 
 
-def _parse_txt(path: Traversable) -> dict[str, str]:
+def _parse_txt(path: Path) -> dict[str, str]:
     colors: dict[str, str] = {}
     for line in path.read_text().splitlines():
         line = line.strip()
@@ -48,7 +46,7 @@ def _parse_txt(path: Traversable) -> dict[str, str]:
 def _discover_schemes() -> dict[str, SchemeMeta]:
     schemes: dict[str, SchemeMeta] = {}
 
-	for scheme_dir in sorted(ASSETS.iterdir(), key=lambda p: p.name):
+    for scheme_dir in sorted(ASSETS.iterdir()):
         if not scheme_dir.is_dir() or scheme_dir.name.startswith("."):
             continue
 
@@ -56,7 +54,7 @@ def _discover_schemes() -> dict[str, SchemeMeta]:
         display_name = sid.capitalize()
 
         variants: list[SchemeVariant] = []
-		for var_dir in sorted(scheme_dir.iterdir(), key=lambda p: p.name):
+        for var_dir in sorted(scheme_dir.iterdir()):
             if not var_dir.is_dir() or var_dir.name.startswith("."):
                 continue
 
@@ -64,10 +62,9 @@ def _discover_schemes() -> dict[str, SchemeMeta]:
             accents: set[str] = set()
 
             for f in var_dir.iterdir():
-				name = PurePosixPath(f.name)
+                if f.suffix != ".txt":
-				if name.suffix != ".txt":
                     continue
-				stem = name.stem
+                stem = f.stem
                 if "-" in stem:
                     maybe_accent, maybe_mode = stem.rsplit("-", 1)
                     if maybe_mode in ("dark", "light"):
@@ -102,28 +99,25 @@ def _discover_schemes() -> dict[str, SchemeMeta]:
 SCHEMES: dict[str, SchemeMeta] = _discover_schemes()
 
 
-def get_palette(
+def get_palette(scheme: str, variant: str, mode: str, accent: str | None = None) -> Palette:
-	scheme: str, variant: str, mode: str, accent: str | None = None
-) -> Palette:
     if scheme not in SCHEMES:
-		raise KeyError(
+        raise KeyError(f"Unknown scheme '{scheme}'. Available: {', '.join(SCHEMES)}")
-			f"Unknown scheme '{scheme}'. Available: {', '.join(SCHEMES)}"
-		)
 
     meta = SCHEMES[scheme]
     var_ids = {v.id for v in meta.variants}
     if variant not in var_ids:
-		raise KeyError(
+        raise KeyError(f"Unknown variant '{variant}' for scheme '{scheme}'. Available: {', '.join(sorted(var_ids))}")
-			f"Unknown variant '{variant}' for scheme '{scheme}'. Available: {', '.join(sorted(var_ids))}"
-		)
 
-	filename = f"{accent}-{mode}.txt" if accent else f"{mode}.txt"
+    if accent:
+        filename = f"{accent}-{mode}.txt"
+    else:
+        filename = f"{mode}.txt"
 
     txt_path = ASSETS / scheme / variant / filename
-	if not txt_path.is_file():
+    if not txt_path.exists():
         txt_path = ASSETS / scheme / variant / f"{mode}.txt"
 
-	if not txt_path.is_file():
+    if not txt_path.exists():
         var_info = next(v for v in meta.variants if v.id == variant)
         raise FileNotFoundError(
             f"No {mode} palette for '{scheme}:{variant}'. Available modes: {sorted(var_info.modes)}"
@@ -131,9 +125,7 @@ def get_palette(
 
     colors = _parse_txt(txt_path)
 
-	return Palette(
+    return Palette(colors=colors, mode=mode, scheme=scheme, variant=variant, accent=accent)
-		colors=colors, mode=mode, scheme=scheme, variant=variant, accent=accent
-	)
 
 
 def list_schemes() -> dict[str, SchemeMeta]:

cli/tests/test_schemepalettes.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from pathlib import Path
-
 import pytest
+from pathlib import Path
 from zshell.utils import schemepalettes as sp
 
 
@@ -13,12 +12,8 @@ def tmp_schemes(tmp_path: Path) -> Path:
 
     gmedium = schemes / "gruvbox" / "medium"
     gmedium.mkdir(parents=True)
-	(gmedium / "dark.txt").write_text(
+    (gmedium / "dark.txt").write_text("background 101415\nonBackground e0e3e4\nprimary 81d3e0\nsurface 1c2021\n")
-		"background 101415\nonBackground e0e3e4\nprimary 81d3e0\nsurface 1c2021\n"
+    (gmedium / "light.txt").write_text("background fbf1c7\nonBackground 3c3836\nprimary 6b5f10\nsurface fbf1c7\n")
-	)
-	(gmedium / "light.txt").write_text(
-		"background fbf1c7\nonBackground 3c3836\nprimary 6b5f10\nsurface fbf1c7\n"
-	)
 
     ghard = schemes / "gruvbox" / "hard"
     ghard.mkdir(parents=True)
@@ -26,24 +21,14 @@ def tmp_schemes(tmp_path: Path) -> Path:
 
     cmocha = schemes / "catppuccin" / "mocha"
     cmocha.mkdir(parents=True)
-	(cmocha / "dark.txt").write_text(
+    (cmocha / "dark.txt").write_text("background 1e1e2e\nprimary cba6f7\nsecondary 756294\nsurface 313244\n")
-		"background 1e1e2e\nprimary cba6f7\nsecondary 756294\nsurface 313244\n"
+    (cmocha / "mauve-dark.txt").write_text("background 1e1e2e\nprimary cba6f7\nsecondary 756294\nsurface 313244\n")
-	)
+    (cmocha / "green-dark.txt").write_text("background 1e1e2e\nprimary a6e3a1\nsecondary 5b8964\nsurface 313244\n")
-	(cmocha / "mauve-dark.txt").write_text(
-		"background 1e1e2e\nprimary cba6f7\nsecondary 756294\nsurface 313244\n"
-	)
-	(cmocha / "green-dark.txt").write_text(
-		"background 1e1e2e\nprimary a6e3a1\nsecondary 5b8964\nsurface 313244\n"
-	)
 
     clatte = schemes / "catppuccin" / "latte"
     clatte.mkdir(parents=True)
-	(clatte / "light.txt").write_text(
+    (clatte / "light.txt").write_text("background eff1f5\nprimary 8839ef\nsecondary c2b8d0\nsurface ccd0da\n")
-		"background eff1f5\nprimary 8839ef\nsecondary c2b8d0\nsurface ccd0da\n"
+    (clatte / "mauve-light.txt").write_text("background eff1f5\nprimary 8839ef\nsecondary c2b8d0\nsurface ccd0da\n")
-	)
-	(clatte / "mauve-light.txt").write_text(
-		"background eff1f5\nprimary 8839ef\nsecondary c2b8d0\nsurface ccd0da\n"
-	)
 
     cextra = schemes / "extra" / "default"
     cextra.mkdir(parents=True)
@@ -96,17 +81,13 @@ class TestDiscoverSchemes:
 
     def test_variant_has_modes(self):
         schemes = sp._discover_schemes()
-		gmedium = next(
+        gmedium = next(v for v in schemes["gruvbox"].variants if v.id == "medium")
-			v for v in schemes["gruvbox"].variants if v.id == "medium"
-		)
         assert "dark" in gmedium.modes
         assert "light" in gmedium.modes
 
     def test_catppuccin_has_accents(self):
         schemes = sp._discover_schemes()
-		mocha = next(
+        mocha = next(v for v in schemes["catppuccin"].variants if v.id == "mocha")
-			v for v in schemes["catppuccin"].variants if v.id == "mocha"
-		)
         assert "mauve" in mocha.accents
         assert "green" in mocha.accents
         assert "rosewater" in mocha.accents
@@ -114,9 +95,7 @@ class TestDiscoverSchemes:
 
     def test_non_accent_scheme_has_no_accents(self):
         schemes = sp._discover_schemes()
-		gmedium = next(
+        gmedium = next(v for v in schemes["gruvbox"].variants if v.id == "medium")
-			v for v in schemes["gruvbox"].variants if v.id == "medium"
-		)
         assert gmedium.accents == ()
 
 
@@ -145,15 +124,11 @@ class TestGetPalette:
             sp.get_palette("nope", "medium", "dark")
 
     def test_unknown_variant_raises(self):
-		with pytest.raises(
+        with pytest.raises(KeyError, match="Unknown variant 'bogus' for scheme 'gruvbox'"):
-			KeyError, match="Unknown variant 'bogus' for scheme 'gruvbox'"
-		):
             sp.get_palette("gruvbox", "bogus", "dark")
 
     def test_unknown_accent_falls_back(self):
-		pal = sp.get_palette(
+        pal = sp.get_palette("catppuccin", "mocha", "dark", accent="nonexistent")
-			"catppuccin", "mocha", "dark", accent="nonexistent"
-		)
         assert pal.accent == "nonexistent"
         assert pal.colors["primary"] is not None
 
@@ -189,7 +164,4 @@ class TestResolvePreset:
         assert sp.resolve_preset("default") == ("default", "default")
 
     def test_edge_spaces(self):
-		assert sp.resolve_preset(" catppuccin : mocha ") == (
+        assert sp.resolve_preset(" catppuccin : mocha ") == (" catppuccin ", " mocha ")
-			" catppuccin ",
-			" mocha ",
-		)

cli/tests/test_shell.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from subprocess import CompletedProcess
-from unittest.mock import call, patch
+from unittest.mock import patch, call
 
 from typer.testing import CliRunner
 from zshell.subcommands.shell import app
@@ -21,15 +21,11 @@ class TestKill:
     def test_kill_runs_qs_kill_success(self, mock_run):
         mock_run.return_value = CompletedProcess([], 0, b"", b"Killed abc\n")
         invoke("kill")
-		mock_run.assert_called_once_with(
+        mock_run.assert_called_once_with(["qs", "-c", "zshell", "kill"], capture_output=True)
-			["qs", "-c", "zshell", "kill"], capture_output=True
-		)
 
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_kill_no_instance_errors(self, mock_run):
-		mock_run.return_value = CompletedProcess(
+        mock_run.return_value = CompletedProcess([], 255, b"", b"No running instances\n")
-			[], 255, b"", b"No running instances\n"
-		)
         result = runner.invoke(app, ["kill"])
         assert result.exit_code != 0
         assert "No running instance to kill" in result.output
@@ -38,32 +34,19 @@ class TestKill:
 class TestStart:
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_start_default_daemon(self, mock_run):
-		mock_run.return_value = CompletedProcess(
+        mock_run.return_value = CompletedProcess([], 0, b"", b"Launching config\n")
-			[], 0, b"", b"Launching config\n"
-		)
         invoke("start")
-		mock_run.assert_called_once_with(
+        mock_run.assert_called_once_with(["qs", "-c", "zshell", "-n", "-d"], capture_output=True)
-			["qs", "-c", "zshell", "-n", "-d"], capture_output=True
-		)
 
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_start_no_daemon(self, mock_run):
-		mock_run.return_value = CompletedProcess(
+        mock_run.return_value = CompletedProcess([], 0, b"", b"Launching config\n")
-			[], 0, b"", b"Launching config\n"
-		)
         invoke("start", "--no-daemon")
-		mock_run.assert_called_once_with(
+        mock_run.assert_called_once_with(["qs", "-c", "zshell", "-n"], capture_output=True)
-			["qs", "-c", "zshell", "-n"], capture_output=True
-		)
 
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_start_already_running_errors(self, mock_run):
-		mock_run.return_value = CompletedProcess(
+        mock_run.return_value = CompletedProcess([], 0, b"An instance of this configuration is already running.\n", b"")
-			[],
-			0,
-			b"An instance of this configuration is already running.\n",
-			b"",
-		)
         result = runner.invoke(app, ["start"])
         assert result.exit_code != 0
         assert "already running" in result.output
@@ -79,14 +62,10 @@ class TestStart:
 class TestShow:
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_show_runs_ipc_show(self, mock_run):
-		mock_run.return_value = CompletedProcess(
+        mock_run.return_value = CompletedProcess([], 0, b"target visibilities\n", b"")
-			[], 0, b"target visibilities\n", b""
-		)
         result = invoke("show")
         assert "target visibilities" in result.output
-		mock_run.assert_called_once_with(
+        mock_run.assert_called_once_with(["qs", "-c", "zshell", "ipc", "show"], capture_output=True)
-			["qs", "-c", "zshell", "ipc", "show"], capture_output=True
-		)
 
 
 class TestLog:
@@ -94,9 +73,7 @@ class TestLog:
     def test_log_runs_qs_log(self, mock_run):
         mock_run.return_value = CompletedProcess([], 0, b"log output\n", b"")
         invoke("log")
-		mock_run.assert_called_once_with(
+        mock_run.assert_called_once_with(["qs", "-c", "zshell", "log"], capture_output=True)
-			["qs", "-c", "zshell", "log"], capture_output=True
-		)
 
 
 class TestLock:
@@ -104,10 +81,7 @@ class TestLock:
     def test_lock_runs_ipc_call_lock(self, mock_run):
         mock_run.return_value = CompletedProcess([], 0, b"", b"")
         invoke("lock")
-		mock_run.assert_called_once_with(
+        mock_run.assert_called_once_with(["qs", "-c", "zshell", "ipc", "call", "lock", "lock"], capture_output=True)
-			["qs", "-c", "zshell", "ipc", "call", "lock", "lock"],
-			capture_output=True,
-		)
 
 
 class TestCall:
@@ -115,27 +89,14 @@ class TestCall:
     def test_call_no_args(self, mock_run):
         mock_run.return_value = CompletedProcess([], 0, b"", b"")
         invoke("call", "target", "method")
-		mock_run.assert_called_once_with(
+        mock_run.assert_called_once_with(["qs", "-c", "zshell", "ipc", "call", "target", "method"], capture_output=True)
-			["qs", "-c", "zshell", "ipc", "call", "target", "method"],
-			capture_output=True,
-		)
 
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_call_with_args(self, mock_run):
         mock_run.return_value = CompletedProcess([], 0, b"", b"")
         invoke("call", "target", "method", "arg1", "arg2")
         mock_run.assert_called_once_with(
-			[
+            ["qs", "-c", "zshell", "ipc", "call", "target", "method", "arg1", "arg2"],
-				"qs",
-				"-c",
-				"zshell",
-				"ipc",
-				"call",
-				"target",
-				"method",
-				"arg1",
-				"arg2",
-			],
             capture_output=True,
         )
 
@@ -145,9 +106,7 @@ class TestRestart:
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_restart_kills_then_starts(self, mock_run, mock_start):
         mock_run.side_effect = [
-			CompletedProcess(
+            CompletedProcess([], 0, b"", b"Killed abc\n"),  # first kill (captured)
-				[], 0, b"", b"Killed abc\n"
-			),  # first kill (captured)
             CompletedProcess([], 255, b"", b""),  # poll → no instance
         ]
         invoke("restart")

pyproject.toml

@@ -1,59 +0,0 @@
-[build-system]
-requires = ["hatchling >= 1.26"]
-build-backend = "hatchling.build"
-
-[project]
-name = "zshell"
-requires-python = ">=3.13"
-version = "0.1.0"
-dependencies = [
-	"typer",
-	"pillow",
-	"jinja2",
-	"materialyoucolor"
-]
-
-[project.scripts]
-zshell-cli = "zshell:main"
-
-[tool.hatch.version]
-source = "vcs"
-
-[tool.hatch.build]
-include = [
-	"cli/src/zshell/assets/**",
-]
-
-[tool.hatch.build.targets.wheel]
-packages = ["cli/src/zshell"]
-
-[tool.hatch.build.targets.sdist]
-only-include = [
-	"cli/src",
-]
-
-[tool.ruff]
-line-length = 80
-
-[tool.ruff.format]
-quote-style = "double"
-indent-style = "tab"
-line-ending = "lf"
-docstring-code-format = true
-docstring-code-line-length = "dynamic"
-
-[tool.ruff.lint]
-ignore = ["E501", "B008"]
-select = [
-	"E",
-	"F",
-	"I",
-	"UP",
-	"B",
-	"SIM",
-	"RUF",
-]
-
-[tool.pytest.ini_options]
-testpaths = ["cli/tests"]
-pythonpath = ["cli/src"]

scripts/build-settings-index.py

@@ -4,24 +4,22 @@ import json
 import re
 import sys
 from collections import defaultdict
-from functools import cache
+from functools import lru_cache
 from pathlib import Path
 
 
-@cache
+@lru_cache(maxsize=None)
 def read_lines(path: Path) -> tuple[str, ...]:
     return tuple(path.read_text().splitlines())
 
 
 ROW_RE = re.compile(
-	r"^\s*(ToggleRow|SliderRow|SelectRow|SpinRow|NavRow|InfoRow|PopupRow|OverlayRow|DefaultRow)\s*\{"
+    r'^\s*(ToggleRow|SliderRow|SelectRow|SpinRow|NavRow|InfoRow|PopupRow|OverlayRow|DefaultRow)\s*\{')
-)
 LABEL_RE = re.compile(r'^\s*(?:label|text):\s*qsTr\("([^"]+)"\)')
 ANCHOR_RE = re.compile(r'^\s*settingAnchor:\s*"([^"]+)"')
-CHECKED_RE = re.compile(r"^\s*checked:\s*(?:Config)\.([\w.]+)\s*$")
+CHECKED_RE = re.compile(r'^\s*checked:\s*(?:Config)\.([\w.]+)\s*$')
 ONTOGGLED_RE = re.compile(
-	r"^\s*onToggled:\s*(?:Config)\.([\w.]+)\s*=\s*checked\s*$"
+    r'^\s*onToggled:\s*(?:Config)\.([\w.]+)\s*=\s*checked\s*$')
-)
 ICON_RE = re.compile(r'^\s*icon:\s*"([^"]+)"')
 SKIP_LABELS = {"Muted", "None"}
 FIELD_WEIGHT = {"title": 1.0, "keywords": 0.4}
@@ -47,7 +45,8 @@ def parse_page_registry(settings: Path) -> list[tuple[str, str]]:
     text = (settings / "PageRegistry.qml").read_text().splitlines()
 
     start = next(
-		i for i, line in enumerate(text) if re.search(r"\bpages\s*:\s*\[", line)
+        i for i, line in enumerate(text)
+        if re.search(r'\bpages\s*:\s*\[', line)
     )
 
     out: list[tuple[str, str]] = []
@@ -93,16 +92,14 @@ def parse_page_registry(settings: Path) -> list[tuple[str, str]]:
     return out
 
 
-BLOCK_RE = re.compile(r"^\s*([A-Za-z_][A-Za-z0-9_]*)\s*\{\s*$")
+BLOCK_RE = re.compile(r'^\s*([A-Za-z_][A-Za-z0-9_]*)\s*\{\s*$')
 
 
 def _strip_comment(line: str) -> str:
     return line.split("//", 1)[0].rstrip()
 
 
-def parse_block(
+def parse_block(lines: list[str], i: int) -> tuple[str, list[tuple[str, list]], int]:
-	lines: list[str], i: int
-) -> tuple[str, list[tuple[str, list]], int]:
     line = _strip_comment(lines[i]).strip()
     m = BLOCK_RE.match(line)
     if not m:
@@ -155,9 +152,8 @@ def parse_page_comps(settings: Path) -> list[list[str]]:
     text = (settings / "PageCompRegistry.qml").read_text().splitlines()
 
     start = next(
-		i
+        i for i, line in enumerate(text)
-		for i, line in enumerate(text)
+        if re.search(r'\bpageComps\s*:\s*\[', _strip_comment(line))
-		if re.search(r"\bpageComps\s*:\s*\[", _strip_comment(line))
     )
 
     comps: list[list[str]] = []
@@ -184,12 +180,10 @@ def parse_page_comps(settings: Path) -> list[list[str]]:
     return comps
 
 
-def dedup_crumbs(
+def dedup_crumbs(labels: list[str], icons: list[str]) -> tuple[list[str], list[str]]:
-	labels: list[str], icons: list[str]
-) -> tuple[list[str], list[str]]:
     out_labels: list[str] = []
     out_icons: list[str] = []
-	for lbl, ico in zip(labels, icons, strict=False):
+    for lbl, ico in zip(labels, icons):
         if out_labels and out_labels[-1] == lbl:
             continue
         out_labels.append(lbl)
@@ -233,10 +227,7 @@ def build_nav_map(settings: Path, files: dict[str, Path]) -> dict[str, dict]:
                 if mo:
                     pos = int(mo.group(1))
                     nav_children.setdefault(name, {})[pos] = (
-						pending_icon or "tune",
+                        pending_icon or "tune", pending_label or "", section)
-						pending_label or "",
-						section,
-					)
                     pending_icon = pending_label = None
 
     nav: dict[str, dict] = {}
@@ -245,12 +236,8 @@ def build_nav_map(settings: Path, files: dict[str, Path]) -> dict[str, dict]:
             continue
         main = names[0]
         main_icon, main_label = top_meta.get(top_idx, ("tune", main))
-		nav[main] = {
+        nav[main] = {"pageIdx": top_idx, "subPath": [],
-			"pageIdx": top_idx,
+                     "crumbIcons": [main_icon], "crumbLabels": [main_label]}
-			"subPath": [],
-			"crumbIcons": [main_icon],
-			"crumbLabels": [main_label],
-		}
         children = dict(nav_children.get(main, {}))
         opened_via_subpage = set()
         for owner, kids in nav_children.items():
@@ -272,26 +259,19 @@ def build_nav_map(settings: Path, files: dict[str, Path]) -> dict[str, dict]:
             labels = [main_label] + ([section] if section else []) + [label]
             icons = [main_icon] + ([icon] if section else []) + [icon]
             labels, icons = dedup_crumbs(labels, icons)
-			nav[child] = {
+            nav[child] = {"pageIdx": top_idx, "subPath": [pos],
-				"pageIdx": top_idx,
-				"subPath": [pos],
                           "crumbIcons": icons,
-				"crumbLabels": labels,
+                          "crumbLabels": labels}
-			}
+            for gpos, (gicon, glabel, gsection) in nav_children.get(child, {}).items():
-			for gpos, (gicon, glabel, gsection) in nav_children.get(
-				child, {}
-			).items():
                 if gpos >= len(names):
                     continue
                 glabels = labels + ([gsection] if gsection else []) + [glabel]
                 gicons = icons + ([gicon] if gsection else []) + [gicon]
                 glabels, gicons = dedup_crumbs(glabels, gicons)
                 nav[names[gpos]] = {
-					"pageIdx": top_idx,
+                    "pageIdx": top_idx, "subPath": [pos, gpos],
-					"subPath": [pos, gpos],
                     "crumbIcons": gicons,
-					"crumbLabels": glabels,
+                    "crumbLabels": glabels}
-				}
     return nav
 
 
@@ -310,12 +290,10 @@ def tokenize(text: str) -> list[str]:
 
 
 SUBTEXT_RE = re.compile(r'^\s*(?:subtext|status):\s*qsTr\("([^"]+)"\)')
-SECTION_RE = re.compile(r"^\s*SectionHeader\s*\{")
+SECTION_RE = re.compile(r'^\s*SectionHeader\s*\{')
 
 
-def extract_settings(
+def extract_settings(files: dict[str, Path], nav: dict[str, dict]) -> list[dict]:
-	files: dict[str, Path], nav: dict[str, dict]
-) -> list[dict]:
     entries: list[dict] = []
     for comp, meta in nav.items():
         pf = files.get(comp)
@@ -359,35 +337,22 @@ def extract_settings(
                             toggled_path = tg.group(1)
                 toggle_path = (
                     checked_path
-					if row_type == "ToggleRow"
+                    if row_type == "ToggleRow" and checked_path and checked_path == toggled_path
-					and checked_path
-					and checked_path == toggled_path
                     else ""
                 )
                 if label and label not in SKIP_LABELS and anchor:
-					extra = (
+                    extra = " ".join(meta["crumbLabels"]) + \
-						" ".join(meta["crumbLabels"])
+                        " " + section + " " + (subtext or "")
-						+ " "
+                    entries.append({
-						+ section
+                        "pageIdx": meta["pageIdx"], "subPath": meta["subPath"],
-						+ " "
-						+ (subtext or "")
-					)
-					entries.append(
-						{
-							"pageIdx": meta["pageIdx"],
-							"subPath": meta["subPath"],
                         "crumbIcons": meta["crumbIcons"],
                         "crumbLabels": meta["crumbLabels"],
-							"title": label,
+                        "title": label, "anchor": anchor,
-							"anchor": anchor,
                         "section": section,
                         "subtext": subtext or "",
                         "togglePath": toggle_path,
-							"keywords": " ".join(
+                        "keywords": " ".join(sorted(set(tokenize(label + " " + extra)))),
-								sorted(set(tokenize(label + " " + extra)))
+                    })
-							),
-						}
-					)
             i += 1
     return entries
 
@@ -407,9 +372,7 @@ def build_inverted_and_ranking(entries: list[dict]):
                 seen.add(tok)
     for tok, ids in inverted.items():
         ids.sort(key=lambda i: ranking[tok][i], reverse=True)
-	return inverted, {
+    return inverted, {t: {str(k): v for k, v in d.items()} for t, d in ranking.items()}
-		t: {str(k): v for k, v in d.items()} for t, d in ranking.items()
-	}
 
 
 def main() -> int:
@@ -424,22 +387,14 @@ def main() -> int:
     inverted, ranking = build_inverted_and_ranking(entries)
     for e in entries:
         e.pop("keywords", None)
-	out.write_text(
+    out.write_text(json.dumps({
-		json.dumps(
-			{
         "version": 2,
         "entries": entries,
         "inverted": inverted,
         "ranking": ranking,
-			},
+    }, ensure_ascii=False, indent=2))
-			ensure_ascii=False,
+    print(f"settings index: {len(entries)} entries, "
-			indent=2,
+          f"{len(inverted)} tokens -> {out}")
-		)
-	)
-	print(
-		f"settings index: {len(entries)} entries, "
-		f"{len(inverted)} tokens -> {out}"
-	)
     print("files:", len(files))
     print("comps:", len(parse_page_comps(settings)))
     print("registry:", len(parse_page_registry(settings)))