Fix: Attempt to Fix Nix/Flatpak (Testing)

2026-06-13 01:09:56 -05:00 · 2026-03-20 21:03:53 -05:00
parent e6b542cd6b
commit 7df7191799
33 changed files with 1953 additions and 620 deletions
@@ -1,5 +1,5 @@
 pkgname=moku
-pkgver=0.3.0
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Native Linux manga reader frontend for Suwayomi-Server"
 arch=('x86_64')
@@ -33,14 +33,8 @@ prepare() {

 build() {
    cd "Moku-$pkgver"
-
-    # Build frontend
    pnpm build
-
-    # Repack dist for Tauri
    tar -czf packaging/frontend-dist.tar.gz -C dist .
-
-    # Build Tauri binary
    TAURI_SKIP_DEVSERVER_CHECK=true cargo build \
        --release \
        --manifest-path src-tauri/Cargo.toml
@@ -49,19 +43,15 @@ build() {
 package() {
    cd "Moku-$pkgver"

-    # Moku binary
    install -Dm755 src-tauri/target/release/moku \
        "$pkgdir/usr/bin/moku"

-    # Bundled JRE
    install -dm755 "$pkgdir/usr/lib/moku/jre"
    tar -xf "$srcdir/jdk.tar.gz" -C "$pkgdir/usr/lib/moku/jre" --strip-components=1

-    # Suwayomi server jar
    install -Dm644 "$srcdir/suwayomi-server.jar" \
        "$pkgdir/usr/lib/moku/tachidesk/Suwayomi-Server.jar"

-    # tachidesk-server wrapper script
    install -dm755 "$pkgdir/usr/lib/moku/tachidesk/default-conf"
    cat > "$pkgdir/usr/lib/moku/tachidesk/default-conf/server.conf" << 'EOF'
 server.ip = "127.0.0.1"
@@ -109,7 +99,6 @@ exec /usr/lib/moku/jre/bin/java \
  -jar /usr/lib/moku/tachidesk/Suwayomi-Server.jar
 EOF

-    # Desktop entry and icons
    install -Dm644 packaging/dev.moku.app.desktop \
        "$pkgdir/usr/share/applications/dev.moku.app.desktop"
    install -Dm644 src-tauri/icons/32x32.png \
@@ -1,78 +1,11 @@
 <div align="center">
-  <img src="src/assets/rounded-logo.png" width="96" />
+  <img src="src/assets/moku-icon-rounded.svg" width="96" />
  <h1>Moku</h1>
-  <p>A fast, minimal manga reader for <a href="https://github.com/Suwayomi/Suwayomi-Server">Suwayomi-Server</a>.<br/>Built with Tauri v2 and React.</p>
-
-  <table>
-    <tr>
-      <td><img src=".github/screenshots/Library-Page.png" width="100%" /></td>
-      <td><img src=".github/screenshots/Libary-Browse.png" width="100%" /></td>
-      <td><img src=".github/screenshots/Series-Detail.png" width="100%" /></td>
-    </tr>
-    <tr>
-      <td><img src=".github/screenshots/Search-Bar.png" width="100%" /></td>
-      <td><img src=".github/screenshots/Download-Manager.png" width="100%" /></td>
-      <td><img src=".github/screenshots/Settings-1.png" width="100%" /></td>
-    </tr>
-  </table>
+  <p>A fast, minimal manga reader for <a href="https://github.com/Suwayomi/Suwayomi-Server">Suwayomi-Server</a>.<br/>Built with Tauri v2 and Svelte.</p>
 </div>

 ---

-## Features
-
-### Reader
- **Single**, **double-page**, and **longstrip** reading modes
- **Infinite longstrip** — when Auto mode is enabled, the next chapter's pages are appended directly into the scroll without any re-render or gap; the entire series flows as one seamless ribbon
- Fit modes: fit width, fit height, fit screen, and 1:1 original
- Per-series zoom control via Ctrl+scroll or a slider popover
- RTL / LTR reading direction toggle
- Configurable page gaps
- Full keyboard navigation with rebindable keybinds
- UI auto-hides after 3 seconds of inactivity; reappears on cursor movement near edges
- Chapter-relative page counter that updates live as you scroll through the infinite strip
- Auto-mark chapters as read when the last page is reached
-
-### Library
- Grid view of your entire manga collection with lazy-loaded cover art
- Filter tabs: **Saved**, **Downloaded**, and **All**
- Genre tag filter chips — multi-select to narrow by any combination of tags
- In-line search
- Context menu: open, add/remove from library
-
-### Series Detail
- Cover, author, artist, status badge, genres, and synopsis
- Read progress bar with percentage
- Continue / Start / Re-read button that picks up exactly where you left off (including mid-chapter page)
- Chapter list with scanlator, upload date, and in-progress page indicator
- **Grid view** — displays all chapters as numbered tiles; read/unread/in-progress states are visually distinct at a glance; switches between list and grid with a single click
- Sort by newest or oldest first
- Jump-to-chapter input
- Bulk download menu: from current chapter, unread only, or all
- Per-chapter context menu: mark read/unread, mark all above as read, download, delete, bulk download from here
- Collapsible source details panel with source ID, language, and source migration
-
-### Search
- Cross-source search running up to 3 concurrent requests
- Language filter bar (preferred language default, per-language, or all)
- Results grouped by source with skeleton loading states
-
-### Sources & Extensions
- Browse and search installed sources, grouped by extension with per-language expansion
- Extension manager: install, update, remove, and install from external APK URL
- Repo refresh with update count badge
-
-### Downloads
- Download queue with live progress
-
-### History
- Reading history grouped by day with relative timestamps
- Per-entry thumbnail, chapter name, and last-read page
- Full-text search across titles and chapter names
- One-click clear
-
---
-
 ## Requirements

 [Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server) must be running. By default Moku expects it at `http://127.0.0.1:4567`.
@@ -114,20 +47,15 @@ pnpm install
 pnpm tauri:dev
 ```

-> `tauri:dev` uses `src-tauri/tauri.dev.conf.json` to point at the Vite dev server, keeping the release build config clean for `nix build`.
-
 ---

-
 ## Stack

 | | |
 |---|---|
 | [Tauri v2](https://tauri.app) | Native app shell |
-| [React](https://react.dev) + [TypeScript](https://www.typescriptlang.org) | UI |
+| [Svelte](https://svelte.dev) + [TypeScript](https://www.typescriptlang.org) | UI |
 | [Vite](https://vitejs.dev) | Frontend bundler |
-| [Zustand](https://zustand-demo.pmnd.rs) | State management |
-| [Phosphor Icons](https://phosphoricons.com) | Icon set |
 | [Crane](https://github.com/ipetkov/crane) | Nix Rust builds |

 ---
@@ -140,4 +68,4 @@ Distributed under the [Apache 2.0 License](./LICENSE).

 ## Disclaimer

-Moku does not host or distribute any content. The developers have no affiliation with any content providers accessible through connected sources.
+Moku does not host or distribute any content. The developers have no affiliation with any content providers accessible through connected sources.
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-# build-scripts/pkgbuild-bump.sh
-# ─────────────────────────────────────────────────────────────────────────────
-# Run this AFTER the git tag has been pushed to GitHub.
-#
-# Usage:
-#   ./build-scripts/pkgbuild-bump.sh 0.3.0
-set -euo pipefail
-
-RED='\033[0;31m'; GREEN='\033[0;32m'; CYAN='\033[0;36m'; BOLD='\033[1m'; RESET='\033[0m'
-info()    { echo -e "${CYAN}  →${RESET} $*"; }
-success() { echo -e "${GREEN}  ✓${RESET} $*"; }
-die()     { echo -e "${RED}  ✗${RESET} $*" >&2; exit 1; }
-section() { echo -e "\n${BOLD}── $* ──${RESET}"; }
-
-[[ $# -lt 1 ]] && die "Usage: $0 <version>"
-VERSION="$1"
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
-PKGBUILD="${REPO_ROOT}/PKGBUILD"
-
-command -v curl &>/dev/null || die "curl not found"
-[[ -f "$PKGBUILD" ]] || die "PKGBUILD not found: $PKGBUILD"
-
-section "Patching PKGBUILD → ${VERSION}"
-
-TARBALL_URL="https://github.com/Youwes09/Moku/archive/refs/tags/v${VERSION}.tar.gz"
-info "Fetching source tarball to compute sha256…"
-TARBALL_SHA=$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}')
-
-sed -i "s/^pkgver=.*/pkgver=${VERSION}/" "$PKGBUILD"
-sed -i "s/^pkgrel=.*/pkgrel=1/"          "$PKGBUILD"
-
-# Replace only the first sha256 entry (source tarball) inside sha256sums=('...')
-# The suwayomi jar and jdk hashes are pinned and stay untouched.
-# Strategy: match the opening sha256sums=('' then swap just that first hash.
-sed -i "s/\(sha256sums=('\)[0-9a-f]\{64\}/\1${TARBALL_SHA}/" "$PKGBUILD"
-
-# Verify the replacement landed
-if ! grep -q "$TARBALL_SHA" "$PKGBUILD"; then
-  die "sha256 replacement failed — check PKGBUILD sha256sums format"
-fi
-
-success "PKGBUILD patched  (pkgver=${VERSION}, sha256=${TARBALL_SHA})"
-info    "PKGBUILD → ${PKGBUILD}"
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-# build-scripts/release.sh
-# ─────────────────────────────────────────────────────────────────────────────
-# Usage:
-#   ./build-scripts/release.sh 0.2.0
-#
-# Requires: nix, flatpak-builder, appstream
-set -euo pipefail
-
-# ── Colour helpers ─────────────────────────────────────────────────────────────
-RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'
-CYAN='\033[0;36m'; BOLD='\033[1m'; RESET='\033[0m'
-info()    { echo -e "${CYAN}  →${RESET} $*"; }
-success() { echo -e "${GREEN}  ✓${RESET} $*"; }
-warn()    { echo -e "${YELLOW}  ⚠${RESET} $*"; }
-die()     { echo -e "${RED}  ✗${RESET} $*" >&2; exit 1; }
-section() { echo -e "\n${BOLD}── $* ──${RESET}"; }
-
-# ── Args ───────────────────────────────────────────────────────────────────────
-[[ $# -lt 1 ]] && die "Usage: $0 <version>"
-VERSION="$1"
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
-FLATPAK_MANIFEST="${REPO_ROOT}/dev.moku.app.yml"
-PKGBUILD="${REPO_ROOT}/PKGBUILD"
-
-# ── Sanity checks ──────────────────────────────────────────────────────────────
-section "Pre-flight"
-command -v nix  &>/dev/null || die "nix not found"
-command -v curl &>/dev/null || die "curl not found"
-[[ -f "$FLATPAK_MANIFEST" ]] || die "Flatpak manifest not found: $FLATPAK_MANIFEST"
-[[ -f "$PKGBUILD"         ]] || die "PKGBUILD not found: $PKGBUILD"
-success "OK"
-
-# ── Bump versions ──────────────────────────────────────────────────────────────
-section "Bumping version → ${VERSION}"
-sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"${VERSION}\"/" \
-  "${REPO_ROOT}/src-tauri/tauri.conf.json"
-success "tauri.conf.json → ${VERSION}"
-
-sed -i "0,/^version = \"[^\"]*\"/s//version = \"${VERSION}\"/" \
-  "${REPO_ROOT}/src-tauri/Cargo.toml"
-success "Cargo.toml      → ${VERSION}"
-
-# flake.nix has two `version = "x.y.z";` strings inside the frontend
-# derivation and fetchPnpmDeps — both need to match.
-sed -i "s/version = \"[^\"]*\";/version = \"${VERSION}\";/g" \
-  "${REPO_ROOT}/flake.nix"
-success "flake.nix       → ${VERSION}"
-
-# ── Build frontend ─────────────────────────────────────────────────────────────
-section "Building frontend"
-cd "$REPO_ROOT"
-nix develop --command pnpm install --frozen-lockfile
-nix develop --command pnpm build
-success "Frontend built → dist/"
-
-# ── Flatpak ────────────────────────────────────────────────────────────────────
-section "Regenerating cargo-sources.json"
-cd "$REPO_ROOT"
-nix-shell \
-  -p "python311.withPackages(ps: [ ps.aiohttp ps.tomlkit ])" \
-  --run "python3 packaging/flatpak-cargo-generator.py src-tauri/Cargo.lock -o packaging/cargo-sources.json"
-success "cargo-sources.json updated"
-
-section "Rebuilding frontend-dist.tar.gz"
-tar -czf packaging/frontend-dist.tar.gz -C dist .
-FRONTEND_SHA=$(sha256sum packaging/frontend-dist.tar.gz | awk '{print $1}')
-success "frontend-dist.tar.gz rebuilt  sha256: ${FRONTEND_SHA}"
-
-section "Patching frontend-dist sha256 in dev.moku.app.yml"
-PATCH_SCRIPT=$(mktemp /tmp/patch-sha256-XXXXXX.py)
-cat > "$PATCH_SCRIPT" << PYEOF
-import re, sys
-path = "${FLATPAK_MANIFEST}"
-new_sha = "${FRONTEND_SHA}"
-text = open(path).read()
-pattern = r'(path:\s*packaging/frontend-dist\.tar\.gz\s*\n\s*sha256:\s*)[0-9a-f]+'
-replacement = r'\g<1>' + new_sha
-updated, n = re.subn(pattern, replacement, text)
-if n == 0:
-    sys.exit("Could not find frontend-dist sha256 in dev.moku.app.yml")
-open(path, 'w').write(updated)
-PYEOF
-nix-shell -p python3 --run "python3 '$PATCH_SCRIPT'"
-rm -f "$PATCH_SCRIPT"
-success "dev.moku.app.yml sha256 updated"
-
-section "Building Flatpak bundle"
-rm -rf "${REPO_ROOT}/build-dir" "${REPO_ROOT}/repo"
-nix shell nixpkgs#appstream nixpkgs#flatpak-builder --command \
-  flatpak-builder \
-    --repo="${REPO_ROOT}/repo" \
-    --force-clean \
-    "${REPO_ROOT}/build-dir" \
-    "$FLATPAK_MANIFEST"
-
-flatpak build-bundle \
-  "${REPO_ROOT}/repo" \
-  "${REPO_ROOT}/moku.flatpak" \
-  dev.moku.app
-
-rm -rf "${REPO_ROOT}/build-dir" "${REPO_ROOT}/repo"
-success "moku.flatpak created"
-
-# ── Done ───────────────────────────────────────────────────────────────────────
-echo ""
-success "v${VERSION} ready"
-info    "Flatpak bundle → ${REPO_ROOT}/moku.flatpak"
-echo ""
-warn    "PKGBUILD not patched yet — tag must exist on GitHub first."
-info    "After pushing the tag, run:"
-echo -e "    ${CYAN}./build-scripts/pkgbuild-bump.sh ${VERSION}${RESET}"
@@ -181,7 +181,7 @@ modules:
        path: .
      - type: file
        path: packaging/frontend-dist.tar.gz
-        sha256: c9bb5ee6613b2bc61e69a92cc1ef0029da3b61138d51b01d363f8ea524e51996
+        sha256: c78a3f002f898011c4e70e1af781b37dac0fd995b5623170256d88339c90ca74
      - packaging/cargo-sources.json
      - type: inline
        dest: src-tauri/.cargo
@@ -2,11 +2,11 @@
  "nodes": {
    "crane": {
      "locked": {
-        "lastModified": 1771438068,
-        "narHash": "sha256-nGBbXvEZVe/egCPVPFcu89RFtd8Rf6J+4RFoVCFec0A=",
+        "lastModified": 1773857772,
+        "narHash": "sha256-5xsK26KRHf0WytBtsBnQYC/lTWDhQuT57HJ7SzuqZcM=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "b5090e53e9d68c523a4bb9ad42b4737ee6747597",
+        "rev": "b556d7bbae5ff86e378451511873dfd07e4504cd",
        "type": "github"
      },
      "original": {
@@ -15,32 +15,16 @@
        "type": "github"
      }
    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
        "type": "github"
      },
      "original": {
@@ -49,53 +33,13 @@
        "type": "github"
      }
    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nix-appimage": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1757920913,
-        "narHash": "sha256-jd0QwCVz4O1sHHkeaZILD/7D6oyalceEJ4EFnWCgm0k=",
-        "owner": "ralismark",
-        "repo": "nix-appimage",
-        "rev": "7946addbc0d97e358a6d7aefe5e82310f0fe6b18",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ralismark",
-        "repo": "nix-appimage",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1771369470,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "lastModified": 1773821835,
+        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
        "type": "github"
      },
      "original": {
@@ -107,11 +51,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1769909678,
-        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "72716169fe93074c333e8d0173151350670b824c",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
        "type": "github"
      },
      "original": {
@@ -124,7 +68,6 @@
      "inputs": {
        "crane": "crane",
        "flake-parts": "flake-parts",
-        "nix-appimage": "nix-appimage",
        "nixpkgs": "nixpkgs",
        "rust-overlay": "rust-overlay"
      }
@@ -136,11 +79,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1771556776,
-        "narHash": "sha256-zKprqMQDl3xVfhSSYvgru1IGXjFdxryWk+KqK0I20Xk=",
+        "lastModified": 1773975983,
+        "narHash": "sha256-zrRVwdfhDdohANqEhzY/ydeza6EXEi8AG6cyMRNYT9Q=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "8b3f46b8a6d17ab46e533a5e3d5b1cc2ff228860",
+        "rev": "cc80954a95f6f356c303ed9f08d0b63ca86216ac",
        "type": "github"
      },
      "original": {
@@ -148,21 +91,6 @@
        "repo": "rust-overlay",
        "type": "github"
      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",
@@ -2,43 +2,34 @@
  description = "Moku — manga reader frontend for Suwayomi";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url     = "github:NixOS/nixpkgs/nixos-unstable";
    flake-parts.url = "github:hercules-ci/flake-parts";
-    crane.url = "github:ipetkov/crane";
+    crane.url       = "github:ipetkov/crane";
    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-appimage = {
-      url = "github:ralismark/nix-appimage";
+      url    = "github:oxalica/rust-overlay";
      inputs.nixpkgs.follows = "nixpkgs";
    };
  };

  outputs =
-    inputs@{ flake-parts, crane, rust-overlay, nix-appimage, ... }:
+    inputs@{ flake-parts, crane, rust-overlay, ... }:
    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-      ];
+      systems = [ "x86_64-linux" "aarch64-linux" ];

-      perSystem =
-        { system, pkgs, lib, ... }:
+      perSystem = { system, lib, ... }:
        let
-          pkgs' = import inputs.nixpkgs {
+          version = "0.4.0";
+
+          pkgs = import inputs.nixpkgs {
            inherit system;
            overlays = [ rust-overlay.overlays.default ];
          };

-          rustToolchain = pkgs'.rust-bin.stable.latest.default.override {
-            extensions = [
-              "rust-src"
-              "rust-analyzer"
-            ];
+          rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+            extensions = [ "rust-src" "rust-analyzer" ];
          };

-          craneLib = (crane.mkLib pkgs').overrideToolchain rustToolchain;
+          craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;

          runtimeLibs = with pkgs; [
            webkitgtk_4_1
@@ -65,56 +56,44 @@
              || base == "package.json"
              || base == "pnpm-lock.yaml"
              || base == "tsconfig.json"
-              || base == "tsconfig.node.json"
-              || base == "vite.config.ts"
-              || base == "postcss.config.js"
-              || base == "postcss.config.cjs"
-              || base == "tailwind.config.js"
-              || base == "tailwind.config.ts";
+              || base == "vite.config.ts";
          };

          frontend = pkgs.stdenv.mkDerivation {
-            pname = "moku-frontend";
-            version = "0.3.0";
-            src = frontendSrc;
+            pname   = "moku-frontend";
+            inherit version;
+            src     = frontendSrc;

-            nativeBuildInputs = with pkgs; [
-              nodejs_22
-              pnpm
-              pnpmConfigHook
-            ];
+            nativeBuildInputs = with pkgs; [ nodejs_22 pnpm pnpmConfigHook ];

            pnpmDeps = pkgs.fetchPnpmDeps {
-              pname = "moku-frontend";
-              version = "0.3.0";
-              src = frontendSrc;
+              pname          = "moku-frontend";
+              inherit version;
+              src            = frontendSrc;
              fetcherVersion = 1;
-              hash = "sha256-bpGYsB534RPNNAcYR9BA61vvFpSG6Xu2hY923PakCyY=";
+              hash           = "sha256-FsZTHeBS9qQ9KYgiwDX1vam6uJXK8OjLe5U6Jfu33lc=";
            };

-            buildPhase = "pnpm build";
+            buildPhase   = "pnpm build";
            installPhase = "cp -r dist $out";
          };

          cargoSrc = lib.cleanSourceWith {
-            src = ./src-tauri;
+            src    = ./src-tauri;
            filter = path: type:
              (craneLib.filterCargoSources path type)
-              || (lib.hasInfix "/icons/" path)
+              || (lib.hasInfix "/icons/"        path)
              || (lib.hasInfix "/capabilities/" path)
              || (builtins.baseNameOf path == "tauri.conf.json");
          };

          commonArgs = {
-            src = cargoSrc;
-            cargoToml = ./src-tauri/Cargo.toml;
-            cargoLock = ./src-tauri/Cargo.lock;
+            src        = cargoSrc;
+            cargoToml  = ./src-tauri/Cargo.toml;
+            cargoLock  = ./src-tauri/Cargo.lock;
            strictDeps = true;
-            buildInputs = runtimeLibs;
-            nativeBuildInputs = with pkgs; [
-              pkg-config
-              wrapGAppsHook3
-            ];
+            buildInputs      = runtimeLibs;
+            nativeBuildInputs = with pkgs; [ pkg-config wrapGAppsHook3 ];
            preBuild = ''
              cp -r ${frontend} ../dist
            '';
@@ -126,6 +105,36 @@
            inherit cargoArtifacts;
            meta.mainProgram = "moku";
            postInstall = ''
+              mkdir -p "$out/share/applications"
+              cat > "$out/share/applications/moku.desktop" << EOF
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Moku
+Comment=Manga reader frontend for Suwayomi
+Exec=$out/bin/moku
+Icon=moku
+Terminal=false
+Categories=Graphics;Viewer;
+Keywords=manga;comic;reader;suwayomi;
+StartupWMClass=moku
+EOF
+
+              for size in 32x32 128x128 256x256 512x512; do
+                src="icons/$size.png"
+                [ -f "$src" ] && install -Dm644 "$src" \
+                  "$out/share/icons/hicolor/$size/apps/moku.png"
+              done
+
+              for size in 128x128 256x256; do
+                src="icons/''${size}@2x.png"
+                [ -f "$src" ] && install -Dm644 "$src" \
+                  "$out/share/icons/hicolor/''${size}@2/apps/moku.png"
+              done
+
+              install -Dm644 "${./src/assets/moku-icon.svg}" \
+                "$out/share/icons/hicolor/scalable/apps/moku.svg"
+
              wrapProgram $out/bin/moku \
                --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share/gsettings-schemas" [
                  pkgs.gsettings-desktop-schemas
@@ -134,72 +143,139 @@
                --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" \
                --prefix PATH : "${lib.makeBinPath [ pkgs.suwayomi-server ]}" \
                --set GDK_BACKEND wayland \
-                --set WEBKIT_FORCE_SANDBOX 0
-
-              # ── Icon ─────────────────────────────────────────────────────────
-              # Tauri bakes several sizes into src-tauri/icons/. We prefer the
-              # largest PNG (512x512) for the hicolor theme, and also install the
-              # rounded 32x32 used as the in-app logo so small sizes look right.
-              # Adjust the source filenames if yours differ.
-              for size in 32x32 128x128 256x256 512x512; do
-                src="icons/$size.png"
-                if [ -f "$src" ]; then
-                  install -Dm644 "$src" \
-                    "$out/share/icons/hicolor/$size/apps/moku.png"
-                fi
-              done
-
-              # @2x variants that Tauri also generates
-              for size in 128x128 256x256; do
-                src="icons/''${size}@2x.png"
-                if [ -f "$src" ]; then
-                  install -Dm644 "$src" \
-                    "$out/share/icons/hicolor/''${size}@2/apps/moku.png"
-                fi
-              done
-
-              # Scalable SVG — src/assets/moku-icon.svg is the rounded version
-              # referenced in SplashScreen.tsx. Pull it straight from the source
-              # tree so the launcher always uses the same rounded artwork.
-              install -Dm644 "${./src/assets/moku-icon.svg}" \
-                "$out/share/icons/hicolor/scalable/apps/moku.svg"
-
-              # ── .desktop entry ───────────────────────────────────────────────
-              install -Dm644 /dev/stdin \
-                "$out/share/applications/moku.desktop" <<EOF
-              [Desktop Entry]
-              Version=1.0
-              Type=Application
-              Name=Moku
-              Comment=Manga reader frontend for Suwayomi
-              Exec=$out/bin/moku
-              Icon=moku
-              Terminal=false
-              Categories=Graphics;Viewer;
-              Keywords=manga;comic;reader;suwayomi;
-              StartupWMClass=moku
-              EOF
+                --set WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS 1
            '';
          });

+          bumpScript = pkgs.writeShellApplication {
+            name = "moku-bump";
+            runtimeInputs = with pkgs; [ gnused coreutils git ];
+            text = ''
+              [[ $# -lt 1 ]] && { echo "Usage: nix run .#bump -- <version>"; exit 1; }
+              VERSION="$1"
+              REPO="$(git rev-parse --show-toplevel)"
+              sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" \
+                "$REPO/src-tauri/tauri.conf.json"
+              sed -i "0,/^version = \"[^\"]*\"/s//version = \"$VERSION\"/" \
+                "$REPO/src-tauri/Cargo.toml"
+              sed -i "s/version = \"[^\"]*\";/version = \"$VERSION\";/g" \
+                "$REPO/flake.nix"
+              echo "Bumped to $VERSION"
+            '';
+          };
+
+          flatpakScript = pkgs.writeShellApplication {
+            name = "moku-flatpak";
+            runtimeInputs = with pkgs; [
+              gnused coreutils git
+              nodejs_22 pnpm
+              appstream flatpak-builder flatpak
+              (python3.withPackages (ps: [ ps.aiohttp ps.tomlkit ]))
+            ];
+            text = ''
+              [[ $# -lt 1 ]] && { echo "Usage: nix run .#flatpak -- <version>"; exit 1; }
+              VERSION="$1"
+              REPO="$(git rev-parse --show-toplevel)"
+              MANIFEST="$REPO/dev.moku.app.yml"
+
+              echo "── Bumping versions ──"
+              sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" \
+                "$REPO/src-tauri/tauri.conf.json"
+              sed -i "0,/^version = \"[^\"]*\"/s//version = \"$VERSION\"/" \
+                "$REPO/src-tauri/Cargo.toml"
+              sed -i "s/version = \"[^\"]*\";/version = \"$VERSION\";/g" \
+                "$REPO/flake.nix"
+              echo "Done"
+
+              echo "── Building frontend ──"
+              cd "$REPO"
+              pnpm install --frozen-lockfile
+              pnpm build
+              echo "Done"
+
+              echo "── Repacking frontend-dist.tar.gz ──"
+              tar -czf "$REPO/packaging/frontend-dist.tar.gz" -C "$REPO/dist" .
+              FRONTEND_SHA=$(sha256sum "$REPO/packaging/frontend-dist.tar.gz" | awk '{print $1}')
+              echo "sha256: $FRONTEND_SHA"
+
+              echo "── Patching manifest sha256 ──"
+              python3 - "$MANIFEST" "$FRONTEND_SHA" <<'PYEOF'
+              import re, sys
+              path, sha = sys.argv[1], sys.argv[2]
+              text = open(path).read()
+              updated, n = re.subn(
+                r'(path:\s*packaging/frontend-dist\.tar\.gz\s*\n\s*sha256:\s*)[0-9a-f]+',
+                r'\g<1>' + sha, text)
+              if n == 0:
+                  sys.exit("ERROR: could not find frontend-dist sha256 in manifest")
+              open(path, 'w').write(updated)
+              PYEOF
+              echo "Done"
+
+              echo "── Regenerating cargo-sources.json ──"
+              python3 "$REPO/packaging/flatpak-cargo-generator.py" \
+                "$REPO/src-tauri/Cargo.lock" \
+                -o "$REPO/packaging/cargo-sources.json"
+              echo "Done"
+
+              echo "── Building flatpak ──"
+              rm -rf "$REPO/build-dir" "$REPO/repo"
+              flatpak-builder \
+                --repo="$REPO/repo" \
+                --force-clean \
+                "$REPO/build-dir" \
+                "$MANIFEST"
+              flatpak build-bundle "$REPO/repo" "$REPO/moku.flatpak" dev.moku.app
+              rm -rf "$REPO/build-dir" "$REPO/repo"
+              echo "moku.flatpak created"
+
+              echo ""
+              echo "Done — v$VERSION"
+              echo "  -> $REPO/moku.flatpak"
+              echo ""
+              echo "After pushing the tag, run:"
+              echo "  nix run .#pkgbuild-bump -- $VERSION"
+            '';
+          };
+
+          pkgbuildBumpScript = pkgs.writeShellApplication {
+            name = "moku-pkgbuild-bump";
+            runtimeInputs = with pkgs; [ gnused curl coreutils git ];
+            text = ''
+              [[ $# -lt 1 ]] && { echo "Usage: nix run .#pkgbuild-bump -- <version>"; exit 1; }
+              VERSION="$1"
+              REPO="$(git rev-parse --show-toplevel)"
+              PKGBUILD="$REPO/PKGBUILD"
+              [[ -f "$PKGBUILD" ]] || { echo "PKGBUILD not found"; exit 1; }
+
+              TARBALL_URL="https://github.com/Youwes09/Moku/archive/refs/tags/v$VERSION.tar.gz"
+              echo "Fetching tarball sha256..."
+              TARBALL_SHA=$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}')
+
+              sed -i "s/^pkgver=.*/pkgver=$VERSION/"   "$PKGBUILD"
+              sed -i "s/^pkgrel=.*/pkgrel=1/"          "$PKGBUILD"
+              sed -i "s/\(sha256sums=('\)[0-9a-f]\{64\}/\1$TARBALL_SHA/" "$PKGBUILD"
+
+              grep -q "$TARBALL_SHA" "$PKGBUILD" \
+                || { echo "ERROR: sha256 replacement failed"; exit 1; }
+
+              echo "PKGBUILD -> $VERSION ($TARBALL_SHA)"
+            '';
+          };
+
        in
        {
-          # Expose as both a runnable app and installable packages.
          apps = {
-            default = {
-              type = "app";
-              program = "${moku}/bin/moku";
-            };
-            moku = {
-              type = "app";
-              program = "${moku}/bin/moku";
-            };
+            default       = { type = "app"; program = "${moku}/bin/moku"; };
+            moku          = { type = "app"; program = "${moku}/bin/moku"; };
+            bump          = { type = "app"; program = "${bumpScript}/bin/moku-bump"; };
+            flatpak       = { type = "app"; program = "${flatpakScript}/bin/moku-flatpak"; };
+            pkgbuild-bump = { type = "app"; program = "${pkgbuildBumpScript}/bin/moku-pkgbuild-bump"; };
          };

          packages = {
            inherit moku frontend;
            default = moku;
-            appimage = nix-appimage.bundlers."${system}".default moku;
          };

          devShells.default = pkgs.mkShell {
@@ -214,26 +290,16 @@
              xdg-utils
            ];
            shellHook = ''
-              export APPIMAGE_EXTRACT_AND_RUN=1
              export NO_STRIP=true
              export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig''${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
              export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}''${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"

-              if [ ! -e /usr/bin/xdg-open ]; then
-                sudo ln -sf ${pkgs.xdg-utils}/bin/xdg-open /usr/bin/xdg-open
-              fi
-
-              LINUXDEPLOY="$HOME/.cache/tauri/linuxdeploy-x86_64.AppImage"
-              LINUXDEPLOY_REAL="$HOME/.cache/tauri/linuxdeploy-x86_64.AppImage.real"
-              if [ -f "$LINUXDEPLOY" ] && [ ! -f "$LINUXDEPLOY_REAL" ]; then
-                mv "$LINUXDEPLOY" "$LINUXDEPLOY_REAL"
-                printf '#!/bin/sh\nexec ${pkgs.appimage-run}/bin/appimage-run "%s" "$@"\n' "$LINUXDEPLOY_REAL" > "$LINUXDEPLOY"
-                chmod +x "$LINUXDEPLOY"
-                echo "linuxdeploy wrapped with appimage-run"
-              fi
-
-              echo "Moku dev shell"
-              echo "  pnpm install && pnpm tauri:dev"
+              echo "Moku dev shell — pnpm install && pnpm tauri:dev"
+              echo ""
+              echo "Release:"
+              echo "  nix run .#bump          -- <ver>   bump versions only"
+              echo "  nix run .#flatpak       -- <ver>   full flatpak build"
+              echo "  nix run .#pkgbuild-bump -- <ver>   patch PKGBUILD (after tag push)"
            '';
          };

@@ -6,7 +6,8 @@
    "dev": "vite",
    "build": "vite build",
    "preview": "vite preview",
-    "tauri": "tauri"
+    "tauri": "tauri",
+    "tauri:dev": "tauri dev --config src-tauri/tauri.dev.conf.json"
  },
  "dependencies": {
    "@tauri-apps/api": "^2.0.0",
@@ -230,66 +230,79 @@ packages:
    resolution: {integrity: sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==}
    cpu: [arm]
    os: [linux]
+    libc: [glibc]

  '@rollup/rollup-linux-arm-musleabihf@4.59.0':
    resolution: {integrity: sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==}
    cpu: [arm]
    os: [linux]
+    libc: [musl]

  '@rollup/rollup-linux-arm64-gnu@4.59.0':
    resolution: {integrity: sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==}
    cpu: [arm64]
    os: [linux]
+    libc: [glibc]

  '@rollup/rollup-linux-arm64-musl@4.59.0':
    resolution: {integrity: sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==}
    cpu: [arm64]
    os: [linux]
+    libc: [musl]

  '@rollup/rollup-linux-loong64-gnu@4.59.0':
    resolution: {integrity: sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==}
    cpu: [loong64]
    os: [linux]
+    libc: [glibc]

  '@rollup/rollup-linux-loong64-musl@4.59.0':
    resolution: {integrity: sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==}
    cpu: [loong64]
    os: [linux]
+    libc: [musl]

  '@rollup/rollup-linux-ppc64-gnu@4.59.0':
    resolution: {integrity: sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==}
    cpu: [ppc64]
    os: [linux]
+    libc: [glibc]

  '@rollup/rollup-linux-ppc64-musl@4.59.0':
    resolution: {integrity: sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==}
    cpu: [ppc64]
    os: [linux]
+    libc: [musl]

  '@rollup/rollup-linux-riscv64-gnu@4.59.0':
    resolution: {integrity: sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==}
    cpu: [riscv64]
    os: [linux]
+    libc: [glibc]

  '@rollup/rollup-linux-riscv64-musl@4.59.0':
    resolution: {integrity: sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==}
    cpu: [riscv64]
    os: [linux]
+    libc: [musl]

  '@rollup/rollup-linux-s390x-gnu@4.59.0':
    resolution: {integrity: sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==}
    cpu: [s390x]
    os: [linux]
+    libc: [glibc]

  '@rollup/rollup-linux-x64-gnu@4.59.0':
    resolution: {integrity: sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==}
    cpu: [x64]
    os: [linux]
+    libc: [glibc]

  '@rollup/rollup-linux-x64-musl@4.59.0':
    resolution: {integrity: sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==}
    cpu: [x64]
    os: [linux]
+    libc: [musl]

  '@rollup/rollup-openbsd-x64@4.59.0':
    resolution: {integrity: sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==}
@@ -367,30 +380,35 @@ packages:
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]
+    libc: [glibc]

  '@tauri-apps/cli-linux-arm64-musl@2.10.1':
    resolution: {integrity: sha512-MIj78PDDGjkg3NqGptDOGgfXks7SYJwhiMh8SBoZS+vfdz7yP5jN18bNaLnDhsVIPARcAhE1TlsZe/8Yxo2zqg==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]
+    libc: [musl]

  '@tauri-apps/cli-linux-riscv64-gnu@2.10.1':
    resolution: {integrity: sha512-X0lvOVUg8PCVaoEtEAnpxmnkwlE1gcMDTqfhbefICKDnOTJ5Est3qL0SrWxizDackIOKBcvtpejrSiVpuJI1kw==}
    engines: {node: '>= 10'}
    cpu: [riscv64]
    os: [linux]
+    libc: [glibc]

  '@tauri-apps/cli-linux-x64-gnu@2.10.1':
    resolution: {integrity: sha512-2/12bEzsJS9fAKybxgicCDFxYD1WEI9kO+tlDwX5znWG2GwMBaiWcmhGlZ8fi+DMe9CXlcVarMTYc0L3REIRxw==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]
+    libc: [glibc]

  '@tauri-apps/cli-linux-x64-musl@2.10.1':
    resolution: {integrity: sha512-Y8J0ZzswPz50UcGOFuXGEMrxbjwKSPgXftx5qnkuMs2rmwQB5ssvLb6tn54wDSYxe7S6vlLob9vt0VKuNOaCIQ==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]
+    libc: [musl]

  '@tauri-apps/cli-win32-arm64-msvc@2.10.1':
    resolution: {integrity: sha512-iSt5B86jHYAPJa/IlYw++SXtFPGnWtFJriHn7X0NFBVunF6zu9+/zOn8OgqIWSl8RgzhLGXQEEtGBdR4wzpVgg==}
@@ -1816,7 +1816,7 @@ dependencies = [

 [[package]]
 name = "moku"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
 "dirs 5.0.1",
 "serde",
@@ -1,11 +1,11 @@
 [package]
 name = "moku"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"

 [lib]
 name = "moku_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
+crate-type = ["cdylib", "rlib"]

 [[bin]]
 name = "moku"
@@ -1,7 +1,7 @@
 {
  "$schema": "../gen/schemas/desktop-schema.json",
  "identifier": "default",
-  "description": "Allow launching suwayomi-server sidecar",
+  "description": "Default permissions for Moku",
  "windows": ["main"],
  "permissions": [
    "core:default",
@@ -10,11 +10,12 @@
    {
      "identifier": "shell:allow-spawn",
      "allow": [
-        {
-          "name": "binaries/suwayomi-server",
-          "sidecar": true
-        }
+        { "name": "tachidesk-server" },
+        { "name": "suwayomi-server" },
+        { "name": "suwayomi-server-aarch64-apple-darwin" },
+        { "name": "suwayomi-server-x86_64-apple-darwin" },
+        { "name": "javaw" }
      ]
    }
  ]
-}
+}
@@ -16,16 +16,20 @@ pub struct StorageInfo {
    path:        String,
 }

+#[derive(Serialize)]
+#[serde(tag = "kind", content = "message")]
+pub enum SpawnError {
+    NotConfigured(String),
+    SpawnFailed(String),
+}
+
 fn resolve_downloads_path(downloads_path: &str) -> PathBuf {
    if !downloads_path.trim().is_empty() {
        return PathBuf::from(downloads_path);
    }
    let base = std::env::var("XDG_DATA_HOME")
        .map(PathBuf::from)
-        .unwrap_or_else(|_| {
-            dirs::data_dir()
-                .unwrap_or_else(|| PathBuf::from("/"))
-        });
+        .unwrap_or_else(|_| dirs::data_dir().unwrap_or_else(|| PathBuf::from("/")));
    base.join("Tachidesk/downloads")
 }

@@ -45,7 +49,9 @@ fn get_storage_info(downloads_path: String) -> Result<StorageInfo, String> {
        0
    };

-    let stat_path = if path.exists() { path.clone() } else {
+    let stat_path = if path.exists() {
+        path.clone()
+    } else {
        dirs::home_dir().unwrap_or_else(|| PathBuf::from("/"))
    };

@@ -56,20 +62,14 @@ fn get_storage_info(downloads_path: String) -> Result<StorageInfo, String> {
        .max_by_key(|d| d.mount_point().as_os_str().len())
        .ok_or_else(|| "Could not find disk for path".to_string())?;

-    let total_bytes = disk.total_space();
-    let free_bytes  = disk.available_space();
-
    Ok(StorageInfo {
        manga_bytes,
-        total_bytes,
-        free_bytes,
+        total_bytes: disk.total_space(),
+        free_bytes:  disk.available_space(),
        path: path.to_string_lossy().into_owned(),
    })
 }

-/// Returns the true OS-level scale factor for the main window.
-/// On Linux this bypasses WebKitGTK's unreliable devicePixelRatio.
-/// On macOS the value comes directly from the native window.
 #[tauri::command]
 fn get_scale_factor(window: tauri::Window) -> f64 {
    window.scale_factor().unwrap_or(1.0)
@@ -77,26 +77,21 @@ fn get_scale_factor(window: tauri::Window) -> f64 {

 fn kill_tachidesk(app: &tauri::AppHandle) {
    let state = app.state::<ServerState>();
-    let mut guard = state.0.lock().unwrap();
-    if let Some(child) = guard.take() {
+    if let Some(child) = state.0.lock().unwrap().take() {
        let _ = child.kill();
-        println!("Killed tracked server child.");
    }

    #[cfg(target_os = "windows")]
    let _ = std::process::Command::new("taskkill")
-        .args(["/F", "/FI", "IMAGENAME eq tachidesk*"])
+        .args(["/F", "/FI", "IMAGENAME eq java*"])
        .status();

    #[cfg(not(target_os = "windows"))]
    let _ = std::process::Command::new("pkill")
-        .arg("-f")
-        .arg("tachidesk")
+        .args(["-f", "tachidesk"])
        .status();
 }

-/// The default server.conf we seed on first launch.
-/// Mirrors the Flatpak wrapper: headless, no tray, no browser pop-up.
 const DEFAULT_SERVER_CONF: &str = r#"server.ip = "127.0.0.1"
 server.port = 4567
 server.webUIEnabled = false
@@ -114,9 +109,6 @@ server.maxSourcesInParallel = 6
 server.extensionRepos = []
 "#;

-/// Ensure the Suwayomi data dir and server.conf exist, and that the three
-/// keys that cause GUI/JCEF crashes are always set to safe values.
-/// This mirrors the shell-script logic in the Flatpak's tachidesk-server wrapper.
 fn seed_server_conf(data_dir: &PathBuf) {
    let conf_path = data_dir.join("server.conf");

@@ -131,97 +123,73 @@ fn seed_server_conf(data_dir: &PathBuf) {
        return;
    }

-    // Conf already exists — patch the three critical keys in-place.
    let Ok(contents) = std::fs::read_to_string(&conf_path) else { return };

    let patched = patch_conf_key(
        patch_conf_key(
-            patch_conf_key(
-                contents,
-                "server.webUIEnabled",
-                "false",
-            ),
-            "server.initialOpenInBrowserEnabled",
-            "false",
+            patch_conf_key(contents, "server.webUIEnabled", "false"),
+            "server.initialOpenInBrowserEnabled", "false",
        ),
-        "server.systemTrayEnabled",
-        "false",
+        "server.systemTrayEnabled", "false",
    );

    let _ = std::fs::write(&conf_path, patched);
 }

-/// Replace `key = <value>` in a HOCON/properties-style conf, or append it
-/// if the key is absent.
-fn patch_conf_key(mut text: String, key: &str, value: &str) -> String {
+fn patch_conf_key(text: String, key: &str, value: &str) -> String {
    let replacement = format!("{key} = {value}");
-    // Find a line that starts with the key (tolerant of surrounding whitespace)
-    if let Some(pos) = text.lines().position(|l| l.trim_start().starts_with(key)) {
-        let lines: Vec<&str> = text.lines().collect();
-        // We need an owned replacement; rebuild from scratch.
-        let owned: Vec<String> = lines
+    let lines: Vec<&str> = text.lines().collect();
+
+    if let Some(pos) = lines.iter().position(|l| l.trim_start().starts_with(key)) {
+        let mut out = lines
            .iter()
            .enumerate()
-            .map(|(i, l)| {
-                if i == pos { replacement.clone() } else { l.to_string() }
-            })
-            .collect();
-        return owned.join("\n");
+            .map(|(i, l)| if i == pos { replacement.as_str() } else { l })
+            .collect::<Vec<_>>()
+            .join("\n");
+        out.push('\n');
+        return out;
    }
-    // Key absent — append.
-    if !text.ends_with('\n') { text.push('\n'); }
-    text.push_str(&replacement);
-    text.push('\n');
-    text
+
+    let mut out = text;
+    if !out.ends_with('\n') { out.push('\n'); }
+    out.push_str(&replacement);
+    out.push('\n');
+    out
 }

-/// Resolve the Suwayomi data directory.
-///
-/// - Linux:  $XDG_DATA_HOME/moku/tachidesk  (matches Flatpak path)
-/// - macOS:  ~/Library/Application Support/dev.moku.app/tachidesk
 fn suwayomi_data_dir() -> PathBuf {
+    #[cfg(target_os = "windows")]
+    {
+        dirs::data_dir()
+            .unwrap_or_else(|| PathBuf::from("C:\\ProgramData"))
+            .join("moku\\tachidesk")
+    }
    #[cfg(target_os = "macos")]
    {
        dirs::data_dir()
            .unwrap_or_else(|| dirs::home_dir().unwrap_or_else(|| PathBuf::from("~")))
            .join("dev.moku.app/tachidesk")
    }
-    #[cfg(not(target_os = "macos"))]
+    #[cfg(not(any(target_os = "windows", target_os = "macos")))]
    {
        let base = std::env::var("XDG_DATA_HOME")
            .map(PathBuf::from)
-            .unwrap_or_else(|_| {
-                dirs::data_dir().unwrap_or_else(|| PathBuf::from("/tmp"))
-            });
+            .unwrap_or_else(|_| dirs::data_dir().unwrap_or_else(|| PathBuf::from("/tmp")));
        base.join("moku/tachidesk")
    }
 }

-/// Everything needed to spawn the server process.
 struct ServerInvocation {
-    /// Path to the executable (javaw.exe on Windows, the sidecar script on macOS/Linux).
-    bin: std::ffi::OsString,
-    /// Extra args prepended before the Suwayomi rootDir flag.
-    /// On Windows: ["-jar", "<path-to-jar>"]
-    /// Elsewhere: []
+    bin:         std::ffi::OsString,
    prefix_args: Vec<String>,
-    /// Working directory for the child process.
-    /// On Windows this must be the bundle folder so javaw can find the JRE and jar.
-    /// Elsewhere: None (inherit).
    working_dir: Option<PathBuf>,
 }

-/// Resolve the server binary path.
-///
-/// If the frontend passes a non-empty `binary` string (user override in
-/// Settings) we always use that — on Linux this is the nixpkgs/Flatpak path.
-///
-/// Otherwise we look for the Tauri-bundled sidecar inside the resource dir
-/// and, on Windows, build the javaw + jar invocation from the suwayomi-bundle.
 fn resolve_server_binary(
    binary: &str,
    app: &tauri::AppHandle,
-) -> Result<ServerInvocation, String> {
+) -> Result<ServerInvocation, SpawnError> {
    if !binary.trim().is_empty() {
        return Ok(ServerInvocation {
            bin: std::ffi::OsString::from(binary),
@@ -233,18 +201,17 @@ fn resolve_server_binary(
    let resource_dir = app
        .path()
        .resource_dir()
-        .map_err(|e| format!("Could not locate resource dir: {e}"))?;
+        .map_err(|e| SpawnError::SpawnFailed(format!("Could not locate resource dir: {e}")))?;

-    // ── Windows: invoke the bundled javaw.exe with -jar Suwayomi-Launcher.jar ──
    #[cfg(target_os = "windows")]
    {
-        let sidecar = resource_dir.join("suwayomi-server-x86_64-pc-windows-msvc.exe");
        let bundle_dir = resource_dir.join("suwayomi-bundle");
-        let jar = bundle_dir.join("Suwayomi-Launcher.jar");
+        let javaw      = bundle_dir.join("jre").join("bin").join("javaw.exe");
+        let jar        = bundle_dir.join("Suwayomi-Launcher.jar");

-        if sidecar.exists() && jar.exists() {
+        if javaw.exists() && jar.exists() {
            return Ok(ServerInvocation {
-                bin: sidecar.into_os_string(),
+                bin: javaw.into_os_string(),
                prefix_args: vec![
                    "-jar".to_string(),
                    jar.to_string_lossy().into_owned(),
@@ -252,16 +219,22 @@ fn resolve_server_binary(
                working_dir: Some(bundle_dir),
            });
        }
+
+        return Err(SpawnError::NotConfigured(
+            "No bundled server found. Set the server path in Settings.".to_string(),
+        ));
    }

-    // ── macOS / Linux: sidecar script is self-contained ──
+    #[cfg(target_os = "macos")]
    let candidates = [
        "suwayomi-server-aarch64-apple-darwin",
        "suwayomi-server-x86_64-apple-darwin",
-        // plain name as a dev/Linux fallback
-        "suwayomi-server",
    ];

+    #[cfg(not(any(target_os = "windows", target_os = "macos")))]
+    let candidates = ["suwayomi-server"];
+
+    #[cfg(not(target_os = "windows"))]
    for name in &candidates {
        let p = resource_dir.join(name);
        if p.exists() {
@@ -273,58 +246,83 @@ fn resolve_server_binary(
        }
    }

-    Err("Suwayomi server binary not found. Please set the path in Settings.".to_string())
+    // Fall back to PATH — covers Nix, distro packages, and any system install.
+    {
+        #[cfg(target_os = "windows")]
+        let which_cmd = "where";
+        #[cfg(not(target_os = "windows"))]
+        let which_cmd = "which";
+
+        for name in &["tachidesk-server", "suwayomi-server"] {
+            if std::process::Command::new(which_cmd)
+                .arg(name)
+                .output()
+                .map(|o| o.status.success())
+                .unwrap_or(false)
+            {
+                return Ok(ServerInvocation {
+                    bin: std::ffi::OsString::from(name),
+                    prefix_args: vec![],
+                    working_dir: None,
+                });
+            }
+        }
+    }
+
+    Err(SpawnError::NotConfigured(
+        "Server binary not found. Set the path in Settings.".to_string(),
+    ))
 }

 #[tauri::command]
-fn spawn_server(binary: String, app: tauri::AppHandle) -> Result<(), String> {
-    let state = app.state::<ServerState>();
+fn spawn_server(binary: String, app: tauri::AppHandle) -> Result<(), SpawnError> {
    {
+        let state = app.state::<ServerState>();
        let guard = state.0.lock().unwrap();
        if guard.is_some() {
-            println!("Server already running, skipping spawn.");
            return Ok(());
        }
    }

-    // Seed server.conf before launching so Suwayomi starts in headless mode.
    let data_dir = suwayomi_data_dir();
    seed_server_conf(&data_dir);

    let invocation = resolve_server_binary(&binary, &app)?;
-    let shell = app.shell();
+    let bin_display = invocation.bin.clone();

    let rootdir_flag = format!(
        "-Dsuwayomi.tachidesk.config.server.rootDir={}",
        data_dir.to_string_lossy()
    );

-    // Build the full arg list: prefix_args (e.g. -jar foo.jar) + rootDir flag.
-    let args: Vec<String> = invocation.prefix_args.into_iter().chain(std::iter::once(rootdir_flag)).collect();
+    let args: Vec<String> = invocation.prefix_args
+        .into_iter()
+        .chain(std::iter::once(rootdir_flag))
+        .collect();

-    // On Windows, set the working directory to the bundle folder so javaw.exe
-    // can resolve the JRE and jar relative paths correctly.
-    let cmd = shell
+    let cmd = app.shell()
        .command(&invocation.bin)
        .env("JAVA_TOOL_OPTIONS", "-Djava.awt.headless=true")
        .args(&args)
-        .current_dir(invocation.working_dir.unwrap_or_else(|| std::env::current_dir().unwrap_or_default()));
+        .current_dir(
+            invocation.working_dir
+                .unwrap_or_else(|| std::env::current_dir().unwrap_or_default())
+        );

    match cmd.spawn() {
        Ok((_rx, child)) => {
-            println!("Spawned server: {:?}", invocation.bin);
-            let mut guard = state.0.lock().unwrap();
-            *guard = Some(child);
+            println!("Spawned server: {:?}", bin_display);
+            let state = app.state::<ServerState>();
+            *state.0.lock().unwrap() = Some(child);
            Ok(())
        }
        Err(e) => {
-            eprintln!("Failed to spawn {:?}: {}", invocation.bin, e);
-            Err(e.to_string())
+            eprintln!("Failed to spawn {:?}: {}", bin_display, e);
+            Err(SpawnError::SpawnFailed(e.to_string()))
        }
    }
 }

-
 #[tauri::command]
 fn kill_server(app: tauri::AppHandle) -> Result<(), String> {
    kill_tachidesk(&app);
@@ -350,4 +348,4 @@ pub fn run() {
        })
        .run(tauri::generate_context!())
        .expect("error while running moku");
-}
+}
@@ -1,12 +1,10 @@
 {
  "$schema": "https://schema.tauri.app/config/2",
  "productName": "Moku",
-  "version": "0.3.0",
+  "version": "0.4.0",
  "identifier": "dev.moku.app",
  "build": {
    "frontendDist": "../dist",
-    "devUrl": "http://localhost:1420",
-    "beforeDevCommand": "pnpm dev",
    "beforeBuildCommand": "pnpm build"
  },
  "app": {
@@ -28,14 +26,21 @@
  },
  "bundle": {
    "active": true,
-    "targets": ["appimage"],
+    "targets": ["appimage", "nsis", "deb"],
    "icon": [
      "icons/32x32.png",
      "icons/128x128.png",
      "icons/128x128@2x.png",
      "icons/icon.icns",
-      "icons/icon.ico"
-    ]
+      "icons/icon.ico",
+      "icons/icon.png"
+    ],
+    "windows": {
+      "nsis": {
+        "installerIcon": "icons/icon.ico",
+        "installMode": "currentUser"
+      }
+    }
  },
  "plugins": {
    "shell": {
@@ -16,11 +16,12 @@

  const MAX_ATTEMPTS = 30;

-  let serverProbeOk = $state(!store.settings.autoStartServer);
-  let appReady      = $state(!store.settings.autoStartServer);
-  let failed        = $state(false);
-  let idle          = $state(false);
-  let devSplash     = $state(false);
+  let serverProbeOk   = $state(!store.settings.autoStartServer);
+  let appReady        = $state(!store.settings.autoStartServer);
+  let failed          = $state(false);
+  let notConfigured   = $state(false);
+  let idle            = $state(false);
+  let devSplash       = $state(false);

  let prevQueue: DownloadQueueItem[] = [];
  let idleTimer: ReturnType<typeof setTimeout> | null = null;
@@ -68,7 +69,6 @@
    const scale = store.settings.uiScale * 1.5;
    document.documentElement.style.zoom = `${scale}%`;
    document.documentElement.style.setProperty("--ui-scale", String(scale));
-    // --visual-vh gives true viewport height independent of zoom
    document.documentElement.style.setProperty("--visual-vh", `${window.innerHeight / (scale / 100)}px`);
  });

@@ -90,8 +90,13 @@
    (window as any).__mokuShowSplash = () => devSplash = true;

    if (store.settings.autoStartServer) {
-      invoke("spawn_server", { binary: store.settings.serverBinary }).catch(err =>
-        console.warn("Could not start server:", err));
+      invoke<void>("spawn_server", { binary: store.settings.serverBinary }).catch((err: any) => {
+        if (err?.kind === "NotConfigured") {
+          notConfigured = true;
+        } else {
+          console.warn("Could not start server:", err);
+        }
+      });
    }

    if (!serverProbeOk) {
@@ -117,6 +122,7 @@
    unlistenDownload = await listen<P>("download-progress", e => { setActiveDownloads(e.payload); });

    return () => {
+      cancelled = true;
      if (store.settings.autoStartServer) invoke("kill_server").catch(() => {});
      if (idleTimer) clearTimeout(idleTimer);
      if (pollInterval) clearInterval(pollInterval);
@@ -125,14 +131,14 @@
    };
  });

-  function handleRetry() { failed = false; serverProbeOk = false; }
+  function handleRetry() { failed = false; notConfigured = false; serverProbeOk = false; }
 </script>

 {#if devSplash}
  <SplashScreen mode="idle" showFps showCards={store.settings.splashCards ?? true}
    onDismiss={() => setTimeout(() => devSplash = false, 340)} />
 {:else if !appReady}
-  <SplashScreen mode="loading" ringFull={serverProbeOk} {failed}
+  <SplashScreen mode="loading" ringFull={serverProbeOk} {failed} {notConfigured}
    showCards={store.settings.splashCards ?? true}
    onReady={() => appReady = true}
    onRetry={handleRetry} />
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="512" height="512" viewBox="0 0 512 512">
+
+  <!-- Background -->
+  <rect width="512" height="512" rx="112" ry="112" fill="#0e1a14"/>
+
+  <!-- Leaf scaled up and centered: original paths scaled ~2.2x and centered -->
+  <g transform="translate(256,256) scale(0.072,-0.072) translate(-5000,-4800)"
+     fill="#2d7a5f" stroke="none">
+    <path d="M4908 6615 c-597 -629 -935 -1264 -934 -1755 0 -508 195 -778 790
+    -1098 l194 -104 22 -114 c33 -164 76 -271 140 -347 80 -94 106 -62 77 94 -47
+    255 43 443 294 613 797 539 714 1392 -250 2551 -230 278 -224 275 -333 160z
+    m52 -945 c0 -472 -8 -850 -17 -850 -36 0 -693 703 -692 740 2 48 167 321 309
+    509 175 233 359 451 380 451 13 0 20 -304 20 -850z m183 775 c120 -126 357
+    -447 356 -482 0 -18 -47 -83 -105 -144 -57 -61 -151 -163 -208 -225 -151 -166
+    -146 -180 -146 406 0 286 7 520 16 520 9 0 48 -34 87 -75z m541 -750 c86 -150
+    196 -391 196 -430 0 -8 -25 -42 -55 -75 -31 -33 -149 -163 -264 -290 -339
+    -374 -480 -520 -501 -520 -13 0 -20 167 -20 465 l1 465 151 170 c83 94 193
+    217 244 275 122 138 137 135 248 -60z m-1098 -633 l374 -378 0 -462 c0 -254
+    -5 -462 -11 -462 -6 0 -55 23 -110 50 l-99 51 0 208 c0 259 -11 288 -176 457
+    -196 200 -188 199 -326 62 l-117 -116 -35 79 c-71 161 -39 569 64 816 42 100
+    20 116 436 -305z m1349 23 c109 -390 -87 -848 -475 -1111 -207 -139 -305 -262
+    -338 -420 -7 -31 -21 -56 -32 -56 -36 -1 -46 86 -48 405 l-2 313 123 137 c68
+    75 214 236 325 357 454 493 421 466 447 375z m-1292 -785 c12 -29 15 -118 7
+    -215 l-14 -166 -73 44 c-174 104 -403 341 -403 416 0 15 47 70 105 123 l104
+    98 127 -125 c70 -69 136 -147 147 -175z"/>
+  </g>
+</svg>
@@ -1,21 +1,23 @@
 <script lang="ts">
  import { onMount } from "svelte";
  import { getCurrentWindow } from "@tauri-apps/api/window";
+  import { store } from "../../store/state.svelte";
  import logoUrl from "../../assets/moku-icon.svg";

  interface Props {
-    mode?:      "loading" | "idle";
-    ringFull?:  boolean;
-    failed?:    boolean;
-    showCards?: boolean;
-    showFps?:   boolean;
-    onReady?:   () => void;
-    onRetry?:   () => void;
-    onDismiss?: () => void;
+    mode?:          "loading" | "idle";
+    ringFull?:      boolean;
+    failed?:        boolean;
+    notConfigured?: boolean;
+    showCards?:     boolean;
+    showFps?:       boolean;
+    onReady?:       () => void;
+    onRetry?:       () => void;
+    onDismiss?:     () => void;
  }

-  let { mode = "loading", ringFull = false, failed = false, showCards = true,
-        showFps = false, onReady, onRetry, onDismiss }: Props = $props();
+  let { mode = "loading", ringFull = false, failed = false, notConfigured = false,
+        showCards = true, showFps = false, onReady, onRetry, onDismiss }: Props = $props();

  const EXIT_MS = 320;

@@ -90,10 +92,22 @@
        const h     = w * 1.44;
        const speed = cfg.speedMin + hash(seed + 5) * (cfg.speedMax - cfg.speedMin);
        const travel = vh + h + BUF;
-        cards.push({ cx: (col + 0.5) * laneW + (hash(seed + 2) * 2 - 1) * Math.max(0, (laneW - w) / 2 - 2), w, h, lines: 1 + Math.floor(hash(seed + 7) * 3), alpha: cfg.alpha, speed, cycleSec: travel / speed, phase: ((col / COLS) + hash(seed + 6) * 0.6 + layer * 0.23) % 1, travel, yStart: vh + h / 2 + BUF / 2, angleStart: hash(seed + 3) * 50 - 25, tilt: (hash(seed + 4) * 2 - 1) * 18 });
+        cards.push({
+          cx: (col + 0.5) * laneW + (hash(seed + 2) * 2 - 1) * Math.max(0, (laneW - w) / 2 - 2),
+          w, h, lines: 1 + Math.floor(hash(seed + 7) * 3), alpha: cfg.alpha, speed,
+          cycleSec: travel / speed,
+          phase: ((col / COLS) + hash(seed + 6) * 0.6 + layer * 0.23) % 1,
+          travel, yStart: vh + h / 2 + BUF / 2,
+          angleStart: hash(seed + 3) * 50 - 25,
+          tilt: (hash(seed + 4) * 2 - 1) * 18,
+        });
      }
    }
-    const trigs: CardTrig[] = cards.map(c => ({ cosA: Math.cos(c.angleStart * (Math.PI / 180)), sinA: Math.sin(c.angleStart * (Math.PI / 180)), tiltRad: c.tilt * (Math.PI / 180) }));
+    const trigs: CardTrig[] = cards.map(c => ({
+      cosA: Math.cos(c.angleStart * (Math.PI / 180)),
+      sinA: Math.sin(c.angleStart * (Math.PI / 180)),
+      tiltRad: c.tilt * (Math.PI / 180),
+    }));
    return { cards, trigs };
  }

@@ -140,7 +154,10 @@
    return oc;
  }

-  function drawFrame(ctx: CanvasRenderingContext2D, t: number, cw: number, ch: number, dpr: number, cards: CardDef[], trigs: CardTrig[], stamps: HTMLCanvasElement[], vignette: HTMLCanvasElement) {
+  function drawFrame(
+    ctx: CanvasRenderingContext2D, t: number, cw: number, ch: number, dpr: number,
+    cards: CardDef[], trigs: CardTrig[], stamps: HTMLCanvasElement[], vignette: HTMLCanvasElement,
+  ) {
    ctx.clearRect(0, 0, cw, ch);
    for (let i = 0; i < cards.length; i++) {
      const c = cards[i];
@@ -174,9 +191,13 @@
  function mountCanvas(el: HTMLCanvasElement) {
    const win = getCurrentWindow();
    const ctx = el.getContext("2d")!;
-    interface RenderState { cards: CardDef[]; trigs: CardTrig[]; stamps: HTMLCanvasElement[]; vignette: HTMLCanvasElement; CW: number; CH: number; scale: number; }
+    interface RenderState {
+      cards: CardDef[]; trigs: CardTrig[]; stamps: HTMLCanvasElement[];
+      vignette: HTMLCanvasElement; CW: number; CH: number; scale: number;
+    }
    let live: RenderState | null = null;
    let lastLogW = 0, lastLogH = 0, lastScale = 0, buildGen = 0;
+
    async function syncSize() {
      const gen = ++buildGen;
      const [phys, scale] = await Promise.all([win.innerSize(), win.scaleFactor()]);
@@ -190,8 +211,10 @@
      el.width = phys.width; el.height = phys.height;
      live = { cards: built.cards, trigs: built.trigs, stamps, vignette: vig, CW: phys.width, CH: phys.height, scale };
    }
+
    const ro = new ResizeObserver(() => syncSize());
    ro.observe(el); syncSize();
+
    let raf = 0, t0 = -1;
    function frame(now: number) {
      raf = requestAnimationFrame(frame);
@@ -205,14 +228,14 @@
    return () => { cancelAnimationFrame(raf); ro.disconnect(); };
  }

-  const ringR    = $derived(44);
-  const ringPad  = $derived(8);
+  const ringR    = $derived(70);
+  const ringPad  = $derived(12);
  const ringSize = $derived((ringR + ringPad) * 2);
  const ringC    = $derived(ringR + ringPad);
  const ringCirc = $derived(2 * Math.PI * ringR);
  const ringArc  = $derived(ringCirc * Math.min(Math.max(ringProg, 0.025), 0.999));
-  const ringTop  = $derived(-((ringSize - 80) / 2));
-  const ringLeft = $derived(-((ringSize - 80) / 2));
+  const ringTop  = $derived(-((ringSize - 140) / 2));
+  const ringLeft = $derived(-((ringSize - 140) / 2));
 </script>

 <div class="splash" class:exiting style="cursor: {mode === 'idle' ? 'pointer' : 'default'}">
@@ -232,21 +255,32 @@
      <p class="hint">press any key to continue</p>
    </div>
  {:else}
-    <div style="position:relative;width:80px;height:80px;margin-bottom:20px;z-index:1">
-      {#if !failed}
+    <div style="position:relative;width:140px;height:140px;margin-bottom:20px;z-index:1">
+      {#if !failed && !notConfigured}
        <svg width={ringSize} height={ringSize} style="position:absolute;pointer-events:none;top:{ringTop}px;left:{ringLeft}px">
          <circle cx={ringC} cy={ringC} r={ringR} fill="none" stroke="var(--border-base)" stroke-width="2" />
          <circle cx={ringC} cy={ringC} r={ringR} fill="none" stroke="var(--accent)" stroke-width="2" stroke-linecap="round" stroke-dasharray="{ringArc} {ringCirc}" transform="rotate(-90 {ringC} {ringC})" style="transition: stroke-dasharray 0.4s cubic-bezier(0.4,0,0.2,1)" />
        </svg>
      {/if}
-      <img src={logoUrl} alt="Moku" style="width:80px;height:80px;border-radius:18px;display:block" />
+      <img src={logoUrl} alt="Moku" style="width:140px;height:140px;border-radius:32px;display:block" />
    </div>
    <p class="title-label">moku</p>
    <div style="z-index:1;display:flex;flex-direction:column;align-items:center;gap:8px">
-      {#if failed}
-        <p style="font-family:var(--font-ui);font-size:11px;color:var(--color-error);letter-spacing:0.1em;margin:0">Could not reach Suwayomi</p>
-        <p style="font-family:var(--font-ui);font-size:10px;color:var(--text-faint);letter-spacing:0.05em;margin:0;text-align:center;max-width:240px;line-height:1.6">Make sure tachidesk-server is on your PATH</p>
-        <button class="retry-btn" onclick={onRetry}>Retry</button>
+      {#if notConfigured}
+        <div class="error-box">
+          <p class="error-title">Server not configured</p>
+          <p class="error-body">Set the server path in Settings, then retry</p>
+          <div style="display:flex;gap:8px;margin-top:8px">
+            <button class="retry-btn" onclick={() => { store.settingsOpen = true; }}>Settings</button>
+            <button class="retry-btn" onclick={onRetry}>Retry</button>
+          </div>
+        </div>
+      {:else if failed}
+        <div class="error-box error-box--danger">
+          <p class="error-title" style="color:var(--color-error)">Could not reach Suwayomi</p>
+          <p class="error-body">Make sure tachidesk-server is on your PATH</p>
+          <button class="retry-btn" style="margin-top:8px" onclick={onRetry}>Retry</button>
+        </div>
      {:else}
        <p style="font-family:var(--font-ui);font-size:10px;color:var(--text-faint);letter-spacing:0.12em;margin:0;min-width:160px;text-align:center">
          {ringFull ? "Ready" : `Initializing server${dots}`}
@@ -268,4 +302,9 @@
  .hint { font-family: var(--font-ui); font-size: 10px; color: var(--text-faint); letter-spacing: 0.22em; text-transform: uppercase; margin: 0; user-select: none; animation: hintFade 3.5s ease-in-out infinite; }
  .title-label { font-family: var(--font-ui); font-size: 11px; font-weight: 500; letter-spacing: 0.26em; text-transform: uppercase; color: var(--text-secondary); margin: 0 0 8px; z-index: 1; user-select: none; }
  .retry-btn { margin-top: 4px; padding: 5px 16px; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: var(--bg-raised); color: var(--text-muted); cursor: pointer; font-family: var(--font-ui); font-size: 11px; letter-spacing: 0.08em; }
+  .retry-btn:hover { border-color: var(--border-strong); color: var(--text-secondary); }
+  .error-box { display: flex; flex-direction: column; align-items: center; gap: 4px; padding: 14px 20px; border-radius: var(--radius-lg); background: rgba(0,0,0,0.55); border: 1px solid rgba(255,255,255,0.12); max-width: 260px; text-align: center; backdrop-filter: blur(4px); }
+  .error-box--danger { border-color: rgba(220,50,50,0.5); }
+  .error-title { font-family: var(--font-ui); font-size: 11px; font-weight: 500; color: var(--text-muted); letter-spacing: 0.1em; margin: 0; }
+  .error-body { font-family: var(--font-ui); font-size: 10px; color: var(--text-faint); letter-spacing: 0.05em; margin: 0; line-height: 1.6; }
 </style>
@@ -0,0 +1,372 @@
+<script lang="ts">
+  import { onDestroy } from "svelte";
+  import { ArrowRight, Compass, List, BookOpen, Star, Fire, BookmarkSimple, FolderSimplePlus, Folder } from "phosphor-svelte";
+  import { gql, thumbUrl } from "../../lib/client";
+  import { UPDATE_MANGA, GET_SOURCES, FETCH_SOURCE_MANGA } from "../../lib/queries";
+  import { cache, CACHE_KEYS, getTopSources } from "../../lib/cache";
+  import { dedupeSources, dedupeMangaByTitle } from "../../lib/util";
+  import { settings, activeSource, genreFilter, previewManga, history, addFolder, assignMangaToFolder } from "../../store";
+  import type { Manga, Source } from "../../lib/types";
+  import ContextMenu, { type MenuEntry } from "../shared/ContextMenu.svelte";
+  import SourceList    from "../sources/SourceList.svelte";
+  import SourceBrowse  from "../sources/SourceBrowse.svelte";
+  import GenreDrillPage from "./GenreDrillPage.svelte";
+
+  type ExploreMode = "explore" | "sources";
+  let mode: ExploreMode = "explore";
+
+  const EXPLORE_ALL_MANGA = `
+    query ExploreAllManga {
+      mangas(orderBy: IN_LIBRARY_AT, orderByType: DESC) {
+        nodes { id title thumbnailUrl inLibrary genre status source { id displayName } }
+      }
+    }
+  `;
+  const MANGAS_BY_GENRE_EXPLORE = `
+    query MangasByGenreExplore($genre: String!, $first: Int) {
+      mangas(filter: { genre: { includesInsensitive: $genre } }, first: $first, orderBy: IN_LIBRARY_AT, orderByType: DESC) {
+        nodes { id title thumbnailUrl inLibrary genre }
+      }
+    }
+  `;
+
+  const FOUNDATIONAL_GENRES = ["Action", "Romance", "Fantasy", "Adventure", "Comedy", "Drama"];
+  const ROW_CAP = 25;
+  const GHOST_COUNT = 3;
+
+  let allManga: Manga[]            = [];
+  let popularManga: Manga[]        = [];
+  let sources: Source[]            = [];
+  let genreResultsMap              = new Map<string, Manga[]>();
+  let loadingLib                   = true;
+  let loadingPopular               = true;
+  let loadingGenres                = false;
+  let loadError                    = false;
+  let retryCount                   = 0;
+  let ctx: { x: number; y: number; manga: Manga } | null = null;
+  let abortCtrl: AbortController | null = null;
+  let fetchedGenresKey             = "";
+
+  function frecencyScore(readAt: number, count: number): number {
+    return count / Math.log((Date.now() - readAt) / 3_600_000 + 2);
+  }
+
+  $: frecencyGenres = (() => {
+    const mangaScores = new Map<number, number>();
+    const mangaReadAt = new Map<number, number>();
+    for (const e of $history) {
+      mangaScores.set(e.mangaId, (mangaScores.get(e.mangaId) ?? 0) + 1);
+      if (e.readAt > (mangaReadAt.get(e.mangaId) ?? 0)) mangaReadAt.set(e.mangaId, e.readAt);
+    }
+    const genreWeights = new Map<string, number>();
+    const mangaMap = new Map(allManga.map((m) => [m.id, m]));
+    for (const [mangaId, count] of mangaScores.entries()) {
+      const score = frecencyScore(mangaReadAt.get(mangaId) ?? 0, count);
+      for (const g of mangaMap.get(mangaId)?.genre ?? []) genreWeights.set(g, (genreWeights.get(g) ?? 0) + score);
+    }
+    if (genreWeights.size === 0) allManga.filter((m) => m.inLibrary).forEach((m) => (m.genre ?? []).forEach((g) => genreWeights.set(g, (genreWeights.get(g) ?? 0) + 1)));
+    if (genreWeights.size === 0) return FOUNDATIONAL_GENRES.slice(0, 3);
+    return Array.from(genreWeights.entries()).sort((a, b) => b[1] - a[1]).slice(0, 3).map(([g]) => g);
+  })();
+
+  $: continueReading = (() => {
+    const mangaMap = new Map(allManga.map((m) => [m.id, m]));
+    const seen = new Set<number>();
+    const result: { manga: Manga; chapterName: string; progress: number }[] = [];
+    for (const e of $history) {
+      if (seen.has(e.mangaId)) continue;
+      seen.add(e.mangaId);
+      const manga = mangaMap.get(e.mangaId);
+      if (!manga) continue;
+      result.push({ manga, chapterName: e.chapterName, progress: e.pageNumber > 0 ? Math.min(e.pageNumber / 20, 1) : 0 });
+      if (result.length >= 12) break;
+    }
+    return result;
+  })();
+
+  $: recommended = allManga.length && frecencyGenres.length ? (() => {
+    const continueIds = new Set(continueReading.map((r) => r.manga.id));
+    return allManga.filter((m) => m.inLibrary && !continueIds.has(m.id) && frecencyGenres.some((g) => (m.genre ?? []).includes(g))).slice(0, 20);
+  })() : [];
+
+  $: if (frecencyGenres.length && allManga.length) loadGenreRows();
+
+  async function loadGenreRows() {
+    const key = frecencyGenres.join(",");
+    if (fetchedGenresKey === key) return;
+    fetchedGenresKey = key;
+    loadingGenres = true;
+    abortCtrl?.abort();
+    const ctrl = new AbortController();
+    abortCtrl = ctrl;
+    const streamMap = new Map<string, Manga[]>();
+    await Promise.allSettled(
+      frecencyGenres.map((genre) =>
+        cache.get(CACHE_KEYS.GENRE(genre), () =>
+          gql<{ mangas: { nodes: Manga[] } }>(MANGAS_BY_GENRE_EXPLORE, { genre, first: 25 }, ctrl.signal)
+            .then((d) => d.mangas.nodes)
+        ).then((mangas) => {
+          if (ctrl.signal.aborted) return;
+          streamMap.set(genre, mangas);
+          genreResultsMap = new Map(streamMap);
+        })
+      )
+    ).catch(() => {});
+    if (!ctrl.signal.aborted) loadingGenres = false;
+  }
+
+  $: if (retryCount >= 0) loadData();
+
+  async function loadData() {
+    if (allManga.length > 0 && retryCount === 0) return;
+    loadingLib = true; loadingPopular = true; loadError = false;
+    const preferredLang = $settings.preferredExtensionLang || "en";
+    if (retryCount > 0) { cache.clear(CACHE_KEYS.LIBRARY); cache.clear(CACHE_KEYS.SOURCES); fetchedGenresKey = ""; }
+
+    cache.get(CACHE_KEYS.LIBRARY, () =>
+      gql<{ mangas: { nodes: Manga[] } }>(EXPLORE_ALL_MANGA).then((d) => d.mangas.nodes)
+    ).then((m) => { allManga = m; }).catch((e) => { console.error(e); loadError = true; }).finally(() => loadingLib = false);
+
+    cache.get(CACHE_KEYS.SOURCES, () =>
+      gql<{ sources: { nodes: Source[] } }>(GET_SOURCES).then((d) => dedupeSources(d.sources.nodes, preferredLang))
+    ).then(async (allSources) => {
+      if (!allSources.length) { loadingPopular = false; return; }
+      const top = getTopSources(allSources).slice(0, 2);
+      sources = allSources;
+      cache.get(CACHE_KEYS.POPULAR, () =>
+        Promise.allSettled(top.map((src) =>
+          gql<{ fetchSourceManga: { mangas: Manga[] } }>(FETCH_SOURCE_MANGA, { source: src.id, type: "POPULAR", page: 1, query: null })
+            .then((d) => d.fetchSourceManga.mangas)
+        )).then((results) => {
+          const merged: Manga[] = [];
+          for (const r of results) if (r.status === "fulfilled") merged.push(...r.value);
+          return dedupeMangaByTitle(merged).slice(0, 30);
+        })
+      ).then((m) => popularManga = m).catch(console.error).finally(() => loadingPopular = false);
+    }).catch((e) => { console.error(e); loadError = true; loadingPopular = false; });
+  }
+
+  function buildCtxItems(m: Manga): MenuEntry[] {
+    return [
+      { label: m.inLibrary ? "In Library" : "Add to library", icon: BookmarkSimple, disabled: m.inLibrary,
+        onClick: () => gql(UPDATE_MANGA, { id: m.id, inLibrary: true }).then(() => cache.clear(CACHE_KEYS.LIBRARY)).catch(console.error) },
+      ...($settings.folders.length > 0 ? [
+        { separator: true } as MenuEntry,
+        ...$settings.folders.map((f): MenuEntry => ({
+          label: f.mangaIds.includes(m.id) ? `✓ ${f.name}` : f.name, icon: Folder,
+          onClick: () => assignMangaToFolder(f.id, m.id),
+        })),
+      ] : []),
+      { separator: true },
+      { label: "New folder & add", icon: FolderSimplePlus, onClick: () => { const name = prompt("Folder name:"); if (name?.trim()) { const id = addFolder(name.trim()); assignMangaToFolder(id, m.id); } } },
+    ];
+  }
+
+  function rowWheel(e: WheelEvent) {
+    if (Math.abs(e.deltaY) <= Math.abs(e.deltaX)) return;
+    const el = e.currentTarget as HTMLDivElement;
+    if (el.scrollLeft <= 0 && el.scrollLeft >= el.scrollWidth - el.clientWidth - 1) return;
+    e.stopPropagation();
+    el.scrollLeft += e.deltaY;
+  }
+
+  onDestroy(() => abortCtrl?.abort());
+</script>
+
+{#if $activeSource}
+  <SourceBrowse />
+{:else if $genreFilter}
+  <GenreDrillPage />
+{:else}
+  <div class="root">
+    <div class="header">
+      <div class="header-left">
+        <h1 class="heading">Explore</h1>
+        <div class="tabs">
+          <button class="tab" class:active={mode === "explore"} on:click={() => mode = "explore"}>
+            <Compass size={11} weight="bold" /> Explore
+          </button>
+          <button class="tab" class:active={mode === "sources"} on:click={() => mode = "sources"}>
+            <List size={11} weight="bold" /> Sources
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <div style="display:{mode === 'explore' ? 'contents' : 'none'}">
+      <div class="body">
+
+        {#if continueReading.length > 0 || loadingLib}
+          <div class="section">
+            <div class="section-header">
+              <span class="section-title"><BookOpen size={11} weight="bold" /> Continue Reading</span>
+            </div>
+            {#if loadingLib}
+              <div class="skeleton-row">{#each Array(8) as _}<div class="card-skeleton"><div class="cover-skeleton skeleton"></div><div class="title-skeleton skeleton"></div></div>{/each}</div>
+            {:else}
+              <div class="row" on:wheel={rowWheel}>
+                {#each continueReading.slice(0, ROW_CAP) as { manga, chapterName, progress }}
+                  <button class="card" on:click={() => previewManga.set(manga)} on:contextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, manga }; }}>
+                    <div class="cover-wrap">
+                      <img src={thumbUrl(manga.thumbnailUrl)} alt={manga.title} class="cover" loading="lazy" decoding="async" />
+                      {#if manga.inLibrary}<span class="in-library-badge">Saved</span>{/if}
+                      {#if progress > 0}<div class="progress-bar"><div class="progress-fill" style="width:{progress * 100}%"></div></div>{/if}
+                    </div>
+                    <p class="title">{manga.title}</p>
+                    {#if chapterName}<p class="subtitle">{chapterName}</p>{/if}
+                  </button>
+                {/each}
+                {#each Array(GHOST_COUNT) as _}<div class="ghost-card" aria-hidden></div>{/each}
+              </div>
+            {/if}
+          </div>
+        {/if}
+
+        {#if recommended.length > 0 || loadingLib}
+          <div class="section">
+            <div class="section-header">
+              <span class="section-title"><Star size={11} weight="bold" /> Recommended for You</span>
+            </div>
+            {#if loadingLib}
+              <div class="skeleton-row">{#each Array(8) as _}<div class="card-skeleton"><div class="cover-skeleton skeleton"></div><div class="title-skeleton skeleton"></div></div>{/each}</div>
+            {:else}
+              <div class="row" on:wheel={rowWheel}>
+                {#each recommended.slice(0, ROW_CAP) as m}
+                  <button class="card" on:click={() => previewManga.set(m)} on:contextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, manga: m }; }}>
+                    <div class="cover-wrap"><img src={thumbUrl(m.thumbnailUrl)} alt={m.title} class="cover" loading="lazy" decoding="async" />{#if m.inLibrary}<span class="in-library-badge">Saved</span>{/if}</div>
+                    <p class="title">{m.title}</p>
+                  </button>
+                {/each}
+                {#each Array(GHOST_COUNT) as _}<div class="ghost-card" aria-hidden></div>{/each}
+              </div>
+            {/if}
+          </div>
+        {/if}
+
+        {#if popularManga.length > 0 || loadingPopular}
+          <div class="section">
+            <div class="section-header">
+              <span class="section-title">
+                <Fire size={11} weight="bold" />
+                {sources.length === 1 ? `Popular on ${sources[0].displayName}` : sources.length > 1 ? `Popular across ${sources.length} sources` : "Popular"}
+              </span>
+            </div>
+            {#if loadingPopular}
+              <div class="skeleton-row">{#each Array(8) as _}<div class="card-skeleton"><div class="cover-skeleton skeleton"></div><div class="title-skeleton skeleton"></div></div>{/each}</div>
+            {:else if sources.length === 0}
+              <div class="no-source">No sources installed. Add extensions first.</div>
+            {:else}
+              <div class="row" on:wheel={rowWheel}>
+                {#each popularManga.slice(0, ROW_CAP) as m}
+                  <button class="card" on:click={() => previewManga.set(m)} on:contextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, manga: m }; }}>
+                    <div class="cover-wrap"><img src={thumbUrl(m.thumbnailUrl)} alt={m.title} class="cover" loading="lazy" decoding="async" />{#if m.inLibrary}<span class="in-library-badge">Saved</span>{/if}</div>
+                    <p class="title">{m.title}</p>
+                  </button>
+                {/each}
+                {#each Array(GHOST_COUNT) as _}<div class="ghost-card" aria-hidden></div>{/each}
+              </div>
+            {/if}
+          </div>
+        {/if}
+
+        {#each frecencyGenres as genre}
+          {@const items = genreResultsMap.get(genre) ?? []}
+          {@const isLoading = loadingGenres && items.length === 0}
+          {#if isLoading || items.length > 0}
+            <div class="section">
+              <div class="section-header">
+                <span class="section-title">{genre}</span>
+                <button class="see-all" on:click={() => genreFilter.set(genre)}>See all <ArrowRight size={11} weight="light" /></button>
+              </div>
+              {#if isLoading}
+                <div class="skeleton-row">{#each Array(8) as _}<div class="card-skeleton"><div class="cover-skeleton skeleton"></div><div class="title-skeleton skeleton"></div></div>{/each}</div>
+              {:else}
+                <div class="row" on:wheel={rowWheel}>
+                  {#each items.slice(0, ROW_CAP) as m}
+                    <button class="card" on:click={() => previewManga.set(m)} on:contextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, manga: m }; }}>
+                      <div class="cover-wrap"><img src={thumbUrl(m.thumbnailUrl)} alt={m.title} class="cover" loading="lazy" decoding="async" />{#if m.inLibrary}<span class="in-library-badge">Saved</span>{/if}</div>
+                      <p class="title">{m.title}</p>
+                    </button>
+                  {/each}
+                  {#if items.length >= ROW_CAP}
+                    <button class="explore-more-card" on:click={() => genreFilter.set(genre)}>
+                      <div class="explore-more-inner">
+                        <ArrowRight size={20} weight="light" class="explore-more-icon" />
+                        <span class="explore-more-label">Explore more</span>
+                        <span class="explore-more-genre">{genre}</span>
+                      </div>
+                    </button>
+                  {/if}
+                  {#each Array(GHOST_COUNT) as _}<div class="ghost-card" aria-hidden></div>{/each}
+                </div>
+              {/if}
+            </div>
+          {/if}
+        {/each}
+
+        {#if !loadingLib && !loadingPopular && !loadingGenres && continueReading.length === 0 && recommended.length === 0 && popularManga.length === 0 && frecencyGenres.every((g) => !genreResultsMap.get(g)?.length)}
+          <div class="empty">
+            {#if loadError}
+              <span>Could not reach Suwayomi</span>
+              <span class="empty-hint">Make sure the server is running, then try again.</span>
+              <button class="retry-btn" on:click={() => { loadingLib = true; loadingPopular = true; retryCount++; }}>Retry</button>
+            {:else}
+              <span>Nothing to explore yet</span>
+              <span class="empty-hint">Add manga to your library or install sources to get started.</span>
+            {/if}
+          </div>
+        {/if}
+      </div>
+    </div>
+
+    {#if mode === "sources"}<SourceList />{/if}
+  </div>
+{/if}
+
+{#if ctx}
+  <ContextMenu x={ctx.x} y={ctx.y} items={buildCtxItems(ctx.manga)} onClose={() => ctx = null} />
+{/if}
+
+<style>
+  .root { display: flex; flex-direction: column; height: 100%; overflow: hidden; animation: fadeIn 0.14s ease both; }
+  .header { display: flex; align-items: center; justify-content: space-between; padding: var(--sp-4) var(--sp-6); border-bottom: 1px solid var(--border-dim); flex-shrink: 0; gap: var(--sp-4); }
+  .header-left { display: flex; align-items: center; gap: var(--sp-4); }
+  .heading { font-family: var(--font-ui); font-size: var(--text-xs); font-weight: var(--weight-normal); color: var(--text-faint); letter-spacing: var(--tracking-wider); text-transform: uppercase; flex-shrink: 0; }
+  .tabs { display: flex; gap: 2px; background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-md); padding: 2px; }
+  .tab { display: flex; align-items: center; gap: 5px; font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); text-transform: uppercase; padding: 4px 10px; border-radius: var(--radius-sm); color: var(--text-faint); transition: background var(--t-base), color var(--t-base); white-space: nowrap; }
+  .tab:hover { color: var(--text-muted); }
+  .tab.active { background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); }
+  .body { flex: 1; overflow-y: auto; padding: var(--sp-5) 0 var(--sp-6); will-change: scroll-position; -webkit-overflow-scrolling: touch; }
+  .section { margin-bottom: var(--sp-6); }
+  .section-header { display: flex; align-items: center; justify-content: space-between; padding: 0 var(--sp-6) var(--sp-3); }
+  .section-title { display: inline-flex; align-items: center; gap: var(--sp-2); font-family: var(--font-ui); font-size: var(--text-xs); font-weight: var(--weight-normal); color: var(--text-faint); letter-spacing: var(--tracking-wider); text-transform: uppercase; }
+  .see-all { display: flex; align-items: center; gap: 4px; font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); text-transform: uppercase; color: var(--text-faint); background: none; border: none; cursor: pointer; padding: 2px 0; transition: color var(--t-base); }
+  .see-all:hover { color: var(--accent-fg); }
+  .row { display: flex; gap: var(--sp-3); padding: 0 var(--sp-6); overflow-x: auto; scrollbar-width: none; -ms-overflow-style: none; scroll-behavior: smooth; }
+  .row::-webkit-scrollbar { display: none; }
+  .card { flex-shrink: 0; width: 110px; background: none; border: none; padding: 0; cursor: pointer; text-align: left; }
+  .card:hover .cover { filter: brightness(1.06); }
+  .card:hover .title { color: var(--text-primary); }
+  .cover-wrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); transform: translateZ(0); }
+  .cover { width: 100%; height: 100%; object-fit: cover; transition: filter var(--t-base); will-change: filter; }
+  .in-library-badge { position: absolute; bottom: var(--sp-1); left: var(--sp-1); font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); text-transform: uppercase; background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); padding: 2px 5px; border-radius: var(--radius-sm); }
+  .progress-bar { position: absolute; bottom: 0; left: 0; right: 0; height: 3px; background: var(--bg-overlay); }
+  .progress-fill { height: 100%; background: var(--accent-fg); border-radius: 0 2px 0 0; transition: width 0.2s ease; }
+  .title { margin-top: var(--sp-2); font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; transition: color var(--t-base); }
+  .subtitle { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); margin-top: 2px; letter-spacing: var(--tracking-wide); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+  .ghost-card { flex-shrink: 0; width: 110px; aspect-ratio: 2/3; pointer-events: none; visibility: hidden; }
+  .skeleton-row { display: flex; gap: var(--sp-3); padding: 0 var(--sp-6); overflow: hidden; }
+  .card-skeleton { flex-shrink: 0; width: 110px; }
+  .cover-skeleton { aspect-ratio: 2/3; border-radius: var(--radius-md); }
+  .title-skeleton { height: 11px; margin-top: var(--sp-2); width: 80%; }
+  .explore-more-card { flex-shrink: 0; width: 110px; aspect-ratio: 2/3; border-radius: var(--radius-md); border: 1px dashed var(--border-strong); background: var(--bg-raised); cursor: pointer; display: flex; align-items: center; justify-content: center; transition: border-color var(--t-base), background var(--t-base); padding: 0; }
+  .explore-more-card:hover { border-color: var(--accent); background: var(--accent-muted); }
+  .explore-more-inner { display: flex; flex-direction: column; align-items: center; gap: var(--sp-2); padding: var(--sp-3); pointer-events: none; }
+  :global(.explore-more-icon) { color: var(--text-faint); transition: color var(--t-base); }
+  .explore-more-label { font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); text-transform: uppercase; color: var(--text-faint); text-align: center; }
+  .explore-more-genre { font-size: var(--text-2xs); color: var(--text-faint); opacity: 0.6; text-align: center; font-family: var(--font-ui); letter-spacing: var(--tracking-wide); }
+  .no-source { display: flex; align-items: center; justify-content: center; padding: var(--sp-4) var(--sp-6); color: var(--text-faint); font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); }
+  .empty { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: var(--sp-8) var(--sp-6); color: var(--text-faint); font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); gap: var(--sp-2); text-align: center; }
+  .empty-hint { font-size: var(--text-2xs); color: var(--text-faint); opacity: 0.6; }
+  .retry-btn { margin-top: var(--sp-3); padding: 6px 16px; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: var(--bg-raised); color: var(--text-muted); cursor: pointer; font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); }
+</style>
@@ -2,6 +2,7 @@
  import { tick } from "svelte";
  import { X, Book, Image, Sliders, Info, Keyboard, Gear, HardDrives, FolderSimple, Plus, Pencil, Trash, Wrench, PaintBrush } from "phosphor-svelte";
  import { invoke } from "@tauri-apps/api/core";
+  import { getVersion } from "@tauri-apps/api/app";
  import { gql } from "../../lib/client";
  import { GET_DOWNLOADS_PATH } from "../../lib/queries";
  import { store, updateSettings, resetKeybinds, addFolder, removeFolder, renameFolder, toggleFolderTab, clearHistory, wipeAllData, setSettingsOpen } from "../../store/state.svelte";
@@ -195,6 +196,33 @@

  
  let splashTriggered = $state(false);
+
+  let appVersion     = $state("…");
+  let latestVersion  = $state<string | null>(null);
+  let checkingUpdate = $state(false);
+  let updateError    = $state<string | null>(null);
+
+  $effect(() => {
+    if (tab === "about") {
+      getVersion().then(v => appVersion = v).catch(() => appVersion = "unknown");
+    }
+  });
+
+  async function checkForUpdate() {
+    checkingUpdate = true; updateError = null; latestVersion = null;
+    try {
+      const res = await fetch("https://api.github.com/repos/Youwes09/Moku/releases/latest", {
+        method: "GET",
+        headers: { "User-Agent": "Moku" },
+      });
+      const data = await res.json() as { tag_name: string };
+      latestVersion = data.tag_name.replace(/^v/, "");
+    } catch (e) {
+      updateError = "Could not reach GitHub";
+    } finally {
+      checkingUpdate = false;
+    }
+  }
  function triggerSplash() {
    splashTriggered = true;
    setTimeout(() => splashTriggered = false, 200);
@@ -695,7 +723,41 @@
              <p class="section-title">Moku</p>
              <div class="about-block">
                <p class="about-line">A manga reader frontend for Suwayomi / Tachidesk.</p>
-                <p class="about-line" style="color:var(--text-faint);margin-top:var(--sp-2)">Built with Tauri + Svelte. Connects to tachidesk-server.</p>
+                <p class="about-line" style="color:var(--text-faint);margin-top:var(--sp-2)">Built with Tauri + Svelte.</p>
+              </div>
+            </div>
+            <div class="section">
+              <p class="section-title">Version</p>
+              <div class="step-row">
+                <div class="toggle-info">
+                  <span class="toggle-label">Current version</span>
+                  <span class="toggle-desc">v{appVersion}</span>
+                </div>
+                <button class="step-btn" style="width:auto;padding:0 var(--sp-3);font-size:var(--text-xs);letter-spacing:var(--tracking-wide)"
+                  onclick={checkForUpdate} disabled={checkingUpdate}>
+                  {checkingUpdate ? "Checking…" : "Check for updates"}
+                </button>
+              </div>
+              {#if updateError}
+                <p style="font-family:var(--font-ui);font-size:var(--text-xs);color:var(--color-error);padding:0 var(--sp-3) var(--sp-2)">{updateError}</p>
+              {:else if latestVersion !== null}
+                {#if latestVersion === appVersion}
+                  <p style="font-family:var(--font-ui);font-size:var(--text-xs);color:#22c55e;padding:0 var(--sp-3) var(--sp-2);letter-spacing:var(--tracking-wide)">✓ You are on the latest version</p>
+                {:else}
+                  <div style="padding:0 var(--sp-3) var(--sp-2);display:flex;flex-direction:column;gap:var(--sp-1)">
+                    <p style="font-family:var(--font-ui);font-size:var(--text-xs);color:#fb923c;letter-spacing:var(--tracking-wide)">Update available — v{latestVersion}</p>
+                    <a href="https://github.com/Youwes09/Moku/releases/latest" target="_blank"
+                      style="font-family:var(--font-ui);font-size:var(--text-xs);color:var(--accent-fg);letter-spacing:var(--tracking-wide);text-decoration:none">
+                      Download on GitHub →
+                    </a>
+                  </div>
+                {/if}
+              {/if}
+            </div>
+            <div class="section">
+              <p class="section-title">Links</p>
+              <div class="about-block">
+                <a href="https://github.com/Youwes09/Moku" target="_blank" class="about-line" style="color:var(--accent-fg);text-decoration:none">GitHub →</a>
              </div>
            </div>
          </div>
@@ -132,7 +132,7 @@ export const DEFAULT_SETTINGS: Settings = {
  compactSidebar:         false,
  gpuAcceleration:        true,
  serverUrl:              "http://localhost:4567",
-  serverBinary:           "tachidesk-server",
+  serverBinary:           "",
  autoStartServer:        true,
  preferredExtensionLang: "en",
  keybinds:               DEFAULT_KEYBINDS,
@@ -151,6 +151,14 @@ export const DEFAULT_SETTINGS: Settings = {

 // ── Persistence ───────────────────────────────────────────────────────────────

+const STORE_VERSION = 2;
+
+// Fields reset to their DEFAULT_SETTINGS value on each version bump.
+// Add a key here whenever its default changes meaning between releases.
+const RESET_ON_UPGRADE: (keyof Settings)[] = [
+  "serverBinary",
+];
+
 function loadPersisted(): any {
  try {
    const raw = localStorage.getItem("moku-store");
@@ -167,7 +175,26 @@ function persist(patch: Record<string, unknown>) {
  } catch {}
 }

-const saved = loadPersisted();
+const saved = (() => {
+  const data = loadPersisted();
+  if (!data) return null;
+  if ((data.storeVersion ?? 1) < STORE_VERSION) {
+    const resetPatch: Partial<Settings> = {};
+    for (const key of RESET_ON_UPGRADE) {
+      (resetPatch as any)[key] = (DEFAULT_SETTINGS as any)[key];
+    }
+    const migrated = {
+      ...data,
+      storeVersion: STORE_VERSION,
+      settings: { ...data.settings, ...resetPatch },
+    };
+    try {
+      localStorage.setItem("moku-store", JSON.stringify(migrated));
+    } catch {}
+    return migrated;
+  }
+  return data;
+})();

 function mergeSettings(saved: any): Settings {
  const userFolders: Folder[]   = saved?.settings?.folders ?? [];
@@ -222,6 +249,7 @@ class Store {

  constructor() {
    $effect.root(() => {
+      $effect(() => { persist({ storeVersion:  STORE_VERSION            }); });
      $effect(() => { persist({ navPage:       this.navPage       }); });
      $effect(() => { persist({ libraryFilter: this.libraryFilter }); });
      $effect(() => { persist({ history:       this.history       }); });
@@ -1,14 +1,21 @@
 import { defineConfig } from "vite";
 import { svelte } from "@sveltejs/vite-plugin-svelte";
+import path from "path";

 export default defineConfig({
  plugins: [svelte()],
  clearScreen: false,
+  resolve: {
+    alias: {
+      $store:      path.resolve("./src/store"),
+      $components: path.resolve("./src/components"),
+    },
+  },
  server: {
    port: 1420,
    strictPort: true,
    watch: {
-      ignored: ["**/.flatpak-builder/**", "**/src-tauri/**"],
+      ignored: ["**/src-tauri/**"],
    },
  },
  envPrefix: ["VITE_", "TAURI_"],