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

Config/Config.qml

@@ -22,6 +22,7 @@ Singleton {
 	property alias notifs: adapter.notifs
 	property alias osd: adapter.osd
 	property alias overview: adapter.overview
+	property alias plugins: adapter.plugins
 	property bool recentlySaved: false
 	property alias screenshot: adapter.screenshot
 	property alias services: adapter.services
@@ -140,7 +141,8 @@ Singleton {
 			launcher: serializeLauncher(),
 			colors: serializeColors(),
 			dock: serializeDock(),
-			screenshot: serializeScreenshot()
+			screenshot: serializeScreenshot(),
+			plugins: serializePlugins()
 		};
 	}
 
@@ -289,6 +291,13 @@ Singleton {
 		};
 	}
 
+	function serializePlugins(): var {
+		return {
+			enabled: plugins.enabled,
+			entries: plugins.entries
+		};
+	}
+
 	function serializeScreenshot(): var {
 		return {
 			enable_pp: screenshot.enable_pp,
@@ -458,6 +467,8 @@ Singleton {
 			}
 			property Overview overview: Overview {
 			}
+			property PluginConfig plugins: PluginConfig {
+			}
 			property Screenshot screenshot: Screenshot {
 			}
 			property Services services: Services {

Config/PluginConfig.qml

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

Drawers/Windows.qml

@@ -35,7 +35,7 @@ Variants {
 			property var root: Quickshell.shellDir
 
 			WlrLayershell.exclusionMode: ExclusionMode.Ignore
-			// WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+			WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 			color: "transparent"
 			contentItem.focus: true
 			mask: visibilities.isDrawing ? null : region

Extensions/FetchPlugins.qml

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

Extensions/LoadExtensions.qml

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

Helpers/Searcher.qml

@@ -6,7 +6,6 @@ import Quickshell
 Singleton {
 	property var extraOpts: ({})
 	readonly property list<var> fuzzyPrepped: useFuzzy ? list.map(e => {
-		console.log(useFuzzy);
 		const obj = {
 			_item: e
 		};

Modules/Launcher/Wrapper.qml

@@ -4,7 +4,6 @@ import Quickshell
 import QtQuick
 import qs.Components
 import qs.Config
-import qs.Modules.Launcher.Services
 
 Item {
 	id: root
@@ -20,17 +19,26 @@ Item {
 			max -= panels.popouts.nonAnimHeight;
 		return max;
 	}
-	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: visibilities.launcher
 	required property PersistentProperties visibilities
+	readonly property bool shouldBeActive: visibilities.launcher
+	property real offsetScale: shouldBeActive ? 0 : 1
 
+	onShouldBeActiveChanged: {
+		if (shouldBeActive) {
+			implicitHeight = Qt.binding(() => content.implicitHeight);
+			timer.stop();
+		} else {
+			implicitHeight = implicitHeight;
+		}
+	}
+
+	visible: offsetScale < 1
 	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
 	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth || 400
 	opacity: 1 - offsetScale
-	visible: offsetScale < 1
 
 	Behavior on offsetScale {
 		Anim {
@@ -39,26 +47,61 @@ Item {
 		}
 	}
 
-	Component.onCompleted: Qt.callLater(() => Apps)
+	onMaxHeightChanged: timer.start()
-	onShouldBeActiveChanged: {
+
-		if (shouldBeActive)
+	Connections {
-			implicitHeight = Qt.binding(() => content.implicitHeight);
+		function onEnabledChanged(): void {
-		else
+			timer.start();
-			implicitHeight = implicitHeight;
+		}
+
+		function onMaxShownChanged(): void {
+			timer.start();
+		}
+
+		target: Config.launcher
+	}
+
+	Connections {
+		function onValuesChanged(): void {
+			if (DesktopEntries.applications.values.length < Config.launcher.maxAppsShown)
+				timer.start();
+		}
+
+		target: DesktopEntries.applications
+	}
+
+	Timer {
+		id: timer
+
+		interval: Appearance.anim.durations.small
+
+		onRunningChanged: {
+			if (running && !root.shouldBeActive) {
+				content.visible = false;
+				content.active = true;
+			} else {
+				root.contentHeight = Math.min(root.maxHeight, content.implicitHeight);
+				content.active = Qt.binding(() => root.shouldBeActive || root.visible);
+				content.visible = true;
+			}
+		}
 	}
 
 	Loader {
 		id: content
 
-		active: root.shouldBeActive || root.visible
+		active: false
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
-		asynchronous: true
 
 		sourceComponent: Content {
 			maxHeight: root.maxHeight
 			panels: root.panels
 			visibilities: root.visibilities
-		}
+
+			Component.onCompleted: root.contentHeight = implicitHeight
+		}
+
+		Component.onCompleted: timer.start()
 	}
 }

Modules/Settings/Categories.qml

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

Modules/Settings/Categories/Plugins.qml

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

Modules/Settings/Content.qml

@@ -79,6 +79,8 @@ Item {
 				stack.push(screenshot);
 			else if (currentCategory === "updates")
 				stack.push(updates);
+			else if (currentCategory === "plugins")
+				stack.push(plugins);
 		}
 
 		target: root
@@ -245,4 +247,11 @@ Item {
 		Cat.SystemUpdates {
 		}
 	}
+
+	Component {
+		id: plugins
+
+		Cat.Plugins {
+		}
+	}
 }

Modules/Wallpaper/Wallpaper.qml

@@ -6,7 +6,7 @@ import qs.Modules.DesktopIcons
 
 Loader {
 	active: Config.background.enabled
-	asynchronous: false
+	asynchronous: true
 
 	sourceComponent: Variants {
 		model: Quickshell.screens

Plugins/ZShell/Models/filesystemmodel.cpp

@@ -12,7 +12,8 @@ FileSystemEntry::FileSystemEntry(const QString& path, const QString& relativePat
 	, m_path(path)
 	, m_relativePath(relativePath)
 	, m_isImageInitialised(false)
-    , m_mimeTypeInitialised(false) {}
+	, m_mimeTypeInitialised(false) {
+}
 
 QString FileSystemEntry::path() const {
 	return m_path;
@@ -57,8 +58,8 @@ bool FileSystemEntry::isImage() const {
 
 QString FileSystemEntry::mimeType() const {
 	if (!m_mimeTypeInitialised) {
-        const QMimeDatabase db;
+		static const QMimeDatabase s_db;
-        m_mimeType = db.mimeTypeForFile(m_path).name();
+		m_mimeType = s_db.mimeTypeForFile(m_path).name();
 		m_mimeTypeInitialised = true;
 	}
 	return m_mimeType;
@@ -219,7 +220,7 @@ void FileSystemModel::watchDirIfRecursive(const QString& path) {
 	if (m_recursive && m_watchChanges) {
 		const auto currentDir = m_dir;
 		const bool showHidden = m_showHidden;
-        const auto future = QtConcurrent::run([showHidden, path]() {
+		auto future = QtConcurrent::run([showHidden, path]() {
 				QDir::Filters filters = QDir::Dirs | QDir::NoDotAndDotDot;
 				if (showHidden) {
 					filters |= QDir::Hidden;
@@ -232,16 +233,12 @@ void FileSystemModel::watchDirIfRecursive(const QString& path) {
 				}
 				return dirs;
 			});
-        const auto watcher = new QFutureWatcher<QStringList>(this);
+		future.then(this, [currentDir, showHidden, this](const QStringList& paths) {
-        connect(watcher, &QFutureWatcher<QStringList>::finished, this, [currentDir, showHidden, watcher, this]() {
-            const auto paths = watcher->result();
 				if (currentDir == m_dir && showHidden == m_showHidden && !paths.isEmpty()) {
 					// Ignore if dir or showHidden has changed
 					m_watcher.addPaths(paths);
 				}
-            watcher->deleteLater();
 			});
-        watcher->setFuture(future);
 	}
 }
 
@@ -295,7 +292,7 @@ void FileSystemModel::updateEntriesForDir(const QString& dir) {
 		oldPaths << entry->path();
 	}
 
-    const auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString>>>& promise) {
+	auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString> > >& promise) {
 			const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags;
 
 			std::optional<QDirIterator> iter;
@@ -353,7 +350,7 @@ void FileSystemModel::updateEntriesForDir(const QString& dir) {
 				newPaths.insert(path);
 			}
 
-        if (promise.isCanceled() || newPaths == oldPaths) {
+			if (promise.isCanceled()) {
 				return;
 			}
 
@@ -365,23 +362,17 @@ void FileSystemModel::updateEntriesForDir(const QString& dir) {
 	}
 	m_futures.insert(dir, future);
 
-    const auto watcher = new QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>(this);
+	future
-
+	.then(this,
-    connect(watcher, &QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>::finished, this, [dir, watcher, this]() {
+	      [dir, this](QPair<QSet<QString>, QSet<QString> > result) {
 			m_futures.remove(dir);
-
+			if (!result.first.isEmpty() || !result.second.isEmpty()) {
-        if (!watcher->future().isResultReadyAt(0)) {
-            watcher->deleteLater();
-            return;
-        }
-
-        const auto result = watcher->result();
 				applyChanges(result.first, result.second);
-
+			}
-        watcher->deleteLater();
+		})
+	.onCanceled(this, [dir, this]() {
+			m_futures.remove(dir);
 		});
-
-    watcher->setFuture(future);
 }
 
 void FileSystemModel::applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths) {

Plugins/ZShell/Models/filesystemmodel.hpp

@@ -132,7 +132,7 @@ private:
 bool m_recursive;
 bool m_watchChanges;
 bool m_showHidden;
-    bool m_sortReverse;
+bool m_sortReverse = false;
 Filter m_filter;
 QStringList m_nameFilters;
 

cli/src/zshell/__init__.py

@@ -1,53 +1,16 @@
 from __future__ import annotations
-import sys
-from pathlib import Path
-
-import click
 import typer
-from typer._completion_shared import install, _get_shell_name
 from zshell.subcommands import shell, scheme, screenshot, wallpaper, record
 
-app = typer.Typer(name="zshell-cli", add_completion=False)
+app = typer.Typer()
 
 app.add_typer(shell.app, name="shell")
 app.add_typer(scheme.app, name="scheme")
 app.add_typer(screenshot.app, name="screenshot")
 app.add_typer(wallpaper.app, name="wallpaper")
 app.add_typer(record.app, name="record")
-
+# app.add_typer(preset.app, name="preset")
-
-def _completion_installed() -> bool:
-    shell = _get_shell_name()
-    match shell:
-        case "zsh":
-            return (Path.home() / ".zfunc" / "_zshell-cli").exists()
-        case "bash":
-            return (Path.home() / ".bash_completions" / "zshell-cli.sh").exists()
-        case "fish":
-            return (Path.home() / ".config" / "fish" / "completions" / "zshell-cli.fish").exists()
-    return False
-
-
-def _install_completion() -> None:
-    if _completion_installed():
-        click.echo("zshell-cli: Shell completion already installed.")
-        raise typer.Exit()
-    shell = _get_shell_name()
-    if shell is None:
-        click.echo("zshell-cli: Unable to detect shell type.", err=True)
-        raise typer.Exit(code=1)
-    try:
-        _, path = install(prog_name="zshell-cli")
-        click.secho(f"zshell-cli: Shell completion installed ({shell}: {path})", fg="green")
-        click.echo("zshell-cli: Restart your shell or source the file to enable tab-completion.")
-    except Exception:
-        pass
 
 
 def main() -> None:
-    if "--install-autocomplete" in sys.argv:
-        _install_completion()
-        return
-    if sys.stdout.isatty() and not _completion_installed():
-        click.echo("zshell-cli: Tip: run with --install-autocomplete for tab completion.", err=True)
     app()

cli/src/zshell/subcommands/record.py

@@ -18,7 +18,8 @@ TEMP_RECORDING = STATE_DIR / "recording.mp4"
 REPLAY_RECORDING = STATE_DIR / "replay.mp4"
 NOTIF_ID_FILE = STATE_DIR / "notifid.txt"
 
-RECORDINGS_DIR = os.getenv("ZSHELL_RECORDINGS_DIR", str(Path(HOME) / "Videos/Recordings"))
+RECORDINGS_DIR = os.getenv("ZSHELL_RECORDINGS_DIR",
+                           str(Path(HOME) / "Videos/Recordings"))
 
 
 def _read_extra_args() -> list[str]:
@@ -35,7 +36,7 @@ def _is_recording() -> bool:
     return subprocess.run(["pidof", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0
 
 
-def _notify(summary: str, body: str = "", actions: list | None = None, timeout: int = 5000) -> Optional[int]:
+def _notify(summary: str, body: str = "", actions: list = None, timeout: int = 5000) -> Optional[int]:
     args = ["notify-send", summary, body, "-t", str(timeout), "-p"]
     if actions:
         for action in actions:
@@ -48,12 +49,14 @@ def _notify(summary: str, body: str = "", actions: list | None = None, timeout:
 
 
 def _close_notification(notif_id: int):
-    subprocess.run(["notify-send", "--close", str(notif_id)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["notify-send", "--close", str(notif_id)],
+                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
 
 def _get_monitors() -> list[dict]:
     try:
-        res = subprocess.run(["hyprctl", "monitors", "-j"], capture_output=True, text=True)
+        res = subprocess.run(["hyprctl", "monitors", "-j"],
+                             capture_output=True, text=True)
         return json.loads(res.stdout)
     except Exception:
         return []
@@ -89,7 +92,6 @@ def _slurp_region() -> Optional[str]:
 
 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 int(match.group(3)), int(match.group(4)), int(match.group(1)), int(match.group(2))
@@ -137,7 +139,8 @@ def start_recording(region: Optional[str], sound: bool):
     cmd.extend(extra_args)
     cmd.extend(["-o", str(TEMP_RECORDING)])
 
-    subprocess.Popen(cmd, start_new_session=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.Popen(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:
@@ -145,12 +148,14 @@ def start_recording(region: Optional[str], sound: bool):
 
     time.sleep(1)
     if not _is_recording():
-        _notify("Recording failed", "Check gpu-screen-recorder output.", timeout=5000)
+        _notify("Recording failed",
+                "Check gpu-screen-recorder output.", timeout=5000)
         raise typer.Exit(code=1)
 
 
 def stop_recording(clipboard: bool):
-    subprocess.run(["pkill", "-f", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["pkill", "-f", RECORDER],
+                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     for _ in range(50):
         if not _is_recording():
@@ -173,31 +178,30 @@ def stop_recording(clipboard: bool):
         NOTIF_ID_FILE.unlink()
 
     if clipboard:
-        subprocess.run(
+        subprocess.run(["wl-copy", "--type", "text/uri-list", f"file://{final_path}"],
-            ["wl-copy", "--type", "text/uri-list", f"file://{final_path}"],
+                       stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-        )
 
     _notify("Recording stopped", f"Saved to {final_path}", timeout=5000)
 
 
 def toggle_pause():
-    subprocess.run(["pkill", "-USR2", "-f", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["pkill", "-USR2", "-f", RECORDER],
+                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     typer.echo("Toggled pause.")
 
 
 @app.command()
 def record(
     region: Optional[str] = typer.Option(
-        None,
+        None, "--region", "-r",
-        "--region",
-        "-r",
         help="Record a region. Use 'slurp' (or omit value) to select interactively, or give 'WxH+X+Y'.",
     ),
-    sound: bool = typer.Option(False, "--sound", "-s", help="Record audio from default output."),
+    sound: bool = typer.Option(
-    pause: bool = typer.Option(False, "--pause", "-p", help="Toggle pause/resume."),
+        False, "--sound", "-s", help="Record audio from default output."),
-    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

@@ -2,7 +2,6 @@ import typer
 import json
 import shutil
 import os
-import sys
 import re
 import subprocess
 
@@ -16,61 +15,11 @@ 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 (
+from materialyoucolor.utils.math_utils import difference_degrees, rotation_direction, sanitize_degrees_double
-    difference_degrees,
-    rotation_direction,
-    sanitize_degrees_double,
-)
 
 app = typer.Typer()
 
 
-def _complete_scheme_name(incomplete):
-    schemes = [
-        "fruit-salad",
-        "expressive",
-        "monochrome",
-        "rainbow",
-        "tonal-spot",
-        "neutral",
-        "fidelity",
-        "content",
-        "vibrant",
-    ]
-    return [s for s in schemes if incomplete in s]
-
-
-def _complete_preset(incomplete):
-    results = []
-    for sid, meta in list_schemes().items():
-        for v in meta.variants:
-            preset = f"{sid}:{v.id}"
-            if incomplete in preset:
-                results.append((preset, f"{meta.name} - {v.name}"))
-    return results
-
-
-def _complete_mode(incomplete):
-    return [m for m in ("dark", "light") if incomplete in m]
-
-
-def _complete_accent(ctx, incomplete):
-    preset_val = ctx.params.get("preset")
-    if preset_val:
-        try:
-            p_scheme, p_variant = resolve_preset(preset_val)
-            for v in list_schemes()[p_scheme].variants:
-                if v.id == p_variant:
-                    return [a for a in v.accents if incomplete in a]
-        except (ValueError, KeyError):
-            pass
-    all_accents = set()
-    for meta in list_schemes().values():
-        for v in meta.variants:
-            all_accents.update(v.accents)
-    return [a for a in sorted(all_accents) if incomplete in a]
-
-
 @app.command()
 def list_presets(
     json_format: bool = typer.Option(False, "--json", help="Output in JSON format"),
@@ -81,7 +30,7 @@ def list_presets(
         for sid, meta in sorted(schemes.items()):
             variants = {}
             for v in meta.variants:
-                entry: dict[str, Any] = {"modes": sorted(v.modes)}
+                entry = {"modes": sorted(v.modes)}
                 if v.accents:
                     entry["accents"] = sorted(v.accents)
                     entry["default_accent"] = sorted(v.accents)[0]
@@ -106,35 +55,14 @@ def list_presets(
 
 @app.command()
 def generate(
-    image_path: Optional[Path] = typer.Option(
+    image_path: Optional[Path] = typer.Option(None, help="Path to source image. Required for image mode."),
-        None, help="Path to source image. Required for image mode."
-    ),
     scheme: Optional[str] = typer.Option(
-        None,
+        None, help="Color scheme algorithm to use for image mode. Ignored in preset mode."
-        help="Color scheme algorithm to use for image mode. Ignored in preset mode.",
-        autocompletion=_complete_scheme_name,
-    ),
-    preset: Optional[str] = typer.Option(
-        None,
-        help="Name of a premade scheme in this format: <scheme>:<variant>",
-        autocompletion=_complete_preset,
-    ),
-    mode: Optional[str] = typer.Option(
-        None,
-        help="Mode of the preset scheme (dark or light).",
-        autocompletion=_complete_mode,
-    ),
-    accent: Optional[str] = typer.Option(
-        None,
-        help="Accent for schemes that support it (e.g. mauve).",
-        autocompletion=_complete_accent,
     ),
+    preset: Optional[str] = typer.Option(None, help="Name of a premade scheme in this format: <scheme>:<variant>"),
+    mode: Optional[str] = typer.Option(None, help="Mode of the preset scheme (dark or light)."),
+    accent: Optional[str] = typer.Option(None, help="Accent for schemes that support it (e.g. mauve)."),
 ):
-    if not any([image_path, scheme, preset, mode, accent]):
-        print(
-            "Hint: use --preset <scheme>:<variant> or --image-path <path>",
-            file=sys.stderr,
-        )
 
     HOME = str(os.getenv("HOME"))
     OUTPUT = Path(HOME + "/.local/state/zshell/scheme.json")
@@ -272,15 +200,11 @@ def generate(
     def harmonize(from_hct: Hct, to_hct: Hct, tone_boost: float) -> Hct:
         diff = difference_degrees(from_hct.hue, to_hct.hue)
         rotation = min(diff * 0.8, 100)
-        output_hue = sanitize_degrees_double(
+        output_hue = sanitize_degrees_double(from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue))
-            from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue)
-        )
         tone = max(0.0, min(100.0, from_hct.tone * (1 + tone_boost)))
         return Hct.from_hct(output_hue, from_hct.chroma, tone)
 
-    def terminal_palette(
+    def terminal_palette(colors: dict[str, str], mode: str, variant: str) -> dict[str, str]:
-        colors: dict[str, str], mode: str, variant: str
-    ) -> dict[str, str]:
         light = mode.lower() == "light"
 
         key_hex = (
@@ -312,7 +236,7 @@ def generate(
 
         image = Image.open(image_path)
         image = image.convert("RGB")
-        image.thumbnail(size, Image.Resampling.NEAREST)
+        image.thumbnail(size, Image.NEAREST)
 
         thumbnail_file.parent.mkdir(parents=True, exist_ok=True)
         image.save(thumbnail_path, "JPEG")
@@ -344,15 +268,8 @@ def generate(
         is_dark = ""
 
         with Image.open(image_path) as img:
-            img.thumbnail((1, 1), Image.Resampling.LANCZOS)
+            img.thumbnail((1, 1), Image.LANCZOS)
-            px = img.getpixel((0, 0))
+            hct = Hct.from_int(argb_from_rgb(*img.getpixel((0, 0))))
-            if isinstance(px, (int, float)):
-                r = g = b = int(px)
-            elif px is not None:
-                r, g, b = int(px[0]), int(px[1]), int(px[2])
-            else:
-                r = g = b = 0
-            hct = Hct.from_int(argb_from_rgb(r, g, b))
             is_dark = "light" if hct.tone > 50 else "dark"
 
         return is_dark
@@ -514,8 +431,6 @@ def generate(
 
             raw = tpl_path.read_text(encoding="utf-8")
             out_path, body = split_directive_and_body(raw)
-            if out_path is None:
-                continue
 
             out_path.parent.mkdir(parents=True, exist_ok=True)
 
@@ -569,30 +484,23 @@ def generate(
         with CONFIG.open() as f:
             config = json.load(f)
 
-        scheme_type = config["colors"].get("schemeType", "fruit-salad")
+        scheme = scheme or config["colors"]["schemeType"]
-        scheme = scheme or scheme_type
-        assert isinstance(scheme, str)
         config_mode = config["general"]["color"]["mode"]
         smart = bool(config["general"]["color"].get("smart", False))
         scheme_class = get_scheme_class(scheme)
 
-        p_variant = "default"
         if preset:
             p_scheme, p_variant = resolve_preset(preset)
             schemes = list_schemes()
             if accent and p_scheme in schemes:
                 meta = schemes[p_scheme]
-                var_accents = next(
+                var_accents = next((v.accents for v in meta.variants if v.id == p_variant), ())
-                    (v.accents for v in meta.variants if v.id == p_variant), ()
-                )
                 if accent not in var_accents:
                     available = ", ".join(var_accents) if var_accents else "none"
                     raise typer.BadParameter(
                         f"Accent '{accent}' not available for '{p_scheme}:{p_variant}'. Available accents: {available}"
                     )
-            palette_obj = get_palette(
+            palette_obj = get_palette(p_scheme, p_variant, mode or config_mode, accent=accent)
-                p_scheme, p_variant, mode or config_mode, accent=accent
-            )
             colors = palette_obj.colors
             effective_mode = palette_obj.mode
             name = palette_obj.scheme

cli/src/zshell/subcommands/shell.py

@@ -51,7 +51,6 @@ def show():
     result = subprocess.run(args + ["ipc"] + ["show"], capture_output=True)
     if result.returncode != 0:
         raise click.ClickException(result.stderr.decode().strip())
-    sys.stdout.write(result.stdout.decode())
     sys.stderr.write(result.stderr.decode())
 
 

cli/src/zshell/subcommands/wallpaper.py

@@ -34,9 +34,9 @@ def lockscreen(
         return
 
     if size[0] < 3840 or size[1] < 2160:
-        img = img.resize((size[0] // 2, size[1] // 2), Image.Resampling.NEAREST)
+        img = img.resize((size[0] // 2, size[1] // 2), Image.NEAREST)
     else:
-        img = img.resize((size[0] // 4, size[1] // 4), Image.Resampling.NEAREST)
+        img = img.resize((size[0] // 4, size[1] // 4), Image.NEAREST)
 
     img = img.filter(ImageFilter.GaussianBlur(blur_amount))
 

shell.qml

@@ -6,6 +6,7 @@
 //@ pragma Env QT_SCALE_FACTOR_ROUNDING_POLICY=Round
 //@ pragma DropExpensiveFonts
 import Quickshell
+import qs.Extensions
 import qs.Modules
 import qs.Modules.Wallpaper
 import qs.Modules.Lock
@@ -38,4 +39,7 @@ ShellRoot {
 
 	Polkit {
 	}
+
+	LoadExtensions {
+	}
 }