(frameMode): New Modal & Launcher connections

- Align blur settings in non-FrameMode motion settings

.github/workflows/nix-pr-check.yml

@@ -1,4 +1,4 @@
-name: Nix flake and NixOS tests
+name: Check nix flake
 
 on:
   pull_request:
@@ -9,7 +9,6 @@ on:
 jobs:
   check-flake:
     runs-on: ubuntu-latest
-    timeout-minutes: 120
     steps:
 
       - name: Checkout
@@ -19,25 +18,6 @@ jobs:
 
       - name: Install Nix
         uses: cachix/install-nix-action@v31
-        with:
-          enable_kvm: true
-          extra_nix_config: |
-            system-features = nixos-test benchmark big-parallel kvm
 
       - name: Check the flake
-        run: nix flake check -L
-
-      - name: Run NixOS module test
-        run: nix build .#nixosTests.x86_64-linux.nixos-module -L
-
-      - name: Run NixOS service start test
-        run: nix build .#nixosTests.x86_64-linux.nixos-service-start-module -L
-
-      - name: Run greeter niri test
-        run: nix build .#nixosTests.x86_64-linux.greeter-niri-module -L
-
-      - name: Run home-manager module test
-        run: nix build .#nixosTests.x86_64-linux.home-manager-module -L
-
-      - name: Run niri home-manager module test
-        run: nix build .#nixosTests.x86_64-linux.niri-home-module -L
+        run: nix flake check

.github/workflows/run-ppa.yml

@@ -243,7 +243,7 @@ jobs:
             fi
             echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
             # ppa-upload.sh uploads to questing + resolute when series is omitted
-            if ! bash distro/scripts/ppa-upload.sh "$PKG" "$PPA_NAME" "" ${REBUILD_RELEASE:+"$REBUILD_RELEASE"}; then
+            if ! bash distro/scripts/ppa-upload.sh "$PKG" "$PPA_NAME" ${REBUILD_RELEASE:+"$REBUILD_RELEASE"}; then
               echo "::error::Upload failed for $PKG"
               exit 1
             fi

.pre-commit-config.yaml

@@ -20,11 +20,3 @@ repos:
         language: system
         files: ^core/.*\.(go|mod|sum)$
         pass_filenames: false
-  - repo: local
-    hooks:
-      - id: no-console-in-qml
-        name: no console.* in QML (use Log service)
-        entry: bash -c 'if grep -nE "console\.(log|error|info|warn|debug)" "$@"; then echo "Use the Log service (log.info/warn/error/debug/fatal) instead of console.*" >&2; exit 1; fi' --
-        language: system
-        files: ^quickshell/.*\.qml$
-        exclude: ^quickshell/(Services/Log\.qml$|dms-plugins/|PLUGINS/)

core/cmd/dms/commands_common.go

@@ -26,17 +26,6 @@ var runCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		daemon, _ := cmd.Flags().GetBool("daemon")
 		session, _ := cmd.Flags().GetBool("session")
-		if v, _ := cmd.Flags().GetString("log-level"); v != "" {
-			if err := os.Setenv("DMS_LOG_LEVEL", v); err != nil {
-				log.Fatalf("Failed to set DMS_LOG_LEVEL: %v", err)
-			}
-		}
-		if v, _ := cmd.Flags().GetString("log-file"); v != "" {
-			if err := os.Setenv("DMS_LOG_FILE", v); err != nil {
-				log.Fatalf("Failed to set DMS_LOG_FILE: %v", err)
-			}
-		}
-		log.ApplyEnvOverrides()
 		if daemon {
 			runShellDaemon(session)
 		} else {
@@ -537,7 +526,5 @@ func getCommonCommands() []*cobra.Command {
 		dlCmd,
 		randrCmd,
 		blurCmd,
-		trashCmd,
-		systemCmd,
 	}
 }

core/cmd/dms/commands_doctor.go

@@ -11,7 +11,6 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/blur"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/config"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/distros"
@@ -91,7 +90,6 @@ var (
 	wayfireVersionRegex    = regexp.MustCompile(`wayfire (\d+\.\d+)`)
 	labwcVersionRegex      = regexp.MustCompile(`labwc (\d+\.\d+\.\d+)`)
 	mangowcVersionRegex    = regexp.MustCompile(`mango (\d+\.\d+\.\d+)`)
-	miracleVersionRegex    = regexp.MustCompile(`miracle-wm v?(\d+\.\d+\.\d+)`)
 )
 
 var doctorCmd = &cobra.Command{
@@ -470,7 +468,6 @@ func checkWindowManagers() []checkResult {
 		{"Wayfire", "wayfire", "--version", wayfireVersionRegex, []string{"wayfire"}},
 		{"labwc", "labwc", "--version", labwcVersionRegex, []string{"labwc"}},
 		{"mangowc", "mango", "-v", mangowcVersionRegex, []string{"mango"}},
-		{"Miracle WM", "miracle-wm", "--version", miracleVersionRegex, []string{"miracle-wm"}},
 	}
 
 	var results []checkResult
@@ -503,7 +500,7 @@ func checkWindowManagers() []checkResult {
 		results = append(results, checkResult{
 			catCompositor, "Compositor", statusError,
 			"No supported Wayland compositor found",
-			"Install Hyprland, niri, Sway, River, Wayfire, or miracle-wm",
+			"Install Hyprland, niri, Sway, River, or Wayfire",
 			doctorDocsURL + "#compositor-checks",
 		})
 	}
@@ -512,24 +509,9 @@ func checkWindowManagers() []checkResult {
 		results = append(results, checkResult{catCompositor, "Active", statusInfo, wm, "", doctorDocsURL + "#compositor"})
 	}
 
-	results = append(results, checkCompositorBlurSupport())
-
 	return results
 }
 
-func checkCompositorBlurSupport() checkResult {
-	supported, err := blur.ProbeSupport()
-	if err != nil {
-		return checkResult{catCompositor, "Background Blur", statusInfo, "Unable to verify", err.Error(), doctorDocsURL + "#compositor-checks"}
-	}
-
-	if supported {
-		return checkResult{catCompositor, "Background Blur", statusOK, "Supported", "Compositor supports ext-background-effect-v1", doctorDocsURL + "#compositor-checks"}
-	}
-
-	return checkResult{catCompositor, "Background Blur", statusWarn, "Unsupported", "Compositor does not support ext-background-effect-v1", doctorDocsURL + "#compositor-checks"}
-}
-
 func getVersionFromCommand(cmd, arg string, regex *regexp.Regexp) string {
 	output, err := exec.Command(cmd, arg).CombinedOutput()
 	if err != nil && len(output) == 0 {
@@ -553,8 +535,6 @@ func detectRunningWM() string {
 		return "Hyprland"
 	case os.Getenv("NIRI_SOCKET") != "":
 		return "niri"
-	case os.Getenv("MIRACLESOCK") != "":
-		return "Miracle WM"
 	case os.Getenv("XDG_CURRENT_DESKTOP") != "":
 		return os.Getenv("XDG_CURRENT_DESKTOP")
 	}
@@ -573,7 +553,6 @@ func checkQuickshellFeatures() ([]checkResult, bool) {
 	qmlContent := `
 import QtQuick
 import Quickshell
-import Quickshell.Wayland
 
 ShellRoot {
 	id: root
@@ -582,7 +561,6 @@ ShellRoot {
 	property bool idleMonitorAvailable: false
 	property bool idleInhibitorAvailable: false
 	property bool shortcutInhibitorAvailable: false
-	property bool backgroundBlurAvailable: false
 
 	Timer {
 		interval: 50
@@ -600,18 +578,16 @@ ShellRoot {
 
 			try {
 				var testItem = Qt.createQmlObject(
-					'import Quickshell; import Quickshell.Wayland; import QtQuick; QtObject { ' +
+					'import Quickshell.Wayland; import QtQuick; QtObject { ' +
 					'readonly property bool hasIdleMonitor: typeof IdleMonitor !== "undefined"; ' +
 					'readonly property bool hasIdleInhibitor: typeof IdleInhibitor !== "undefined"; ' +
-					'readonly property bool hasShortcutInhibitor: typeof ShortcutInhibitor !== "undefined"; ' +
-					'readonly property bool hasBackgroundBlur: typeof BackgroundEffect !== "undefined" ' +
+					'readonly property bool hasShortcutInhibitor: typeof ShortcutInhibitor !== "undefined" ' +
 					'}',
 					root
 				)
 				root.idleMonitorAvailable = testItem.hasIdleMonitor
 				root.idleInhibitorAvailable = testItem.hasIdleInhibitor
 				root.shortcutInhibitorAvailable = testItem.hasShortcutInhibitor
-				root.backgroundBlurAvailable = testItem.hasBackgroundBlur
 				testItem.destroy()
 			} catch (e) {}
 
@@ -620,8 +596,6 @@ ShellRoot {
 			console.warn(root.idleInhibitorAvailable ? "FEATURE:IdleInhibitor:OK" : "FEATURE:IdleInhibitor:UNAVAILABLE")
 			console.warn(root.shortcutInhibitorAvailable ? "FEATURE:ShortcutInhibitor:OK" : "FEATURE:ShortcutInhibitor:UNAVAILABLE")
 
-			console.warn(root.backgroundBlurAvailable ? "FEATURE:BackgroundBlur:OK" : "FEATURE:BackgroundBlur:UNAVAILABLE")
-
 			Quickshell.execDetached(["kill", "-TERM", String(Quickshell.processId)])
 		}
 	}
@@ -642,7 +616,6 @@ ShellRoot {
 		{"IdleMonitor", "Idle detection"},
 		{"IdleInhibitor", "Prevent idle/sleep"},
 		{"ShortcutInhibitor", "Allow shortcut management (niri)"},
-		{"BackgroundBlur", "Background blur API support in Quickshell"},
 	}
 
 	var results []checkResult

core/cmd/dms/commands_setup.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"
 
@@ -12,7 +11,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/greeter"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/privesc"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
 	"github.com/spf13/cobra"
 )
@@ -269,8 +267,6 @@ func runSetupDmsConfig(name string) error {
 func runSetup() error {
 	fmt.Println("=== DMS Configuration Setup ===")
 
-	ensureInputGroup()
-
 	wm, wmSelected := promptCompositor()
 	terminal, terminalSelected := promptTerminal()
 	useSystemd := promptSystemd()
@@ -344,37 +340,6 @@ func runSetup() error {
 	return nil
 }
 
-// Add user to the input group for the evdev manager for inut state tracking.
-// Caps Lock OSD and the Caps Lock bar indicator.
-func ensureInputGroup() {
-	if !utils.HasGroup("input") {
-		return
-	}
-	currentUser := os.Getenv("USER")
-	if currentUser == "" {
-		currentUser = os.Getenv("LOGNAME")
-	}
-	if currentUser == "" {
-		return
-	}
-	out, err := execGroups(currentUser)
-	if err == nil && strings.Contains(out, "input") {
-		fmt.Printf("✓ %s is already in the input group (Caps Lock OSD enabled)\n", currentUser)
-		return
-	}
-	fmt.Println("Adding user to input group for Caps Lock OSD support...")
-	if err := privesc.Run(context.Background(), "", "usermod", "-aG", "input", currentUser); err != nil {
-		fmt.Printf("⚠ Could not add %s to input group (Caps Lock OSD will be unavailable): %v\n", currentUser, err)
-	} else {
-		fmt.Printf("✓ Added %s to input group (logout/login required to take effect)\n", currentUser)
-	}
-}
-
-func execGroups(user string) (string, error) {
-	out, err := exec.Command("groups", user).Output()
-	return string(out), err
-}
-
 func promptCompositor() (deps.WindowManager, bool) {
 	fmt.Println("Select compositor:")
 	fmt.Println("1) Niri")

core/cmd/dms/commands_system.go

@@ -1,277 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate"
-	"github.com/spf13/cobra"
-)
-
-var systemCmd = &cobra.Command{
-	Use:   "system",
-	Short: "System operations",
-	Long:  "System-level operations (updates, etc.). Runs against installed package managers directly; does not require the DMS server.",
-}
-
-var systemUpdateCmd = &cobra.Command{
-	Use:   "update",
-	Short: "Apply or list system updates",
-	Long: `Apply or list system updates across detected package managers.
-
-Default behavior is to apply available updates after prompting for confirmation.
-Use --check to list updates without applying.
-
-Examples:
-  dms system update --check                  # list available updates
-  dms system update                          # apply updates (interactive prompt)
-  dms system update --noconfirm              # apply updates without prompting
-  dms system update --dry                    # simulate without changing anything
-  dms system update --no-flatpak --noconfirm # apply system updates only
-  dms system update --interval 3600          # set the server poll interval to 1h`,
-	Run: runSystemUpdate,
-}
-
-var (
-	sysUpdateCheck      bool
-	sysUpdateNoConfirm  bool
-	sysUpdateDry        bool
-	sysUpdateJSON       bool
-	sysUpdateNoFlatpak  bool
-	sysUpdateNoAUR      bool
-	sysUpdateIntervalS  int
-	sysUpdateListPmTime = 5 * time.Minute
-)
-
-func init() {
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateCheck, "check", false, "List available updates without applying")
-	systemUpdateCmd.Flags().BoolVarP(&sysUpdateNoConfirm, "noconfirm", "y", false, "Apply updates without prompting")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateDry, "dry", false, "Simulate the upgrade without applying changes")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateJSON, "json", false, "Output as JSON (with --check)")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateNoFlatpak, "no-flatpak", false, "Skip the Flatpak overlay")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateNoAUR, "no-aur", false, "Skip the AUR (paru/yay only)")
-	systemUpdateCmd.Flags().IntVar(&sysUpdateIntervalS, "interval", -1, "Set the DMS server poll interval in seconds and exit (requires running server)")
-
-	systemCmd.AddCommand(systemUpdateCmd)
-}
-
-func runSystemUpdate(cmd *cobra.Command, args []string) {
-	switch {
-	case sysUpdateIntervalS >= 0:
-		runSystemUpdateSetInterval(sysUpdateIntervalS)
-	case sysUpdateCheck:
-		runSystemUpdateCheck()
-	default:
-		runSystemUpdateApply()
-	}
-}
-
-func selectBackends(ctx context.Context) []sysupdate.Backend {
-	sel := sysupdate.Select(ctx)
-	backends := sel.All()
-	if !sysUpdateNoFlatpak {
-		return backends
-	}
-	out := backends[:0]
-	for _, b := range backends {
-		if b.Repo() == sysupdate.RepoFlatpak {
-			continue
-		}
-		out = append(out, b)
-	}
-	return out
-}
-
-func runSystemUpdateCheck() {
-	ctx, cancel := context.WithTimeout(context.Background(), sysUpdateListPmTime)
-	defer cancel()
-
-	backends := selectBackends(ctx)
-	if len(backends) == 0 {
-		log.Fatal("No supported package manager found")
-	}
-
-	type backendResult struct {
-		ID       string              `json:"id"`
-		Display  string              `json:"displayName"`
-		Packages []sysupdate.Package `json:"packages"`
-	}
-	var results []backendResult
-	var allPkgs []sysupdate.Package
-	var firstErr error
-
-	for _, b := range backends {
-		pkgs, err := b.CheckUpdates(ctx)
-		if err != nil && firstErr == nil {
-			firstErr = fmt.Errorf("%s: %w", b.ID(), err)
-		}
-		results = append(results, backendResult{ID: b.ID(), Display: b.DisplayName(), Packages: pkgs})
-		allPkgs = append(allPkgs, pkgs...)
-	}
-
-	if sysUpdateJSON {
-		out, _ := json.MarshalIndent(map[string]any{
-			"backends": results,
-			"packages": allPkgs,
-			"error":    errOrEmpty(firstErr),
-			"count":    len(allPkgs),
-		}, "", "  ")
-		fmt.Println(string(out))
-		return
-	}
-
-	printBackends(backends)
-	fmt.Printf("Updates: %d\n", len(allPkgs))
-	if firstErr != nil {
-		fmt.Printf("Error:   %v\n", firstErr)
-	}
-	if len(allPkgs) == 0 {
-		return
-	}
-	fmt.Println()
-	for _, p := range allPkgs {
-		fmt.Printf("  [%s] %s  %s -> %s\n", p.Repo, p.Name, defaultIfEmpty(p.FromVersion, "?"), defaultIfEmpty(p.ToVersion, "?"))
-	}
-}
-
-func runSystemUpdateApply() {
-	checkCtx, checkCancel := context.WithTimeout(context.Background(), sysUpdateListPmTime)
-	defer checkCancel()
-
-	backends := selectBackends(checkCtx)
-	if len(backends) == 0 {
-		log.Fatal("No supported package manager found")
-	}
-
-	pkgs, firstErr := collectUpdates(checkCtx, backends)
-	if firstErr != nil {
-		fmt.Printf("Warning: %v\n\n", firstErr)
-	}
-
-	printBackends(backends)
-	fmt.Printf("Updates: %d\n", len(pkgs))
-	if len(pkgs) == 0 {
-		fmt.Println("Nothing to upgrade.")
-		return
-	}
-	fmt.Println()
-	for _, p := range pkgs {
-		fmt.Printf("  [%s] %s  %s -> %s\n", p.Repo, p.Name, defaultIfEmpty(p.FromVersion, "?"), defaultIfEmpty(p.ToVersion, "?"))
-	}
-	fmt.Println()
-
-	if !sysUpdateNoConfirm && !sysUpdateDry {
-		if !promptYesNo("Proceed with upgrade? [y/N]: ") {
-			fmt.Println("Aborted.")
-			return
-		}
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
-	defer cancel()
-
-	opts := sysupdate.UpgradeOptions{
-		IncludeFlatpak: !sysUpdateNoFlatpak,
-		IncludeAUR:     !sysUpdateNoAUR,
-		DryRun:         sysUpdateDry,
-	}
-
-	onLine := func(line string) { fmt.Println(line) }
-	for _, b := range backends {
-		fmt.Printf("\n== %s ==\n", b.DisplayName())
-		if err := b.Upgrade(ctx, opts, onLine); err != nil {
-			log.Fatalf("%s upgrade failed: %v", b.ID(), err)
-		}
-	}
-	if sysUpdateDry {
-		fmt.Println("\nDry run complete (no changes applied).")
-		return
-	}
-	fmt.Println("\nUpgrade complete.")
-}
-
-func collectUpdates(ctx context.Context, backends []sysupdate.Backend) ([]sysupdate.Package, error) {
-	var all []sysupdate.Package
-	var firstErr error
-	for _, b := range backends {
-		pkgs, err := b.CheckUpdates(ctx)
-		if err != nil && firstErr == nil {
-			firstErr = fmt.Errorf("%s: %w", b.ID(), err)
-		}
-		all = append(all, pkgs...)
-	}
-	return all, firstErr
-}
-
-func runSystemUpdateSetInterval(seconds int) {
-	resp, err := sendServerRequest(models.Request{
-		ID:     1,
-		Method: "sysupdate.setInterval",
-		Params: map[string]any{"seconds": float64(seconds)},
-	})
-	if err != nil {
-		log.Fatalf("Failed: %v (is dms server running?)", err)
-	}
-	if resp.Error != "" {
-		log.Fatalf("Error: %s", resp.Error)
-	}
-	fmt.Printf("Interval set to %d seconds.\n", seconds)
-}
-
-func promptYesNo(prompt string) bool {
-	if !stdinIsTTY() {
-		log.Fatal("Refusing to apply updates non-interactively. Re-run with --noconfirm or --check.")
-	}
-	fmt.Print(prompt)
-	reader := bufio.NewReader(os.Stdin)
-	line, err := reader.ReadString('\n')
-	if err != nil {
-		return false
-	}
-	switch strings.ToLower(strings.TrimSpace(line)) {
-	case "y", "yes":
-		return true
-	default:
-		return false
-	}
-}
-
-func printBackends(backends []sysupdate.Backend) {
-	if len(backends) == 0 {
-		return
-	}
-	names := make([]string, 0, len(backends))
-	for _, b := range backends {
-		names = append(names, b.DisplayName())
-	}
-	fmt.Printf("Backends: %s\n", strings.Join(names, ", "))
-}
-
-func stdinIsTTY() bool {
-	fi, err := os.Stdin.Stat()
-	if err != nil {
-		return false
-	}
-	return (fi.Mode() & os.ModeCharDevice) != 0
-}
-
-func errOrEmpty(err error) string {
-	if err == nil {
-		return ""
-	}
-	return err.Error()
-}
-
-func defaultIfEmpty(s, def string) string {
-	if s == "" {
-		return def
-	}
-	return s
-}

core/cmd/dms/commands_trash.go

@@ -1,122 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/trash"
-	"github.com/spf13/cobra"
-)
-
-var trashCmd = &cobra.Command{
-	Use:   "trash",
-	Short: "Manage the user's trash (XDG Trash spec 1.0)",
-}
-
-var trashPutCmd = &cobra.Command{
-	Use:   "put <path...>",
-	Short: "Move files or directories into the trash",
-	Args:  cobra.MinimumNArgs(1),
-	Run:   runTrashPut,
-}
-
-var trashListCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List trashed items across all known trash directories",
-	Run:   runTrashList,
-}
-
-var trashCountCmd = &cobra.Command{
-	Use:   "count",
-	Short: "Print the total number of trashed items",
-	Run:   runTrashCount,
-}
-
-var trashEmptyCmd = &cobra.Command{
-	Use:   "empty",
-	Short: "Permanently delete every trashed item",
-	Run:   runTrashEmpty,
-}
-
-var trashRestoreCmd = &cobra.Command{
-	Use:   "restore <name>",
-	Short: "Restore a trashed item to its original location",
-	Args:  cobra.ExactArgs(1),
-	Run:   runTrashRestore,
-}
-
-var (
-	trashJSONOutput bool
-	trashRestoreDir string
-)
-
-func init() {
-	trashListCmd.Flags().BoolVar(&trashJSONOutput, "json", false, "Output as JSON")
-	trashRestoreCmd.Flags().StringVar(&trashRestoreDir, "trash-dir", "", "Trash directory containing the item (default: home trash)")
-	trashCmd.AddCommand(trashPutCmd, trashListCmd, trashCountCmd, trashEmptyCmd, trashRestoreCmd)
-}
-
-func runTrashPut(cmd *cobra.Command, args []string) {
-	var failed int
-	for _, p := range args {
-		if _, err := trash.Put(p); err != nil {
-			log.Errorf("trash %s: %v", p, err)
-			failed++
-			continue
-		}
-		fmt.Println(p)
-	}
-	if failed > 0 {
-		os.Exit(1)
-	}
-}
-
-func runTrashList(cmd *cobra.Command, args []string) {
-	entries, err := trash.List()
-	if err != nil {
-		log.Fatalf("list trash: %v", err)
-	}
-
-	if trashJSONOutput {
-		if entries == nil {
-			entries = []trash.Entry{}
-		}
-		out, _ := json.MarshalIndent(entries, "", "  ")
-		fmt.Println(string(out))
-		return
-	}
-
-	if len(entries) == 0 {
-		fmt.Println("Trash is empty")
-		return
-	}
-	for _, e := range entries {
-		marker := "F"
-		if e.IsDir {
-			marker = "D"
-		}
-		fmt.Printf("%s  %s  %s  %s\n", marker, e.DeletionDate, e.Name, e.OriginalPath)
-	}
-}
-
-func runTrashCount(cmd *cobra.Command, args []string) {
-	n, err := trash.Count()
-	if err != nil {
-		log.Fatalf("count trash: %v", err)
-	}
-	fmt.Println(n)
-}
-
-func runTrashEmpty(cmd *cobra.Command, args []string) {
-	if err := trash.Empty(); err != nil {
-		log.Fatalf("empty trash: %v", err)
-	}
-}
-
-func runTrashRestore(cmd *cobra.Command, args []string) {
-	if err := trash.Restore(args[0], trashRestoreDir); err != nil {
-		log.Fatalf("restore: %v", err)
-	}
-}

core/cmd/dms/main.go

@@ -15,8 +15,6 @@ func init() {
 	runCmd.Flags().BoolP("daemon", "d", false, "Run in daemon mode")
 	runCmd.Flags().Bool("daemon-child", false, "Internal flag for daemon child process")
 	runCmd.Flags().Bool("session", false, "Session managed (like as a systemd unit)")
-	runCmd.Flags().String("log-level", "", "Log level: debug, info, warn, error, fatal (overrides DMS_LOG_LEVEL)")
-	runCmd.Flags().String("log-file", "", "Append logs to this file in addition to stderr (overrides DMS_LOG_FILE)")
 	runCmd.Flags().MarkHidden("daemon-child")
 
 	greeterCmd.AddCommand(greeterInstallCmd, greeterSyncCmd, greeterEnableCmd, greeterStatusCmd, greeterUninstallCmd)

core/cmd/dms/main_distro.go

@@ -15,8 +15,6 @@ func init() {
 	runCmd.Flags().BoolP("daemon", "d", false, "Run in daemon mode")
 	runCmd.Flags().Bool("daemon-child", false, "Internal flag for daemon child process")
 	runCmd.Flags().Bool("session", false, "Session managed (like as a systemd unit)")
-	runCmd.Flags().String("log-level", "", "Log level: debug, info, warn, error, fatal (overrides DMS_LOG_LEVEL)")
-	runCmd.Flags().String("log-file", "", "Append logs to this file in addition to stderr (overrides DMS_LOG_FILE)")
 	runCmd.Flags().MarkHidden("daemon-child")
 
 	greeterCmd.AddCommand(greeterInstallCmd, greeterSyncCmd, greeterEnableCmd, greeterStatusCmd, greeterUninstallCmd)

core/cmd/dms/shell.go

@@ -80,16 +80,6 @@ func getRuntimeDir() string {
 	return os.TempDir()
 }
 
-func appendLogEnv(env []string) []string {
-	if v := os.Getenv("DMS_LOG_LEVEL"); v != "" {
-		env = append(env, "DMS_LOG_LEVEL="+v)
-	}
-	if v := os.Getenv("DMS_LOG_FILE"); v != "" {
-		env = append(env, "DMS_LOG_FILE="+v)
-	}
-	return env
-}
-
 func hasSystemdRun() bool {
 	_, err := exec.LookPath("systemd-run")
 	return err == nil
@@ -226,8 +216,6 @@ func runShellInteractive(session bool) {
 		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORM=wayland;xcb")
 	}
 
-	cmd.Env = appendLogEnv(cmd.Env)
-
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -471,8 +459,6 @@ func runShellDaemon(session bool) {
 		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORM=wayland;xcb")
 	}
 
-	cmd.Env = appendLogEnv(cmd.Env)
-
 	devNull, err := os.OpenFile("/dev/null", os.O_RDWR, 0)
 	if err != nil {
 		log.Fatalf("Error opening /dev/null: %v", err)

core/go.mod

@@ -6,11 +6,11 @@ toolchain go1.26.1
 
 require (
 	github.com/Wifx/gonetworkmanager/v2 v2.2.0
-	github.com/alecthomas/chroma/v2 v2.24.0
+	github.com/alecthomas/chroma/v2 v2.23.1
 	github.com/charmbracelet/bubbles v1.0.0
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/charmbracelet/log v1.0.0
+	github.com/charmbracelet/log v0.4.2
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/godbus/dbus/v5 v5.2.2
 	github.com/holoplot/go-evdev v0.0.0-20250804134636-ab1d56a1fe83
@@ -20,27 +20,28 @@ require (
 	github.com/stretchr/testify v1.11.1
 	github.com/yeqown/go-qrcode/v2 v2.2.5
 	github.com/yeqown/go-qrcode/writer/standard v1.3.0
-	github.com/yuin/goldmark v1.8.2
+	github.com/yuin/goldmark v1.7.16
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	go.etcd.io/bbolt v1.4.3
-	golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
-	golang.org/x/image v0.39.0
+	golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a
+	golang.org/x/image v0.36.0
 )
 
 require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.4.1 // indirect
-	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/ProtonMail/go-crypto v1.3.0 // indirect
+	github.com/clipperhouse/displaywidth v0.10.0 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/cloudflare/circl v1.6.3 // indirect
 	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
-	github.com/dlclark/regexp2 v1.12.0 // indirect
+	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fogleman/gg v1.3.0 // indirect
 	github.com/go-git/gcfg/v2 v2.0.2 // indirect
-	github.com/go-git/go-billy/v6 v6.0.0-20260424211911-732291493fb8 // indirect
+	github.com/go-git/go-billy/v6 v6.0.0-20260209124918-37866f83c2d3 // indirect
 	github.com/go-logfmt/logfmt v0.6.1 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/kevinburke/ssh_config v1.6.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/pjbgf/sha1cd v0.5.0 // indirect
@@ -48,37 +49,36 @@ require (
 	github.com/sergi/go-diff v1.4.0 // indirect
 	github.com/stretchr/objx v0.5.3 // indirect
 	github.com/yeqown/reedsolomon v1.0.0 // indirect
-	golang.org/x/crypto v0.50.0 // indirect
-	golang.org/x/net v0.53.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/net v0.50.0 // indirect
 )
 
 require (
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	github.com/charmbracelet/colorprofile v0.4.3 // indirect
+	github.com/charmbracelet/colorprofile v0.4.2 // indirect
 	github.com/charmbracelet/harmonica v0.2.0 // indirect
-	github.com/charmbracelet/x/ansi v0.11.7 // indirect
+	github.com/charmbracelet/x/ansi v0.11.6 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
-	github.com/go-git/go-git/v6 v6.0.0-alpha.2
+	github.com/go-git/go-git/v6 v6.0.0-20260216160506-e6a3f881772f
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.4.0
-	github.com/mattn/go-isatty v0.0.22
+	github.com/lucasb-eyer/go-colorful v1.3.0
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.23 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/muesli/termenv v0.16.0
+	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/afero v1.15.0
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/sys v0.43.0
-	golang.org/x/text v0.36.0
+	golang.org/x/sys v0.41.0
+	golang.org/x/text v0.34.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 

core/go.sum

@@ -1,14 +1,14 @@
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67IQOfM=
-github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
 github.com/Wifx/gonetworkmanager/v2 v2.2.0 h1:kPstgsQtY8CmDOOFZd81ytM9Gi3f6ImzPCKF7nNhQ2U=
 github.com/Wifx/gonetworkmanager/v2 v2.2.0/go.mod h1:fMDb//SHsKWxyDUAwXvCqurV3npbIyyaQWenGpZ/uXg=
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
 github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
-github.com/alecthomas/chroma/v2 v2.24.0 h1:zrg+k0tAaVbM8whaT2hR5DOUqAdopsDaH998EGi6Llk=
-github.com/alecthomas/chroma/v2 v2.24.0/go.mod h1:l+ohZ9xRXIbGe7cIW+YZgOGbvuVLjMps/FYN/CwuabI=
+github.com/alecthomas/chroma/v2 v2.23.1 h1:nv2AVZdTyClGbVQkIzlDm/rnhk1E9bU9nXwmZ/Vk/iY=
+github.com/alecthomas/chroma/v2 v2.23.1/go.mod h1:NqVhfBR0lte5Ouh3DcthuUCTUpDC9cxBOfyMbMQPs3o=
 github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
 github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
@@ -24,22 +24,22 @@ github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5f
 github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
 github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
 github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
-github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
-github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
+github.com/charmbracelet/colorprofile v0.4.2 h1:BdSNuMjRbotnxHSfxy+PCSa4xAmz7szw70ktAtWRYrY=
+github.com/charmbracelet/colorprofile v0.4.2/go.mod h1:0rTi81QpwDElInthtrQ6Ni7cG0sDtwAd4C4le060fT8=
 github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
 github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/log v1.0.0 h1:HVVVMmfOorfj3BA9i8X8UL69Hoz9lI0PYwXfJvOdRc4=
-github.com/charmbracelet/log v1.0.0/go.mod h1:uYgY3SmLpwJWxmlrPwXvzVYujxis1vAKRV/0VQB7yWA=
-github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
-github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
+github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
+github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
+github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
+github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
 github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
 github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
 github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
 github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
-github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
-github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
+github.com/clipperhouse/displaywidth v0.10.0 h1:GhBG8WuerxjFQQYeuZAeVTuyxuX+UraiZGD4HJQ3Y8g=
+github.com/clipperhouse/displaywidth v0.10.0/go.mod h1:XqJajYsaiEwkxOj4bowCTMcT1SgvHo9flfF3jQasdbs=
 github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
 github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
@@ -52,8 +52,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8=
-github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
+github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
@@ -66,12 +66,12 @@ github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo=
 github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs=
-github.com/go-git/go-billy/v6 v6.0.0-20260424211911-732291493fb8 h1:QRpwB1ans3fB3Cmeuog1ATzvXg/xhqubqiQi97xNO6E=
-github.com/go-git/go-billy/v6 v6.0.0-20260424211911-732291493fb8/go.mod h1:CdBVp7CXl9l3sOyNEog46cP1Pvx/hjCe9AD0mtaIUYU=
-github.com/go-git/go-git-fixtures/v6 v6.0.0-20260405195209-b16dd39735e0 h1:XoTsdvaghuVfIr7HpNTmFDLu2nz3I2iGqyn6Uk6MkJc=
-github.com/go-git/go-git-fixtures/v6 v6.0.0-20260405195209-b16dd39735e0/go.mod h1:1Lr7/vYEYyl6Ir9Ku0tKrCIRreM5zovv0Jdx2MPSM4s=
-github.com/go-git/go-git/v6 v6.0.0-alpha.2 h1:T3loNtDuAixNzXtlQxZhnYiYpaQ3CA4vn9RssAniEeI=
-github.com/go-git/go-git/v6 v6.0.0-alpha.2/go.mod h1:oCD3i19CTz7gBpeb11ZZqL91WzqbMq9avn5KpUYy/Ak=
+github.com/go-git/go-billy/v6 v6.0.0-20260209124918-37866f83c2d3 h1:UU7oARtwQ5g85aFiCSwIUA6PBmAshYj0sytl/5CCBgs=
+github.com/go-git/go-billy/v6 v6.0.0-20260209124918-37866f83c2d3/go.mod h1:ZW9JC5gionMP1kv5uiaOaV23q0FFmNrVOV8VW+y/acc=
+github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260122163445-0622d7459a67 h1:3hutPZF+/FBjR/9MdsLJ7e1mlt9pwHgwxMW7CrbmWII=
+github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260122163445-0622d7459a67/go.mod h1:xKt0pNHST9tYHvbiLxSY27CQWFwgIxBJuDrOE0JvbZw=
+github.com/go-git/go-git/v6 v6.0.0-20260216160506-e6a3f881772f h1:TBkCJv9YwPOuXq1OG0r01bcxRrvs15Hp/DtZuPt4H6s=
+github.com/go-git/go-git/v6 v6.0.0-20260216160506-e6a3f881772f/go.mod h1:B88nWzfnhTlIikoJ4d84Nc9noKS5mJoA7SgDdkt0aPU=
 github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE=
 github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -79,6 +79,8 @@ github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
 github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -93,20 +95,20 @@ github.com/kevinburke/ssh_config v1.6.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7Dmvb
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
-github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
-github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
+github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
+github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 h1:P8UmIzZMYDR+NGImiFvErt6VWfIRPuGM+vyjiEdkmIw=
 github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
-github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw=
-github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
+github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -123,8 +125,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sblinch/kdl-go v0.0.0-20260121213736-8b7053306ca6 h1:JsjzqC6ymELkN4XlTjZPSahSAem21GySugLbKz6uF5E=
 github.com/sblinch/kdl-go v0.0.0-20260121213736-8b7053306ca6/go.mod h1:b3oNGuAKOQzhsCKmuLc/urEOPzgHj6fB8vl8bwTBh28=
@@ -153,33 +155,35 @@ github.com/yeqown/go-qrcode/writer/standard v1.3.0/go.mod h1:O4MbzsotGCvy8upYPCR
 github.com/yeqown/reedsolomon v1.0.0 h1:x1h/Ej/uJnNu8jaX7GLHBWmZKCAWjEJTetkqaabr4B0=
 github.com/yeqown/reedsolomon v1.0.0/go.mod h1:P76zpcn2TCuL0ul1Fso373qHRc69LKwAw/Iy6g1WiiM=
 github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
-github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+github.com/yuin/goldmark v1.7.16 h1:n+CJdUxaFMiDUNnWC3dMWCIQJSkxH4uz3ZwQBkAlVNE=
+github.com/yuin/goldmark v1.7.16/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ=
 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I=
 go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
 go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
-golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
-golang.org/x/image v0.39.0 h1:skVYidAEVKgn8lZ602XO75asgXBgLj9G/FE3RbuPFww=
-golang.org/x/image v0.39.0/go.mod h1:sIbmppfU+xFLPIG0FoVUTvyBMmgng1/XAMhQ2ft0hpA=
-golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
-golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
+golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a h1:ovFr6Z0MNmU7nH8VaX5xqw+05ST2uO1exVfZPVqRC5o=
+golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
+golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
+golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
+golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
+golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
-golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
+golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
+golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

core/internal/log/log.go

@@ -1,16 +1,12 @@
 package log
 
 import (
-	"io"
 	"os"
-	"regexp"
 	"strings"
 	"sync"
 
 	"github.com/charmbracelet/lipgloss"
 	cblog "github.com/charmbracelet/log"
-	"github.com/mattn/go-isatty"
-	"github.com/muesli/termenv"
 )
 
 // Logger embeds the Charm Logger and adds Printf/Fatalf
@@ -25,26 +21,8 @@ func (l *Logger) Fatalf(format string, v ...any) { l.Logger.Fatalf(format, v...)
 var (
 	logger     *Logger
 	initLogger sync.Once
-
-	logMu     sync.Mutex
-	logFile   *os.File
-	logStderr io.Writer = os.Stderr
-
-	ansiRe = regexp.MustCompile(`\x1b\[[0-9;]*[a-zA-Z]`)
 )
 
-// ansiStripWriter strips ANSI escape sequences before forwarding to w. Used
-// for the file sink so colored stderr stays colored while the file stays plain.
-type ansiStripWriter struct{ w io.Writer }
-
-func (a *ansiStripWriter) Write(p []byte) (int, error) {
-	stripped := ansiRe.ReplaceAll(p, nil)
-	if _, err := a.w.Write(stripped); err != nil {
-		return 0, err
-	}
-	return len(p), nil
-}
-
 func parseLogLevel(level string) cblog.Level {
 	switch strings.ToLower(level) {
 	case "debug":
@@ -108,7 +86,7 @@ func GetLogger() *Logger {
 			SetString(" DEBUG").
 			Foreground(lipgloss.Color("4"))
 
-		base := cblog.New(logStderr)
+		base := cblog.New(os.Stderr)
 		base.SetStyles(styles)
 		base.SetReportTimestamp(false)
 
@@ -120,85 +98,10 @@ func GetLogger() *Logger {
 		base.SetPrefix(" go")
 
 		logger = &Logger{base}
-
-		if path := os.Getenv("DMS_LOG_FILE"); path != "" {
-			_ = SetLogFile(path)
-		}
 	})
 	return logger
 }
 
-// SetLevel updates the active log level. Accepts the same strings as
-// DMS_LOG_LEVEL. Unknown values default to info.
-func SetLevel(level string) {
-	GetLogger().SetLevel(parseLogLevel(level))
-}
-
-// SetLogFile makes the logger append to path in addition to stderr. Passing an
-// empty string detaches the file sink. Atomic per-line writes (≤PIPE_BUF) on
-// O_APPEND keep concurrent Go and QML writers from corrupting each other.
-//
-// Color handling: charmbracelet/log auto-detects color support from its
-// io.Writer, and io.MultiWriter doesn't pass that through, so we force the ANSI
-// profile when stderr is a TTY and route the file through ansiStripWriter so
-// the file stays plain while stderr keeps its colors.
-func SetLogFile(path string) error {
-	logMu.Lock()
-	defer logMu.Unlock()
-
-	if logFile != nil {
-		logFile.Close()
-		logFile = nil
-	}
-
-	l := GetLogger()
-	if path == "" {
-		l.SetOutput(logStderr)
-		applyColorProfile(l, logStderr)
-		return nil
-	}
-
-	f, err := os.OpenFile(path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0o644)
-	if err != nil {
-		return err
-	}
-	logFile = f
-	out := io.MultiWriter(logStderr, &ansiStripWriter{w: f})
-	l.SetOutput(out)
-	applyColorProfile(l, logStderr)
-	return nil
-}
-
-// applyColorProfile forces the renderer's color profile to match what stderr
-// would produce on its own, undoing the auto-downgrade triggered by wrapping
-// stderr in a non-TTY writer (e.g. io.MultiWriter).
-func applyColorProfile(l *Logger, stderr io.Writer) {
-	f, ok := stderr.(*os.File)
-	if !ok {
-		l.SetColorProfile(termenv.Ascii)
-		return
-	}
-	if isatty.IsTerminal(f.Fd()) {
-		l.SetColorProfile(termenv.ANSI)
-		return
-	}
-	l.SetColorProfile(termenv.Ascii)
-}
-
-// ApplyEnvOverrides re-reads DMS_LOG_LEVEL and DMS_LOG_FILE and reconfigures
-// the singleton. Safe to call after CLI flags have rewritten the environment.
-func ApplyEnvOverrides() {
-	GetLogger()
-	if level := os.Getenv("DMS_LOG_LEVEL"); level != "" {
-		SetLevel(level)
-	}
-	if path := os.Getenv("DMS_LOG_FILE"); path != "" {
-		if err := SetLogFile(path); err != nil {
-			Warnf("Failed to open log file %q: %v", path, err)
-		}
-	}
-}
-
 // * Convenience wrappers
 
 func Debug(msg any, keyvals ...any)  { GetLogger().Debug(msg, keyvals...) }

core/internal/matugen/matugen.go

@@ -60,7 +60,6 @@ var templateRegistry = []TemplateDef{
 	{ID: "pywalfox", Commands: []string{"pywalfox"}, ConfigFile: "pywalfox.toml"},
 	{ID: "zenbrowser", Commands: []string{"zen", "zen-browser", "zen-beta", "zen-twilight"}, Flatpaks: []string{"app.zen_browser.zen"}, ConfigFile: "zenbrowser.toml"},
 	{ID: "vesktop", Commands: []string{"vesktop"}, Flatpaks: []string{"dev.vencord.Vesktop"}, ConfigFile: "vesktop.toml"},
-	{ID: "vencord", Commands: []string{"discord", "Discord", "discord-canary", "DiscordCanary"}, Flatpaks: []string{"com.discordapp.Discord", "com.discordapp.DiscordCanary"}, ConfigFile: "vencord.toml"},
 	{ID: "equibop", Commands: []string{"equibop"}, ConfigFile: "equibop.toml"},
 	{ID: "ghostty", Commands: []string{"ghostty"}, ConfigFile: "ghostty.toml", Kind: TemplateKindTerminal},
 	{ID: "kitty", Commands: []string{"kitty"}, ConfigFile: "kitty.toml", Kind: TemplateKindTerminal},

core/internal/server/clipboard/manager.go

@@ -212,10 +212,9 @@ func (m *Manager) setupDataDeviceSync() {
 		}
 
 		var offer any
-		switch {
-		case e.Id != nil:
+		if e.Id != nil {
 			offer = e.Id
-		case e.OfferId != 0:
+		} else if e.OfferId != 0 {
 			m.offerMutex.RLock()
 			offer = m.offerRegistry[e.OfferId]
 			m.offerMutex.RUnlock()
@@ -225,6 +224,10 @@ func (m *Manager) setupDataDeviceSync() {
 		wasOwner := m.isOwner
 		m.ownerLock.Unlock()
 
+		if offer == nil {
+			return
+		}
+
 		if wasOwner {
 			return
 		}
@@ -233,11 +236,9 @@ func (m *Manager) setupDataDeviceSync() {
 		m.currentOffer = offer
 
 		if prevOffer != nil && prevOffer != offer {
-			m.releaseOffer(prevOffer)
-		}
-
-		if offer == nil {
-			return
+			m.offerMutex.Lock()
+			delete(m.offerMimeTypes, prevOffer)
+			m.offerMutex.Unlock()
 		}
 
 		m.offerMutex.RLock()
@@ -291,33 +292,6 @@ func (m *Manager) setupDataDeviceSync() {
 	log.Info("Data device setup complete")
 }
 
-func (m *Manager) releaseOffer(offer any) {
-	if offer == nil {
-		return
-	}
-	typedOffer, ok := offer.(*ext_data_control.ExtDataControlOfferV1)
-	if !ok {
-		return
-	}
-	m.offerMutex.Lock()
-	delete(m.offerMimeTypes, offer)
-	delete(m.offerRegistry, typedOffer.ID())
-	m.offerMutex.Unlock()
-	typedOffer.Destroy()
-}
-
-func (m *Manager) releaseCurrentSource() {
-	if m.currentSource == nil {
-		return
-	}
-	source, ok := m.currentSource.(*ext_data_control.ExtDataControlSourceV1)
-	m.currentSource = nil
-	if !ok {
-		return
-	}
-	source.Destroy()
-}
-
 func (m *Manager) readAndStore(r *os.File, mimeType string) {
 	defer r.Close()
 
@@ -421,7 +395,7 @@ func (m *Manager) deduplicateInTx(b *bolt.Bucket, hash uint64) error {
 		if extractHash(v) != hash {
 			continue
 		}
-		entry, err := decodeEntryMeta(v)
+		entry, err := decodeEntry(v)
 		if err == nil && entry.Pinned {
 			continue
 		}
@@ -439,7 +413,7 @@ func (m *Manager) trimLengthInTx(b *bolt.Bucket) error {
 	c := b.Cursor()
 	var count int
 	for k, v := c.Last(); k != nil; k, v = c.Prev() {
-		entry, err := decodeEntryMeta(v)
+		entry, err := decodeEntry(v)
 		if err == nil && entry.Pinned {
 			continue
 		}
@@ -482,14 +456,6 @@ func encodeEntry(e Entry) ([]byte, error) {
 }
 
 func decodeEntry(data []byte) (Entry, error) {
-	return decodeEntryFields(data, true)
-}
-
-func decodeEntryMeta(data []byte) (Entry, error) {
-	return decodeEntryFields(data, false)
-}
-
-func decodeEntryFields(data []byte, withData bool) (Entry, error) {
 	buf := bytes.NewReader(data)
 	var e Entry
 
@@ -497,15 +463,8 @@ func decodeEntryFields(data []byte, withData bool) (Entry, error) {
 
 	var dataLen uint32
 	binary.Read(buf, binary.BigEndian, &dataLen)
-	switch {
-	case withData:
-		e.Data = make([]byte, dataLen)
-		buf.Read(e.Data)
-	default:
-		if _, err := buf.Seek(int64(dataLen), io.SeekCurrent); err != nil {
-			return e, err
-		}
-	}
+	e.Data = make([]byte, dataLen)
+	buf.Read(e.Data)
 
 	var mimeLen uint32
 	binary.Read(buf, binary.BigEndian, &mimeLen)
@@ -709,9 +668,14 @@ func sizeStr(size int) string {
 func (m *Manager) updateState() {
 	history := m.GetHistory()
 
+	for i := range history {
+		history[i].Data = nil
+	}
+
 	var current *Entry
 	if len(history) > 0 {
 		c := history[0]
+		c.Data = nil
 		current = &c
 	}
 
@@ -786,7 +750,7 @@ func (m *Manager) GetHistory() []Entry {
 		c := b.Cursor()
 
 		for k, v := c.Last(); k != nil; k, v = c.Prev() {
-			entry, err := decodeEntryMeta(v)
+			entry, err := decodeEntry(v)
 			if err != nil {
 				continue
 			}
@@ -971,7 +935,7 @@ func (m *Manager) ClearHistory() {
 		var toDelete [][]byte
 		c := b.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
-			entry, err := decodeEntryMeta(v)
+			entry, err := decodeEntry(v)
 			if err != nil || !entry.Pinned {
 				toDelete = append(toDelete, k)
 			}
@@ -994,7 +958,7 @@ func (m *Manager) ClearHistory() {
 		if b != nil {
 			c := b.Cursor()
 			for k, v := c.First(); k != nil; k, v = c.Next() {
-				entry, _ := decodeEntryMeta(v)
+				entry, _ := decodeEntry(v)
 				if entry.Pinned {
 					pinnedCount++
 				}
@@ -1102,7 +1066,6 @@ func (m *Manager) SetClipboard(data []byte, mimeType string) error {
 			m.ownerLock.Unlock()
 		})
 
-		m.releaseCurrentSource()
 		m.currentSource = source
 		m.sourceMutex.Lock()
 		m.sourceMimeTypes = []string{mimeType}
@@ -1182,11 +1145,9 @@ func (m *Manager) Close() {
 	m.subscribers = make(map[string]chan State)
 	m.subMutex.Unlock()
 
-	m.releaseCurrentSource()
-
-	if m.currentOffer != nil {
-		m.releaseOffer(m.currentOffer)
-		m.currentOffer = nil
+	if m.currentSource != nil {
+		source := m.currentSource.(*ext_data_control.ExtDataControlSourceV1)
+		source.Destroy()
 	}
 
 	if m.dataDevice != nil {
@@ -1230,10 +1191,11 @@ func (m *Manager) clearOldEntries(days int) error {
 		var toDelete [][]byte
 		c := b.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
-			entry, err := decodeEntryMeta(v)
+			entry, err := decodeEntry(v)
 			if err != nil {
 				continue
 			}
+			// Skip pinned entries
 			if entry.Pinned {
 				continue
 			}
@@ -1348,7 +1310,7 @@ func (m *Manager) Search(params SearchParams) SearchResult {
 
 		c := b.Cursor()
 		for k, v := c.Last(); k != nil; k, v = c.Prev() {
-			entry, err := decodeEntryMeta(v)
+			entry, err := decodeEntry(v)
 			if err != nil {
 				continue
 			}
@@ -1373,6 +1335,7 @@ func (m *Manager) Search(params SearchParams) SearchResult {
 				continue
 			}
 
+			entry.Data = nil
 			all = append(all, entry)
 		}
 		return nil
@@ -1547,7 +1510,7 @@ func (m *Manager) PinEntry(id uint64) error {
 		}
 		c := b.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
-			entry, err := decodeEntryMeta(v)
+			entry, err := decodeEntry(v)
 			if err != nil || !entry.Pinned {
 				continue
 			}
@@ -1565,6 +1528,7 @@ func (m *Manager) PinEntry(id uint64) error {
 		return nil
 	}
 
+	// Check pinned count
 	cfg := m.getConfig()
 	pinnedCount := 0
 	if err := m.db.View(func(tx *bolt.Tx) error {
@@ -1574,7 +1538,7 @@ func (m *Manager) PinEntry(id uint64) error {
 		}
 		c := b.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
-			entry, err := decodeEntryMeta(v)
+			entry, err := decodeEntry(v)
 			if err == nil && entry.Pinned {
 				pinnedCount++
 			}
@@ -1665,11 +1629,12 @@ func (m *Manager) GetPinnedEntries() []Entry {
 
 		c := b.Cursor()
 		for k, v := c.Last(); k != nil; k, v = c.Prev() {
-			entry, err := decodeEntryMeta(v)
+			entry, err := decodeEntry(v)
 			if err != nil {
 				continue
 			}
 			if entry.Pinned {
+				entry.Data = nil
 				pinned = append(pinned, entry)
 			}
 		}
@@ -1695,7 +1660,7 @@ func (m *Manager) GetPinnedCount() int {
 
 		c := b.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
-			entry, err := decodeEntryMeta(v)
+			entry, err := decodeEntry(v)
 			if err == nil && entry.Pinned {
 				count++
 			}
@@ -1814,7 +1779,6 @@ func (m *Manager) CopyFile(filePath string) error {
 			m.ownerLock.Unlock()
 		})
 
-		m.releaseCurrentSource()
 		m.currentSource = source
 
 		m.ownerLock.Lock()

core/internal/server/evdev/manager.go

@@ -391,7 +391,7 @@ func (m *Manager) Close() {
 
 func InitializeManager() (*Manager, error) {
 	if os.Getuid() != 0 && !hasInputGroupAccess() {
-		return nil, fmt.Errorf("insufficient permissions to access input devices. Add your user to the 'input' group: `sudo usermod -a -G input $USER` or run `dms setup`")
+		return nil, fmt.Errorf("insufficient permissions to access input devices")
 	}
 
 	return NewManager()

core/internal/server/freedesktop/screensaver.go

@@ -104,7 +104,7 @@ func (m *Manager) claimScreensaverName(handler *screensaverHandler, name, iface
 		return false
 	}
 	if reply != dbus.RequestNameReplyPrimaryOwner {
-		log.Infof("Screensaver name %s already owned by another process (e.g. hypridle/swayidle)", name)
+		log.Warnf("Screensaver name %s already owned by another process", name)
 		return false
 	}
 	if err := m.exportScreensaverOnPaths(handler, iface, paths...); err != nil {

core/internal/server/loginctl/types.go

@@ -35,7 +35,12 @@ type SessionState struct {
 type EventType string
 
 const (
-	EventStateChanged EventType = "state_changed"
+	EventStateChanged      EventType = "state_changed"
+	EventLock              EventType = "lock"
+	EventUnlock            EventType = "unlock"
+	EventPrepareForSleep   EventType = "prepare_for_sleep"
+	EventIdleHintChanged   EventType = "idle_hint_changed"
+	EventLockedHintChanged EventType = "locked_hint_changed"
 )
 
 type SessionEvent struct {

core/internal/server/loginctl/types_test.go

@@ -8,6 +8,11 @@ import (
 
 func TestEventType_Constants(t *testing.T) {
 	assert.Equal(t, EventType("state_changed"), EventStateChanged)
+	assert.Equal(t, EventType("lock"), EventLock)
+	assert.Equal(t, EventType("unlock"), EventUnlock)
+	assert.Equal(t, EventType("prepare_for_sleep"), EventPrepareForSleep)
+	assert.Equal(t, EventType("idle_hint_changed"), EventIdleHintChanged)
+	assert.Equal(t, EventType("locked_hint_changed"), EventLockedHintChanged)
 }
 
 func TestSessionState_Struct(t *testing.T) {
@@ -35,11 +40,11 @@ func TestSessionEvent_Struct(t *testing.T) {
 	}
 
 	event := SessionEvent{
-		Type: EventStateChanged,
+		Type: EventLock,
 		Data: state,
 	}
 
-	assert.Equal(t, EventStateChanged, event.Type)
+	assert.Equal(t, EventLock, event.Type)
 	assert.Equal(t, "1", event.Data.SessionID)
 	assert.True(t, event.Data.Locked)
 }

core/internal/server/router.go

@@ -20,7 +20,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/network"
 	serverPlugins "github.com/AvengeMedia/DankMaterialShell/core/internal/server/plugins"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/thememode"
 	serverThemes "github.com/AvengeMedia/DankMaterialShell/core/internal/server/themes"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland"
@@ -203,15 +202,6 @@ func RouteRequest(conn net.Conn, req models.Request) {
 		return
 	}
 
-	if strings.HasPrefix(req.Method, "sysupdate.") {
-		if sysUpdateManager == nil {
-			models.RespondError(conn, req.ID, "sysupdate manager not initialized")
-			return
-		}
-		sysupdate.HandleRequest(conn, req, sysUpdateManager)
-		return
-	}
-
 	switch req.Method {
 	case "ping":
 		models.Respond(conn, req.ID, "pong")

core/internal/server/server.go

@@ -30,7 +30,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/network"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/thememode"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/trayrecovery"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland"
@@ -76,7 +75,6 @@ var wlContext *wlcontext.SharedContext
 var themeModeManager *thememode.Manager
 var trayRecoveryManager *trayrecovery.Manager
 var locationManager *location.Manager
-var sysUpdateManager *sysupdate.Manager
 var geoClientInstance geolocation.Client
 
 const dbusClientID = "dms-dbus-client"
@@ -423,19 +421,6 @@ func InitializeLocationManager(geoClient geolocation.Client) error {
 	return nil
 }
 
-func InitializeSysUpdateManager() error {
-	manager, err := sysupdate.NewManager()
-	if err != nil {
-		log.Warnf("Failed to initialize sysupdate manager: %v", err)
-		return err
-	}
-
-	sysUpdateManager = manager
-
-	log.Info("Sysupdate manager initialized")
-	return nil
-}
-
 func handleConnection(conn net.Conn) {
 	defer conn.Close()
 
@@ -521,10 +506,6 @@ func getCapabilities() Capabilities {
 		caps = append(caps, "dbus")
 	}
 
-	if sysUpdateManager != nil {
-		caps = append(caps, "sysupdate")
-	}
-
 	return Capabilities{Capabilities: caps}
 }
 
@@ -595,10 +576,6 @@ func getServerInfo() ServerInfo {
 		caps = append(caps, "dbus")
 	}
 
-	if sysUpdateManager != nil {
-		caps = append(caps, "sysupdate")
-	}
-
 	return ServerInfo{
 		APIVersion:   APIVersion,
 		CLIVersion:   CLIVersion,
@@ -1266,38 +1243,6 @@ func handleSubscribe(conn net.Conn, req models.Request) {
 		}()
 	}
 
-	if shouldSubscribe("sysupdate") && sysUpdateManager != nil {
-		wg.Add(1)
-		sysupdateChan := sysUpdateManager.Subscribe(clientID + "-sysupdate")
-		go func() {
-			defer wg.Done()
-			defer sysUpdateManager.Unsubscribe(clientID + "-sysupdate")
-
-			initialState := sysUpdateManager.GetState()
-			select {
-			case eventChan <- ServiceEvent{Service: "sysupdate", Data: initialState}:
-			case <-stopChan:
-				return
-			}
-
-			for {
-				select {
-				case state, ok := <-sysupdateChan:
-					if !ok {
-						return
-					}
-					select {
-					case eventChan <- ServiceEvent{Service: "sysupdate", Data: state}:
-					case <-stopChan:
-						return
-					}
-				case <-stopChan:
-					return
-				}
-			}
-		}()
-	}
-
 	if shouldSubscribe("dbus") && dbusManager != nil {
 		wg.Add(1)
 		dbusChan := dbusManager.SubscribeSignals(dbusClientID)
@@ -1403,9 +1348,6 @@ func cleanupManagers() {
 	if locationManager != nil {
 		locationManager.Close()
 	}
-	if sysUpdateManager != nil {
-		sysUpdateManager.Close()
-	}
 	if geoClientInstance != nil {
 		geoClientInstance.Close()
 	}
@@ -1791,10 +1733,6 @@ func Start(printDocs bool) error {
 		}
 	}()
 
-	if err := InitializeSysUpdateManager(); err != nil {
-		log.Warnf("Sysupdate manager unavailable: %v", err)
-	}
-
 	log.Info("")
 	log.Infof("Ready! Capabilities: %v", getCapabilities().Capabilities)
 

core/internal/server/sysupdate/backend.go

@@ -1,96 +0,0 @@
-package sysupdate
-
-import (
-	"context"
-	"os/exec"
-	"sync"
-)
-
-type Backend interface {
-	ID() string
-	DisplayName() string
-	Repo() RepoKind
-	IsAvailable(ctx context.Context) bool
-	NeedsAuth() bool
-	RunsInTerminal() bool
-	CheckUpdates(ctx context.Context) ([]Package, error)
-	Upgrade(ctx context.Context, opts UpgradeOptions, onLine func(string)) error
-}
-
-type Selection struct {
-	System  Backend
-	Overlay []Backend
-}
-
-func (s Selection) All() []Backend {
-	if s.System == nil {
-		return s.Overlay
-	}
-	out := make([]Backend, 0, 1+len(s.Overlay))
-	out = append(out, s.System)
-	out = append(out, s.Overlay...)
-	return out
-}
-
-func (s Selection) Info() []BackendInfo {
-	all := s.All()
-	out := make([]BackendInfo, 0, len(all))
-	for _, b := range all {
-		out = append(out, BackendInfo{
-			ID:             b.ID(),
-			DisplayName:    b.DisplayName(),
-			Repo:           b.Repo(),
-			NeedsAuth:      b.NeedsAuth(),
-			RunsInTerminal: b.RunsInTerminal(),
-		})
-	}
-	return out
-}
-
-var (
-	registryMu       sync.RWMutex
-	systemCandidates []func() Backend
-	overlayCandidate []func() Backend
-)
-
-func RegisterSystemBackend(factory func() Backend) {
-	registryMu.Lock()
-	defer registryMu.Unlock()
-	systemCandidates = append(systemCandidates, factory)
-}
-
-func RegisterOverlayBackend(factory func() Backend) {
-	registryMu.Lock()
-	defer registryMu.Unlock()
-	overlayCandidate = append(overlayCandidate, factory)
-}
-
-func Select(ctx context.Context) Selection {
-	registryMu.RLock()
-	sys := append([]func() Backend(nil), systemCandidates...)
-	ov := append([]func() Backend(nil), overlayCandidate...)
-	registryMu.RUnlock()
-
-	var sel Selection
-	for _, factory := range sys {
-		b := factory()
-		if !b.IsAvailable(ctx) {
-			continue
-		}
-		sel.System = b
-		break
-	}
-	for _, factory := range ov {
-		b := factory()
-		if !b.IsAvailable(ctx) {
-			continue
-		}
-		sel.Overlay = append(sel.Overlay, b)
-	}
-	return sel
-}
-
-func commandExists(name string) bool {
-	_, err := exec.LookPath(name)
-	return err == nil
-}

core/internal/server/sysupdate/backend_apt.go

@@ -1,79 +0,0 @@
-package sysupdate
-
-import (
-	"context"
-	"os/exec"
-	"regexp"
-	"strings"
-)
-
-func init() {
-	RegisterSystemBackend(func() Backend { return &aptBackend{} })
-}
-
-var aptUpgradableLine = regexp.MustCompile(`^([^/]+)/\S+\s+(\S+)\s+\S+\s+\[upgradable from:\s+([^\]]+)\]`)
-
-type aptBackend struct{}
-
-func (aptBackend) ID() string           { return "apt" }
-func (aptBackend) DisplayName() string  { return "APT" }
-func (aptBackend) Repo() RepoKind       { return RepoSystem }
-func (aptBackend) NeedsAuth() bool      { return true }
-func (aptBackend) RunsInTerminal() bool { return false }
-func (aptBackend) IsAvailable(_ context.Context) bool {
-	return commandExists("apt") || commandExists("apt-get")
-}
-
-func (aptBackend) CheckUpdates(ctx context.Context) ([]Package, error) {
-	cmd := exec.CommandContext(ctx, "apt", "list", "--upgradable")
-	cmd.Env = append(cmd.Environ(), "LC_ALL=C")
-	out, err := cmd.Output()
-	if err != nil {
-		return nil, err
-	}
-	return parseAptUpgradable(string(out)), nil
-}
-
-func (aptBackend) Upgrade(ctx context.Context, opts UpgradeOptions, onLine func(string)) error {
-	bin := "apt-get"
-	if !commandExists(bin) {
-		bin = "apt"
-	}
-	if opts.DryRun {
-		return Run(ctx, []string{bin, "upgrade", "--dry-run"}, RunOptions{
-			Env:    []string{"DEBIAN_FRONTEND=noninteractive", "LC_ALL=C"},
-			OnLine: onLine,
-		})
-	}
-	names := pickTargetNames(opts.Targets, "apt", true)
-	if len(names) == 0 {
-		return nil
-	}
-	argv := append([]string{"pkexec", "env", "DEBIAN_FRONTEND=noninteractive", "LC_ALL=C", bin, "install", "-y", "--only-upgrade"}, names...)
-	return Run(ctx, argv, RunOptions{OnLine: onLine})
-}
-
-func parseAptUpgradable(text string) []Package {
-	if text == "" {
-		return nil
-	}
-	var pkgs []Package
-	for line := range strings.SplitSeq(text, "\n") {
-		line = strings.TrimSpace(line)
-		if line == "" {
-			continue
-		}
-		m := aptUpgradableLine.FindStringSubmatch(line)
-		if m == nil {
-			continue
-		}
-		pkgs = append(pkgs, Package{
-			Name:        m[1],
-			Repo:        RepoSystem,
-			Backend:     "apt",
-			FromVersion: m[3],
-			ToVersion:   m[2],
-		})
-	}
-	return pkgs
-}

core/internal/server/sysupdate/backend_apt_test.go

@@ -1,72 +0,0 @@
-package sysupdate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestParseAptUpgradable(t *testing.T) {
-	tests := []struct {
-		name  string
-		input string
-		want  []Package
-	}{
-		{
-			name:  "empty",
-			input: "",
-			want:  nil,
-		},
-		{
-			name: "header line only",
-			input: `Listing... Done
-`,
-			want: nil,
-		},
-		{
-			name: "single upgradable",
-			input: `Listing... Done
-bash/stable 5.2.40-1 amd64 [upgradable from: 5.2.39-1]`,
-			want: []Package{
-				{Name: "bash", Repo: RepoSystem, Backend: "apt", FromVersion: "5.2.39-1", ToVersion: "5.2.40-1"},
-			},
-		},
-		{
-			name: "multiple architectures and suites",
-			input: `Listing... Done
-bash/stable 5.2.40-1 amd64 [upgradable from: 5.2.39-1]
-libfoo/stable-security 1.0.0-2 amd64 [upgradable from: 1.0.0-1]
-zsh/testing 5.9-6 arm64 [upgradable from: 5.9-5]`,
-			want: []Package{
-				{Name: "bash", Repo: RepoSystem, Backend: "apt", FromVersion: "5.2.39-1", ToVersion: "5.2.40-1"},
-				{Name: "libfoo", Repo: RepoSystem, Backend: "apt", FromVersion: "1.0.0-1", ToVersion: "1.0.0-2"},
-				{Name: "zsh", Repo: RepoSystem, Backend: "apt", FromVersion: "5.9-5", ToVersion: "5.9-6"},
-			},
-		},
-		{
-			name: "package name with hyphens, dots, plus signs",
-			input: `Listing... Done
-g++/stable 4:13.3.0-1 amd64 [upgradable from: 4:13.2.0-1]
-libsdl2-2.0-0/stable 2.30.0+dfsg-1 amd64 [upgradable from: 2.28.5+dfsg-1]`,
-			want: []Package{
-				{Name: "g++", Repo: RepoSystem, Backend: "apt", FromVersion: "4:13.2.0-1", ToVersion: "4:13.3.0-1"},
-				{Name: "libsdl2-2.0-0", Repo: RepoSystem, Backend: "apt", FromVersion: "2.28.5+dfsg-1", ToVersion: "2.30.0+dfsg-1"},
-			},
-		},
-		{
-			name:  "non-matching lines ignored",
-			input: "WARNING: this is some warning\nbash/stable 5.2.40-1 amd64 [upgradable from: 5.2.39-1]",
-			want: []Package{
-				{Name: "bash", Repo: RepoSystem, Backend: "apt", FromVersion: "5.2.39-1", ToVersion: "5.2.40-1"},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := parseAptUpgradable(tt.input)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("parseAptUpgradable() = %#v\nwant %#v", got, tt.want)
-			}
-		})
-	}
-}

core/internal/server/sysupdate/backend_dnf.go

@@ -1,125 +0,0 @@
-package sysupdate
-
-import (
-	"context"
-	"errors"
-	"os/exec"
-	"strings"
-)
-
-func init() {
-	RegisterSystemBackend(func() Backend { return &dnfBackend{bin: "dnf5"} })
-	RegisterSystemBackend(func() Backend { return &dnfBackend{bin: "dnf"} })
-}
-
-type dnfBackend struct {
-	bin string
-}
-
-func (b dnfBackend) ID() string           { return b.bin }
-func (b dnfBackend) DisplayName() string  { return strings.ToUpper(b.bin) }
-func (b dnfBackend) Repo() RepoKind       { return RepoSystem }
-func (b dnfBackend) NeedsAuth() bool      { return true }
-func (b dnfBackend) RunsInTerminal() bool { return false }
-
-func (b dnfBackend) IsAvailable(ctx context.Context) bool {
-	if !commandExists(b.bin) {
-		return false
-	}
-	if commandExists("rpm-ostree") && ostreeBooted(ctx) {
-		return false
-	}
-	return true
-}
-
-func (b dnfBackend) CheckUpdates(ctx context.Context) ([]Package, error) {
-	out, err := dnfListUpgrades(ctx, b.bin)
-	if err != nil {
-		return nil, err
-	}
-	installed := rpmInstalledVersions(ctx)
-	return parseDnfList(out, b.bin, installed), nil
-}
-
-func (b dnfBackend) Upgrade(ctx context.Context, opts UpgradeOptions, onLine func(string)) error {
-	if opts.DryRun {
-		return Run(ctx, []string{b.bin, "upgrade", "--assumeno"}, RunOptions{OnLine: onLine})
-	}
-	names := pickTargetNames(opts.Targets, b.bin, true)
-	if len(names) == 0 {
-		return nil
-	}
-	argv := append([]string{"pkexec", b.bin, "upgrade", "-y"}, names...)
-	return Run(ctx, argv, RunOptions{OnLine: onLine})
-}
-
-func dnfListUpgrades(ctx context.Context, bin string) (string, error) {
-	cmd := exec.CommandContext(ctx, bin, "list", "--upgrades", "--quiet")
-	out, err := cmd.Output()
-	if err == nil {
-		return string(out), nil
-	}
-	if exitErr, ok := errors.AsType[*exec.ExitError](err); ok && exitErr.ExitCode() == 1 {
-		return "", nil
-	}
-	return "", err
-}
-
-func rpmInstalledVersions(ctx context.Context) map[string]string {
-	out, err := exec.CommandContext(ctx, "rpm", "-qa", "--qf", `%{NAME}\t%{VERSION}-%{RELEASE}\n`).Output()
-	if err != nil {
-		return nil
-	}
-	m := make(map[string]string)
-	for line := range strings.SplitSeq(string(out), "\n") {
-		name, ver, ok := strings.Cut(line, "\t")
-		if !ok {
-			continue
-		}
-		m[name] = ver
-	}
-	return m
-}
-
-func parseDnfList(text, backendID string, installed map[string]string) []Package {
-	if text == "" {
-		return nil
-	}
-	var pkgs []Package
-	for line := range strings.SplitSeq(text, "\n") {
-		fields := strings.Fields(line)
-		if len(fields) < 2 {
-			continue
-		}
-		nameArch := fields[0]
-		version := fields[1]
-		dot := strings.LastIndex(nameArch, ".")
-		if dot <= 0 {
-			continue
-		}
-		if !looksLikeRpmVersion(version) {
-			continue
-		}
-		name := nameArch[:dot]
-		pkgs = append(pkgs, Package{
-			Name:        nameArch,
-			Repo:        RepoSystem,
-			Backend:     backendID,
-			FromVersion: installed[name],
-			ToVersion:   version,
-		})
-	}
-	return pkgs
-}
-
-func looksLikeRpmVersion(s string) bool {
-	if s == "" {
-		return false
-	}
-	for _, r := range s {
-		if r >= '0' && r <= '9' {
-			return true
-		}
-	}
-	return false
-}

core/internal/server/sysupdate/backend_dnf_test.go

@@ -1,80 +0,0 @@
-package sysupdate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestParseDnfList(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		backendID string
-		installed map[string]string
-		want      []Package
-	}{
-		{
-			name:  "empty",
-			input: "",
-			want:  nil,
-		},
-		{
-			name:      "single package with installed cross-ref",
-			input:     "bash.x86_64                              5.2.40-1.fc41                       updates",
-			backendID: "dnf",
-			installed: map[string]string{"bash": "5.2.39-1.fc41"},
-			want: []Package{
-				{Name: "bash.x86_64", Repo: RepoSystem, Backend: "dnf", FromVersion: "5.2.39-1.fc41", ToVersion: "5.2.40-1.fc41"},
-			},
-		},
-		{
-			name: "noarch package and missing installed entry",
-			input: `bash.x86_64        5.2.40-1.fc41        updates
-fonts-misc.noarch  1.0.5-2.fc41         updates`,
-			backendID: "dnf",
-			installed: map[string]string{"bash": "5.2.39-1.fc41"},
-			want: []Package{
-				{Name: "bash.x86_64", Repo: RepoSystem, Backend: "dnf", FromVersion: "5.2.39-1.fc41", ToVersion: "5.2.40-1.fc41"},
-				{Name: "fonts-misc.noarch", Repo: RepoSystem, Backend: "dnf", FromVersion: "", ToVersion: "1.0.5-2.fc41"},
-			},
-		},
-		{
-			name: "skips header rows",
-			input: `Available
-Upgrades
-bash.x86_64       5.2.40-1.fc41       updates`,
-			backendID: "dnf",
-			installed: nil,
-			want: []Package{
-				{Name: "bash.x86_64", Repo: RepoSystem, Backend: "dnf", FromVersion: "", ToVersion: "5.2.40-1.fc41"},
-			},
-		},
-		{
-			name:      "skips lines with too few fields",
-			input:     "incomplete",
-			backendID: "dnf",
-			want:      nil,
-		},
-		{
-			name: "skips dnf5 banner / column header lines",
-			input: `Updates available
-Last metadata expiration check: 0:01:23 ago on Tue Apr 29 14:00:00 2026.
-Package    Version    Repository    Size
-bash.x86_64       5.2.40-1.fc41       updates`,
-			backendID: "dnf",
-			installed: nil,
-			want: []Package{
-				{Name: "bash.x86_64", Repo: RepoSystem, Backend: "dnf", FromVersion: "", ToVersion: "5.2.40-1.fc41"},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := parseDnfList(tt.input, tt.backendID, tt.installed)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("parseDnfList() = %#v\nwant %#v", got, tt.want)
-			}
-		})
-	}
-}

core/internal/server/sysupdate/backend_flatpak.go

@@ -1,169 +0,0 @@
-package sysupdate
-
-import (
-	"context"
-	"os/exec"
-	"strings"
-)
-
-func init() {
-	RegisterOverlayBackend(func() Backend { return &flatpakBackend{} })
-}
-
-type flatpakBackend struct{}
-
-func (flatpakBackend) ID() string                         { return "flatpak" }
-func (flatpakBackend) DisplayName() string                { return "Flatpak" }
-func (flatpakBackend) Repo() RepoKind                     { return RepoFlatpak }
-func (flatpakBackend) NeedsAuth() bool                    { return false }
-func (flatpakBackend) RunsInTerminal() bool               { return false }
-func (flatpakBackend) IsAvailable(_ context.Context) bool { return commandExists("flatpak") }
-
-func (flatpakBackend) CheckUpdates(ctx context.Context) ([]Package, error) {
-	cmd := exec.CommandContext(ctx, "flatpak", "remote-ls", "--updates", "--columns=application,version,branch,commit,name")
-	out, err := cmd.Output()
-	if err != nil {
-		return nil, err
-	}
-	installed := flatpakInstalled(ctx)
-	return parseFlatpakUpdates(string(out), installed), nil
-}
-
-func flatpakInstalled(ctx context.Context) map[string]flatpakInstalledEntry {
-	out, err := exec.CommandContext(ctx, "flatpak", "list", "--columns=application,version,branch,active").Output()
-	if err != nil {
-		return nil
-	}
-	m := make(map[string]flatpakInstalledEntry)
-	for line := range strings.SplitSeq(string(out), "\n") {
-		if line == "" {
-			continue
-		}
-		fields := strings.Split(line, "\t")
-		if len(fields) == 0 || fields[0] == "" {
-			continue
-		}
-		appID := fields[0]
-		entry := flatpakInstalledEntry{}
-		if len(fields) > 1 {
-			entry.version = fields[1]
-		}
-		if len(fields) > 2 {
-			entry.branch = fields[2]
-		}
-		if len(fields) > 3 {
-			entry.commit = fields[3]
-		}
-		key := appID
-		if entry.branch != "" {
-			key = appID + "//" + entry.branch
-		}
-		m[key] = entry
-	}
-	return m
-}
-
-type flatpakInstalledEntry struct {
-	version string
-	branch  string
-	commit  string
-}
-
-func (flatpakBackend) Upgrade(ctx context.Context, opts UpgradeOptions, onLine func(string)) error {
-	if opts.DryRun {
-		return Run(ctx, []string{"flatpak", "update", "--no-deploy", "-y"}, RunOptions{OnLine: onLine})
-	}
-	refs := flatpakTargetRefs(opts.Targets)
-	if len(refs) == 0 {
-		return nil
-	}
-	argv := append([]string{"flatpak", "update", "-y", "--noninteractive"}, refs...)
-	return Run(ctx, argv, RunOptions{OnLine: onLine})
-}
-
-func flatpakTargetRefs(targets []Package) []string {
-	out := make([]string, 0, len(targets))
-	for _, p := range targets {
-		if p.Backend != "flatpak" {
-			continue
-		}
-		ref := p.Ref
-		if ref == "" {
-			ref = p.Name
-		}
-		out = append(out, ref)
-	}
-	return out
-}
-
-func parseFlatpakUpdates(text string, installed map[string]flatpakInstalledEntry) []Package {
-	if text == "" {
-		return nil
-	}
-	var pkgs []Package
-	for line := range strings.SplitSeq(text, "\n") {
-		if line == "" {
-			continue
-		}
-		fields := strings.Split(line, "\t")
-		if len(fields) == 0 || fields[0] == "" {
-			continue
-		}
-		appID := fields[0]
-		version, branch, commit := "", "", ""
-		if len(fields) > 1 {
-			version = fields[1]
-		}
-		if len(fields) > 2 {
-			branch = fields[2]
-		}
-		if len(fields) > 3 {
-			commit = fields[3]
-		}
-		display := appID
-		if len(fields) > 4 && fields[4] != "" {
-			display = fields[4]
-		}
-
-		key := appID
-		if branch != "" {
-			key = appID + "//" + branch
-		}
-		inst := installed[key]
-
-		if inst.commit != "" && commit != "" && strings.HasPrefix(commit, inst.commit) {
-			continue
-		}
-
-		from, to := flatpakVersionPair(inst.version, inst.commit, version, commit)
-
-		ref := appID
-		if branch != "" {
-			ref = appID + "//" + branch
-		}
-
-		pkgs = append(pkgs, Package{
-			Name:        display,
-			Repo:        RepoFlatpak,
-			Backend:     "flatpak",
-			FromVersion: from,
-			ToVersion:   to,
-			Ref:         ref,
-		})
-	}
-	return pkgs
-}
-
-func flatpakVersionPair(installedVer, installedCommit, remoteVer, remoteCommit string) (from, to string) {
-	if remoteVer != "" {
-		return installedVer, remoteVer
-	}
-	return shortCommit(installedCommit), shortCommit(remoteCommit)
-}
-
-func shortCommit(c string) string {
-	if len(c) > 8 {
-		return c[:8]
-	}
-	return c
-}

core/internal/server/sysupdate/backend_flatpak_test.go

@@ -1,150 +0,0 @@
-package sysupdate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestParseFlatpakUpdates(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		installed map[string]flatpakInstalledEntry
-		want      []Package
-	}{
-		{
-			name:  "empty",
-			input: "",
-			want:  nil,
-		},
-		{
-			name: "real flathub-style row with empty version, falls back to commit",
-			// columns: application,version,branch,commit,name
-			input: "com.discordapp.Discord\t\tstable\t43a1e5d2d3a446919356fd86d9f984ad7c6a0e20f109250d9d868223f26ca586\tDiscord",
-			installed: map[string]flatpakInstalledEntry{
-				"com.discordapp.Discord//stable": {commit: "8b16fa1a9b2aa189302c2428c8a7bb33dd050faf7e535dd1d975044cb0986855"},
-			},
-			want: []Package{
-				{
-					Name:        "Discord",
-					Repo:        RepoFlatpak,
-					Backend:     "flatpak",
-					FromVersion: "8b16fa1a",
-					ToVersion:   "43a1e5d2",
-					Ref:         "com.discordapp.Discord//stable",
-				},
-			},
-		},
-		{
-			name:  "remote provides version, installed version known",
-			input: "com.example.App\t1.5.0\tstable\tdeadbeefcafe\tExample App",
-			installed: map[string]flatpakInstalledEntry{
-				"com.example.App//stable": {version: "1.4.2"},
-			},
-			want: []Package{
-				{
-					Name:        "Example App",
-					Repo:        RepoFlatpak,
-					Backend:     "flatpak",
-					FromVersion: "1.4.2",
-					ToVersion:   "1.5.0",
-					Ref:         "com.example.App//stable",
-				},
-			},
-		},
-		{
-			name:      "no installed entry, remote has no version, falls back to commit on both sides",
-			input:     "org.gnome.Platform\t\t49\tbadcd4afb1fe\tgnome platform",
-			installed: nil,
-			want: []Package{
-				{
-					Name:        "gnome platform",
-					Repo:        RepoFlatpak,
-					Backend:     "flatpak",
-					FromVersion: "",
-					ToVersion:   "badcd4af",
-					Ref:         "org.gnome.Platform//49",
-				},
-			},
-		},
-		{
-			name:  "missing display name falls back to application id",
-			input: "com.example.NoName\t2.0\tstable\tabcdef123456\t",
-			want: []Package{
-				{
-					Name:        "com.example.NoName",
-					Repo:        RepoFlatpak,
-					Backend:     "flatpak",
-					FromVersion: "",
-					ToVersion:   "2.0",
-					Ref:         "com.example.NoName//stable",
-				},
-			},
-		},
-		{
-			name:  "skips blank lines and rows with empty application id",
-			input: "\n\t\t\t\t\norg.real.App\t1.0\tstable\tdeadbeef\tReal App",
-			want: []Package{
-				{
-					Name:        "Real App",
-					Repo:        RepoFlatpak,
-					Backend:     "flatpak",
-					FromVersion: "",
-					ToVersion:   "1.0",
-					Ref:         "org.real.App//stable",
-				},
-			},
-		},
-		{
-			name:  "skips phantom updates where remote commit matches installed",
-			input: "com.phantom.App\t\tstable\tabc12345deadbeef\tPhantom",
-			installed: map[string]flatpakInstalledEntry{
-				"com.phantom.App//stable": {commit: "abc12345"},
-			},
-			want: nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := parseFlatpakUpdates(tt.input, tt.installed)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("parseFlatpakUpdates() = %#v\nwant %#v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestFlatpakVersionPair(t *testing.T) {
-	tests := []struct {
-		name                                                   string
-		installedVer, installedCommit, remoteVer, remoteCommit string
-		wantFrom, wantTo                                       string
-	}{
-		{
-			name:         "remote has version - prefer versions",
-			installedVer: "1.0.0", remoteVer: "1.1.0",
-			wantFrom: "1.0.0", wantTo: "1.1.0",
-		},
-		{
-			name:            "remote has no version - both sides fall to short commit",
-			installedCommit: "8b16fa1a9b2aa189302c2428c8a7bb33dd050faf7e535dd1d975044cb0986855",
-			remoteCommit:    "43a1e5d2d3a446919356fd86d9f984ad7c6a0e20f109250d9d868223f26ca586",
-			wantFrom:        "8b16fa1a", wantTo: "43a1e5d2",
-		},
-		{
-			name:            "short commits left as-is",
-			installedCommit: "abc123", remoteCommit: "def456",
-			wantFrom: "abc123", wantTo: "def456",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			from, to := flatpakVersionPair(tt.installedVer, tt.installedCommit, tt.remoteVer, tt.remoteCommit)
-			if from != tt.wantFrom || to != tt.wantTo {
-				t.Errorf("flatpakVersionPair() = (%q, %q), want (%q, %q)", from, to, tt.wantFrom, tt.wantTo)
-			}
-		})
-	}
-}

core/internal/server/sysupdate/backend_pacman.go

@@ -1,258 +0,0 @@
-package sysupdate
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-)
-
-func init() {
-	RegisterSystemBackend(func() Backend { return &archHelperBackend{id: "paru"} })
-	RegisterSystemBackend(func() Backend { return &archHelperBackend{id: "yay"} })
-	RegisterSystemBackend(func() Backend { return &pacmanBackend{} })
-}
-
-var archUpdateLine = regexp.MustCompile(`^(\S+)\s+(\S+)\s+->\s+(\S+)`)
-
-type pacmanBackend struct{}
-
-func (pacmanBackend) ID() string                         { return "pacman" }
-func (pacmanBackend) DisplayName() string                { return "Pacman" }
-func (pacmanBackend) Repo() RepoKind                     { return RepoSystem }
-func (pacmanBackend) NeedsAuth() bool                    { return true }
-func (pacmanBackend) RunsInTerminal() bool               { return false }
-func (pacmanBackend) IsAvailable(_ context.Context) bool { return commandExists("pacman") }
-
-func (b pacmanBackend) CheckUpdates(ctx context.Context) ([]Package, error) {
-	out, err := pacmanRepoUpdates(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return parseArchUpdates(out, b.ID(), RepoSystem), nil
-}
-
-func (b pacmanBackend) Upgrade(ctx context.Context, opts UpgradeOptions, onLine func(string)) error {
-	if opts.DryRun {
-		return Run(ctx, []string{"pacman", "-Sup"}, RunOptions{OnLine: onLine})
-	}
-	names := pickTargetNames(opts.Targets, b.ID(), opts.IncludeAUR)
-	if len(names) == 0 {
-		return nil
-	}
-	argv := append([]string{"pkexec", "pacman", "-Sy", "--noconfirm", "--needed"}, names...)
-	return Run(ctx, argv, RunOptions{OnLine: onLine})
-}
-
-type archHelperBackend struct {
-	id string
-}
-
-func (b archHelperBackend) ID() string      { return b.id }
-func (b archHelperBackend) Repo() RepoKind  { return RepoSystem }
-func (b archHelperBackend) NeedsAuth() bool { return true }
-func (b archHelperBackend) RunsInTerminal() bool {
-	return os.Getenv("DMS_FORCE_PKEXEC") != "1"
-}
-func (b archHelperBackend) IsAvailable(_ context.Context) bool { return commandExists(b.id) }
-
-func (b archHelperBackend) DisplayName() string {
-	switch b.id {
-	case "paru":
-		return "Paru (AUR)"
-	case "yay":
-		return "Yay (AUR)"
-	default:
-		return b.id
-	}
-}
-
-func (b archHelperBackend) CheckUpdates(ctx context.Context) ([]Package, error) {
-	repoOut, err := pacmanRepoUpdates(ctx)
-	if err != nil {
-		return nil, err
-	}
-	pkgs := parseArchUpdates(repoOut, b.id, RepoSystem)
-
-	aurOut, err := capturePermissive(ctx, b.id, "-Qua")
-	if err != nil {
-		return nil, err
-	}
-	pkgs = append(pkgs, parseArchUpdates(aurOut, b.id, RepoAUR)...)
-	return pkgs, nil
-}
-
-func (b archHelperBackend) Upgrade(ctx context.Context, opts UpgradeOptions, onLine func(string)) error {
-	if opts.DryRun {
-		return Run(ctx, []string{b.id, "-Sup"}, RunOptions{OnLine: onLine})
-	}
-	names := pickTargetNames(opts.Targets, b.id, opts.IncludeAUR)
-	if len(names) == 0 {
-		return nil
-	}
-	if os.Getenv("DMS_FORCE_PKEXEC") == "1" {
-		argv := append([]string{"pkexec", b.id, "-Sy", "--noconfirm", "--needed"}, names...)
-		return Run(ctx, argv, RunOptions{OnLine: onLine})
-	}
-	term := findTerminal(opts.Terminal)
-	if term == "" {
-		return fmt.Errorf("no terminal found (pick one in DMS settings, set $TERMINAL, or install kitty/ghostty/foot/alacritty)")
-	}
-	cmd := fmt.Sprintf("%s -Sy --noconfirm --needed %s", b.id, strings.Join(names, " "))
-	title := fmt.Sprintf("DMS — System Update (%s)", b.id)
-	return Run(ctx, wrapInTerminal(term, title, cmd), RunOptions{OnLine: onLine})
-}
-
-func pickTargetNames(targets []Package, backendID string, includeAUR bool) []string {
-	out := make([]string, 0, len(targets))
-	for _, p := range targets {
-		if p.Backend != backendID {
-			continue
-		}
-		if !includeAUR && p.Repo == RepoAUR {
-			continue
-		}
-		out = append(out, p.Name)
-	}
-	return out
-}
-
-func pacmanRepoUpdates(ctx context.Context) (string, error) {
-	if commandExists("checkupdates") {
-		return capturePermissive(ctx, "checkupdates")
-	}
-	if commandExists("fakeroot") {
-		out, err := pacmanCheckViaFakeroot(ctx)
-		if err == nil {
-			return out, nil
-		}
-		log.Warnf("[sysupdate] fakeroot db refresh failed, falling back to stale pacman -Qu: %v", err)
-	}
-	return capturePermissive(ctx, "pacman", "-Qu")
-}
-
-func pacmanCheckViaFakeroot(ctx context.Context) (string, error) {
-	dir, err := pacmanPrivateDB()
-	if err != nil {
-		return "", err
-	}
-
-	if err := seedPacmanDB(dir); err != nil {
-		return "", fmt.Errorf("seed sync db: %w", err)
-	}
-
-	refresh := exec.CommandContext(ctx, "fakeroot", "--", "pacman", "-Sy", "--dbpath", dir, "--logfile", "/dev/null", "--disable-sandbox")
-	if out, err := refresh.CombinedOutput(); err != nil {
-		return "", fmt.Errorf("fakeroot pacman -Sy: %w (%s)", err, strings.TrimSpace(string(out)))
-	}
-
-	return capturePermissive(ctx, "pacman", "-Qu", "--dbpath", dir)
-}
-
-func seedPacmanDB(dir string) error {
-	syncDir := filepath.Join(dir, "sync")
-	if err := os.MkdirAll(syncDir, 0o755); err != nil {
-		return err
-	}
-	dbs, err := filepath.Glob("/var/lib/pacman/sync/*.db")
-	if err != nil {
-		return err
-	}
-	for _, src := range dbs {
-		if err := copyFile(src, filepath.Join(syncDir, filepath.Base(src))); err != nil {
-			return err
-		}
-	}
-
-	localLink := filepath.Join(dir, "local")
-	if fi, err := os.Lstat(localLink); err == nil {
-		if fi.Mode()&os.ModeSymlink == 0 {
-			if err := os.RemoveAll(localLink); err != nil {
-				return err
-			}
-		} else {
-			return nil
-		}
-	}
-	return os.Symlink("/var/lib/pacman/local", localLink)
-}
-
-func copyFile(src, dst string) error {
-	in, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer in.Close()
-	out, err := os.OpenFile(dst, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o644)
-	if err != nil {
-		return err
-	}
-	defer out.Close()
-	if _, err := io.Copy(out, in); err != nil {
-		return err
-	}
-	return out.Sync()
-}
-
-func pacmanPrivateDB() (string, error) {
-	tmp := os.Getenv("TMPDIR")
-	if tmp == "" {
-		tmp = "/tmp"
-	}
-	dir := filepath.Join(tmp, fmt.Sprintf("dms-checkup-db-%d", os.Getuid()))
-	if err := os.MkdirAll(dir, 0o755); err != nil {
-		return "", err
-	}
-	return dir, nil
-}
-
-func capturePermissive(ctx context.Context, argv ...string) (string, error) {
-	cmd := exec.CommandContext(ctx, argv[0], argv[1:]...)
-	out, err := cmd.Output()
-	if err == nil {
-		return string(out), nil
-	}
-	if exitErr, ok := errors.AsType[*exec.ExitError](err); ok {
-		switch exitErr.ExitCode() {
-		case 1, 2:
-			return string(out), nil
-		}
-	}
-	return "", err
-}
-
-func parseArchUpdates(text, backendID string, repo RepoKind) []Package {
-	if text == "" {
-		return nil
-	}
-	var pkgs []Package
-	for line := range strings.SplitSeq(text, "\n") {
-		line = strings.TrimSpace(line)
-		if line == "" {
-			continue
-		}
-		m := archUpdateLine.FindStringSubmatch(line)
-		if m == nil {
-			continue
-		}
-		p := Package{
-			Name:        m[1],
-			Repo:        repo,
-			Backend:     backendID,
-			FromVersion: m[2],
-			ToVersion:   m[3],
-		}
-		if repo == RepoAUR {
-			p.ChangelogURL = "https://aur.archlinux.org/packages/" + p.Name
-		}
-		pkgs = append(pkgs, p)
-	}
-	return pkgs
-}

core/internal/server/sysupdate/backend_pacman_test.go

@@ -1,114 +0,0 @@
-package sysupdate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestParseArchUpdates(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		backendID string
-		repo      RepoKind
-		want      []Package
-	}{
-		{
-			name:      "empty",
-			input:     "",
-			backendID: "paru",
-			repo:      RepoSystem,
-			want:      nil,
-		},
-		{
-			name:      "whitespace only",
-			input:     "   \n\n  \n",
-			backendID: "paru",
-			repo:      RepoSystem,
-			want:      nil,
-		},
-		{
-			name:      "single repo update",
-			input:     "bat 0.26.0-1 -> 0.26.1-2",
-			backendID: "paru",
-			repo:      RepoSystem,
-			want: []Package{
-				{Name: "bat", Repo: RepoSystem, Backend: "paru", FromVersion: "0.26.0-1", ToVersion: "0.26.1-2"},
-			},
-		},
-		{
-			name: "multiple updates with epoch versions",
-			input: `cups 2:2.4.18-1 -> 2:2.4.19-1
-linux 6.18.0-1 -> 6.18.1-1
-mesa 26.4.0-1 -> 26.4.1-1`,
-			backendID: "paru",
-			repo:      RepoSystem,
-			want: []Package{
-				{Name: "cups", Repo: RepoSystem, Backend: "paru", FromVersion: "2:2.4.18-1", ToVersion: "2:2.4.19-1"},
-				{Name: "linux", Repo: RepoSystem, Backend: "paru", FromVersion: "6.18.0-1", ToVersion: "6.18.1-1"},
-				{Name: "mesa", Repo: RepoSystem, Backend: "paru", FromVersion: "26.4.0-1", ToVersion: "26.4.1-1"},
-			},
-		},
-		{
-			name:      "AUR update with changelog url",
-			input:     "google-chrome 147.0.7727.116-1 -> 147.0.7727.137-1",
-			backendID: "paru",
-			repo:      RepoAUR,
-			want: []Package{
-				{
-					Name:         "google-chrome",
-					Repo:         RepoAUR,
-					Backend:      "paru",
-					FromVersion:  "147.0.7727.116-1",
-					ToVersion:    "147.0.7727.137-1",
-					ChangelogURL: "https://aur.archlinux.org/packages/google-chrome",
-				},
-			},
-		},
-		{
-			name:      "git package latest-commit marker",
-			input:     "niri-git 26.04.r5.ga85b922-1 -> latest-commit",
-			backendID: "yay",
-			repo:      RepoAUR,
-			want: []Package{
-				{
-					Name:         "niri-git",
-					Repo:         RepoAUR,
-					Backend:      "yay",
-					FromVersion:  "26.04.r5.ga85b922-1",
-					ToVersion:    "latest-commit",
-					ChangelogURL: "https://aur.archlinux.org/packages/niri-git",
-				},
-			},
-		},
-		{
-			name: "skips lines that don't match arrow format",
-			input: `bat 0.26.0-1 -> 0.26.1-2
-this is not an update line
-foo`,
-			backendID: "pacman",
-			repo:      RepoSystem,
-			want: []Package{
-				{Name: "bat", Repo: RepoSystem, Backend: "pacman", FromVersion: "0.26.0-1", ToVersion: "0.26.1-2"},
-			},
-		},
-		{
-			name:      "extra whitespace tolerated",
-			input:     "  bat   0.26.0-1   ->   0.26.1-2  ",
-			backendID: "paru",
-			repo:      RepoSystem,
-			want: []Package{
-				{Name: "bat", Repo: RepoSystem, Backend: "paru", FromVersion: "0.26.0-1", ToVersion: "0.26.1-2"},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := parseArchUpdates(tt.input, tt.backendID, tt.repo)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("parseArchUpdates() = %#v\nwant %#v", got, tt.want)
-			}
-		})
-	}
-}

core/internal/server/sysupdate/backend_rpmostree.go

@@ -1,125 +0,0 @@
-package sysupdate
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"os/exec"
-)
-
-const ostreeExitUpdateAvailable = 77
-
-func init() {
-	RegisterSystemBackend(func() Backend { return &rpmOstreeBackend{} })
-}
-
-type rpmOstreeBackend struct{}
-
-func (rpmOstreeBackend) ID() string           { return "rpm-ostree" }
-func (rpmOstreeBackend) DisplayName() string  { return "rpm-ostree" }
-func (rpmOstreeBackend) Repo() RepoKind       { return RepoOSTree }
-func (rpmOstreeBackend) NeedsAuth() bool      { return true }
-func (rpmOstreeBackend) RunsInTerminal() bool { return false }
-
-func (b rpmOstreeBackend) IsAvailable(ctx context.Context) bool {
-	if !commandExists("rpm-ostree") {
-		return false
-	}
-	return ostreeBooted(ctx)
-}
-
-type ostreeStatus struct {
-	Deployments  []ostreeDeployment `json:"deployments"`
-	CachedUpdate *ostreeCached      `json:"cached-update"`
-}
-
-type ostreeDeployment struct {
-	Origin    string `json:"origin"`
-	Version   string `json:"version"`
-	Timestamp int64  `json:"timestamp"`
-	Booted    bool   `json:"booted"`
-}
-
-type ostreeCached struct {
-	Origin    string `json:"origin"`
-	Version   string `json:"version"`
-	Timestamp int64  `json:"timestamp"`
-	Checksum  string `json:"checksum"`
-}
-
-func ostreeBooted(ctx context.Context) bool {
-	cmd := exec.CommandContext(ctx, "rpm-ostree", "status", "--json")
-	out, err := cmd.Output()
-	if err != nil {
-		return false
-	}
-	var s ostreeStatus
-	if err := json.Unmarshal(out, &s); err != nil {
-		return false
-	}
-	return len(s.Deployments) > 0
-}
-
-func (rpmOstreeBackend) CheckUpdates(ctx context.Context) ([]Package, error) {
-	cmd := exec.CommandContext(ctx, "rpm-ostree", "upgrade", "--check")
-	if err := cmd.Run(); err != nil {
-		exitErr, ok := errors.AsType[*exec.ExitError](err)
-		if !ok || exitErr.ExitCode() != ostreeExitUpdateAvailable {
-			return nil, err
-		}
-	}
-
-	statusOut, err := exec.CommandContext(ctx, "rpm-ostree", "status", "--json").Output()
-	if err != nil {
-		return nil, err
-	}
-	return parseRpmOstreeStatus(statusOut)
-}
-
-func parseRpmOstreeStatus(statusOut []byte) ([]Package, error) {
-	var s ostreeStatus
-	if err := json.Unmarshal(statusOut, &s); err != nil {
-		return nil, err
-	}
-	if s.CachedUpdate == nil {
-		return nil, nil
-	}
-
-	booted := bootedDeployment(s.Deployments)
-	from := ""
-	if booted != nil {
-		from = booted.Version
-	}
-	if from == s.CachedUpdate.Version {
-		return nil, nil
-	}
-
-	name := s.CachedUpdate.Origin
-	if name == "" {
-		name = "system"
-	}
-	return []Package{{
-		Name:        name,
-		Repo:        RepoOSTree,
-		Backend:     "rpm-ostree",
-		FromVersion: from,
-		ToVersion:   s.CachedUpdate.Version,
-	}}, nil
-}
-
-func bootedDeployment(deps []ostreeDeployment) *ostreeDeployment {
-	for i := range deps {
-		if deps[i].Booted {
-			return &deps[i]
-		}
-	}
-	return nil
-}
-
-func (rpmOstreeBackend) Upgrade(ctx context.Context, opts UpgradeOptions, onLine func(string)) error {
-	argv := []string{"rpm-ostree", "upgrade"}
-	if opts.DryRun {
-		argv = append(argv, "--check")
-	}
-	return Run(ctx, argv, RunOptions{OnLine: onLine})
-}

core/internal/server/sysupdate/backend_rpmostree_test.go

@@ -1,104 +0,0 @@
-package sysupdate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestParseRpmOstreeStatus(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		want    []Package
-		wantErr bool
-	}{
-		{
-			name:  "no cached update",
-			input: `{"deployments":[{"version":"39.20240101.0","booted":true}],"cached-update":null}`,
-			want:  nil,
-		},
-		{
-			name: "cached update available, booted version differs",
-			input: `{
-				"deployments": [
-					{"origin": "fedora:fedora/x86_64/silverblue", "version": "39.20240101.0", "booted": true},
-					{"origin": "fedora:fedora/x86_64/silverblue", "version": "39.20231215.0", "booted": false}
-				],
-				"cached-update": {
-					"origin": "fedora:fedora/x86_64/silverblue",
-					"version": "39.20240115.0",
-					"checksum": "abc123"
-				}
-			}`,
-			want: []Package{
-				{
-					Name:        "fedora:fedora/x86_64/silverblue",
-					Repo:        RepoOSTree,
-					Backend:     "rpm-ostree",
-					FromVersion: "39.20240101.0",
-					ToVersion:   "39.20240115.0",
-				},
-			},
-		},
-		{
-			name: "cached update equals booted version (no real update)",
-			input: `{
-				"deployments": [{"version": "39.20240101.0", "booted": true}],
-				"cached-update": {"origin": "x", "version": "39.20240101.0"}
-			}`,
-			want: nil,
-		},
-		{
-			name: "no booted deployment falls back to empty from",
-			input: `{
-				"deployments": [{"version": "39.20240101.0", "booted": false}],
-				"cached-update": {"origin": "fedora:silverblue", "version": "39.20240115.0"}
-			}`,
-			want: []Package{
-				{
-					Name:        "fedora:silverblue",
-					Repo:        RepoOSTree,
-					Backend:     "rpm-ostree",
-					FromVersion: "",
-					ToVersion:   "39.20240115.0",
-				},
-			},
-		},
-		{
-			name: "missing origin defaults to system",
-			input: `{
-				"deployments": [{"version": "1.0", "booted": true}],
-				"cached-update": {"version": "1.1"}
-			}`,
-			want: []Package{
-				{
-					Name:        "system",
-					Repo:        RepoOSTree,
-					Backend:     "rpm-ostree",
-					FromVersion: "1.0",
-					ToVersion:   "1.1",
-				},
-			},
-		},
-		{
-			name:    "malformed JSON",
-			input:   `{not json`,
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := parseRpmOstreeStatus([]byte(tt.input))
-			if (err != nil) != tt.wantErr {
-				t.Fatalf("parseRpmOstreeStatus() err = %v, wantErr %v", err, tt.wantErr)
-			}
-			if tt.wantErr {
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("parseRpmOstreeStatus() = %#v\nwant %#v", got, tt.want)
-			}
-		})
-	}
-}

core/internal/server/sysupdate/backend_zypper.go

@@ -1,83 +0,0 @@
-package sysupdate
-
-import (
-	"context"
-	"encoding/xml"
-	"errors"
-	"os/exec"
-)
-
-func init() {
-	RegisterSystemBackend(func() Backend { return &zypperBackend{} })
-}
-
-type zypperBackend struct{}
-
-func (zypperBackend) ID() string                         { return "zypper" }
-func (zypperBackend) DisplayName() string                { return "Zypper" }
-func (zypperBackend) Repo() RepoKind                     { return RepoSystem }
-func (zypperBackend) NeedsAuth() bool                    { return true }
-func (zypperBackend) RunsInTerminal() bool               { return false }
-func (zypperBackend) IsAvailable(_ context.Context) bool { return commandExists("zypper") }
-
-type zypperUpdateList struct {
-	XMLName xml.Name       `xml:"stream"`
-	Updates []zypperUpdate `xml:"update-list>update"`
-}
-
-type zypperUpdate struct {
-	Name       string `xml:"name,attr"`
-	Edition    string `xml:"edition,attr"`
-	EditionOld string `xml:"edition-old,attr"`
-	Kind       string `xml:"kind,attr"`
-}
-
-func (zypperBackend) CheckUpdates(ctx context.Context) ([]Package, error) {
-	cmd := exec.CommandContext(ctx, "zypper", "--non-interactive", "--xmlout", "list-updates")
-	out, err := cmd.Output()
-	if err != nil {
-		if exitErr, ok := errors.AsType[*exec.ExitError](err); ok {
-			switch exitErr.ExitCode() {
-			case 100, 101, 102, 103:
-				err = nil
-			}
-		}
-		if err != nil {
-			return nil, err
-		}
-	}
-	return parseZypperXML(out)
-}
-
-func parseZypperXML(out []byte) ([]Package, error) {
-	var list zypperUpdateList
-	if err := xml.Unmarshal(out, &list); err != nil {
-		return nil, err
-	}
-	pkgs := make([]Package, 0, len(list.Updates))
-	for _, u := range list.Updates {
-		if u.Kind != "" && u.Kind != "package" {
-			continue
-		}
-		pkgs = append(pkgs, Package{
-			Name:        u.Name,
-			Repo:        RepoSystem,
-			Backend:     "zypper",
-			FromVersion: u.EditionOld,
-			ToVersion:   u.Edition,
-		})
-	}
-	return pkgs, nil
-}
-
-func (zypperBackend) Upgrade(ctx context.Context, opts UpgradeOptions, onLine func(string)) error {
-	if opts.DryRun {
-		return Run(ctx, []string{"zypper", "--non-interactive", "--dry-run", "update"}, RunOptions{OnLine: onLine})
-	}
-	names := pickTargetNames(opts.Targets, "zypper", true)
-	if len(names) == 0 {
-		return nil
-	}
-	argv := append([]string{"pkexec", "zypper", "--non-interactive", "update"}, names...)
-	return Run(ctx, argv, RunOptions{OnLine: onLine})
-}

core/internal/server/sysupdate/backend_zypper_test.go

@@ -1,80 +0,0 @@
-package sysupdate
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestParseZypperXML(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		want    []Package
-		wantErr bool
-	}{
-		{
-			name:  "empty stream",
-			input: `<?xml version="1.0"?><stream><update-list></update-list></stream>`,
-			want:  []Package{},
-		},
-		{
-			name: "single package update",
-			input: `<?xml version="1.0"?>
-<stream>
-  <update-list>
-    <update name="zsh" edition="5.9-6" edition-old="5.9-5" kind="package" arch="x86_64">
-      <source url="https://download.opensuse.org/" alias="repo-oss"/>
-    </update>
-  </update-list>
-</stream>`,
-			want: []Package{
-				{Name: "zsh", Repo: RepoSystem, Backend: "zypper", FromVersion: "5.9-5", ToVersion: "5.9-6"},
-			},
-		},
-		{
-			name: "skips non-package kinds",
-			input: `<?xml version="1.0"?>
-<stream>
-  <update-list>
-    <update name="foo" edition="2.0" edition-old="1.0" kind="package"/>
-    <update name="security-patch" edition="1" edition-old="0" kind="patch"/>
-    <update name="bar" edition="3.0" edition-old="2.0" kind="package"/>
-  </update-list>
-</stream>`,
-			want: []Package{
-				{Name: "foo", Repo: RepoSystem, Backend: "zypper", FromVersion: "1.0", ToVersion: "2.0"},
-				{Name: "bar", Repo: RepoSystem, Backend: "zypper", FromVersion: "2.0", ToVersion: "3.0"},
-			},
-		},
-		{
-			name: "treats missing kind as package",
-			input: `<?xml version="1.0"?>
-<stream><update-list>
-  <update name="kernel" edition="6.18.1-1" edition-old="6.18.0-1"/>
-</update-list></stream>`,
-			want: []Package{
-				{Name: "kernel", Repo: RepoSystem, Backend: "zypper", FromVersion: "6.18.0-1", ToVersion: "6.18.1-1"},
-			},
-		},
-		{
-			name:    "malformed XML returns error",
-			input:   `not xml at all`,
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := parseZypperXML([]byte(tt.input))
-			if (err != nil) != tt.wantErr {
-				t.Fatalf("parseZypperXML() err = %v, wantErr %v", err, tt.wantErr)
-			}
-			if tt.wantErr {
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("parseZypperXML() = %#v\nwant %#v", got, tt.want)
-			}
-		})
-	}
-}

core/internal/server/sysupdate/executor.go

@@ -1,125 +0,0 @@
-package sysupdate
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"sync"
-	"syscall"
-)
-
-type RunOptions struct {
-	Env    []string
-	OnLine func(string)
-}
-
-func Run(ctx context.Context, argv []string, opts RunOptions) error {
-	if len(argv) == 0 {
-		return fmt.Errorf("sysupdate.Run: empty argv")
-	}
-
-	cmd := exec.CommandContext(ctx, argv[0], argv[1:]...)
-	if len(opts.Env) > 0 {
-		cmd.Env = append(cmd.Environ(), opts.Env...)
-	}
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
-	cmd.Cancel = func() error {
-		if cmd.Process == nil {
-			return nil
-		}
-		return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
-	}
-
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		return err
-	}
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		return err
-	}
-
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-	go pump(stdout, opts.OnLine, &wg)
-	go pump(stderr, opts.OnLine, &wg)
-	wg.Wait()
-
-	return cmd.Wait()
-}
-
-func pump(r io.Reader, onLine func(string), wg *sync.WaitGroup) {
-	defer wg.Done()
-	if onLine == nil {
-		_, _ = io.Copy(io.Discard, r)
-		return
-	}
-	scanner := bufio.NewScanner(r)
-	scanner.Buffer(make([]byte, 64*1024), 1024*1024)
-	for scanner.Scan() {
-		onLine(scanner.Text())
-	}
-}
-
-func Capture(ctx context.Context, argv []string) (string, error) {
-	if len(argv) == 0 {
-		return "", fmt.Errorf("sysupdate.Capture: empty argv")
-	}
-	cmd := exec.CommandContext(ctx, argv[0], argv[1:]...)
-	out, err := cmd.Output()
-	return string(out), err
-}
-
-func findTerminal(override string) string {
-	if override != "" && commandExists(override) {
-		return override
-	}
-	if t := os.Getenv("TERMINAL"); t != "" && commandExists(t) {
-		return t
-	}
-	for _, t := range []string{"ghostty", "kitty", "foot", "alacritty", "wezterm", "konsole", "gnome-terminal", "xterm"} {
-		if commandExists(t) {
-			return t
-		}
-	}
-	return ""
-}
-
-func wrapInTerminal(term, title, shellCmd string) []string {
-	const appID = "dms-sysupdate"
-	banner := fmt.Sprintf(
-		`printf '\033[1;36m=== %s ===\033[0m\n'; printf '\033[2m$ %s\033[0m\n'; printf '\033[33mYou may be prompted for your sudo password to apply system updates.\033[0m\n\n'`,
-		title, shellCmd,
-	)
-	closer := `printf '\n\033[1;32m=== Done. Press Enter to close. ===\033[0m\n'; read`
-	export := `export SUDO_PROMPT="[DMS] sudo password for %u: "; `
-	full := export + banner + "; " + shellCmd + "; " + closer
-
-	switch term {
-	case "kitty":
-		return []string{term, "--class", appID, "-T", title, "-e", "sh", "-c", full}
-	case "alacritty":
-		return []string{term, "--class", appID, "-T", title, "-e", "sh", "-c", full}
-	case "foot":
-		return []string{term, "--app-id=" + appID, "--title=" + title, "-e", "sh", "-c", full}
-	case "ghostty":
-		return []string{term, "--class=" + appID, "--title=" + title, "-e", "sh", "-c", full}
-	case "wezterm":
-		return []string{term, "--class", appID, "-T", title, "-e", "sh", "-c", full}
-	case "xterm":
-		return []string{term, "-class", appID, "-T", title, "-e", "sh", "-c", full}
-	case "konsole":
-		return []string{term, "-p", "tabtitle=" + title, "-e", "sh", "-c", full}
-	case "gnome-terminal":
-		return []string{term, "--title=" + title, "--", "sh", "-c", full}
-	default:
-		return []string{term, "-e", "sh", "-c", full}
-	}
-}

core/internal/server/sysupdate/handlers.go

@@ -1,55 +0,0 @@
-package sysupdate
-
-import (
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/params"
-)
-
-func HandleRequest(conn net.Conn, req models.Request, m *Manager) {
-	switch req.Method {
-	case "sysupdate.getState":
-		models.Respond(conn, req.ID, m.GetState())
-	case "sysupdate.refresh":
-		force := params.BoolOpt(req.Params, "force", false)
-		m.Refresh(RefreshOptions{Force: force})
-		models.Respond(conn, req.ID, m.GetState())
-	case "sysupdate.upgrade":
-		handleUpgrade(conn, req, m)
-	case "sysupdate.cancel":
-		m.Cancel()
-		models.Respond(conn, req.ID, m.GetState())
-	case "sysupdate.acquire":
-		m.Acquire()
-		models.Respond(conn, req.ID, models.SuccessResult{Success: true})
-	case "sysupdate.release":
-		m.Release()
-		models.Respond(conn, req.ID, models.SuccessResult{Success: true})
-	case "sysupdate.setInterval":
-		seconds, err := params.Int(req.Params, "seconds")
-		if err != nil {
-			models.RespondError(conn, req.ID, err.Error())
-			return
-		}
-		m.SetInterval(seconds)
-		models.Respond(conn, req.ID, m.GetState())
-	default:
-		models.RespondError(conn, req.ID, "unknown method: "+req.Method)
-	}
-}
-
-func handleUpgrade(conn net.Conn, req models.Request, m *Manager) {
-	opts := UpgradeOptions{
-		IncludeFlatpak: params.BoolOpt(req.Params, "includeFlatpak", true),
-		IncludeAUR:     params.BoolOpt(req.Params, "includeAUR", true),
-		DryRun:         params.BoolOpt(req.Params, "dry", false),
-		CustomCommand:  params.StringOpt(req.Params, "customCommand", ""),
-		Terminal:       params.StringOpt(req.Params, "terminal", ""),
-	}
-	if err := m.Upgrade(opts); err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-	models.Respond(conn, req.ID, m.GetState())
-}

core/internal/server/sysupdate/manager.go

@@ -1,506 +0,0 @@
-package sysupdate
-
-import (
-	"bufio"
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
-)
-
-const (
-	defaultIntervalSeconds = 30 * 60
-	minIntervalSeconds     = 5 * 60
-	recentLogCapacity      = 200
-	checkTimeout           = 5 * time.Minute
-	upgradeTimeout         = 30 * time.Minute
-)
-
-type Manager struct {
-	mu          sync.RWMutex
-	state       State
-	subscribers syncmap.Map[string, chan State]
-
-	selection Selection
-
-	notifyDirty chan struct{}
-	stopChan    chan struct{}
-	notifierWG  sync.WaitGroup
-	schedulerWG sync.WaitGroup
-
-	acquireCount int32
-	wakeSched    chan struct{}
-
-	refreshSerial sync.Mutex
-
-	opMu     sync.Mutex
-	opCtx    context.Context
-	opCancel context.CancelFunc
-}
-
-func NewManager() (*Manager, error) {
-	m := &Manager{
-		notifyDirty: make(chan struct{}, 1),
-		stopChan:    make(chan struct{}),
-		wakeSched:   make(chan struct{}, 1),
-	}
-	m.state = State{
-		Phase:           PhaseIdle,
-		IntervalSeconds: defaultIntervalSeconds,
-		Backends:        []BackendInfo{},
-		Packages:        []Package{},
-	}
-
-	id, pretty := readOSRelease()
-	m.state.Distro = id
-	m.state.DistroPretty = pretty
-
-	m.selection = Select(context.Background())
-	m.state.Backends = m.selection.Info()
-	if len(m.state.Backends) == 0 {
-		m.state.Error = &ErrorInfo{
-			Code:    ErrCodeNoBackend,
-			Message: "no supported package manager found",
-			Hint:    "install a supported package manager (pacman, dnf, apt, zypper) or flatpak",
-		}
-	}
-
-	m.notifierWG.Add(1)
-	go m.notifier()
-
-	m.schedulerWG.Add(1)
-	go m.scheduler()
-
-	go m.runRefresh(context.Background())
-
-	return m, nil
-}
-
-func (m *Manager) GetState() State {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	return cloneState(m.state)
-}
-
-func (m *Manager) Subscribe(id string) chan State {
-	ch := make(chan State, 16)
-	m.subscribers.Store(id, ch)
-	return ch
-}
-
-func (m *Manager) Unsubscribe(id string) {
-	if val, ok := m.subscribers.LoadAndDelete(id); ok {
-		close(val)
-	}
-}
-
-func (m *Manager) Close() {
-	select {
-	case <-m.stopChan:
-		return
-	default:
-		close(m.stopChan)
-	}
-	m.opMu.Lock()
-	if m.opCancel != nil {
-		m.opCancel()
-	}
-	m.opMu.Unlock()
-	select {
-	case m.wakeSched <- struct{}{}:
-	default:
-	}
-	m.schedulerWG.Wait()
-	m.notifierWG.Wait()
-	m.subscribers.Range(func(key string, ch chan State) bool {
-		close(ch)
-		m.subscribers.Delete(key)
-		return true
-	})
-}
-
-func (m *Manager) SetInterval(seconds int) {
-	if seconds < minIntervalSeconds {
-		seconds = minIntervalSeconds
-	}
-	m.mu.Lock()
-	m.state.IntervalSeconds = seconds
-	m.mu.Unlock()
-	m.markDirty()
-}
-
-func (m *Manager) Refresh(opts RefreshOptions) {
-	m.mu.RLock()
-	phase := m.state.Phase
-	m.mu.RUnlock()
-
-	switch {
-	case phase == PhaseUpgrading:
-		return
-	case phase == PhaseRefreshing && !opts.Force:
-		m.refreshSerial.Lock()
-		m.refreshSerial.Unlock()
-		return
-	}
-	m.runRefresh(context.Background())
-}
-
-func (m *Manager) Upgrade(opts UpgradeOptions) error {
-	if len(m.selection.All()) == 0 {
-		return errors.New("no backend available")
-	}
-
-	m.opMu.Lock()
-	if m.opCancel != nil {
-		m.opMu.Unlock()
-		return errors.New("operation already running")
-	}
-	ctx, cancel := context.WithTimeout(context.Background(), upgradeTimeout)
-	m.opCtx = ctx
-	m.opCancel = cancel
-	m.opMu.Unlock()
-
-	go m.runUpgrade(ctx, opts)
-	return nil
-}
-
-func (m *Manager) Cancel() {
-	m.opMu.Lock()
-	cancel := m.opCancel
-	m.opMu.Unlock()
-	if cancel == nil {
-		return
-	}
-	cancel()
-}
-
-func (m *Manager) Acquire() {
-	first := atomic.AddInt32(&m.acquireCount, 1) == 1
-	select {
-	case m.wakeSched <- struct{}{}:
-	default:
-	}
-	if first {
-		go m.runRefresh(context.Background())
-	}
-}
-
-func (m *Manager) Release() {
-	if atomic.AddInt32(&m.acquireCount, -1) < 0 {
-		atomic.StoreInt32(&m.acquireCount, 0)
-	}
-}
-
-func (m *Manager) scheduler() {
-	defer m.schedulerWG.Done()
-	for {
-		if atomic.LoadInt32(&m.acquireCount) == 0 {
-			select {
-			case <-m.stopChan:
-				return
-			case <-m.wakeSched:
-			}
-			continue
-		}
-
-		m.mu.RLock()
-		interval := m.state.IntervalSeconds
-		m.mu.RUnlock()
-		if interval < minIntervalSeconds {
-			interval = minIntervalSeconds
-		}
-		t := time.NewTimer(time.Duration(interval) * time.Second)
-		select {
-		case <-m.stopChan:
-			t.Stop()
-			return
-		case <-m.wakeSched:
-			t.Stop()
-		case <-t.C:
-			m.runRefresh(context.Background())
-		}
-	}
-}
-
-func (m *Manager) runRefresh(parent context.Context) {
-	m.refreshSerial.Lock()
-	defer m.refreshSerial.Unlock()
-
-	if len(m.selection.All()) == 0 {
-		return
-	}
-
-	ctx, cancel := context.WithTimeout(parent, checkTimeout)
-	defer cancel()
-
-	m.mu.Lock()
-	if m.state.Phase == PhaseUpgrading {
-		m.mu.Unlock()
-		return
-	}
-	m.state.Phase = PhaseRefreshing
-	m.state.Error = nil
-	m.state.RecentLog = nil
-	m.mu.Unlock()
-	m.markDirty()
-
-	type backendResult struct {
-		pkgs []Package
-		err  error
-	}
-	backends := m.selection.All()
-	results := make([]backendResult, len(backends))
-	var wg sync.WaitGroup
-	for i, b := range backends {
-		wg.Add(1)
-		go func(i int, b Backend) {
-			defer wg.Done()
-			pkgs, err := b.CheckUpdates(ctx)
-			results[i] = backendResult{pkgs: pkgs, err: err}
-		}(i, b)
-	}
-	wg.Wait()
-
-	now := time.Now().Unix()
-	m.mu.Lock()
-	m.state.LastCheckUnix = now
-	m.state.Packages = m.state.Packages[:0]
-	var firstErr error
-	for i, r := range results {
-		if r.err != nil {
-			if firstErr == nil {
-				firstErr = fmt.Errorf("%s: %w", backends[i].ID(), r.err)
-			}
-			continue
-		}
-		m.state.Packages = append(m.state.Packages, r.pkgs...)
-	}
-	m.state.Count = len(m.state.Packages)
-	if firstErr != nil {
-		m.state.Phase = PhaseError
-		m.state.Error = &ErrorInfo{Code: ErrCodeBackendFailed, Message: firstErr.Error()}
-	} else {
-		m.state.Phase = PhaseIdle
-		m.state.LastSuccessUnix = now
-		m.state.NextCheckUnix = now + int64(m.state.IntervalSeconds)
-	}
-	m.mu.Unlock()
-	m.markDirty()
-}
-
-func (m *Manager) runUpgrade(ctx context.Context, opts UpgradeOptions) {
-	defer func() {
-		m.opMu.Lock()
-		if m.opCancel != nil {
-			m.opCancel = nil
-			m.opCtx = nil
-		}
-		m.opMu.Unlock()
-	}()
-
-	if opts.CustomCommand != "" {
-		m.runCustomUpgrade(ctx, opts.CustomCommand, opts.Terminal)
-		return
-	}
-
-	backends := upgradeBackends(m.selection, opts)
-	if len(backends) == 0 {
-		m.setError(ErrCodeNoBackend, "no backend selected for upgrade")
-		return
-	}
-
-	if len(opts.Targets) == 0 {
-		m.mu.RLock()
-		opts.Targets = append([]Package(nil), m.state.Packages...)
-		m.mu.RUnlock()
-	}
-
-	opID := fmt.Sprintf("op-%d", time.Now().UnixNano())
-	m.mu.Lock()
-	m.state.Phase = PhaseUpgrading
-	m.state.OperationID = opID
-	m.state.OperationStarted = time.Now().Unix()
-	m.state.RecentLog = m.state.RecentLog[:0]
-	m.state.Error = nil
-	m.mu.Unlock()
-	m.markDirty()
-
-	onLine := func(line string) { m.appendLog(line) }
-	for _, b := range backends {
-		m.appendLog(fmt.Sprintf("== %s ==", b.DisplayName()))
-		if err := b.Upgrade(ctx, opts, onLine); err != nil {
-			code := ErrCodeBackendFailed
-			if errors.Is(ctx.Err(), context.DeadlineExceeded) {
-				code = ErrCodeTimeout
-			} else if errors.Is(ctx.Err(), context.Canceled) {
-				code = ErrCodeCancelled
-			}
-			m.mu.Lock()
-			m.state.Phase = PhaseError
-			m.state.Error = &ErrorInfo{Code: code, Message: fmt.Sprintf("%s: %v", b.ID(), err)}
-			m.mu.Unlock()
-			m.markDirty()
-			return
-		}
-	}
-
-	m.mu.Lock()
-	m.state.Phase = PhaseIdle
-	m.state.OperationID = ""
-	m.state.OperationStarted = 0
-	m.mu.Unlock()
-	m.markDirty()
-	go m.runRefresh(context.Background())
-}
-
-func (m *Manager) runCustomUpgrade(ctx context.Context, command, terminalOverride string) {
-	term := findTerminal(terminalOverride)
-	if term == "" {
-		m.setError(ErrCodeBackendFailed, "no terminal found (pick one in DMS settings, set $TERMINAL, or install kitty/ghostty/foot/alacritty)")
-		return
-	}
-
-	opID := fmt.Sprintf("op-%d", time.Now().UnixNano())
-	m.mu.Lock()
-	m.state.Phase = PhaseUpgrading
-	m.state.OperationID = opID
-	m.state.OperationStarted = time.Now().Unix()
-	m.state.RecentLog = m.state.RecentLog[:0]
-	m.state.Error = nil
-	m.mu.Unlock()
-	m.markDirty()
-
-	onLine := func(line string) { m.appendLog(line) }
-	argv := wrapInTerminal(term, "DMS — System Update (custom)", command)
-	if err := Run(ctx, argv, RunOptions{OnLine: onLine}); err != nil {
-		code := ErrCodeBackendFailed
-		switch {
-		case errors.Is(ctx.Err(), context.DeadlineExceeded):
-			code = ErrCodeTimeout
-		case errors.Is(ctx.Err(), context.Canceled):
-			code = ErrCodeCancelled
-		}
-		m.mu.Lock()
-		m.state.Phase = PhaseError
-		m.state.Error = &ErrorInfo{Code: code, Message: err.Error()}
-		m.mu.Unlock()
-		m.markDirty()
-		return
-	}
-
-	m.mu.Lock()
-	m.state.Phase = PhaseIdle
-	m.state.OperationID = ""
-	m.state.OperationStarted = 0
-	m.mu.Unlock()
-	m.markDirty()
-	go m.runRefresh(context.Background())
-}
-
-func upgradeBackends(sel Selection, opts UpgradeOptions) []Backend {
-	var out []Backend
-	if sel.System != nil {
-		out = append(out, sel.System)
-	}
-	for _, b := range sel.Overlay {
-		switch {
-		case b.Repo() == RepoFlatpak && !opts.IncludeFlatpak:
-			continue
-		}
-		out = append(out, b)
-	}
-	return out
-}
-
-func (m *Manager) appendLog(line string) {
-	m.mu.Lock()
-	if cap(m.state.RecentLog) == 0 {
-		m.state.RecentLog = make([]string, 0, recentLogCapacity)
-	}
-	if len(m.state.RecentLog) >= recentLogCapacity {
-		copy(m.state.RecentLog, m.state.RecentLog[1:])
-		m.state.RecentLog = m.state.RecentLog[:recentLogCapacity-1]
-	}
-	m.state.RecentLog = append(m.state.RecentLog, line)
-	m.mu.Unlock()
-	m.markDirty()
-}
-
-func (m *Manager) setError(code ErrorCode, msg string) {
-	m.mu.Lock()
-	m.state.Phase = PhaseError
-	m.state.Error = &ErrorInfo{Code: code, Message: msg}
-	m.mu.Unlock()
-	m.markDirty()
-}
-
-func (m *Manager) markDirty() {
-	select {
-	case m.notifyDirty <- struct{}{}:
-	default:
-	}
-}
-
-func (m *Manager) notifier() {
-	defer m.notifierWG.Done()
-	for {
-		select {
-		case <-m.stopChan:
-			return
-		case <-m.notifyDirty:
-			snap := m.GetState()
-			m.subscribers.Range(func(key string, ch chan State) bool {
-				select {
-				case ch <- snap:
-				default:
-				}
-				return true
-			})
-		}
-	}
-}
-
-func cloneState(s State) State {
-	out := s
-	out.Backends = append([]BackendInfo(nil), s.Backends...)
-	out.Packages = append([]Package(nil), s.Packages...)
-	out.RecentLog = append([]string(nil), s.RecentLog...)
-	if s.Error != nil {
-		errCopy := *s.Error
-		out.Error = &errCopy
-	}
-	return out
-}
-
-func readOSRelease() (id, pretty string) {
-	f, err := os.Open("/etc/os-release")
-	if err != nil {
-		return "", ""
-	}
-	defer f.Close()
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		k, v, ok := strings.Cut(scanner.Text(), "=")
-		if !ok {
-			continue
-		}
-		v = strings.Trim(v, "\"")
-		switch k {
-		case "ID":
-			id = v
-		case "PRETTY_NAME":
-			pretty = v
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		log.Debugf("[sysupdate] read os-release: %v", err)
-	}
-	return id, pretty
-}

core/internal/server/sysupdate/types.go

@@ -1,86 +0,0 @@
-package sysupdate
-
-type Phase string
-
-const (
-	PhaseIdle       Phase = "idle"
-	PhaseRefreshing Phase = "refreshing"
-	PhaseUpgrading  Phase = "upgrading"
-	PhaseError      Phase = "error"
-)
-
-type RepoKind string
-
-const (
-	RepoSystem  RepoKind = "system"
-	RepoAUR     RepoKind = "aur"
-	RepoFlatpak RepoKind = "flatpak"
-	RepoOSTree  RepoKind = "ostree"
-)
-
-type ErrorCode string
-
-const (
-	ErrCodeNone           ErrorCode = ""
-	ErrCodeNoBackend      ErrorCode = "no-backend"
-	ErrCodeBusy           ErrorCode = "busy"
-	ErrCodeBackendFailed  ErrorCode = "backend-failed"
-	ErrCodeTimeout        ErrorCode = "timeout"
-	ErrCodeCancelled      ErrorCode = "cancelled"
-	ErrCodeInvalidRequest ErrorCode = "invalid-request"
-)
-
-type Package struct {
-	Name         string   `json:"name"`
-	Repo         RepoKind `json:"repo"`
-	Backend      string   `json:"backend"`
-	FromVersion  string   `json:"fromVersion,omitempty"`
-	ToVersion    string   `json:"toVersion,omitempty"`
-	SizeBytes    int64    `json:"sizeBytes,omitempty"`
-	ChangelogURL string   `json:"changelogUrl,omitempty"`
-	Ref          string   `json:"-"`
-}
-
-type BackendInfo struct {
-	ID             string   `json:"id"`
-	DisplayName    string   `json:"displayName"`
-	Repo           RepoKind `json:"repo"`
-	NeedsAuth      bool     `json:"needsAuth"`
-	RunsInTerminal bool     `json:"runsInTerminal"`
-}
-
-type ErrorInfo struct {
-	Code    ErrorCode `json:"code,omitempty"`
-	Message string    `json:"message,omitempty"`
-	Hint    string    `json:"hint,omitempty"`
-}
-
-type State struct {
-	Phase            Phase         `json:"phase"`
-	Distro           string        `json:"distro,omitempty"`
-	DistroPretty     string        `json:"distroPretty,omitempty"`
-	Backends         []BackendInfo `json:"backends"`
-	Packages         []Package     `json:"packages"`
-	Count            int           `json:"count"`
-	IntervalSeconds  int           `json:"intervalSeconds"`
-	LastCheckUnix    int64         `json:"lastCheckUnix,omitempty"`
-	LastSuccessUnix  int64         `json:"lastSuccessUnix,omitempty"`
-	NextCheckUnix    int64         `json:"nextCheckUnix,omitempty"`
-	OperationID      string        `json:"operationId,omitempty"`
-	OperationStarted int64         `json:"operationStartedUnix,omitempty"`
-	RecentLog        []string      `json:"recentLog,omitempty"`
-	Error            *ErrorInfo    `json:"error,omitempty"`
-}
-
-type UpgradeOptions struct {
-	IncludeFlatpak bool
-	IncludeAUR     bool
-	DryRun         bool
-	CustomCommand  string
-	Terminal       string
-	Targets        []Package
-}
-
-type RefreshOptions struct {
-	Force bool
-}

core/internal/trash/trash.go

@@ -1,455 +0,0 @@
-// Package trash implements the FreeDesktop.org Trash specification 1.0.
-// See: https://specifications.freedesktop.org/trash-spec/trashspec-1.0.html
-package trash
-
-import (
-	"errors"
-	"fmt"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
-)
-
-const trashInfoExt = ".trashinfo"
-
-type Entry struct {
-	Name         string `json:"name"`
-	OriginalPath string `json:"originalPath"`
-	DeletionDate string `json:"deletionDate"`
-	TrashDir     string `json:"trashDir"`
-	FilesPath    string `json:"filesPath"`
-	InfoPath     string `json:"infoPath"`
-	Size         int64  `json:"size"`
-	IsDir        bool   `json:"isDir"`
-}
-
-func homeTrashDir() (string, error) {
-	xdg := os.Getenv("XDG_DATA_HOME")
-	if xdg == "" {
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return "", err
-		}
-		xdg = filepath.Join(home, ".local", "share")
-	}
-	return filepath.Join(xdg, "Trash"), nil
-}
-
-func ensureTrashDirs(trashDir string) error {
-	if err := os.MkdirAll(filepath.Join(trashDir, "files"), 0o700); err != nil {
-		return err
-	}
-	return os.MkdirAll(filepath.Join(trashDir, "info"), 0o700)
-}
-
-func fsDevice(path string) (uint64, error) {
-	var st syscall.Stat_t
-	if err := syscall.Lstat(path, &st); err != nil {
-		return 0, err
-	}
-	return uint64(st.Dev), nil
-}
-
-func fsDeviceWalkUp(start string) (uint64, error) {
-	cur := start
-	for {
-		if dev, err := fsDevice(cur); err == nil {
-			return dev, nil
-		}
-		parent := filepath.Dir(cur)
-		if parent == cur {
-			return 0, fmt.Errorf("no existing ancestor for %s", start)
-		}
-		cur = parent
-	}
-}
-
-func findTopDir(path string) (string, error) {
-	abs, err := filepath.Abs(path)
-	if err != nil {
-		return "", err
-	}
-	dev, err := fsDevice(abs)
-	if err != nil {
-		return "", err
-	}
-	cur := abs
-	for {
-		parent := filepath.Dir(cur)
-		if parent == cur {
-			return cur, nil
-		}
-		pdev, err := fsDevice(parent)
-		if err != nil {
-			return cur, nil
-		}
-		if pdev != dev {
-			return cur, nil
-		}
-		cur = parent
-	}
-}
-
-// isValidSharedTrash enforces the spec's checks on $topdir/.Trash:
-// must exist, must be a directory, must not be a symlink, must have sticky bit.
-func isValidSharedTrash(p string) bool {
-	info, err := os.Lstat(p)
-	if err != nil {
-		return false
-	}
-	if info.Mode()&os.ModeSymlink != 0 {
-		return false
-	}
-	if !info.IsDir() {
-		return false
-	}
-	return info.Mode()&os.ModeSticky != 0
-}
-
-// trashDirForPath chooses the correct trash dir per spec and returns the value
-// to store in the .trashinfo Path field (absolute for home, relative-to-topdir
-// for per-mountpoint trash).
-func trashDirForPath(absPath string) (trashDir string, storedPath string, err error) {
-	home, err := homeTrashDir()
-	if err != nil {
-		return "", "", err
-	}
-
-	pathDev, err := fsDevice(absPath)
-	if err != nil {
-		return "", "", err
-	}
-	homeDev, err := fsDeviceWalkUp(home)
-	if err != nil {
-		return "", "", err
-	}
-
-	if pathDev == homeDev {
-		return home, absPath, nil
-	}
-
-	topDir, err := findTopDir(absPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	uid := strconv.Itoa(os.Getuid())
-	stored, rerr := filepath.Rel(topDir, absPath)
-	if rerr != nil || strings.HasPrefix(stored, "..") {
-		stored = absPath
-	}
-
-	shared := filepath.Join(topDir, ".Trash")
-	if isValidSharedTrash(shared) {
-		return filepath.Join(shared, uid), stored, nil
-	}
-	return filepath.Join(topDir, ".Trash-"+uid), stored, nil
-}
-
-// uniqueName returns a basename in trashDir that does not collide with an
-// existing entry in either files/ or info/.
-func uniqueName(trashDir, basename string) (string, error) {
-	filesDir := filepath.Join(trashDir, "files")
-	infoDir := filepath.Join(trashDir, "info")
-	if !exists(filepath.Join(filesDir, basename)) && !exists(filepath.Join(infoDir, basename+trashInfoExt)) {
-		return basename, nil
-	}
-	ext := filepath.Ext(basename)
-	stem := strings.TrimSuffix(basename, ext)
-	for i := 2; i < 100000; i++ {
-		candidate := fmt.Sprintf("%s.%d%s", stem, i, ext)
-		if !exists(filepath.Join(filesDir, candidate)) && !exists(filepath.Join(infoDir, candidate+trashInfoExt)) {
-			return candidate, nil
-		}
-	}
-	return "", errors.New("could not find unique trash name")
-}
-
-func exists(p string) bool {
-	_, err := os.Lstat(p)
-	return err == nil
-}
-
-// pathEncode percent-escapes a POSIX path per RFC 2396, preserving "/".
-func pathEncode(p string) string {
-	parts := strings.Split(p, "/")
-	for i, seg := range parts {
-		parts[i] = url.PathEscape(seg)
-	}
-	return strings.Join(parts, "/")
-}
-
-func pathDecode(p string) string {
-	if d, err := url.PathUnescape(p); err == nil {
-		return d
-	}
-	return p
-}
-
-func writeTrashInfo(infoPath, storedPath string, when time.Time) error {
-	body := "[Trash Info]\nPath=" + pathEncode(storedPath) +
-		"\nDeletionDate=" + when.Format("2006-01-02T15:04:05") + "\n"
-	f, err := os.OpenFile(infoPath, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0o600)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	_, err = f.WriteString(body)
-	return err
-}
-
-// Put trashes a single file or directory.
-func Put(path string) (Entry, error) {
-	abs, err := filepath.Abs(path)
-	if err != nil {
-		return Entry{}, err
-	}
-	info, err := os.Lstat(abs)
-	if err != nil {
-		return Entry{}, err
-	}
-
-	trashDir, storedPath, err := trashDirForPath(abs)
-	if err != nil {
-		return Entry{}, err
-	}
-	if err := ensureTrashDirs(trashDir); err != nil {
-		return Entry{}, fmt.Errorf("create trash dir %s: %w", trashDir, err)
-	}
-
-	name, err := uniqueName(trashDir, filepath.Base(abs))
-	if err != nil {
-		return Entry{}, err
-	}
-
-	infoPath := filepath.Join(trashDir, "info", name+trashInfoExt)
-	when := time.Now()
-	if err := writeTrashInfo(infoPath, storedPath, when); err != nil {
-		return Entry{}, err
-	}
-
-	target := filepath.Join(trashDir, "files", name)
-	if err := os.Rename(abs, target); err != nil {
-		os.Remove(infoPath)
-		return Entry{}, err
-	}
-
-	return Entry{
-		Name:         name,
-		OriginalPath: storedPath,
-		DeletionDate: when.Format("2006-01-02T15:04:05"),
-		TrashDir:     trashDir,
-		FilesPath:    target,
-		InfoPath:     infoPath,
-		Size:         info.Size(),
-		IsDir:        info.IsDir(),
-	}, nil
-}
-
-// allTrashDirs returns the home trash plus every per-mountpoint trash dir
-// that exists (and passes the spec's safety checks for $topdir/.Trash).
-func allTrashDirs() []string {
-	var dirs []string
-	if h, err := homeTrashDir(); err == nil {
-		dirs = append(dirs, h)
-	}
-
-	uid := strconv.Itoa(os.Getuid())
-	for _, mount := range readMountPoints() {
-		shared := filepath.Join(mount, ".Trash")
-		if isValidSharedTrash(shared) {
-			candidate := filepath.Join(shared, uid)
-			if info, err := os.Stat(candidate); err == nil && info.IsDir() {
-				dirs = append(dirs, candidate)
-			}
-		}
-		candidate := filepath.Join(mount, ".Trash-"+uid)
-		if info, err := os.Lstat(candidate); err == nil && info.IsDir() && info.Mode()&os.ModeSymlink == 0 {
-			dirs = append(dirs, candidate)
-		}
-	}
-	return dirs
-}
-
-// readMountPoints returns user-visible mount points from /proc/self/mountinfo,
-// skipping pseudo and system filesystems.
-func readMountPoints() []string {
-	data, err := os.ReadFile("/proc/self/mountinfo")
-	if err != nil {
-		return nil
-	}
-	skipPrefixes := []string{"/proc", "/sys", "/dev"}
-	var out []string
-	seen := map[string]bool{}
-	for line := range strings.SplitSeq(string(data), "\n") {
-		fields := strings.Fields(line)
-		if len(fields) < 5 {
-			continue
-		}
-		mp := fields[4]
-		if mp == "/" {
-			continue
-		}
-		skip := false
-		for _, p := range skipPrefixes {
-			if mp == p || strings.HasPrefix(mp, p+"/") {
-				skip = true
-				break
-			}
-		}
-		if skip || seen[mp] {
-			continue
-		}
-		seen[mp] = true
-		out = append(out, mp)
-	}
-	return out
-}
-
-func List() ([]Entry, error) {
-	var entries []Entry
-	for _, d := range allTrashDirs() {
-		es, _ := listOne(d)
-		entries = append(entries, es...)
-	}
-	return entries, nil
-}
-
-func listOne(trashDir string) ([]Entry, error) {
-	infoDir := filepath.Join(trashDir, "info")
-	filesDir := filepath.Join(trashDir, "files")
-	dir, err := os.ReadDir(infoDir)
-	if err != nil {
-		return nil, err
-	}
-	var entries []Entry
-	for _, ent := range dir {
-		if !strings.HasSuffix(ent.Name(), trashInfoExt) {
-			continue
-		}
-		name := strings.TrimSuffix(ent.Name(), trashInfoExt)
-		infoPath := filepath.Join(infoDir, ent.Name())
-		filesPath := filepath.Join(filesDir, name)
-
-		body, err := os.ReadFile(infoPath)
-		if err != nil {
-			continue
-		}
-
-		e := Entry{Name: name, TrashDir: trashDir, InfoPath: infoPath, FilesPath: filesPath}
-		for line := range strings.SplitSeq(string(body), "\n") {
-			if v, ok := strings.CutPrefix(line, "Path="); ok {
-				e.OriginalPath = pathDecode(v)
-				continue
-			}
-			if v, ok := strings.CutPrefix(line, "DeletionDate="); ok {
-				e.DeletionDate = v
-			}
-		}
-		if info, err := os.Lstat(filesPath); err == nil {
-			e.Size = info.Size()
-			e.IsDir = info.IsDir()
-		}
-		entries = append(entries, e)
-	}
-	return entries, nil
-}
-
-func Count() (int, error) {
-	n := 0
-	for _, d := range allTrashDirs() {
-		ents, err := os.ReadDir(filepath.Join(d, "info"))
-		if err != nil {
-			continue
-		}
-		for _, e := range ents {
-			if strings.HasSuffix(e.Name(), trashInfoExt) {
-				n++
-			}
-		}
-	}
-	return n, nil
-}
-
-func Empty() error {
-	var firstErr error
-	for _, d := range allTrashDirs() {
-		if err := emptyOne(d); err != nil && firstErr == nil {
-			firstErr = err
-		}
-	}
-	return firstErr
-}
-
-func emptyOne(trashDir string) error {
-	var firstErr error
-	for _, sub := range []string{"files", "info"} {
-		path := filepath.Join(trashDir, sub)
-		ents, err := os.ReadDir(path)
-		if err != nil {
-			continue
-		}
-		for _, e := range ents {
-			if err := os.RemoveAll(filepath.Join(path, e.Name())); err != nil && firstErr == nil {
-				firstErr = err
-			}
-		}
-	}
-	os.Remove(filepath.Join(trashDir, "directorysizes"))
-	return firstErr
-}
-
-// Restore returns a trashed item to its original location.
-func Restore(name, trashDir string) error {
-	if trashDir == "" {
-		h, err := homeTrashDir()
-		if err != nil {
-			return err
-		}
-		trashDir = h
-	}
-
-	infoPath := filepath.Join(trashDir, "info", name+trashInfoExt)
-	filesPath := filepath.Join(trashDir, "files", name)
-
-	body, err := os.ReadFile(infoPath)
-	if err != nil {
-		return err
-	}
-
-	var stored string
-	for line := range strings.SplitSeq(string(body), "\n") {
-		if v, ok := strings.CutPrefix(line, "Path="); ok {
-			stored = pathDecode(v)
-			break
-		}
-	}
-	if stored == "" {
-		return errors.New("invalid .trashinfo: missing Path")
-	}
-
-	target := stored
-	if !filepath.IsAbs(stored) {
-		topDir := filepath.Dir(trashDir)
-		if filepath.Base(topDir) == ".Trash" {
-			topDir = filepath.Dir(topDir)
-		}
-		target = filepath.Join(topDir, stored)
-	}
-
-	if exists(target) {
-		return fmt.Errorf("restore target already exists: %s", target)
-	}
-	if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
-		return err
-	}
-	if err := os.Rename(filesPath, target); err != nil {
-		return err
-	}
-	os.Remove(infoPath)
-	return nil
-}

core/internal/trash/trash_test.go

@@ -1,315 +0,0 @@
-package trash
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-)
-
-func setupHomeTrash(t *testing.T) (homeRoot string, trashDir string) {
-	t.Helper()
-	homeRoot = t.TempDir()
-	xdg := filepath.Join(homeRoot, ".local", "share")
-	if err := os.MkdirAll(xdg, 0o700); err != nil {
-		t.Fatalf("mkdir xdg: %v", err)
-	}
-	t.Setenv("XDG_DATA_HOME", xdg)
-	t.Setenv("HOME", homeRoot)
-	trashDir = filepath.Join(xdg, "Trash")
-	return homeRoot, trashDir
-}
-
-func writeFile(t *testing.T, path, content string) {
-	t.Helper()
-	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-		t.Fatalf("mkdir: %v", err)
-	}
-	if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
-		t.Fatalf("write %s: %v", path, err)
-	}
-}
-
-func TestPutHomeTrashAbsolutePath(t *testing.T) {
-	homeRoot, trashDir := setupHomeTrash(t)
-
-	src := filepath.Join(homeRoot, "doc.txt")
-	writeFile(t, src, "hi")
-
-	entry, err := Put(src)
-	if err != nil {
-		t.Fatalf("Put: %v", err)
-	}
-
-	if entry.Name != "doc.txt" {
-		t.Errorf("name = %q, want doc.txt", entry.Name)
-	}
-	if entry.OriginalPath != src {
-		t.Errorf("originalPath = %q, want %q", entry.OriginalPath, src)
-	}
-	if entry.TrashDir != trashDir {
-		t.Errorf("trashDir = %q, want %q", entry.TrashDir, trashDir)
-	}
-	if _, err := os.Stat(src); !os.IsNotExist(err) {
-		t.Errorf("source still exists: %v", err)
-	}
-
-	body, err := os.ReadFile(filepath.Join(trashDir, "info", "doc.txt.trashinfo"))
-	if err != nil {
-		t.Fatalf("read trashinfo: %v", err)
-	}
-	if !strings.HasPrefix(string(body), "[Trash Info]\n") {
-		t.Errorf("trashinfo missing header: %q", body)
-	}
-	if !strings.Contains(string(body), "Path="+src+"\n") {
-		t.Errorf("Path key missing or wrong: %q", body)
-	}
-	if !strings.Contains(string(body), "DeletionDate=") {
-		t.Errorf("DeletionDate missing: %q", body)
-	}
-}
-
-func TestPutPercentEncodesPath(t *testing.T) {
-	homeRoot, trashDir := setupHomeTrash(t)
-
-	name := "spaces & %.txt"
-	src := filepath.Join(homeRoot, name)
-	writeFile(t, src, "x")
-
-	if _, err := Put(src); err != nil {
-		t.Fatalf("Put: %v", err)
-	}
-
-	body, err := os.ReadFile(filepath.Join(trashDir, "info", name+".trashinfo"))
-	if err != nil {
-		t.Fatalf("read: %v", err)
-	}
-	want := "Path=" + filepath.Dir(src) + "/spaces%20&%20%25.txt"
-	if !strings.Contains(string(body), want) {
-		t.Errorf("expected %q in %q", want, body)
-	}
-}
-
-func TestPutCollisionGetsUniqueName(t *testing.T) {
-	homeRoot, trashDir := setupHomeTrash(t)
-
-	for i := range 3 {
-		src := filepath.Join(homeRoot, "dup.txt")
-		writeFile(t, src, "x")
-		if _, err := Put(src); err != nil {
-			t.Fatalf("Put #%d: %v", i, err)
-		}
-	}
-
-	want := []string{"dup.txt", "dup.2.txt", "dup.3.txt"}
-	for _, n := range want {
-		if _, err := os.Stat(filepath.Join(trashDir, "files", n)); err != nil {
-			t.Errorf("expected %s in trash: %v", n, err)
-		}
-		if _, err := os.Stat(filepath.Join(trashDir, "info", n+".trashinfo")); err != nil {
-			t.Errorf("expected %s.trashinfo: %v", n, err)
-		}
-	}
-}
-
-func TestListAndCount(t *testing.T) {
-	homeRoot, _ := setupHomeTrash(t)
-
-	if n, _ := Count(); n != 0 {
-		t.Errorf("initial count = %d, want 0", n)
-	}
-	entries, _ := List()
-	if len(entries) != 0 {
-		t.Errorf("initial list len = %d, want 0", len(entries))
-	}
-
-	for _, n := range []string{"a.txt", "b.txt", "c.log"} {
-		src := filepath.Join(homeRoot, n)
-		writeFile(t, src, n)
-		if _, err := Put(src); err != nil {
-			t.Fatalf("Put %s: %v", n, err)
-		}
-	}
-
-	got, _ := Count()
-	if got != 3 {
-		t.Errorf("count = %d, want 3", got)
-	}
-	entries, _ = List()
-	if len(entries) != 3 {
-		t.Errorf("list len = %d, want 3", len(entries))
-	}
-	for _, e := range entries {
-		if e.OriginalPath == "" {
-			t.Errorf("entry %s: empty OriginalPath", e.Name)
-		}
-		if _, err := time.Parse("2006-01-02T15:04:05", e.DeletionDate); err != nil {
-			t.Errorf("entry %s: bad DeletionDate %q: %v", e.Name, e.DeletionDate, err)
-		}
-	}
-}
-
-func TestEmptyClearsAll(t *testing.T) {
-	homeRoot, trashDir := setupHomeTrash(t)
-
-	for _, n := range []string{"x", "y", "z"} {
-		src := filepath.Join(homeRoot, n)
-		writeFile(t, src, n)
-		if _, err := Put(src); err != nil {
-			t.Fatalf("Put: %v", err)
-		}
-	}
-	if n, _ := Count(); n != 3 {
-		t.Fatalf("pre-empty count = %d", n)
-	}
-
-	if err := Empty(); err != nil {
-		t.Fatalf("Empty: %v", err)
-	}
-
-	if n, _ := Count(); n != 0 {
-		t.Errorf("post-empty count = %d, want 0", n)
-	}
-	for _, sub := range []string{"files", "info"} {
-		ents, err := os.ReadDir(filepath.Join(trashDir, sub))
-		if err != nil {
-			t.Fatalf("readdir %s: %v", sub, err)
-		}
-		if len(ents) != 0 {
-			t.Errorf("%s/ has %d entries, want 0", sub, len(ents))
-		}
-	}
-}
-
-func TestRestoreToOriginalPath(t *testing.T) {
-	homeRoot, trashDir := setupHomeTrash(t)
-
-	src := filepath.Join(homeRoot, "sub", "dir", "thing.txt")
-	writeFile(t, src, "payload")
-
-	entry, err := Put(src)
-	if err != nil {
-		t.Fatalf("Put: %v", err)
-	}
-
-	os.RemoveAll(filepath.Join(homeRoot, "sub"))
-
-	if err := Restore(entry.Name, trashDir); err != nil {
-		t.Fatalf("Restore: %v", err)
-	}
-
-	body, err := os.ReadFile(src)
-	if err != nil {
-		t.Fatalf("read restored: %v", err)
-	}
-	if string(body) != "payload" {
-		t.Errorf("restored content = %q, want %q", body, "payload")
-	}
-
-	if _, err := os.Stat(entry.InfoPath); !os.IsNotExist(err) {
-		t.Errorf("info file still present: %v", err)
-	}
-	if _, err := os.Stat(entry.FilesPath); !os.IsNotExist(err) {
-		t.Errorf("files entry still present: %v", err)
-	}
-}
-
-func TestRestoreRefusesToOverwrite(t *testing.T) {
-	homeRoot, trashDir := setupHomeTrash(t)
-
-	src := filepath.Join(homeRoot, "keep.txt")
-	writeFile(t, src, "v1")
-
-	entry, err := Put(src)
-	if err != nil {
-		t.Fatalf("Put: %v", err)
-	}
-
-	writeFile(t, src, "v2-blocking")
-
-	err = Restore(entry.Name, trashDir)
-	if err == nil {
-		t.Fatalf("expected error on conflicting restore, got nil")
-	}
-	if !strings.Contains(err.Error(), "exists") {
-		t.Errorf("error %q does not mention conflict", err)
-	}
-
-	body, _ := os.ReadFile(src)
-	if string(body) != "v2-blocking" {
-		t.Errorf("blocking file altered: %q", body)
-	}
-}
-
-func TestPutDirectory(t *testing.T) {
-	homeRoot, trashDir := setupHomeTrash(t)
-
-	dir := filepath.Join(homeRoot, "myfolder")
-	writeFile(t, filepath.Join(dir, "child.txt"), "inside")
-
-	entry, err := Put(dir)
-	if err != nil {
-		t.Fatalf("Put dir: %v", err)
-	}
-	if !entry.IsDir {
-		t.Errorf("IsDir = false, want true")
-	}
-
-	moved := filepath.Join(trashDir, "files", "myfolder", "child.txt")
-	body, err := os.ReadFile(moved)
-	if err != nil {
-		t.Fatalf("read moved child: %v", err)
-	}
-	if string(body) != "inside" {
-		t.Errorf("child content = %q", body)
-	}
-}
-
-func TestIsValidSharedTrashRejectsSymlink(t *testing.T) {
-	tmp := t.TempDir()
-	target := filepath.Join(tmp, "real")
-	if err := os.MkdirAll(target, os.ModeSticky|0o777); err != nil {
-		t.Fatalf("mkdir target: %v", err)
-	}
-
-	link := filepath.Join(tmp, ".Trash")
-	if err := os.Symlink(target, link); err != nil {
-		t.Fatalf("symlink: %v", err)
-	}
-	if isValidSharedTrash(link) {
-		t.Errorf("symlinked .Trash accepted; spec requires rejection")
-	}
-}
-
-func TestIsValidSharedTrashRequiresStickyBit(t *testing.T) {
-	tmp := t.TempDir()
-	dir := filepath.Join(tmp, ".Trash")
-	if err := os.MkdirAll(dir, 0o777); err != nil {
-		t.Fatalf("mkdir: %v", err)
-	}
-	if isValidSharedTrash(dir) {
-		t.Errorf(".Trash without sticky bit accepted; spec requires rejection")
-	}
-
-	if err := os.Chmod(dir, os.ModeSticky|0o777); err != nil {
-		t.Fatalf("chmod: %v", err)
-	}
-	if !isValidSharedTrash(dir) {
-		t.Errorf(".Trash with sticky bit rejected; spec accepts it")
-	}
-}
-
-func TestPathEncodeRoundTrip(t *testing.T) {
-	cases := []string{
-		"/home/u/file.txt",
-		"/path with spaces/and-symbols & %.txt",
-		"relative/path/é unicode.md",
-	}
-	for _, in := range cases {
-		got := pathDecode(pathEncode(in))
-		if got != in {
-			t.Errorf("round-trip %q -> %q", in, got)
-		}
-	}
-}

core/internal/version/version_test.go

@@ -2,10 +2,12 @@ package version
 
 import (
 	"os"
+	"os/exec"
 	"path/filepath"
 	"testing"
 
 	mocks_version "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/version"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
 )
 
 func TestCompareVersions(t *testing.T) {
@@ -148,6 +150,76 @@ func TestGetCurrentDMSVersion_NotInstalled(t *testing.T) {
 	}
 }
 
+func TestGetCurrentDMSVersion_GitTag(t *testing.T) {
+	if !utils.CommandExists("git") {
+		t.Skip("git not available")
+	}
+
+	tempDir := t.TempDir()
+	dmsPath := filepath.Join(tempDir, ".config", "quickshell", "dms")
+	os.MkdirAll(dmsPath, 0o755)
+
+	originalHome := os.Getenv("HOME")
+	defer os.Setenv("HOME", originalHome)
+	os.Setenv("HOME", tempDir)
+
+	exec.Command("git", "init", dmsPath).Run()
+	exec.Command("git", "-C", dmsPath, "config", "user.email", "test@test.com").Run()
+	exec.Command("git", "-C", dmsPath, "config", "user.name", "Test User").Run()
+
+	testFile := filepath.Join(dmsPath, "test.txt")
+	os.WriteFile(testFile, []byte("test"), 0o644)
+	exec.Command("git", "-C", dmsPath, "add", ".").Run()
+	exec.Command("git", "-C", dmsPath, "commit", "-m", "initial").Run()
+	exec.Command("git", "-C", dmsPath, "tag", "v0.1.0").Run()
+
+	version, err := GetCurrentDMSVersion()
+	if err != nil {
+		t.Fatalf("GetCurrentDMSVersion() failed: %v", err)
+	}
+
+	if version != "v0.1.0" {
+		t.Errorf("Expected version v0.1.0, got %s", version)
+	}
+}
+
+func TestGetCurrentDMSVersion_GitBranch(t *testing.T) {
+	if !utils.CommandExists("git") {
+		t.Skip("git not available")
+	}
+
+	tempDir := t.TempDir()
+	dmsPath := filepath.Join(tempDir, ".config", "quickshell", "dms")
+	os.MkdirAll(dmsPath, 0o755)
+
+	originalHome := os.Getenv("HOME")
+	defer os.Setenv("HOME", originalHome)
+	os.Setenv("HOME", tempDir)
+
+	exec.Command("git", "init", dmsPath).Run()
+	exec.Command("git", "-C", dmsPath, "config", "user.email", "test@test.com").Run()
+	exec.Command("git", "-C", dmsPath, "config", "user.name", "Test User").Run()
+	exec.Command("git", "-C", dmsPath, "checkout", "-b", "master").Run()
+
+	testFile := filepath.Join(dmsPath, "test.txt")
+	os.WriteFile(testFile, []byte("test"), 0o644)
+	exec.Command("git", "-C", dmsPath, "add", ".").Run()
+	exec.Command("git", "-C", dmsPath, "commit", "-m", "initial").Run()
+
+	version, err := GetCurrentDMSVersion()
+	if err != nil {
+		t.Fatalf("GetCurrentDMSVersion() failed: %v", err)
+	}
+
+	if version == "" {
+		t.Error("Expected non-empty version")
+	}
+
+	if len(version) < 7 {
+		t.Errorf("Expected version with branch@commit format, got %s", version)
+	}
+}
+
 func TestVersionInfo_IsGit(t *testing.T) {
 	tests := []struct {
 		current  string

distro/nix/default.nix

@@ -1,11 +0,0 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ../../flake.lock);
-  in
-  fetchTarball {
-    url =
-      lock.nodes.flake-compat.locked.url
-        or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  }
-) { src = ../..; }).defaultNix

distro/nix/shell.nix

@@ -1,11 +0,0 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ../../flake.lock);
-  in
-  fetchTarball {
-    url =
-      lock.nodes.flake-compat.locked.url
-        or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  }
-) { src = ../..; }).shellNix

distro/nix/tests/default.nix

@@ -1,52 +0,0 @@
-{
-  self,
-  pkgs,
-  ...
-}:
-rec {
-  all = pkgs.symlinkJoin {
-    name = "dms-nixos-tests";
-    paths = [
-      nixos-module
-      nixos-service-start-module
-      greeter-niri-module
-      niri-home-module
-      home-manager-module
-    ];
-  };
-
-  nixos-module = import ./nixos-module.nix {
-    inherit
-      self
-      pkgs
-      ;
-  };
-
-  nixos-service-start-module = import ./nixos-service-start-module.nix {
-    inherit
-      self
-      pkgs
-      ;
-  };
-
-  greeter-niri-module = import ./greeter-niri-module.nix {
-    inherit
-      self
-      pkgs
-      ;
-  };
-
-  niri-home-module = import ./niri-home-module.nix {
-    inherit
-      self
-      pkgs
-      ;
-  };
-
-  home-manager-module = import ./home-manager-module.nix {
-    inherit
-      self
-      pkgs
-      ;
-  };
-}

distro/nix/tests/greeter-niri-module.nix

@@ -1,60 +0,0 @@
-{
-  self,
-  pkgs,
-  ...
-}:
-pkgs.testers.runNixOSTest {
-  name = "dms-greeter-niri-module";
-
-  nodes.machine = {
-    imports = [
-      self.nixosModules.greeter
-    ];
-
-    users.groups.greeter = { };
-    users.users.greeter = {
-      isSystemUser = true;
-      group = "greeter";
-    };
-
-    services.greetd.settings.default_session.user = "greeter";
-
-    programs.niri.enable = true;
-
-    programs.dank-material-shell.greeter = {
-      enable = true;
-      compositor.name = "niri";
-    };
-
-    system.stateVersion = "25.11";
-  };
-
-  testScript = ''
-    import re
-
-    machine.wait_for_unit("multi-user.target")
-    machine.wait_for_unit("greetd.service")
-
-    machine.succeed("systemctl is-enabled greetd.service")
-    machine.succeed("systemctl is-active greetd.service")
-
-    greetd_unit = machine.succeed("cat /etc/systemd/system/greetd.service")
-    config_match = re.search(r'--config (/nix/store[^ ]+-greetd.toml)', greetd_unit)
-    if config_match is None:
-        raise AssertionError(greetd_unit)
-
-    greetd_config_path = config_match.group(1)
-    greetd_config = machine.succeed(f"cat {greetd_config_path}")
-    t.assertIn("dms-greeter", greetd_config)
-
-    script_match = re.search(r'command\s*=\s*"([^"]+/bin/dms-greeter)"', greetd_config)
-    if script_match is None:
-        raise AssertionError(greetd_config)
-
-    script_path = script_match.group(1)
-    script = machine.succeed(f"cat {script_path}")
-    t.assertIn("--command", script)
-    t.assertIn("niri", script)
-    t.assertIn("/share/quickshell/dms", script)
-  '';
-}

distro/nix/tests/home-manager-module.nix

@@ -1,107 +0,0 @@
-{
-  self,
-  pkgs,
-  ...
-}:
-let
-  homeManagerNixosModule =
-    (fetchTarball {
-      url = "https://github.com/nix-community/home-manager/archive/e82d4a4ecd18363aa2054cbaa3e32e4134c3dbf4.tar.gz";
-      sha256 = "sha256-ZTYDofOM3/PJhRF1EuBh6uibm+DmkhU7Wor6mMN7YTc=";
-    })
-    + "/nixos";
-in
-pkgs.testers.runNixOSTest {
-  name = "dms-home-manager-module";
-
-  nodes.machine = {
-    ...
-  }: {
-    imports = [
-      homeManagerNixosModule
-    ];
-
-    users.users.danklinux = {
-      isNormalUser = true;
-      createHome = true;
-      home = "/home/danklinux";
-      extraGroups = [ "wheel" ];
-    };
-
-    home-manager.useGlobalPkgs = true;
-    home-manager.useUserPackages = true;
-
-    home-manager.users.danklinux = {
-      pkgs,
-      ...
-    }: {
-      imports = [
-        self.homeModules.dank-material-shell
-      ];
-
-      home.username = "danklinux";
-      home.homeDirectory = "/home/danklinux";
-      home.stateVersion = "25.11";
-
-      programs.dank-material-shell = {
-        enable = true;
-        systemd = {
-          enable = true;
-          target = "default.target";
-        };
-
-        settings = {
-          theme = "integration-test";
-        };
-
-        clipboardSettings = {
-          maxItems = 10;
-        };
-
-        session = {
-          startedFrom = "nixos-test";
-        };
-
-        plugins.TestPlugin = {
-          enable = true;
-          src = pkgs.runCommand "dms-test-plugin" { } ''
-            mkdir -p "$out"
-            echo plugin > "$out/plugin.txt"
-          '';
-          settings = {
-            enabled = true;
-            source = "test";
-          };
-        };
-      };
-    };
-
-    system.stateVersion = "25.11";
-  };
-
-  testScript = ''
-    import json
-
-    machine.wait_for_unit("multi-user.target")
-
-    machine.succeed("su -- danklinux -c 'command -v dms'")
-    machine.succeed("su -- danklinux -c 'test -f ~/.config/DankMaterialShell/settings.json'")
-    machine.succeed("su -- danklinux -c 'test -f ~/.config/DankMaterialShell/clsettings.json'")
-    machine.succeed("su -- danklinux -c 'test -f ~/.config/DankMaterialShell/plugin_settings.json'")
-    machine.succeed("su -- danklinux -c 'test -e ~/.config/DankMaterialShell/plugins/TestPlugin'")
-    machine.succeed("su -- danklinux -c 'test -f ~/.local/state/DankMaterialShell/session.json'")
-
-    settings = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/DankMaterialShell/settings.json'"))
-    clipboard = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/DankMaterialShell/clsettings.json'"))
-    session = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.local/state/DankMaterialShell/session.json'"))
-    plugins = json.loads(machine.succeed("su -- danklinux -c 'cat ~/.config/DankMaterialShell/plugin_settings.json'"))
-    doctor = json.loads(machine.succeed("su -- danklinux -c 'dms doctor --json'"))
-
-    t.assertEqual(settings["theme"], "integration-test")
-    t.assertEqual(clipboard["maxItems"], 10)
-    t.assertEqual(session["startedFrom"], "nixos-test")
-    t.assertTrue(plugins["TestPlugin"]["enabled"])
-    t.assertEqual(plugins["TestPlugin"]["source"], "test")
-    t.assertIsInstance(doctor.get("results"), list)
-  '';
-}

distro/nix/tests/niri-home-module.nix

@@ -1,84 +0,0 @@
-{
-  self,
-  pkgs,
-  ...
-}:
-let
-  homeManagerNixosModule =
-    (fetchTarball {
-      url = "https://github.com/nix-community/home-manager/archive/e82d4a4ecd18363aa2054cbaa3e32e4134c3dbf4.tar.gz";
-      sha256 = "sha256-ZTYDofOM3/PJhRF1EuBh6uibm+DmkhU7Wor6mMN7YTc=";
-    })
-    + "/nixos";
-
-  niriFlake = builtins.getFlake "github:sodiboo/niri-flake/2bb22af2985e5f3cfd051b3d977ebfbf81126280?narHash=sha256-ooPmu%2B8tqOGh4kozPW4rJC7Y7WM/FHtEY3OK1PoNW7g%3D";
-
-  fakeNiri = (pkgs.writeScriptBin "niri" "") // {
-    cargoBuildNoDefaultFeatures = false;
-  };
-in
-pkgs.testers.runNixOSTest {
-  name = "dms-niri-home-module";
-
-  nodes.machine = {
-    ...
-  }: {
-    imports = [
-      homeManagerNixosModule
-    ];
-
-    users.users.danklinux = {
-      isNormalUser = true;
-      createHome = true;
-      home = "/home/danklinux";
-      extraGroups = [ "wheel" ];
-    };
-
-    home-manager.useGlobalPkgs = true;
-    home-manager.useUserPackages = true;
-
-    environment.pathsToLink = [
-      "/share/applications"
-      "/share/xdg-desktop-portal"
-    ];
-
-    home-manager.users.danklinux = {
-      ...
-    }: {
-      imports = [
-        self.homeModules.dank-material-shell
-        niriFlake.homeModules.niri
-        self.homeModules.niri
-      ];
-
-      home.username = "danklinux";
-      home.homeDirectory = "/home/danklinux";
-      home.stateVersion = "25.11";
-
-      programs.niri = {
-        enable = true;
-        package = fakeNiri; # avoids niri from being compiled in the CI
-      };
-
-      programs.dank-material-shell = {
-        enable = true;
-        niri = {
-          enableKeybinds = false;
-          enableSpawn = true;
-        };
-      };
-    };
-
-    system.stateVersion = "25.11";
-  };
-
-  testScript = ''
-    machine.wait_for_unit("multi-user.target")
-
-    machine.succeed("su -- danklinux -c 'test -f ~/.config/niri/config.kdl'")
-    machine.succeed("su -- danklinux -c 'grep -F \"include \\\"dms/binds.kdl\\\"\" ~/.config/niri/config.kdl'")
-    machine.succeed("su -- danklinux -c 'grep -F \"include \\\"hm.kdl\\\"\" ~/.config/niri/config.kdl'")
-    machine.succeed("su -- danklinux -c 'grep -F \"spawn-at-startup\" ~/.config/niri/hm.kdl'")
-    machine.succeed("su -- danklinux -c 'grep -F \"\\\"dms\\\" \\\"run\\\"\" ~/.config/niri/hm.kdl'")
-  '';
-}

distro/nix/tests/nixos-module.nix

@@ -1,47 +0,0 @@
-{
-  self,
-  pkgs,
-  ...
-}:
-pkgs.testers.runNixOSTest {
-  name = "dms-nixos-module";
-
-  nodes.machine = {
-    imports = [
-      self.nixosModules.dank-material-shell
-    ];
-
-    users.users.danklinux = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" ];
-    };
-
-    programs.dank-material-shell = {
-      enable = true;
-      systemd.enable = true;
-      plugins = {
-        TestPlugin = {
-          src = pkgs.emptyDirectory;
-        };
-      };
-    };
-
-    system.stateVersion = "25.11";
-  };
-
-  testScript = ''
-    import json
-
-    machine.wait_for_unit("multi-user.target")
-
-    machine.succeed("command -v dms")
-    machine.succeed("command -v quickshell")
-    machine.succeed("su -- danklinux -c 'dms --help >/dev/null'")
-    machine.succeed("test -d /etc/xdg/quickshell/dms-plugins")
-    machine.succeed("test -f /run/current-system/sw/lib/systemd/user/dms.service")
-
-    payload = json.loads(machine.succeed("su -- danklinux -c 'dms doctor --json'"))
-    t.assertIn("summary", payload)
-    t.assertIsInstance(payload.get("results"), list)
-  '';
-}

distro/nix/tests/nixos-service-start-module.nix

@@ -1,48 +0,0 @@
-{
-  self,
-  pkgs,
-  ...
-}:
-let
-  fakeDms = pkgs.writeShellScriptBin "dms" ''
-    printf '%s\n' "$@" > /tmp/dms-service-args
-    exec ${pkgs.coreutils}/bin/sleep 300
-  '';
-in
-pkgs.testers.runNixOSTest {
-  name = "dms-nixos-service-start-module";
-
-  nodes.machine = {
-    imports = [
-      self.nixosModules.dank-material-shell
-    ];
-
-    users.users.danklinux = {
-      isNormalUser = true;
-      linger = true;
-      extraGroups = [ "wheel" ];
-    };
-
-    programs.dank-material-shell = {
-      enable = true;
-      package = fakeDms;
-      systemd = {
-        enable = true;
-        target = "default.target";
-      };
-    };
-
-    system.stateVersion = "25.11";
-  };
-
-  testScript = ''
-    machine.wait_for_unit("multi-user.target")
-    machine.wait_for_unit("user@1000.service")
-
-    machine.succeed("systemctl --machine=danklinux@ --user start dms.service")
-    machine.wait_until_succeeds("systemctl --machine=danklinux@ --user is-active dms.service")
-    machine.wait_until_succeeds("test -f /tmp/dms-service-args")
-    machine.succeed("grep -Fx run /tmp/dms-service-args")
-    machine.succeed("grep -Fx -- --session /tmp/dms-service-args")
-  '';
-}

flake.lock

@@ -1,28 +1,12 @@
 {
   "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776169885,
-        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
@@ -39,23 +23,22 @@
         ]
       },
       "locked": {
-        "lastModified": 1776854048,
-        "narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=",
+        "lastModified": 1766725085,
+        "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=",
         "ref": "refs/heads/master",
-        "rev": "783c953987dc56ff0601abe6845ed96f1d00495a",
-        "revCount": 806,
+        "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
+        "revCount": 715,
         "type": "git",
         "url": "https://git.outfoxxed.me/quickshell/quickshell"
       },
       "original": {
-        "rev": "783c953987dc56ff0601abe6845ed96f1d00495a",
+        "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
         "type": "git",
         "url": "https://git.outfoxxed.me/quickshell/quickshell"
       }
     },
     "root": {
       "inputs": {
-        "flake-compat": "flake-compat",
         "nixpkgs": "nixpkgs",
         "quickshell": "quickshell"
       }

flake.nix

@@ -4,13 +4,9 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     quickshell = {
-      url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=783c953987dc56ff0601abe6845ed96f1d00495a";
+      url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=41828c4180fb921df7992a5405f5ff05d2ac2fff";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    flake-compat = {
-      url = "github:NixOS/flake-compat";
-      flake = false;
-    };
   };
 
   outputs =
@@ -45,12 +41,10 @@
         nixpkgs.lib.genAttrs [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ] (
           system: fn system nixpkgs.legacyPackages.${system}
         );
-      forEachLinuxSystem =
-        fn:
-        nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ] (
-          system: fn system nixpkgs.legacyPackages.${system}
-        );
-
+      buildDmsPkgs = pkgs: {
+        dms-shell = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
+        quickshell = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
+      };
       mkModuleWithDmsPkgs =
         modulePath:
         args@{ pkgs, ... }:
@@ -59,7 +53,6 @@
             (import modulePath (args // { dmsPkgs = buildDmsPkgs pkgs; }))
           ];
         };
-
       mkQmlImportPath =
         pkgs: qmlPkgs:
         pkgs.lib.concatStringsSep ":" (map (o: "${o}/${pkgs.qt6.qtbase.qtQmlPrefix}") qmlPkgs);
@@ -76,11 +69,10 @@
           qtimageformats
           kimageformats
         ];
-
-      # Allows downstream modules to provide their own 'pkgs' (with overlays)
-      # instead of being forced to use the flake's locked nixpkgs.
-      mkDmsShell =
-        pkgs:
+    in
+    {
+      packages = forEachSystem (
+        system: pkgs:
         let
           mkDate =
             longDate:
@@ -98,96 +90,89 @@
             in
             "${cleanVersion}${dateSuffix}${revSuffix}";
         in
-        pkgs.lib.makeOverridable (
-          {
-            extraQtPackages ? [ ],
-          }:
-          (pkgs.buildGoModule.override { go = goForPkgs pkgs; }) (
-            let
-              rootSrc = ./.;
-              qtPackages = (qmlPkgs pkgs) ++ extraQtPackages;
-            in
+        {
+          dms-shell = pkgs.lib.makeOverridable (
             {
-              inherit version;
-              pname = "dms-shell";
-              src = ./core;
-              vendorHash = "sha256-kPu3MLqhLaCaBpCwIP8JXep0J/Z45kxDFOEY8JvcWdU=";
+              extraQtPackages ? [ ],
+            }:
+            (pkgs.buildGoModule.override { go = goForPkgs pkgs; }) (
+              let
+                rootSrc = ./.;
+                qtPackages = (qmlPkgs pkgs) ++ extraQtPackages;
+              in
+              {
+                inherit version;
+                pname = "dms-shell";
+                src = ./core;
+                vendorHash = "sha256-dEk7IOd6aQwaxZruxQclN7TGMyb8EJOl6NBWRsoZ9HQ=";
 
-              subPackages = [ "cmd/dms" ];
+                subPackages = [ "cmd/dms" ];
 
-              ldflags = [
-                "-s"
-                "-w"
-                "-X 'main.Version=${version}'"
-              ];
+                ldflags = [
+                  "-s"
+                  "-w"
+                  "-X 'main.Version=${version}'"
+                ];
 
-              nativeBuildInputs = with pkgs; [
-                installShellFiles
-                makeWrapper
-              ];
+                nativeBuildInputs = with pkgs; [
+                  installShellFiles
+                  makeWrapper
+                ];
 
-              postInstall = ''
-                mkdir -p $out/share/quickshell/dms
-                cp -r ${rootSrc}/quickshell/. $out/share/quickshell/dms/
+                postInstall = ''
+                  mkdir -p $out/share/quickshell/dms
+                  cp -r ${rootSrc}/quickshell/. $out/share/quickshell/dms/
 
-                chmod u+w $out/share/quickshell/dms/VERSION
-                echo "${version}" > $out/share/quickshell/dms/VERSION
+                  chmod u+w $out/share/quickshell/dms/VERSION
+                  echo "${version}" > $out/share/quickshell/dms/VERSION
 
-                # Install desktop file and icon
-                install -D ${rootSrc}/assets/dms-open.desktop \
-                  $out/share/applications/dms-open.desktop
-                install -D ${rootSrc}/core/assets/danklogo.svg \
-                  $out/share/hicolor/scalable/apps/danklogo.svg
+                  # Install desktop file and icon
+                  install -D ${rootSrc}/assets/dms-open.desktop \
+                    $out/share/applications/dms-open.desktop
+                  install -D ${rootSrc}/core/assets/danklogo.svg \
+                    $out/share/hicolor/scalable/apps/danklogo.svg
 
-                wrapProgram $out/bin/dms \
-                  --add-flags "-c $out/share/quickshell/dms" \
-                  --prefix "NIXPKGS_QT6_QML_IMPORT_PATH" ":" "${mkQmlImportPath pkgs qtPackages}" \
-                  --prefix "QT_PLUGIN_PATH" ":" "${mkQtPluginPath pkgs qtPackages}"
+                  wrapProgram $out/bin/dms \
+                    --add-flags "-c $out/share/quickshell/dms" \
+                    --prefix "NIXPKGS_QT6_QML_IMPORT_PATH" ":" "${mkQmlImportPath pkgs qtPackages}" \
+                    --prefix "QT_PLUGIN_PATH" ":" "${mkQtPluginPath pkgs qtPackages}"
 
-                install -Dm644 ${rootSrc}/assets/systemd/dms.service \
-                  $out/lib/systemd/user/dms.service
+                  install -Dm644 ${rootSrc}/assets/systemd/dms.service \
+                    $out/lib/systemd/user/dms.service
 
-                substituteInPlace $out/lib/systemd/user/dms.service \
-                  --replace-fail /usr/bin/dms $out/bin/dms \
-                  --replace-fail /usr/bin/pkill ${pkgs.procps}/bin/pkill
+                  substituteInPlace $out/lib/systemd/user/dms.service \
+                    --replace-fail /usr/bin/dms $out/bin/dms \
+                    --replace-fail /usr/bin/pkill ${pkgs.procps}/bin/pkill
 
-                substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \
-                  --replace-fail /bin/bash ${pkgs.bashInteractive}/bin/bash
+                  substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \
+                    --replace-fail /bin/bash ${pkgs.bashInteractive}/bin/bash
 
-                substituteInPlace $out/share/quickshell/dms/assets/pam/fprint \
-                  --replace-fail pam_fprintd.so ${pkgs.fprintd}/lib/security/pam_fprintd.so
+                  substituteInPlace $out/share/quickshell/dms/assets/pam/fprint \
+                    --replace-fail pam_fprintd.so ${pkgs.fprintd}/lib/security/pam_fprintd.so
 
-                substituteInPlace $out/share/quickshell/dms/assets/pam/u2f \
-                  --replace-fail pam_u2f.so ${pkgs.pam_u2f}/lib/security/pam_u2f.so
+                  substituteInPlace $out/share/quickshell/dms/assets/pam/u2f \
+                    --replace-fail pam_u2f.so ${pkgs.pam_u2f}/lib/security/pam_u2f.so
 
-                installShellCompletion --cmd dms \
-                  --bash <($out/bin/dms completion bash) \
-                  --fish <($out/bin/dms completion fish) \
-                  --zsh <($out/bin/dms completion zsh)
-              '';
+                  installShellCompletion --cmd dms \
+                    --bash <($out/bin/dms completion bash) \
+                    --fish <($out/bin/dms completion fish) \
+                    --zsh <($out/bin/dms completion zsh)
+                '';
 
-              meta = {
-                description = "Desktop shell for wayland compositors built with Quickshell & GO";
-                homepage = "https://danklinux.com";
-                changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${version}";
-                license = pkgs.lib.licenses.mit;
-                mainProgram = "dms";
-                platforms = pkgs.lib.platforms.linux;
-              };
-            }
-          )
-        ) { };
+                meta = {
+                  description = "Desktop shell for wayland compositors built with Quickshell & GO";
+                  homepage = "https://danklinux.com";
+                  changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${version}";
+                  license = pkgs.lib.licenses.mit;
+                  mainProgram = "dms";
+                  platforms = pkgs.lib.platforms.linux;
+                };
+              }
+            )
+          ) { };
 
-      buildDmsPkgs = pkgs: {
-        dms-shell = mkDmsShell pkgs;
-        quickshell = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
-      };
-    in
-    {
-      packages = forEachSystem (
-        system: pkgs: {
-          dms-shell = mkDmsShell pkgs;
           quickshell = quickshell.packages.${system}.default;
+
           default = self.packages.${system}.dms-shell;
         }
       );
@@ -251,16 +236,5 @@
           };
         }
       );
-
-      nixosTests = forEachLinuxSystem (
-        system: pkgs:
-        import ./distro/nix/tests {
-          inherit
-            self
-            pkgs
-            ;
-          lib = pkgs.lib;
-        }
-      );
     };
 }

quickshell/Common/AnimVariants.qml

@@ -5,40 +5,121 @@ import QtQuick
 import Quickshell
 import qs.Common
 
-// AnimVariants — central tuning for animation variants (Material/Fluent/Dynamic)
-// and motion effects (Standard/Directional/Depth). Lookups are indexed by enum
-// value: animationVariant 0=Material, 1=Fluent, 2=Dynamic; motionEffect
-// 0=Standard, 1=Directional, 2=Depth.
+// AnimVariants — Central tuning for animation and Motion Effects variants
+// (Material/Fluent/Dynamic) (Standard/Directional/Depth)
 
 Singleton {
     id: root
 
-    readonly property int _variant: (typeof SettingsData === "undefined") ? 0 : SettingsData.animationVariant
-    readonly property int _effect: (typeof SettingsData === "undefined") ? 0 : SettingsData.motionEffect
+    readonly property list<real> variantEnterCurve: {
+        if (typeof SettingsData === "undefined")
+            return Anims.expressiveDefaultSpatial;
+        switch (SettingsData.animationVariant) {
+        case 1:
+            return Anims.standardDecel;
+        case 2:
+            return Anims.expressiveFastSpatial;
+        default:
+            return Anims.expressiveDefaultSpatial;
+        }
+    }
 
-    readonly property var _enterCurves: [Anims.expressiveDefaultSpatial, Anims.standardDecel, Anims.expressiveFastSpatial]
-    readonly property var _exitCurves: [Anims.emphasized, Anims.standard, Anims.emphasized]
-    readonly property var _directionalExitCurves: [Anims.emphasized, Anims.emphasizedAccel, Anims.emphasizedAccel]
-    readonly property var _enterDurationFactors: [1.0, 0.9, 1.08]
-    readonly property var _exitDurationFactors: [1.0, 0.85, 0.92]
-    readonly property var _cleanupPaddings: [50, 8, 24]
-    readonly property var _effectScaleCollapsed: [0.96, 1.0, 0.88]
-    readonly property var _effectAnimOffsets: [16, 144, 56]
+    readonly property list<real> variantExitCurve: {
+        if (typeof SettingsData === "undefined")
+            return Anims.emphasized;
+        switch (SettingsData.animationVariant) {
+        case 1:
+            return Anims.standard;
+        case 2:
+            return Anims.emphasized;
+        default:
+            return Anims.emphasized;
+        }
+    }
 
-    readonly property list<real> variantEnterCurve: _enterCurves[_variant] || _enterCurves[0]
-    readonly property list<real> variantExitCurve: _exitCurves[_variant] || _exitCurves[0]
+    // Modal-specific entry curve
+    readonly property list<real> variantModalEnterCurve: {
+        if (typeof SettingsData === "undefined")
+            return Anims.expressiveDefaultSpatial;
+        if (isDirectionalEffect) {
+            if (SettingsData.animationVariant === 1)
+                return Anims.standardDecel;
+            if (SettingsData.animationVariant === 2)
+                return Anims.expressiveFastSpatial;
+        }
+        return variantEnterCurve;
+    }
 
-    readonly property list<real> variantModalEnterCurve: isDirectionalEffect && _variant !== 0 ? (_enterCurves[_variant] || _enterCurves[0]) : variantEnterCurve
-    readonly property list<real> variantModalExitCurve: isDirectionalEffect ? (_directionalExitCurves[_variant] || _exitCurves[0]) : variantExitCurve
+    readonly property list<real> variantModalExitCurve: {
+        if (typeof SettingsData === "undefined")
+            return Anims.emphasized;
+        if (isDirectionalEffect) {
+            if (SettingsData.animationVariant === 1)
+                return Anims.emphasizedAccel;
+            if (SettingsData.animationVariant === 2)
+                return Anims.emphasizedAccel;
+        }
+        return variantExitCurve;
+    }
 
-    readonly property list<real> variantPopoutEnterCurve: isDirectionalEffect ? (_variant === 0 ? Anims.standardDecel : (_enterCurves[_variant] || _enterCurves[0])) : variantEnterCurve
-    readonly property list<real> variantPopoutExitCurve: isDirectionalEffect ? (_directionalExitCurves[_variant] || _exitCurves[0]) : variantExitCurve
+    // Popout-specific entry curve
+    readonly property list<real> variantPopoutEnterCurve: {
+        if (typeof SettingsData === "undefined")
+            return Anims.expressiveDefaultSpatial;
+        if (isDirectionalEffect) {
+            if (SettingsData.animationVariant === 1)
+                return Anims.standardDecel;
+            if (SettingsData.animationVariant === 2)
+                return Anims.expressiveFastSpatial;
+            return Anims.standardDecel;
+        }
+        return variantEnterCurve;
+    }
 
-    readonly property real variantEnterDurationFactor: _enterDurationFactors[_variant] !== undefined ? _enterDurationFactors[_variant] : 1.0
-    readonly property real variantExitDurationFactor: _exitDurationFactors[_variant] !== undefined ? _exitDurationFactors[_variant] : 1.0
+    readonly property list<real> variantPopoutExitCurve: {
+        if (typeof SettingsData === "undefined")
+            return Anims.emphasized;
+        if (isDirectionalEffect) {
+            if (SettingsData.animationVariant === 1)
+                return Anims.emphasizedAccel;
+            if (SettingsData.animationVariant === 2)
+                return Anims.emphasizedAccel;
+        }
+        return variantExitCurve;
+    }
+
+    readonly property real variantEnterDurationFactor: {
+        if (typeof SettingsData === "undefined")
+            return 1.0;
+        switch (SettingsData.animationVariant) {
+        case 1:
+            return 0.9;
+        case 2:
+            return 1.08;
+        default:
+            return 1.0;
+        }
+    }
+
+    readonly property real variantExitDurationFactor: {
+        if (typeof SettingsData === "undefined")
+            return 1.0;
+        switch (SettingsData.animationVariant) {
+        case 1:
+            return 0.85;
+        case 2:
+            return 0.92;
+        default:
+            return 1.0;
+        }
+    }
 
     // Fluent: opacity at ~55% of duration; Material/Dynamic: 1:1 with position
-    readonly property real variantOpacityDurationScale: _variant === 1 ? 0.55 : 1.0
+    readonly property real variantOpacityDurationScale: {
+        if (typeof SettingsData === "undefined")
+            return 1.0;
+        return SettingsData.animationVariant === 1 ? 0.55 : 1.0;
+    }
 
     function variantDuration(baseDuration, entering) {
         const factor = entering ? variantEnterDurationFactor : variantExitDurationFactor;
@@ -46,17 +127,53 @@ Singleton {
     }
 
     function variantExitCleanupPadding() {
-        return _cleanupPaddings[_effect] !== undefined ? _cleanupPaddings[_effect] : 50;
+        if (typeof SettingsData === "undefined")
+            return 50;
+        switch (SettingsData.motionEffect) {
+        case 1:
+            return 8;
+        case 2:
+            return 24;
+        default:
+            return 50;
+        }
     }
 
     function variantCloseInterval(baseDuration) {
         return variantDuration(baseDuration, false) + variantExitCleanupPadding();
     }
 
-    readonly property bool isDirectionalEffect: isConnectedEffect || _effect === 1
-    readonly property bool isDepthEffect: _effect === 2
-    readonly property bool isConnectedEffect: (typeof SettingsData !== "undefined") && SettingsData.connectedFrameModeActive
+    readonly property bool isDirectionalEffect: isConnectedEffect
+        || (typeof SettingsData !== "undefined" && SettingsData.motionEffect === 1)
+    readonly property bool isDepthEffect: typeof SettingsData !== "undefined" && SettingsData.motionEffect === 2
+    readonly property bool isConnectedEffect: typeof SettingsData !== "undefined"
+        && SettingsData.frameEnabled
+        && SettingsData.motionEffect === 1
+        && SettingsData.directionalAnimationMode === 3
 
-    readonly property real effectScaleCollapsed: _effectScaleCollapsed[_effect] !== undefined ? _effectScaleCollapsed[_effect] : 0.96
-    readonly property real effectAnimOffset: _effectAnimOffsets[_effect] !== undefined ? _effectAnimOffsets[_effect] : 16
+    readonly property real effectScaleCollapsed: {
+        if (typeof SettingsData === "undefined")
+            return 0.96;
+        switch (SettingsData.motionEffect) {
+        case 1:
+            return 1.0;
+        case 2:
+            return 0.88;
+        default:
+            return 0.96;
+        }
+    }
+
+    readonly property real effectAnimOffset: {
+        if (typeof SettingsData === "undefined")
+            return 16;
+        switch (SettingsData.motionEffect) {
+        case 1:
+            return 144;
+        case 2:
+            return 56;
+        default:
+            return 16;
+        }
+    }
 }

quickshell/Common/CacheData.qml

@@ -5,11 +5,9 @@ import QtCore
 import QtQuick
 import Quickshell
 import Quickshell.Io
-import qs.Services
 
 Singleton {
     id: root
-    readonly property var log: Log.scoped("CacheData")
 
     readonly property int cacheConfigVersion: 1
 
@@ -133,7 +131,7 @@ Singleton {
                 }
             }
         } catch (e) {
-            log.warn("Failed to parse cache:", e.message);
+            console.warn("CacheData: Failed to parse cache:", e.message);
         } finally {
             _loading = false;
         }
@@ -151,7 +149,7 @@ Singleton {
     }
 
     function migrateFromUndefinedToV1(cache) {
-        log.info("Migrating configuration from undefined to version 1");
+        console.info("CacheData: Migrating configuration from undefined to version 1");
     }
 
     function cleanupUnusedKeys() {
@@ -166,7 +164,7 @@ Singleton {
 
             for (const key in cache) {
                 if (!validKeys.includes(key)) {
-                    log.debug("Removing unused key:", key);
+                    console.log("CacheData: Removing unused key:", key);
                     delete cache[key];
                     needsSave = true;
                 }
@@ -176,7 +174,7 @@ Singleton {
                 cacheFile.setText(JSON.stringify(cache, null, 2));
             }
         } catch (e) {
-            log.warn("Failed to cleanup unused keys:", e.message);
+            console.warn("CacheData: Failed to cleanup unused keys:", e.message);
         }
     }
 
@@ -186,7 +184,7 @@ Singleton {
             if (content && content.trim())
                 return JSON.parse(content);
         } catch (e) {
-            log.warn("Failed to parse launcher cache:", e.message);
+            console.warn("CacheData: Failed to parse launcher cache:", e.message);
         }
         return null;
     }
@@ -222,7 +220,7 @@ Singleton {
         }
         onLoadFailed: error => {
             if (!isGreeterMode) {
-                log.info("No cache file found, starting fresh");
+                console.info("CacheData: No cache file found, starting fresh");
             }
         }
     }

quickshell/Common/ConnectedModeState.qml

@@ -38,13 +38,6 @@ Singleton {
     // Dock slide offsets — hot-path updates separated from full geometry state
     property var dockSlides: ({})
 
-    function _cloneDict(src) {
-        const next = {};
-        for (const k in src)
-            next[k] = src[k];
-        return next;
-    }
-
     function hasPopoutOwner(claimId) {
         return !!claimId && popoutOwnerId === claimId;
     }
@@ -148,6 +141,13 @@ Singleton {
         return true;
     }
 
+    function _cloneDockStates() {
+        const next = {};
+        for (const screenName in dockStates)
+            next[screenName] = dockStates[screenName];
+        return next;
+    }
+
     function _normalizeDockState(state) {
         return {
             "reveal": !!(state && state.reveal),
@@ -161,22 +161,12 @@ Singleton {
         };
     }
 
-    function _sameDockState(a, b) {
-        if (!a || !b)
-            return false;
-        return a.reveal === b.reveal && a.barSide === b.barSide && Math.abs(a.bodyX - b.bodyX) < 0.5 && Math.abs(a.bodyY - b.bodyY) < 0.5 && Math.abs(a.bodyW - b.bodyW) < 0.5 && Math.abs(a.bodyH - b.bodyH) < 0.5 && Math.abs(a.slideX - b.slideX) < 0.5 && Math.abs(a.slideY - b.slideY) < 0.5;
-    }
-
     function setDockState(screenName, state) {
         if (!screenName || !state)
             return false;
 
-        const normalized = _normalizeDockState(state);
-        if (_sameDockState(dockStates[screenName], normalized))
-            return true;
-
-        const next = _cloneDict(dockStates);
-        next[screenName] = normalized;
+        const next = _cloneDockStates();
+        next[screenName] = _normalizeDockState(state);
         dockStates = next;
         return true;
     }
@@ -185,13 +175,15 @@ Singleton {
         if (!screenName || !dockStates[screenName])
             return false;
 
-        const next = _cloneDict(dockStates);
+        const next = _cloneDockStates();
         delete next[screenName];
         dockStates = next;
 
         // Also clear corresponding slide
         if (dockSlides[screenName]) {
-            const nextSlides = _cloneDict(dockSlides);
+            const nextSlides = {};
+            for (const k in dockSlides)
+                nextSlides[k] = dockSlides[k];
             delete nextSlides[screenName];
             dockSlides = nextSlides;
         }
@@ -201,33 +193,36 @@ Singleton {
     function setDockSlide(screenName, x, y) {
         if (!screenName)
             return false;
-        const numX = Number(x);
-        const numY = Number(y);
-        const cur = dockSlides[screenName];
-        if (cur && Math.abs(cur.x - numX) < 0.5 && Math.abs(cur.y - numY) < 0.5)
-            return true;
-        const next = _cloneDict(dockSlides);
-        next[screenName] = {
-            "x": numX,
-            "y": numY
-        };
+        const next = {};
+        for (const k in dockSlides)
+            next[k] = dockSlides[k];
+        next[screenName] = { "x": Number(x), "y": Number(y) };
         dockSlides = next;
         return true;
     }
 
+    // ─── Notification state (per screen, updated by NotificationSurface) ──────
+
     readonly property var emptyNotificationState: ({
-            "visible": false,
-            "barSide": "top",
-            "bodyX": 0,
-            "bodyY": 0,
-            "bodyW": 0,
-            "bodyH": 0,
-            "omitStartConnector": false,
-            "omitEndConnector": false
-        })
+        "visible": false,
+        "barSide": "top",
+        "bodyX": 0,
+        "bodyY": 0,
+        "bodyW": 0,
+        "bodyH": 0,
+        "omitStartConnector": false,
+        "omitEndConnector": false
+    })
 
     property var notificationStates: ({})
 
+    function _cloneNotificationStates() {
+        const next = {};
+        for (const screenName in notificationStates)
+            next[screenName] = notificationStates[screenName];
+        return next;
+    }
+
     function _normalizeNotificationState(state) {
         return {
             "visible": !!(state && state.visible),
@@ -244,13 +239,20 @@ Singleton {
     function _sameNotificationGeometry(a, b) {
         if (!a || !b)
             return false;
-        return Math.abs(Number(a.bodyX) - Number(b.bodyX)) < 0.5 && Math.abs(Number(a.bodyY) - Number(b.bodyY)) < 0.5 && Math.abs(Number(a.bodyW) - Number(b.bodyW)) < 0.5 && Math.abs(Number(a.bodyH) - Number(b.bodyH)) < 0.5;
+        return Math.abs(Number(a.bodyX) - Number(b.bodyX)) < 0.5
+            && Math.abs(Number(a.bodyY) - Number(b.bodyY)) < 0.5
+            && Math.abs(Number(a.bodyW) - Number(b.bodyW)) < 0.5
+            && Math.abs(Number(a.bodyH) - Number(b.bodyH)) < 0.5;
     }
 
     function _sameNotificationState(a, b) {
         if (!a || !b)
             return false;
-        return a.visible === b.visible && a.barSide === b.barSide && a.omitStartConnector === b.omitStartConnector && a.omitEndConnector === b.omitEndConnector && _sameNotificationGeometry(a, b);
+        return a.visible === b.visible
+            && a.barSide === b.barSide
+            && a.omitStartConnector === b.omitStartConnector
+            && a.omitEndConnector === b.omitEndConnector
+            && _sameNotificationGeometry(a, b);
     }
 
     function setNotificationState(screenName, state) {
@@ -261,7 +263,7 @@ Singleton {
         if (_sameNotificationState(notificationStates[screenName], normalized))
             return true;
 
-        const next = _cloneDict(notificationStates);
+        const next = _cloneNotificationStates();
         next[screenName] = normalized;
         notificationStates = next;
         return true;
@@ -271,7 +273,7 @@ Singleton {
         if (!screenName || !notificationStates[screenName])
             return false;
 
-        const next = _cloneDict(notificationStates);
+        const next = _cloneNotificationStates();
         delete next[screenName];
         notificationStates = next;
         return true;
@@ -279,20 +281,27 @@ Singleton {
 
     // DankModal / DankLauncherV2Modal State
     readonly property var emptyModalState: ({
-            "visible": false,
-            "barSide": "bottom",
-            "bodyX": 0,
-            "bodyY": 0,
-            "bodyW": 0,
-            "bodyH": 0,
-            "animX": 0,
-            "animY": 0,
-            "omitStartConnector": false,
-            "omitEndConnector": false
-        })
+        "visible": false,
+        "barSide": "bottom",
+        "bodyX": 0,
+        "bodyY": 0,
+        "bodyW": 0,
+        "bodyH": 0,
+        "animX": 0,
+        "animY": 0,
+        "omitStartConnector": false,
+        "omitEndConnector": false
+    })
 
     property var modalStates: ({})
 
+    function _cloneModalStates() {
+        const next = {};
+        for (const screenName in modalStates)
+            next[screenName] = modalStates[screenName];
+        return next;
+    }
+
     function _normalizeModalState(state) {
         return {
             "visible": !!(state && state.visible),
@@ -311,13 +320,22 @@ Singleton {
     function _sameModalGeometry(a, b) {
         if (!a || !b)
             return false;
-        return Math.abs(Number(a.bodyX) - Number(b.bodyX)) < 0.5 && Math.abs(Number(a.bodyY) - Number(b.bodyY)) < 0.5 && Math.abs(Number(a.bodyW) - Number(b.bodyW)) < 0.5 && Math.abs(Number(a.bodyH) - Number(b.bodyH)) < 0.5 && Math.abs(Number(a.animX) - Number(b.animX)) < 0.5 && Math.abs(Number(a.animY) - Number(b.animY)) < 0.5;
+        return Math.abs(Number(a.bodyX) - Number(b.bodyX)) < 0.5
+            && Math.abs(Number(a.bodyY) - Number(b.bodyY)) < 0.5
+            && Math.abs(Number(a.bodyW) - Number(b.bodyW)) < 0.5
+            && Math.abs(Number(a.bodyH) - Number(b.bodyH)) < 0.5
+            && Math.abs(Number(a.animX) - Number(b.animX)) < 0.5
+            && Math.abs(Number(a.animY) - Number(b.animY)) < 0.5;
     }
 
     function _sameModalState(a, b) {
         if (!a || !b)
             return false;
-        return a.visible === b.visible && a.barSide === b.barSide && a.omitStartConnector === b.omitStartConnector && a.omitEndConnector === b.omitEndConnector && _sameModalGeometry(a, b);
+        return a.visible === b.visible
+            && a.barSide === b.barSide
+            && a.omitStartConnector === b.omitStartConnector
+            && a.omitEndConnector === b.omitEndConnector
+            && _sameModalGeometry(a, b);
     }
 
     function setModalState(screenName, state) {
@@ -328,7 +346,7 @@ Singleton {
         if (_sameModalState(modalStates[screenName], normalized))
             return true;
 
-        const next = _cloneDict(modalStates);
+        const next = _cloneModalStates();
         next[screenName] = normalized;
         modalStates = next;
         return true;
@@ -338,63 +356,94 @@ Singleton {
         if (!screenName || !modalStates[screenName])
             return false;
 
-        const next = _cloneDict(modalStates);
+        const next = _cloneModalStates();
         delete next[screenName];
         modalStates = next;
         return true;
     }
 
     function setModalAnim(screenName, animX, animY) {
-        const cur = screenName ? modalStates[screenName] : null;
+        if (!screenName)
+            return false;
+        const cur = modalStates[screenName];
         if (!cur)
             return false;
-        const nax = animX !== undefined ? Number(animX) : cur.animX;
-        const nay = animY !== undefined ? Number(animY) : cur.animY;
-        if (Math.abs(nax - cur.animX) < 0.5 && Math.abs(nay - cur.animY) < 0.5)
-            return false;
-        const next = _cloneDict(modalStates);
-        next[screenName] = Object.assign({}, cur, {
-            "animX": nax,
-            "animY": nay
-        });
-        modalStates = next;
-        return true;
+        let changed = false;
+        const nextAnimX = animX !== undefined ? Number(animX) : cur.animX;
+        const nextAnimY = animY !== undefined ? Number(animY) : cur.animY;
+        if (Math.abs(nextAnimX - cur.animX) >= 0.5 || Math.abs(nextAnimY - cur.animY) >= 0.5) {
+            const updated = {
+                "visible": cur.visible,
+                "barSide": cur.barSide,
+                "bodyX": cur.bodyX,
+                "bodyY": cur.bodyY,
+                "bodyW": cur.bodyW,
+                "bodyH": cur.bodyH,
+                "animX": nextAnimX,
+                "animY": nextAnimY,
+                "omitStartConnector": cur.omitStartConnector,
+                "omitEndConnector": cur.omitEndConnector
+            };
+            const next = _cloneModalStates();
+            next[screenName] = updated;
+            modalStates = next;
+            changed = true;
+        }
+        return changed;
     }
 
     function setModalBody(screenName, bodyX, bodyY, bodyW, bodyH) {
-        const cur = screenName ? modalStates[screenName] : null;
+        if (!screenName)
+            return false;
+        const cur = modalStates[screenName];
         if (!cur)
             return false;
         const nx = bodyX !== undefined ? Number(bodyX) : cur.bodyX;
         const ny = bodyY !== undefined ? Number(bodyY) : cur.bodyY;
         const nw = bodyW !== undefined ? Number(bodyW) : cur.bodyW;
         const nh = bodyH !== undefined ? Number(bodyH) : cur.bodyH;
-        if (Math.abs(nx - cur.bodyX) < 0.5 && Math.abs(ny - cur.bodyY) < 0.5 && Math.abs(nw - cur.bodyW) < 0.5 && Math.abs(nh - cur.bodyH) < 0.5)
+        if (Math.abs(nx - cur.bodyX) < 0.5
+            && Math.abs(ny - cur.bodyY) < 0.5
+            && Math.abs(nw - cur.bodyW) < 0.5
+            && Math.abs(nh - cur.bodyH) < 0.5)
             return false;
-        const next = _cloneDict(modalStates);
-        next[screenName] = Object.assign({}, cur, {
+        const updated = {
+            "visible": cur.visible,
+            "barSide": cur.barSide,
             "bodyX": nx,
             "bodyY": ny,
             "bodyW": nw,
-            "bodyH": nh
-        });
+            "bodyH": nh,
+            "animX": cur.animX,
+            "animY": cur.animY,
+            "omitStartConnector": cur.omitStartConnector,
+            "omitEndConnector": cur.omitEndConnector
+        };
+        const next = _cloneModalStates();
+        next[screenName] = updated;
         modalStates = next;
         return true;
     }
 
+    // ─── Dock retract coordination ────────────────────────────────
+
     property var dockRetractRequests: ({})
 
+    function _cloneRetractRequests() {
+        const next = {};
+        for (const k in dockRetractRequests)
+            next[k] = dockRetractRequests[k];
+        return next;
+    }
+
     function requestDockRetract(requesterId, screenName, side) {
         if (!requesterId || !screenName || !side)
             return false;
         const existing = dockRetractRequests[requesterId];
         if (existing && existing.screenName === screenName && existing.side === side)
             return true;
-        const next = _cloneDict(dockRetractRequests);
-        next[requesterId] = {
-            "screenName": screenName,
-            "side": side
-        };
+        const next = _cloneRetractRequests();
+        next[requesterId] = { "screenName": screenName, "side": side };
         dockRetractRequests = next;
         return true;
     }
@@ -402,7 +451,7 @@ Singleton {
     function releaseDockRetract(requesterId) {
         if (!requesterId || !dockRetractRequests[requesterId])
             return false;
-        const next = _cloneDict(dockRetractRequests);
+        const next = _cloneRetractRequests();
         delete next[requesterId];
         dockRetractRequests = next;
         return true;
@@ -418,64 +467,4 @@ Singleton {
         }
         return false;
     }
-
-    // Prune state for screens that are no longer connected. Stale entries
-    // accumulate across hotplug cycles otherwise — Frame's per-screen
-    // FrameInstance doesn't notice when its peer dicts go orphan.
-    function _pruneToLiveScreens() {
-        const live = {};
-        const screens = Quickshell.screens || [];
-        for (let i = 0; i < screens.length; i++) {
-            const s = screens[i];
-            if (s && s.name)
-                live[s.name] = true;
-        }
-
-        function pruneKeyed(dict) {
-            let changed = false;
-            const next = {};
-            for (const k in dict) {
-                if (live[k])
-                    next[k] = dict[k];
-                else
-                    changed = true;
-            }
-            return changed ? next : null;
-        }
-
-        const nextDock = pruneKeyed(dockStates);
-        if (nextDock !== null)
-            dockStates = nextDock;
-        const nextSlides = pruneKeyed(dockSlides);
-        if (nextSlides !== null)
-            dockSlides = nextSlides;
-        const nextNotif = pruneKeyed(notificationStates);
-        if (nextNotif !== null)
-            notificationStates = nextNotif;
-        const nextModal = pruneKeyed(modalStates);
-        if (nextModal !== null)
-            modalStates = nextModal;
-
-        let retractChanged = false;
-        const nextRetract = {};
-        for (const k in dockRetractRequests) {
-            const r = dockRetractRequests[k];
-            if (r && live[r.screenName])
-                nextRetract[k] = r;
-            else
-                retractChanged = true;
-        }
-        if (retractChanged)
-            dockRetractRequests = nextRetract;
-
-        if (popoutOwnerId && popoutScreen && !live[popoutScreen])
-            releasePopout(popoutOwnerId);
-    }
-
-    Connections {
-        target: Quickshell
-        function onScreensChanged() {
-            root._pruneToLiveScreens();
-        }
-    }
 }

quickshell/Common/ConnectorGeometry.js

@@ -1,68 +0,0 @@
-.pragma library
-
-// Geometry for connected-frame arc connectors.
-// `barSide` is one of "top" | "bottom" | "left" | "right" — the edge where the
-// host bar/dock sits. `placement` is "left" (start) or "right" (end) of the
-// body's far edge. `radius` is the connector's arc radius. `spacing` is the
-// gap between the host edge and the body.
-
-function isVertical(barSide) {
-    return barSide === "left" || barSide === "right";
-}
-
-function isHorizontal(barSide) {
-    return barSide === "top" || barSide === "bottom";
-}
-
-function connectorWidth(barSide, spacing, radius) {
-    return isVertical(barSide) ? (spacing + radius) : radius;
-}
-
-function connectorHeight(barSide, spacing, radius) {
-    return isVertical(barSide) ? radius : (spacing + radius);
-}
-
-function seamX(barSide, baseX, bodyWidth, placement) {
-    if (!isVertical(barSide))
-        return placement === "left" ? baseX : baseX + bodyWidth;
-    return barSide === "left" ? baseX : baseX + bodyWidth;
-}
-
-function seamY(barSide, baseY, bodyHeight, placement) {
-    if (barSide === "top")
-        return baseY;
-    if (barSide === "bottom")
-        return baseY + bodyHeight;
-    return placement === "left" ? baseY : baseY + bodyHeight;
-}
-
-function connectorX(barSide, baseX, bodyWidth, placement, spacing, radius) {
-    var s = seamX(barSide, baseX, bodyWidth, placement);
-    var w = connectorWidth(barSide, spacing, radius);
-    if (!isVertical(barSide))
-        return placement === "left" ? s - w : s;
-    return barSide === "left" ? s : s - w;
-}
-
-function connectorY(barSide, baseY, bodyHeight, placement, spacing, radius) {
-    var s = seamY(barSide, baseY, bodyHeight, placement);
-    var h = connectorHeight(barSide, spacing, radius);
-    if (barSide === "top")
-        return s;
-    if (barSide === "bottom")
-        return s - h;
-    return placement === "left" ? s - h : s;
-}
-
-// Which corner of the connector's bounding rect hosts the concave arc that
-// carves into the body. Used for arc-sweep orientation.
-function arcCorner(barSide, placement) {
-    var left = placement === "left";
-    if (barSide === "top")
-        return left ? "bottomLeft" : "bottomRight";
-    if (barSide === "bottom")
-        return left ? "topLeft" : "topRight";
-    if (barSide === "left")
-        return left ? "topRight" : "bottomRight";
-    return left ? "topLeft" : "bottomLeft";
-}

quickshell/Common/I18n.qml

@@ -5,11 +5,9 @@ import QtQuick
 import Qt.labs.folderlistmodel
 import Quickshell
 import Quickshell.Io
-import qs.Services
 
 Singleton {
     id: root
-    readonly property var log: Log.scoped("I18n")
 
     property string _resolvedLocale: "en"
 
@@ -56,15 +54,15 @@ Singleton {
             try {
                 root.translations = JSON.parse(text());
                 root.translationsLoaded = true;
-                log.info(`I18n: Loaded translations for '${root._resolvedLocale}' (${Object.keys(root.translations).length} contexts)`);
+                console.info(`I18n: Loaded translations for '${root._resolvedLocale}' (${Object.keys(root.translations).length} contexts)`);
             } catch (e) {
-                log.warn(`I18n: Error parsing '${root._resolvedLocale}':`, e, "- falling back to English");
+                console.warn(`I18n: Error parsing '${root._resolvedLocale}':`, e, "- falling back to English");
                 root._fallbackToEnglish();
             }
         }
 
         onLoadFailed: error => {
-            log.warn(`I18n: Failed to load '${root._resolvedLocale}' (${error}), ` + "falling back to English");
+            console.warn(`I18n: Failed to load '${root._resolvedLocale}' (${error}), ` + "falling back to English");
             root._fallbackToEnglish();
         }
     }
@@ -107,14 +105,14 @@ Singleton {
         _selectedPath = fileUrl;
         translationsLoaded = false;
         translations = ({});
-        log.info(`I18n: Using locale '${localeTag}' from ${fileUrl}`);
+        console.info(`I18n: Using locale '${localeTag}' from ${fileUrl}`);
     }
 
     function _fallbackToEnglish() {
         _selectedPath = "";
         translationsLoaded = false;
         translations = ({});
-        log.warn("Falling back to built-in English strings");
+        console.warn("I18n: Falling back to built-in English strings");
     }
 
     function tr(term, context) {

quickshell/Common/KeybindActions.js

@@ -161,16 +161,10 @@ const NIRI_ACTIONS = {
         { id: "focus-monitor-right", label: "Focus Monitor Right" },
         { id: "focus-monitor-down", label: "Focus Monitor Down" },
         { id: "focus-monitor-up", label: "Focus Monitor Up" },
-        { id: "move-column-to-monitor-left", label: "Move Column to Monitor Left" },
-        { id: "move-column-to-monitor-right", label: "Move Column to Monitor Right" },
-        { id: "move-column-to-monitor-down", label: "Move Column to Monitor Down" },
-        { id: "move-column-to-monitor-up", label: "Move Column to Monitor Up" },
-        { id: "move-workspace-to-monitor-left", label: "Move Workspace to Monitor Left" },
-        { id: "move-workspace-to-monitor-right", label: "Move Workspace to Monitor Right" },
-        { id: "move-workspace-to-monitor-down", label: "Move Workspace to Monitor Down" },
-        { id: "move-workspace-to-monitor-up", label: "Move Workspace to Monitor Up" },
-        { id: "move-workspace-to-monitor-next", label: "Move Workspace to Next Monitor" },
-        { id: "move-workspace-to-monitor-previous", label: "Move Workspace to Previous Monitor" }
+        { id: "move-column-to-monitor-left", label: "Move to Monitor Left" },
+        { id: "move-column-to-monitor-right", label: "Move to Monitor Right" },
+        { id: "move-column-to-monitor-down", label: "Move to Monitor Down" },
+        { id: "move-column-to-monitor-up", label: "Move to Monitor Up" }
     ],
     "Screenshot": [
         { id: "screenshot", label: "Screenshot (Interactive)" },

quickshell/Common/Paths.qml

@@ -24,9 +24,7 @@ Singleton {
     }
 
     function expandTilde(path: string): string {
-        if (!path.startsWith("~"))
-            return path;
-        return strip(root.home) + path.substring(1);
+        return strip(path.replace("~", stringify(root.home)));
     }
 
     function shortenHome(path: string): string {

quickshell/Common/Proc.qml

@@ -3,11 +3,9 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
-import qs.Services
 
 Singleton {
     id: root
-    readonly property var log: Log.scoped("Proc")
 
     readonly property int noTimeout: -1
     property int defaultDebounceMs: 50
@@ -114,7 +112,7 @@ Singleton {
                     const safeExitCode = exitCodeValue !== null && exitCodeValue !== undefined ? exitCodeValue : -1;
                     entry.callback(safeOutput, safeExitCode);
                 } catch (e) {
-                    log.warn("runCommand callback error for command:", entry.command, "Error:", e);
+                    console.warn("runCommand callback error for command:", entry.command, "Error:", e);
                 }
             }
             try {

quickshell/Common/SessionData.qml

@@ -12,7 +12,6 @@ import "settings/SessionStore.js" as Store
 
 Singleton {
     id: root
-    readonly property var log: Log.scoped("SessionData")
 
     readonly property int sessionConfigVersion: 3
 
@@ -31,36 +30,9 @@ Singleton {
     property bool isLightMode: false
     property bool doNotDisturb: false
     property real doNotDisturbUntil: 0
-    property string terminalOverride: ""
     property bool isSwitchingMode: false
     property bool suppressOSD: true
 
-    readonly property var terminalOptions: ["ghostty", "kitty", "foot", "alacritty", "wezterm", "konsole", "gnome-terminal", "xterm"]
-    property var installedTerminals: []
-
-    function resolveTerminal() {
-        if (terminalOverride && terminalOverride.length > 0) {
-            return terminalOverride;
-        }
-        const env = Quickshell.env("TERMINAL");
-        if (env && env.length > 0) {
-            return env;
-        }
-        return "";
-    }
-
-    Process {
-        id: terminalProbe
-        running: true
-        command: ["sh", "-c", "for t in ghostty kitty foot alacritty wezterm konsole gnome-terminal xterm; do command -v \"$t\" >/dev/null 2>&1 && echo \"$t\"; done"]
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const found = text.trim().split("\n").filter(line => line.length > 0);
-                root.installedTerminals = found;
-            }
-        }
-    }
-
     Timer {
         id: dndExpireTimer
         repeat: false
@@ -258,7 +230,7 @@ Singleton {
         } catch (e) {
             _parseError = true;
             const msg = e.message;
-            log.error("Failed to parse session.json - file will not be overwritten.");
+            console.error("SessionData: Failed to parse session.json - file will not be overwritten.");
             Qt.callLater(() => ToastService.showError(I18n.tr("Failed to parse session.json"), msg));
         }
     }
@@ -338,7 +310,7 @@ Singleton {
         } catch (e) {
             _parseError = true;
             const msg = e.message;
-            log.error("Failed to parse session.json - file will not be overwritten.");
+            console.error("SessionData: Failed to parse session.json - file will not be overwritten.");
             Qt.callLater(() => ToastService.showError(I18n.tr("Failed to parse session.json"), msg));
         }
     }
@@ -553,7 +525,7 @@ Singleton {
         }
 
         if (!screen) {
-            log.warn("Screen not found");
+            console.warn("SessionData: Screen not found");
             return;
         }
 
@@ -650,7 +622,7 @@ Singleton {
         }
 
         if (!screen) {
-            log.warn("Screen not found");
+            console.warn("SessionData: Screen not found");
             return;
         }
 
@@ -681,7 +653,7 @@ Singleton {
         }
 
         if (!screen) {
-            log.warn("Screen not found");
+            console.warn("SessionData: Screen not found");
             return;
         }
 
@@ -712,7 +684,7 @@ Singleton {
         }
 
         if (!screen) {
-            log.warn("Screen not found");
+            console.warn("SessionData: Screen not found");
             return;
         }
 
@@ -743,7 +715,7 @@ Singleton {
         }
 
         if (!screen) {
-            log.warn("Screen not found");
+            console.warn("SessionData: Screen not found");
             return;
         }
 

quickshell/Common/SettingsData.qml

@@ -13,7 +13,6 @@ import "settings/SettingsStore.js" as Store
 
 Singleton {
     id: root
-    readonly property var log: Log.scoped("SettingsData")
 
     readonly property int settingsConfigVersion: 11
 
@@ -185,6 +184,8 @@ Singleton {
     onAnimationVariantChanged: saveSettings()
     property int motionEffect: SettingsData.AnimationEffect.Standard
     onMotionEffectChanged: saveSettings()
+    property int directionalAnimationMode: 0
+    onDirectionalAnimationModeChanged: saveSettings()
     property bool m3ElevationEnabled: true
     onM3ElevationEnabledChanged: saveSettings()
     property int m3ElevationIntensity: 12
@@ -206,15 +207,11 @@ Singleton {
 
     property bool blurEnabled: false
     onBlurEnabledChanged: saveSettings()
-    property bool blurForegroundLayers: true
-    onBlurForegroundLayersChanged: saveSettings()
-    property real blurLayerOutlineOpacity: 0.12
-    onBlurLayerOutlineOpacityChanged: saveSettings()
     property string blurBorderColor: "outline"
     onBlurBorderColorChanged: saveSettings()
     property string blurBorderCustomColor: "#ffffff"
     onBlurBorderCustomColorChanged: saveSettings()
-    property real blurBorderOpacity: 0.35
+    property real blurBorderOpacity: 1.0
     onBlurBorderOpacityChanged: saveSettings()
     property string wallpaperFillMode: "Fill"
     property bool blurredWallpaperLayer: false
@@ -238,32 +235,34 @@ Singleton {
     onFrameShowOnOverviewChanged: saveSettings()
     property bool frameBlurEnabled: true
     onFrameBlurEnabledChanged: saveSettings()
-    property bool frameCloseGaps: true
+    property bool frameCloseGaps: false
     onFrameCloseGapsChanged: saveSettings()
     property string frameLauncherEmergeSide: "bottom"
     onFrameLauncherEmergeSideChanged: saveSettings()
-    property bool frameLauncherArcExtender: false
-    onFrameLauncherArcExtenderChanged: saveSettings()
     readonly property string frameModalEmergeSide: frameLauncherEmergeSide === "top" ? "bottom" : "top"
-    property string frameMode: "separate"
-    onFrameModeChanged: saveSettings()
+    property int previousDirectionalMode: 1
+    onPreviousDirectionalModeChanged: saveSettings()
     property var connectedFrameBarStyleBackups: ({})
     onConnectedFrameBarStyleBackupsChanged: saveSettings()
-    readonly property bool connectedFrameModeActive: frameEnabled && frameMode === "connected"
+    readonly property bool connectedFrameModeActive: frameEnabled
+        && motionEffect === SettingsData.AnimationEffect.Directional
+        && directionalAnimationMode === 3
     onConnectedFrameModeActiveChanged: {
         if (_loading)
             return;
-        _reconcileConnectedFrameBarStyles();
+        if (connectedFrameModeActive) {
+            _captureConnectedFrameBarStyleBackups(barConfigs, true);
+            _enforceConnectedModeBarStyleReset();
+        } else {
+            _restoreConnectedFrameBarStyleBackups();
+        }
     }
 
     readonly property color effectiveFrameColor: {
         const fc = frameColor;
-        if (!fc || fc === "default")
-            return Theme.surfaceContainer;
-        if (fc === "primary")
-            return Theme.primary;
-        if (fc === "surface")
-            return Theme.surface;
+        if (!fc || fc === "default") return Theme.surfaceContainer;
+        if (fc === "primary") return Theme.primary;
+        if (fc === "surface") return Theme.surface;
         return fc;
     }
 
@@ -280,9 +279,6 @@ Singleton {
     property int selectedGpuIndex: 0
     property var enabledGpuPciIds: []
     property bool showSystemTray: true
-    property string systemTrayIconTintMode: "none"
-    property int systemTrayIconTintSaturation: 50
-    property int systemTrayIconTintStrength: 135
     property bool showClock: true
     property bool showNotificationButton: true
     property bool showBattery: true
@@ -558,7 +554,6 @@ Singleton {
     property bool matugenTemplatePywalfox: true
     property bool matugenTemplateZenBrowser: true
     property bool matugenTemplateVesktop: true
-    property bool matugenTemplateVencord: true
     property bool matugenTemplateEquibop: true
     property bool matugenTemplateGhostty: true
     property bool matugenTemplateKitty: true
@@ -611,9 +606,6 @@ Singleton {
     property int dockMaxVisibleApps: 0
     property int dockMaxVisibleRunningApps: 0
     property bool dockShowOverflowBadge: true
-    property bool dockShowTrash: false
-    property string dockTrashFileManager: "default"
-    property string dockTrashCustomCommand: ""
 
     property bool notificationOverlayEnabled: false
     property bool notificationPopupShadowEnabled: true
@@ -706,9 +698,6 @@ Singleton {
     property bool updaterUseCustomCommand: false
     property string updaterCustomCommand: ""
     property string updaterTerminalAdditionalParams: ""
-    property int updaterIntervalSeconds: 1800
-    property bool updaterIncludeFlatpak: true
-    property bool updaterAllowAUR: true
 
     property string displayNameMode: "system"
     property var screenPreferences: ({})
@@ -1340,9 +1329,6 @@ Singleton {
 
             Store.parse(root, obj);
 
-            if (obj?.directionalAnimationMode === 3 && frameMode !== "connected")
-                frameMode = "connected";
-
             if (obj?.weatherLocation !== undefined)
                 _legacyWeatherLocation = obj.weatherLocation;
             if (obj?.weatherCoordinates !== undefined)
@@ -1363,7 +1349,7 @@ Singleton {
         } catch (e) {
             _parseError = true;
             const msg = e.message;
-            log.error("Failed to parse settings.json - file will not be overwritten. Error:", msg);
+            console.error("SettingsData: Failed to parse settings.json - file will not be overwritten. Error:", msg);
             Qt.callLater(() => ToastService.showError(I18n.tr("Failed to parse settings.json"), msg));
             applyStoredTheme();
         } finally {
@@ -1385,12 +1371,12 @@ Singleton {
         if (_isReadOnly) {
             _hasUnsavedChanges = _checkForUnsavedChanges();
             if (!wasReadOnly)
-                log.info("settings.json is now read-only");
+                console.info("SettingsData: settings.json is now read-only");
         } else {
             _loadedSettingsSnapshot = JSON.stringify(Store.toJson(root));
             _hasUnsavedChanges = false;
             if (wasReadOnly)
-                log.info("settings.json is now writable");
+                console.info("SettingsData: settings.json is now writable");
             if (_pendingMigration)
                 settingsFile.setText(JSON.stringify(_pendingMigration, null, 2));
         }
@@ -1444,7 +1430,7 @@ Singleton {
         } catch (e) {
             const msg = e.message || String(e);
             if (!_isMissingPluginSettingsError(e))
-                log.warn("Failed to load plugin_settings.json. Error:", msg);
+                console.warn("SettingsData: Failed to load plugin_settings.json. Error:", msg);
             _resetPluginSettings();
         }
     }
@@ -1461,7 +1447,7 @@ Singleton {
         } catch (e) {
             _pluginParseError = true;
             const msg = e.message;
-            log.error("Failed to parse plugin_settings.json - file will not be overwritten. Error:", msg);
+            console.error("SettingsData: Failed to parse plugin_settings.json - file will not be overwritten. Error:", msg);
             Qt.callLater(() => ToastService.showError(I18n.tr("Failed to parse plugin_settings.json"), msg));
             pluginSettings = {};
         } finally {
@@ -1561,8 +1547,43 @@ Singleton {
             updateBarConfigs();
     }
 
-    // Zeroes out connected-mode-hostile fields (shadow, square/goth corners, border).
-    // Returns { configs, changed } — `configs` is the same ref when no change.
+    function _reconcileConnectedFrameBarStyles() {
+        if (connectedFrameModeActive) {
+            if (!_hasConnectedFrameBarStyleBackups())
+                _captureConnectedFrameBarStyleBackups(barConfigs, true);
+            _enforceConnectedModeBarStyleReset();
+            return;
+        }
+        _restoreConnectedFrameBarStyleBackups();
+    }
+
+    function _sanitizeBarConfigForConnectedFrame(config) {
+        if (!connectedFrameModeActive || !config)
+            return config;
+
+        let changed = false;
+        const sanitized = Object.assign({}, config);
+
+        if ((sanitized.shadowIntensity ?? 0) !== 0) {
+            sanitized.shadowIntensity = 0;
+            changed = true;
+        }
+        if (sanitized.squareCorners ?? false) {
+            sanitized.squareCorners = false;
+            changed = true;
+        }
+        if (sanitized.gothCornersEnabled ?? false) {
+            sanitized.gothCornersEnabled = false;
+            changed = true;
+        }
+        if (sanitized.borderEnabled ?? false) {
+            sanitized.borderEnabled = false;
+            changed = true;
+        }
+
+        return changed ? sanitized : config;
+    }
+
     function _sanitizeBarConfigsForConnectedFrame(configs) {
         if (!connectedFrameModeActive || !Array.isArray(configs))
             return {
@@ -1570,53 +1591,26 @@ Singleton {
                 "changed": false
             };
 
-        let anyChanged = false;
-        const out = configs.map(cfg => {
-            if (!cfg)
-                return cfg;
-            let dirty = false;
-            const s = Object.assign({}, cfg);
-            if ((s.shadowIntensity ?? 0) !== 0) {
-                s.shadowIntensity = 0;
-                dirty = true;
-            }
-            if (s.squareCorners ?? false) {
-                s.squareCorners = false;
-                dirty = true;
-            }
-            if (s.gothCornersEnabled ?? false) {
-                s.gothCornersEnabled = false;
-                dirty = true;
-            }
-            if (s.borderEnabled ?? false) {
-                s.borderEnabled = false;
-                dirty = true;
-            }
-            if (dirty)
-                anyChanged = true;
-            return dirty ? s : cfg;
+        let changed = false;
+        const sanitizedConfigs = configs.map(config => {
+            const sanitized = _sanitizeBarConfigForConnectedFrame(config);
+            if (sanitized !== config)
+                changed = true;
+            return sanitized;
         });
+
         return {
-            "configs": anyChanged ? out : configs,
-            "changed": anyChanged
+            "configs": changed ? sanitizedConfigs : configs,
+            "changed": changed
         };
     }
 
-    // Single entry point for connected-mode bar-style state.
-    //   active  → capture backups (if not yet) and sanitize bar configs
-    //   !active → restore backups
-    function _reconcileConnectedFrameBarStyles() {
-        if (!connectedFrameModeActive) {
-            _restoreConnectedFrameBarStyleBackups();
-            return;
-        }
-        if (!_hasConnectedFrameBarStyleBackups())
-            _captureConnectedFrameBarStyleBackups(barConfigs, true);
+    function _enforceConnectedModeBarStyleReset() {
         const result = _sanitizeBarConfigsForConnectedFrame(barConfigs);
-        if (result.changed) {
-            barConfigs = result.configs;
-            updateBarConfigs();
-        }
+        if (!result.changed)
+            return;
+        barConfigs = result.configs;
+        updateBarConfigs();
     }
 
     function detectAvailableIconThemes() {
@@ -2181,77 +2175,54 @@ Singleton {
     }
 
     function getActiveBarEdgeForScreen(screen) {
-        if (!screen)
-            return "";
+        if (!screen) return "";
         for (var i = 0; i < barConfigs.length; i++) {
             var bc = barConfigs[i];
-            if (!bc.enabled)
-                continue;
+            if (!bc.enabled) continue;
             var prefs = bc.screenPreferences || ["all"];
-            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs))
-                continue;
+            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs)) continue;
             switch (bc.position ?? 0) {
-            case SettingsData.Position.Top:
-                return "top";
-            case SettingsData.Position.Bottom:
-                return "bottom";
-            case SettingsData.Position.Left:
-                return "left";
-            case SettingsData.Position.Right:
-                return "right";
+            case SettingsData.Position.Top:    return "top";
+            case SettingsData.Position.Bottom: return "bottom";
+            case SettingsData.Position.Left:   return "left";
+            case SettingsData.Position.Right:  return "right";
             }
         }
         return "";
     }
 
     function getActiveBarEdgesForScreen(screen) {
-        if (!screen)
-            return [];
+        if (!screen) return [];
         var edges = [];
         for (var i = 0; i < barConfigs.length; i++) {
             var bc = barConfigs[i];
-            if (!bc.enabled)
-                continue;
+            if (!bc.enabled) continue;
             var prefs = bc.screenPreferences || ["all"];
-            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs))
-                continue;
+            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs)) continue;
             switch (bc.position ?? 0) {
-            case SettingsData.Position.Top:
-                edges.push("top");
-                break;
-            case SettingsData.Position.Bottom:
-                edges.push("bottom");
-                break;
-            case SettingsData.Position.Left:
-                edges.push("left");
-                break;
-            case SettingsData.Position.Right:
-                edges.push("right");
-                break;
+            case SettingsData.Position.Top:    edges.push("top"); break;
+            case SettingsData.Position.Bottom: edges.push("bottom"); break;
+            case SettingsData.Position.Left:   edges.push("left"); break;
+            case SettingsData.Position.Right:  edges.push("right"); break;
             }
         }
         return edges;
     }
 
     function frameEdgeInsetForSide(screen, side) {
-        if (!frameEnabled || !screen)
-            return 0;
+        if (!frameEnabled || !screen) return 0;
         const edges = getActiveBarEdgesForScreen(screen);
         return edges.includes(side) ? frameBarSize : frameThickness;
     }
 
     function getActiveBarThicknessForScreen(screen) {
-        if (frameEnabled)
-            return frameBarSize;
-        if (!screen)
-            return frameThickness;
+        if (frameEnabled) return frameBarSize;
+        if (!screen) return frameThickness;
         for (var i = 0; i < barConfigs.length; i++) {
             var bc = barConfigs[i];
-            if (!bc.enabled)
-                continue;
+            if (!bc.enabled) continue;
             var prefs = bc.screenPreferences || ["all"];
-            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs))
-                continue;
+            if (!prefs.includes("all") && !isScreenInPreferences(screen, prefs)) continue;
             const innerPadding = bc.innerPadding ?? 4;
             const barT = Math.max(26 + innerPadding * 0.6, Theme.barHeight - 4 - (8 - innerPadding));
             const spacing = bc.spacing ?? 4;
@@ -3099,7 +3070,7 @@ Singleton {
             } catch (e) {
                 _parseError = true;
                 const msg = e.message;
-                log.error("Failed to reload settings.json - file will not be overwritten. Error:", msg);
+                console.error("SettingsData: Failed to reload settings.json - file will not be overwritten. Error:", msg);
                 Qt.callLater(() => ToastService.showError(I18n.tr("Failed to parse settings.json"), msg));
             } finally {
                 _loading = false;
@@ -3134,7 +3105,7 @@ Singleton {
             if (!isGreeterMode) {
                 const msg = String(error || "");
                 if (!_isMissingPluginSettingsError(error))
-                    log.warn("Failed to load plugin_settings.json. Error:", msg);
+                    console.warn("SettingsData: Failed to load plugin_settings.json. Error:", msg);
                 _resetPluginSettings();
             }
         }

quickshell/Common/Theme.qml

@@ -12,7 +12,6 @@ import "StockThemes.js" as StockThemes
 
 Singleton {
     id: root
-    readonly property var log: Log.scoped("Theme")
 
     readonly property string stateDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericCacheLocation).toString()) + "/DankMaterialShell"
     readonly property bool envDisableMatugen: Quickshell.env("DMS_DISABLE_MATUGEN") === "1" || Quickshell.env("DMS_DISABLE_MATUGEN") === "true"
@@ -149,7 +148,7 @@ Singleton {
             }
 
             if (colorsFileLoadFailed && currentTheme === dynamic && rawWallpaperPath) {
-                log.info("Matugen now available, regenerating colors for dynamic theme");
+                console.info("Theme: Matugen now available, regenerating colors for dynamic theme");
                 const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode);
                 const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default";
                 const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot";
@@ -342,6 +341,19 @@ Singleton {
 
     Connections {
         target: DMSService
+        enabled: typeof DMSService !== "undefined" && typeof SessionData !== "undefined"
+
+        function onLoginctlEvent(event) {
+            if (!SessionData.themeModeAutoEnabled)
+                return;
+            if (event.event === "unlock" || event.event === "resume") {
+                if (!themeAutoBackendAvailable()) {
+                    root.evaluateThemeMode();
+                    return;
+                }
+                DMSService.sendRequest("theme.auto.trigger", {});
+            }
+        }
 
         function onThemeAutoStateUpdate(data) {
             if (!SessionData.themeModeAutoEnabled) {
@@ -377,7 +389,7 @@ Singleton {
                         "use": true
                     }, response => {
                         if (!response.error) {
-                            log.info("Theme automation: IP location enabled after connection");
+                            console.info("Theme automation: IP location enabled after connection");
                         }
                     });
                 } else if (SessionData.latitude !== 0.0 && SessionData.longitude !== 0.0) {
@@ -390,39 +402,18 @@ Singleton {
                                 "longitude": SessionData.longitude
                             }, locationResponse => {
                                 if (locationResponse?.error) {
-                                    log.warn("Theme automation: Failed to set location", locationResponse.error);
+                                    console.warn("Theme automation: Failed to set location", locationResponse.error);
                                 }
                             });
                         }
                     });
                 } else {
-                    log.warn("Theme automation: No location configured");
+                    console.warn("Theme automation: No location configured");
                 }
             }
         }
     }
 
-    Connections {
-        target: SessionService
-        enabled: SessionData.themeModeAutoEnabled
-
-        function onSessionUnlocked() {
-            root.triggerThemeAutomationRefresh();
-        }
-
-        function onSessionResumed() {
-            root.triggerThemeAutomationRefresh();
-        }
-    }
-
-    function triggerThemeAutomationRefresh() {
-        if (!themeAutoBackendAvailable()) {
-            root.evaluateThemeMode();
-            return;
-        }
-        DMSService.sendRequest("theme.auto.trigger", {});
-    }
-
     function applyGreeterTheme(themeName) {
         switchTheme(themeName, false, false);
         if (themeName === dynamic && dynamicColorsFileView.path) {
@@ -550,8 +541,8 @@ Singleton {
     property color success: currentThemeData.success || "#4CAF50"
 
     property color primaryHover: Qt.rgba(primary.r, primary.g, primary.b, 0.12)
-    property color primaryHoverLight: Qt.rgba(primary.r, primary.g, primary.b, transparentBlurLayers ? 0.12 : 0.08)
-    property color primaryPressed: Qt.rgba(primary.r, primary.g, primary.b, transparentBlurLayers ? 0.24 : 0.16)
+    property color primaryHoverLight: Qt.rgba(primary.r, primary.g, primary.b, 0.08)
+    property color primaryPressed: Qt.rgba(primary.r, primary.g, primary.b, 0.16)
     property color primarySelected: Qt.rgba(primary.r, primary.g, primary.b, 0.3)
     property color primaryBackground: Qt.rgba(primary.r, primary.g, primary.b, 0.04)
 
@@ -560,28 +551,17 @@ Singleton {
     property color surfaceHover: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.08)
     property color surfacePressed: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.12)
     property color surfaceSelected: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.15)
-    property color surfaceLight: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, transparentBlurLayers ? 0.3 : 0.1)
+    property color surfaceLight: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.1)
     property color surfaceVariantAlpha: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.2)
-
-    readonly property bool blurForegroundLayers: BlurService.enabled && (typeof SettingsData === "undefined" || (SettingsData.blurForegroundLayers ?? true))
-    readonly property bool transparentBlurLayers: BlurService.enabled && !blurForegroundLayers
-    readonly property color readableSurface: withAlpha(surfaceContainer, popupTransparency)
-    readonly property color readableSurfaceHigh: withAlpha(surfaceContainerHigh, popupTransparency)
-    readonly property color floatingSurface: transparentBlurLayers ? "transparent" : readableSurface
-    readonly property color floatingSurfaceHigh: transparentBlurLayers ? "transparent" : readableSurfaceHigh
-    readonly property color nestedSurface: floatingSurfaceHigh
-    readonly property real blurLayerOutlineOpacity: Math.max(0, Math.min(1, typeof SettingsData === "undefined" ? 0.12 : (SettingsData.blurLayerOutlineOpacity ?? 0.12)))
-    readonly property real layerOutlineOpacity: BlurService.enabled ? blurLayerOutlineOpacity : 0.08
-    readonly property int layerOutlineWidth: BlurService.enabled && layerOutlineOpacity > 0 ? 1 : 0
     property color surfaceTextHover: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.08)
     property color surfaceTextAlpha: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.3)
     property color surfaceTextLight: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.06)
     property color surfaceTextMedium: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.7)
 
     property color outlineButton: Qt.rgba(outline.r, outline.g, outline.b, 0.5)
-    property color outlineLight: Qt.rgba(outline.r, outline.g, outline.b, BlurService.enabled ? Math.min(1, layerOutlineOpacity * 0.625) : 0.05)
-    property color outlineMedium: Qt.rgba(outline.r, outline.g, outline.b, layerOutlineOpacity)
-    property color outlineStrong: Qt.rgba(outline.r, outline.g, outline.b, BlurService.enabled ? Math.min(1, layerOutlineOpacity * 1.5) : 0.12)
+    property color outlineLight: Qt.rgba(outline.r, outline.g, outline.b, 0.05)
+    property color outlineMedium: Qt.rgba(outline.r, outline.g, outline.b, 0.08)
+    property color outlineStrong: Qt.rgba(outline.r, outline.g, outline.b, 0.12)
 
     property color errorHover: Qt.rgba(error.r, error.g, error.b, 0.12)
     property color errorPressed: Qt.rgba(error.r, error.g, error.b, 0.16)
@@ -599,12 +579,6 @@ Singleton {
         }
     }
 
-    readonly property color ccTileInactiveBg: transparentBlurLayers ? withAlpha(surfaceContainerHigh, 0.16) : (blurForegroundLayers ? withAlpha(surfaceContainerHigh, Math.min(popupTransparency, 0.24)) : withAlpha(surfaceContainer, popupTransparency))
-    readonly property color ccPillInactiveBg: transparentBlurLayers ? withAlpha(surfaceContainerHigh, 0.08) : nestedSurface
-    readonly property color ccPillInactiveHoverBg: transparentBlurLayers ? withAlpha(primary, 0.10) : primaryPressed
-    readonly property color ccSliderTrackColor: transparentBlurLayers ? surfaceText : surfaceContainerHigh
-    readonly property real ccSliderTrackOpacity: transparentBlurLayers ? 0.18 : popupTransparency
-
     readonly property color ccTileActiveText: {
         switch (SettingsData.controlCenterTileColorMode) {
         case "primaryContainer":
@@ -986,10 +960,7 @@ Singleton {
         "expressiveEffects": [0.34, 0.8, 0.34, 1, 1, 1]
     }
 
-    // Theme is the canonical access point for animation variant state. The
-    // aliases below forward to AnimVariants.qml so consumers don't need two
-    // imports. ~200 call sites read through Theme.variantEnterCurve /
-    // Theme.isConnectedEffect / etc. — do NOT migrate to AnimVariants directly.
+    // Delegates to AnimVariants.qml for curves, timing, scale, and offsets.
     readonly property list<real> variantEnterCurve: AnimVariants.variantEnterCurve
     readonly property list<real> variantExitCurve: AnimVariants.variantExitCurve
     readonly property list<real> variantModalEnterCurve: AnimVariants.variantModalEnterCurve
@@ -1003,28 +974,25 @@ Singleton {
     readonly property bool isDepthEffect: AnimVariants.isDepthEffect
     readonly property bool isConnectedEffect: AnimVariants.isConnectedEffect
     readonly property real connectedCornerRadius: {
-        if (typeof SettingsData === "undefined")
-            return 12;
+        if (typeof SettingsData === "undefined") return 12;
         return SettingsData.connectedFrameModeActive ? SettingsData.frameRounding : cornerRadius;
     }
     readonly property color connectedSurfaceColor: {
         if (typeof SettingsData === "undefined")
             return withAlpha(surfaceContainer, popupTransparency);
-        return isConnectedEffect ? Qt.rgba(SettingsData.effectiveFrameColor.r, SettingsData.effectiveFrameColor.g, SettingsData.effectiveFrameColor.b, SettingsData.frameOpacity) : withAlpha(surfaceContainer, popupTransparency);
+        return isConnectedEffect
+            ? Qt.rgba(SettingsData.effectiveFrameColor.r, SettingsData.effectiveFrameColor.g, SettingsData.effectiveFrameColor.b, SettingsData.frameOpacity)
+            : withAlpha(surfaceContainer, popupTransparency);
     }
     readonly property real connectedSurfaceRadius: isConnectedEffect ? connectedCornerRadius : cornerRadius
-    readonly property bool connectedSurfaceBlurEnabled: (typeof SettingsData === "undefined") ? true : (!isConnectedEffect || SettingsData.frameBlurEnabled)
+    readonly property bool connectedSurfaceBlurEnabled: (typeof SettingsData === "undefined")
+        ? true
+        : (!isConnectedEffect || SettingsData.frameBlurEnabled)
     readonly property real effectScaleCollapsed: AnimVariants.effectScaleCollapsed
     readonly property real effectAnimOffset: AnimVariants.effectAnimOffset
-    function variantDuration(baseDuration, entering) {
-        return AnimVariants.variantDuration(baseDuration, entering);
-    }
-    function variantExitCleanupPadding() {
-        return AnimVariants.variantExitCleanupPadding();
-    }
-    function variantCloseInterval(baseDuration) {
-        return AnimVariants.variantCloseInterval(baseDuration);
-    }
+    function variantDuration(baseDuration, entering) { return AnimVariants.variantDuration(baseDuration, entering); }
+    function variantExitCleanupPadding() { return AnimVariants.variantExitCleanupPadding(); }
+    function variantCloseInterval(baseDuration) { return AnimVariants.variantCloseInterval(baseDuration); }
 
     readonly property var animationPresetDurations: {
         "none": 0,
@@ -1396,7 +1364,7 @@ Singleton {
     }
 
     function loadCustomThemeFromFile(filePath) {
-        customThemeFileView.path = Paths.expandTilde(filePath);
+        customThemeFileView.path = filePath;
     }
 
     function reloadCustomThemeVariant() {
@@ -1575,12 +1543,12 @@ Singleton {
 
     function setDesiredTheme(kind, value, isLight, iconTheme, matugenType, stockColors) {
         if (!matugenAvailable) {
-            log.warn("matugen not available or disabled - cannot set system theme");
+            console.warn("Theme: matugen not available or disabled - cannot set system theme");
             return;
         }
 
         if (workerRunning) {
-            log.info("Worker already running, queueing request");
+            console.info("Theme: Worker already running, queueing request");
             pendingThemeRequest = {
                 kind,
                 value,
@@ -1592,7 +1560,7 @@ Singleton {
             return;
         }
 
-        log.info("Setting desired theme -", kind, "mode:", isLight ? "light" : "dark", stockColors ? "(stock colors)" : "(dynamic)");
+        console.info("Theme: Setting desired theme -", kind, "mode:", isLight ? "light" : "dark", stockColors ? "(stock colors)" : "(dynamic)");
 
         if (typeof NiriService !== "undefined" && CompositorService.isNiri) {
             NiriService.suppressNextToast();
@@ -1607,7 +1575,7 @@ Singleton {
             "runUserTemplates": (typeof SettingsData !== "undefined") ? SettingsData.runUserMatugenTemplates : true
         };
 
-        log.debug("Starting matugen worker");
+        console.log("Theme: Starting matugen worker");
         workerRunning = true;
 
         const args = ["dms", "matugen", "queue", "--state-dir", stateDir, "--shell-dir", shellDir, "--config-dir", configDir, "--kind", desired.kind, "--value", desired.value, "--mode", desired.mode, "--icon-theme", desired.iconTheme, "--matugen-type", desired.matugenType,];
@@ -1631,7 +1599,7 @@ Singleton {
         if (typeof SettingsData !== "undefined") {
             const skipTemplates = [];
             if (!SettingsData.runDmsMatugenTemplates) {
-                skipTemplates.push("gtk", "nvim", "niri", "qt5ct", "qt6ct", "firefox", "pywalfox", "zenbrowser", "vesktop", "vencord", "equibop", "ghostty", "kitty", "foot", "alacritty", "wezterm", "dgop", "kcolorscheme", "vscode", "emacs", "zed");
+                skipTemplates.push("gtk", "nvim", "niri", "qt5ct", "qt6ct", "firefox", "pywalfox", "zenbrowser", "vesktop", "equibop", "ghostty", "kitty", "foot", "alacritty", "wezterm", "dgop", "kcolorscheme", "vscode", "emacs", "zed");
             } else {
                 if (!SettingsData.matugenTemplateGtk)
                     skipTemplates.push("gtk");
@@ -1653,8 +1621,6 @@ Singleton {
                     skipTemplates.push("zenbrowser");
                 if (!SettingsData.matugenTemplateVesktop)
                     skipTemplates.push("vesktop");
-                if (!SettingsData.matugenTemplateVencord)
-                    skipTemplates.push("vencord");
                 if (!SettingsData.matugenTemplateEquibop)
                     skipTemplates.push("equibop");
                 if (!SettingsData.matugenTemplateGhostty)
@@ -1767,7 +1733,7 @@ Singleton {
         }
 
         if (!darkTheme || !darkTheme.primary) {
-            log.warn("Theme data not available for:", currentTheme);
+            console.warn("Theme data not available for:", currentTheme);
             return;
         }
 
@@ -2011,10 +1977,10 @@ Singleton {
         id: systemThemeGenerator
         running: false
         stdout: SplitParser {
-            onRead: data => log.info("Theme worker:", data)
+            onRead: data => console.info("Theme worker:", data)
         }
         stderr: SplitParser {
-            onRead: data => log.warn("Theme worker:", data)
+            onRead: data => console.warn("Theme worker:", data)
         }
 
         onExited: exitCode => {
@@ -2023,18 +1989,18 @@ Singleton {
 
             switch (exitCode) {
             case 0:
-                log.info("Matugen worker completed successfully");
+                console.info("Theme: Matugen worker completed successfully");
                 root.matugenCompleted(currentMode, "success");
                 break;
             case 2:
-                log.debug("Matugen worker completed with code 2 (no changes needed)");
+                console.log("Theme: Matugen worker completed with code 2 (no changes needed)");
                 root.matugenCompleted(currentMode, "no-changes");
                 break;
             default:
                 if (typeof ToastService !== "undefined") {
                     ToastService.showError("Theme worker failed (" + exitCode + ")");
                 }
-                log.warn("Matugen worker failed with exit code:", exitCode);
+                console.warn("Theme: Matugen worker failed with exit code:", exitCode);
                 root.matugenCompleted(currentMode, "error");
             }
 
@@ -2043,14 +2009,13 @@ Singleton {
 
             const req = pendingThemeRequest;
             pendingThemeRequest = null;
-            log.info("Processing queued theme request");
+            console.info("Theme: Processing queued theme request");
             setDesiredTheme(req.kind, req.value, req.isLight, req.iconTheme, req.matugenType, req.stockColors);
         }
     }
 
     FileView {
         id: customThemeFileView
-        blockLoading: false
         watchChanges: currentTheme === "custom"
 
         function parseAndLoadTheme() {
@@ -2097,7 +2062,7 @@ Singleton {
                     }
                 }
             } catch (e) {
-                log.error("Failed to parse dynamic colors:", e);
+                console.error("Theme: Failed to parse dynamic colors:", e);
                 if (typeof ToastService !== "undefined") {
                     ToastService.wallpaperErrorStatus = "error";
                     ToastService.showError("Dynamic colors parse error: " + e.message);
@@ -2117,11 +2082,11 @@ Singleton {
 
         onLoadFailed: function (error) {
             if (currentTheme === dynamic) {
-                log.warn("Dynamic colors file load failed, marking for regeneration");
+                console.warn("Theme: Dynamic colors file load failed, marking for regeneration");
                 colorsFileLoadFailed = true;
                 const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode);
                 if (!isGreeterMode && matugenAvailable && rawWallpaperPath) {
-                    log.debug("Matugen available, triggering immediate regeneration");
+                    console.log("Theme: Matugen available, triggering immediate regeneration");
                     generateSystemThemesFromCurrentTheme();
                 }
             }
@@ -2245,7 +2210,7 @@ Singleton {
             "endMinute": endMinute
         }, response => {
             if (response && response.error) {
-                log.error("Theme automation: Failed to sync time schedule:", response.error);
+                console.error("Theme automation: Failed to sync time schedule:", response.error);
             }
         });
 
@@ -2338,9 +2303,9 @@ Singleton {
 
         if (root.themeModeAutomationActive) {
             if (SessionData.nightModeUseIPLocation) {
-                log.warn("Theme automation: Waiting for IP location from backend");
+                console.warn("Theme automation: Waiting for IP location from backend");
             } else {
-                log.warn("Theme automation: Location mode requires coordinates");
+                console.warn("Theme automation: Location mode requires coordinates");
             }
         }
     }
@@ -2422,7 +2387,7 @@ Singleton {
                 "use": true
             }, response => {
                 if (response?.error) {
-                    log.warn("Theme automation: Failed to enable IP location", response.error);
+                    console.warn("Theme automation: Failed to enable IP location", response.error);
                 }
             });
             return true;
@@ -2436,7 +2401,7 @@ Singleton {
                         "longitude": SessionData.longitude
                     }, locResp => {
                         if (locResp?.error) {
-                            log.warn("Theme automation: Failed to set location", locResp.error);
+                            console.warn("Theme automation: Failed to set location", locResp.error);
                         }
                     });
                 }

quickshell/Common/htmlElide.js

@@ -1,93 +0,0 @@
-.pragma library
-
-function stripHtmlTags(html) {
-    if (!html)
-        return "";
-    return String(html)
-        .replace(/<[^>]+>/g, "")
-        .replace(/&nbsp;/g, " ")
-        .replace(/&amp;/g, "&")
-        .replace(/&lt;/g, "<")
-        .replace(/&gt;/g, ">")
-        .replace(/&quot;/g, "\"")
-        .replace(/&#039;/g, "'");
-}
-
-function elideRichText(html, visibleBudget) {
-    if (!html)
-        return "";
-    if (visibleBudget <= 0)
-        return "";
-
-    var out = "";
-    var visible = 0;
-    var i = 0;
-    var openTags = [];
-    var len = html.length;
-
-    while (i < len && visible < visibleBudget) {
-        var ch = html.charAt(i);
-        if (ch === "<") {
-            var end = html.indexOf(">", i);
-            if (end < 0)
-                break;
-            var tag = html.substring(i, end + 1);
-            out += tag;
-            var isClose = tag.charAt(1) === "/";
-            var match = tag.match(/^<\/?([a-zA-Z]+)/);
-            var name = match ? match[1] : "";
-            if (isClose) {
-                if (openTags.length > 0 && openTags[openTags.length - 1] === name)
-                    openTags.pop();
-            } else if (!tag.endsWith("/>") && name) {
-                openTags.push(name);
-            }
-            i = end + 1;
-        } else if (ch === "&") {
-            var eend = html.indexOf(";", i);
-            if (eend < 0 || eend - i > 6) {
-                out += "&amp;";
-                visible++;
-                i++;
-            } else {
-                out += html.substring(i, eend + 1);
-                visible++;
-                i = eend + 1;
-            }
-        } else {
-            out += ch;
-            visible++;
-            i++;
-        }
-    }
-
-    while (i < len && html.charAt(i) === "<") {
-        var tend = html.indexOf(">", i);
-        if (tend < 0)
-            break;
-        var ttag = html.substring(i, tend + 1);
-        out += ttag;
-        var tisClose = ttag.charAt(1) === "/";
-        var tmatch = ttag.match(/^<\/?([a-zA-Z]+)/);
-        var tname = tmatch ? tmatch[1] : "";
-        if (tisClose) {
-            if (openTags.length > 0 && openTags[openTags.length - 1] === tname)
-                openTags.pop();
-        } else if (!ttag.endsWith("/>") && tname) {
-            openTags.push(tname);
-        }
-        i = tend + 1;
-    }
-
-    if (i < len) {
-        out = out.replace(/\s+$/, "");
-        while (openTags.length > 0)
-            out += "</" + openTags.pop() + ">";
-        out += "…";
-    } else {
-        while (openTags.length > 0)
-            out += "</" + openTags.pop() + ">";
-    }
-
-    return out;
-}

quickshell/Common/settings/SessionSpec.js

@@ -4,7 +4,6 @@ var SPEC = {
     isLightMode: { def: false },
     doNotDisturb: { def: false },
     doNotDisturbUntil: { def: 0 },
-    terminalOverride: { def: "" },
 
     wallpaperPath: { def: "" },
     perMonitorWallpaper: { def: false },

quickshell/Common/settings/SettingsSpec.js

@@ -51,6 +51,8 @@ var SPEC = {
     enableRippleEffects: { def: true },
     animationVariant: { def: 0 },
     motionEffect: { def: 0 },
+    directionalAnimationMode: { def: 0 },
+    previousDirectionalMode: { def: 1 },
     m3ElevationEnabled: { def: true },
     m3ElevationIntensity: { def: 12 },
     m3ElevationOpacity: { def: 30 },
@@ -61,11 +63,9 @@ var SPEC = {
     popoutElevationEnabled: { def: true },
     barElevationEnabled: { def: true },
     blurEnabled: { def: false },
-    blurForegroundLayers: { def: true },
-    blurLayerOutlineOpacity: { def: 0.12, coerce: percentToUnit },
     blurBorderColor: { def: "outline" },
     blurBorderCustomColor: { def: "#ffffff" },
-    blurBorderOpacity: { def: 0.35, coerce: percentToUnit },
+    blurBorderOpacity: { def: 1.0, coerce: percentToUnit },
     wallpaperFillMode: { def: "Fill" },
     blurredWallpaperLayer: { def: false },
     blurWallpaperOnOverview: { def: false },
@@ -83,9 +83,6 @@ var SPEC = {
     selectedGpuIndex: { def: 0 },
     enabledGpuPciIds: { def: [] },
     showSystemTray: { def: true },
-    systemTrayIconTintMode: { def: "none" },
-    systemTrayIconTintSaturation: { def: 50 },
-    systemTrayIconTintStrength: { def: 135 },
     showClock: { def: true },
     showNotificationButton: { def: true },
     showBattery: { def: true },
@@ -304,7 +301,6 @@ var SPEC = {
     matugenTemplatePywalfox: { def: true },
     matugenTemplateZenBrowser: { def: true },
     matugenTemplateVesktop: { def: true },
-    matugenTemplateVencord: { def: true },
     matugenTemplateEquibop: { def: true },
     matugenTemplateGhostty: { def: true },
     matugenTemplateKitty: { def: true },
@@ -353,9 +349,6 @@ var SPEC = {
     dockMaxVisibleApps: { def: 0 },
     dockMaxVisibleRunningApps: { def: 0 },
     dockShowOverflowBadge: { def: true },
-    dockShowTrash: { def: false },
-    dockTrashFileManager: { def: "default" },
-    dockTrashCustomCommand: { def: "" },
 
     notificationOverlayEnabled: { def: false },
     notificationPopupShadowEnabled: { def: true },
@@ -431,9 +424,6 @@ var SPEC = {
     updaterUseCustomCommand: { def: false },
     updaterCustomCommand: { def: "" },
     updaterTerminalAdditionalParams: { def: "" },
-    updaterIntervalSeconds: { def: 1800 },
-    updaterIncludeFlatpak: { def: true },
-    updaterAllowAUR: { def: true },
 
     displayNameMode: { def: "system" },
     screenPreferences: { def: {} },
@@ -563,10 +553,8 @@ var SPEC = {
     frameBarSize: { def: 40 },
     frameShowOnOverview: { def: false },
     frameBlurEnabled: { def: true },
-    frameCloseGaps: { def: true },
-    frameLauncherEmergeSide: { def: "bottom" },
-    frameLauncherArcExtender: { def: false },
-    frameMode: { def: "separate" }
+    frameCloseGaps: { def: false },
+    frameLauncherEmergeSide: { def: "bottom" }
 };
 
 function getValidKeys() {

quickshell/DMSShell.qml

@@ -4,7 +4,6 @@ import qs.Common
 import qs.Modals
 import qs.Modals.Changelog
 import qs.Modals.Clipboard
-import qs.Modals.Common
 import qs.Modals.Greeter
 import qs.Modals.Settings
 import qs.Modals.DankLauncherV2
@@ -28,16 +27,6 @@ import qs.Services
 
 Item {
     id: root
-    readonly property var log: Log.scoped("DMSShell")
-
-    property bool osdSurfacesLoaded: true
-    property int pendingOsdResumeReloads: 0
-
-    function recreateOsdSurfaces() {
-        OSDManager.currentOSDsByScreen = ({});
-        osdSurfacesLoaded = false;
-        osdSurfaceReloadTimer.restart();
-    }
 
     Instantiator {
         id: daemonPluginInstantiator
@@ -56,7 +45,7 @@ Item {
                         item.popoutService = PopoutService;
                     }
                     item.pluginId = pluginId;
-                    log.info("Daemon plugin loaded:", pluginId);
+                    console.info("Daemon plugin loaded:", pluginId);
                 }
             }
         }
@@ -95,7 +84,7 @@ Item {
                 }
 
                 onFadeCancelled: {
-                    log.debug("Fade to lock cancelled by user on screen:", fadeWindowLoader.modelData.name);
+                    console.log("Fade to lock cancelled by user on screen:", fadeWindowLoader.modelData.name);
                 }
             }
 
@@ -135,7 +124,7 @@ Item {
                 }
 
                 onFadeCancelled: {
-                    log.debug("Fade to DPMS cancelled by user on screen:", fadeDpmsWindowLoader.modelData.name);
+                    console.log("Fade to DPMS cancelled by user on screen:", fadeDpmsWindowLoader.modelData.name);
                 }
             }
 
@@ -246,32 +235,6 @@ Item {
         }
     }
 
-    Timer {
-        id: osdResumeRecreateTimer
-        interval: 400
-        repeat: false
-        onTriggered: {
-            root.recreateOsdSurfaces();
-            root.pendingOsdResumeReloads--;
-
-            if (root.pendingOsdResumeReloads <= 0) {
-                root.pendingOsdResumeReloads = 0;
-                interval = 400;
-                return;
-            }
-
-            interval = 1400;
-            restart();
-        }
-    }
-
-    Timer {
-        id: osdSurfaceReloadTimer
-        interval: 120
-        repeat: false
-        onTriggered: root.osdSurfacesLoaded = true
-    }
-
     Component.onCompleted: {
         dockRecreateDebounce.start();
         // Force PolkitService singleton to initialize
@@ -289,15 +252,11 @@ Item {
 
         sourceComponent: Dock {
             contextMenu: dockContextMenuLoader.item ? dockContextMenuLoader.item : null
-            trashContextMenu: dockTrashContextMenuLoader.item ? dockTrashContextMenuLoader.item : null
         }
 
         onLoaded: {
             if (item) {
                 dockContextMenuLoader.active = true;
-                if (SettingsData.dockShowTrash) {
-                    dockTrashContextMenuLoader.active = true;
-                }
             }
         }
 
@@ -334,6 +293,7 @@ Item {
         sourceComponent: Component {
             DankDashPopout {
                 id: dankDashPopout
+                onPopoutClosed: PopoutService.unloadDankDash()
             }
         }
     }
@@ -348,43 +308,6 @@ Item {
         }
     }
 
-    LazyLoader {
-        id: dockTrashContextMenuLoader
-
-        active: false
-
-        DockTrashContextMenu {
-            id: dockTrashContextMenu
-        }
-    }
-
-    Connections {
-        target: SettingsData
-        function onDockShowTrashChanged() {
-            if (SettingsData.dockShowTrash) {
-                dockTrashContextMenuLoader.active = true;
-            }
-        }
-    }
-
-    ConfirmModal {
-        id: emptyTrashConfirm
-    }
-
-    Connections {
-        target: TrashService
-        function onEmptyTrashConfirmRequested(itemCount) {
-            emptyTrashConfirm.showWithOptions({
-                title: I18n.tr("Empty Trash?"),
-                message: I18n.tr("Permanently delete %1 item(s)? This cannot be undone.").arg(itemCount),
-                confirmText: I18n.tr("Empty"),
-                cancelText: I18n.tr("Cancel"),
-                confirmColor: Theme.error,
-                onConfirm: () => TrashService.emptyTrash()
-            });
-        }
-    }
-
     LazyLoader {
         id: notificationCenterLoader
 
@@ -776,7 +699,7 @@ Item {
                 cmd += " " + escapedPath;
             }
 
-            log.debug("FilePicker: Launching", cmd);
+            console.log("FilePicker: Launching", cmd);
 
             Quickshell.execDetached({
                 command: ["sh", "-c", cmd]
@@ -808,10 +731,10 @@ Item {
         }
 
         function onAppPickerRequested(data) {
-            log.debug("App picker requested with data:", JSON.stringify(data));
+            console.log("DMSShell: App picker requested with data:", JSON.stringify(data));
 
             if (!data || !data.target) {
-                log.warn("Invalid app picker request data");
+                console.warn("DMSShell: Invalid app picker request data");
                 return;
             }
 
@@ -829,16 +752,6 @@ Item {
         }
     }
 
-    Connections {
-        target: SessionService
-
-        function onSessionResumed() {
-            root.pendingOsdResumeReloads = 2;
-            osdResumeRecreateTimer.interval = 400;
-            osdResumeRecreateTimer.restart();
-        }
-    }
-
     DankColorPickerModal {
         id: colorPickerModal
 
@@ -880,19 +793,10 @@ Item {
 
         ProcessListModal {
             id: processListModal
-            property bool wasShown: false
 
             Component.onCompleted: {
                 PopoutService.processListModal = processListModal;
             }
-
-            onVisibleChanged: {
-                if (visible) {
-                    wasShown = true;
-                } else if (wasShown) {
-                    PopoutService.unloadProcessListModal();
-                }
-            }
         }
     }
 
@@ -907,12 +811,7 @@ Item {
 
         SystemUpdatePopout {
             id: systemUpdatePopout
-            onPopoutClosed: {
-                if (systemUpdatePopout._reopenAfterUpgrade) {
-                    return;
-                }
-                PopoutService.unloadSystemUpdate();
-            }
+            onPopoutClosed: PopoutService.unloadSystemUpdate()
 
             Component.onCompleted: {
                 PopoutService.systemUpdatePopout = systemUpdatePopout;
@@ -1027,85 +926,81 @@ Item {
         }
     }
 
+    Variants {
+        model: SettingsData.getFilteredScreens("osd")
+
+        delegate: VolumeOSD {
+            modelData: item
+        }
+    }
+
+    Variants {
+        model: SettingsData.getFilteredScreens("osd")
+
+        delegate: MediaVolumeOSD {
+            modelData: item
+        }
+    }
+
+    Variants {
+        model: SettingsData.getFilteredScreens("osd")
+
+        delegate: MediaPlaybackOSD {
+            modelData: item
+        }
+    }
+
+    Variants {
+        model: SettingsData.getFilteredScreens("osd")
+
+        delegate: MicMuteOSD {
+            modelData: item
+        }
+    }
+
+    Variants {
+        model: SettingsData.getFilteredScreens("osd")
+
+        delegate: BrightnessOSD {
+            modelData: item
+        }
+    }
+
+    Variants {
+        model: SettingsData.getFilteredScreens("osd")
+
+        delegate: IdleInhibitorOSD {
+            modelData: item
+        }
+    }
+
     Loader {
-        id: osdSurfacesLoader
-        active: root.osdSurfacesLoaded
-        asynchronous: false
+        id: powerProfileWatcherLoader
+        active: SettingsData.osdPowerProfileEnabled
+        source: "Services/PowerProfileWatcher.qml"
+    }
 
-        sourceComponent: Component {
-            Item {
-                Variants {
-                    model: SettingsData.getFilteredScreens("osd")
+    Variants {
+        model: SettingsData.osdPowerProfileEnabled ? SettingsData.getFilteredScreens("osd") : []
 
-                    delegate: VolumeOSD {
-                        modelData: item
-                    }
-                }
+        delegate: PowerProfileOSD {
+            modelData: item
+        }
+    }
 
-                Variants {
-                    model: SettingsData.getFilteredScreens("osd")
+    Variants {
+        model: SettingsData.getFilteredScreens("osd")
 
-                    delegate: MediaVolumeOSD {
-                        modelData: item
-                    }
-                }
+        delegate: CapsLockOSD {
+            modelData: item
+        }
+    }
 
-                Variants {
-                    model: SettingsData.getFilteredScreens("osd")
+    Variants {
+        model: SettingsData.getFilteredScreens("osd")
 
-                    delegate: MediaPlaybackOSD {
-                        modelData: item
-                    }
-                }
-
-                Variants {
-                    model: SettingsData.getFilteredScreens("osd")
-
-                    delegate: MicMuteOSD {
-                        modelData: item
-                    }
-                }
-
-                Variants {
-                    model: SettingsData.getFilteredScreens("osd")
-
-                    delegate: BrightnessOSD {
-                        modelData: item
-                    }
-                }
-
-                Variants {
-                    model: SettingsData.getFilteredScreens("osd")
-
-                    delegate: IdleInhibitorOSD {
-                        modelData: item
-                    }
-                }
-
-                Variants {
-                    model: SettingsData.osdPowerProfileEnabled ? SettingsData.getFilteredScreens("osd") : []
-
-                    delegate: PowerProfileOSD {
-                        modelData: item
-                    }
-                }
-
-                Variants {
-                    model: SettingsData.getFilteredScreens("osd")
-
-                    delegate: CapsLockOSD {
-                        modelData: item
-                    }
-                }
-
-                Variants {
-                    model: SettingsData.getFilteredScreens("osd")
-
-                    delegate: AudioOutputOSD {
-                        modelData: item
-                    }
-                }
-            }
+        delegate: AudioOutputOSD {
+            modelData: item
         }
     }
 

quickshell/DMSShellIPC.qml

@@ -9,7 +9,6 @@ import qs.Modules.Settings.DisplayConfig
 
 Item {
     id: root
-    readonly property var log: Log.scoped("DMSShellIPC")
 
     required property var powerMenuModalLoader
     required property var processListModalLoader
@@ -162,36 +161,37 @@ Item {
     }
 
     IpcHandler {
-        function resolveTabIndex(tab: string): int {
-            switch ((tab || "").toLowerCase()) {
-            case "media":
-                return 1;
-            case "wallpaper":
-                return 2;
-            case "weather":
-                return SettingsData.weatherEnabled ? 3 : 0;
-            default:
-                return 0;
-            }
-        }
-
         function open(tab: string): string {
             const bar = root.getPreferredBar("clockButtonRef");
             if (!bar)
                 return "DASH_OPEN_FAILED";
 
-            const tabIndex = resolveTabIndex(tab);
             const dash = root.dankDashPopoutLoader.item;
-            if (dash && dash.shouldBeVisible && dash.triggerScreen?.name === bar.screen?.name) {
-                dash.currentTabIndex = tabIndex;
-                if (dash.updateSurfacePosition)
-                    dash.updateSurfacePosition();
-                return "DASH_OPEN_SUCCESS";
+            const onSameScreen = dash && dash.shouldBeVisible && dash.triggerScreen?.name === bar.screen?.name;
+
+            if (!onSameScreen) {
+                bar.triggerWallpaperBrowser();
             }
 
-            if (!bar.triggerDashTab(tabIndex))
+            if (!root.dankDashPopoutLoader.item)
                 return "DASH_OPEN_FAILED";
 
+            switch (tab.toLowerCase()) {
+            case "media":
+                root.dankDashPopoutLoader.item.currentTabIndex = 1;
+                break;
+            case "wallpaper":
+                root.dankDashPopoutLoader.item.currentTabIndex = 2;
+                break;
+            case "weather":
+                root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 3 : 0;
+                break;
+            default:
+                root.dankDashPopoutLoader.item.currentTabIndex = 0;
+                break;
+            }
+
+            root.dankDashPopoutLoader.item.dashVisible = true;
             return "DASH_OPEN_SUCCESS";
         }
 
@@ -211,8 +211,23 @@ Item {
 
             const bar = root.getPreferredBar("clockButtonRef");
             if (bar) {
-                if (!bar.triggerDashTab(resolveTabIndex(tab)))
-                    return "DASH_TOGGLE_FAILED";
+                bar.triggerWallpaperBrowser();
+                if (root.dankDashPopoutLoader.item) {
+                    switch (tab.toLowerCase()) {
+                    case "media":
+                        root.dankDashPopoutLoader.item.currentTabIndex = 1;
+                        break;
+                    case "wallpaper":
+                        root.dankDashPopoutLoader.item.currentTabIndex = 2;
+                        break;
+                    case "weather":
+                        root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 3 : 0;
+                        break;
+                    default:
+                        root.dankDashPopoutLoader.item.currentTabIndex = 0;
+                        break;
+                    }
+                }
                 return "DASH_TOGGLE_SUCCESS";
             }
             return "DASH_TOGGLE_FAILED";
@@ -846,7 +861,7 @@ Item {
 
         function set(key: string, value: string): string {
             if (!(key in SettingsData)) {
-                log.warn("Cannot set property, not found:", key);
+                console.warn("Cannot set property, not found:", key);
                 return "SETTINGS_INVALID_KEY";
             }
 
@@ -879,12 +894,12 @@ Item {
                     throw "Unsupported type";
                 }
 
-                log.warn("Setting:", key, value);
+                console.warn("Setting:", key, value);
                 SettingsData[key] = value;
                 SettingsData.saveSettings();
                 return "SETTINGS_SET_SUCCESS";
             } catch (e) {
-                log.warn("Failed to set property:", key, "error:", e);
+                console.warn("Failed to set property:", key, "error:", e);
                 return "SETTINGS_SET_FAILURE";
             }
         }

quickshell/Modals/AppPickerModal.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import Quickshell
 import qs.Common
 import qs.Modals.Common
 import qs.Widgets
@@ -6,7 +7,6 @@ import qs.Services
 
 DankModal {
     id: root
-    readonly property var log: Log.scoped("AppPickerModal")
 
     property string title: I18n.tr("Select Application")
     property string targetData: ""
@@ -30,52 +30,52 @@ DankModal {
     onBackgroundClicked: close()
 
     onDialogClosed: {
-        searchQuery = "";
-        selectedIndex = 0;
-        keyboardNavigationActive = false;
+        searchQuery = ""
+        selectedIndex = 0
+        keyboardNavigationActive = false
     }
 
     onOpened: {
-        searchQuery = "";
-        updateApplicationList();
-        selectedIndex = 0;
+        searchQuery = ""
+        updateApplicationList()
+        selectedIndex = 0
         Qt.callLater(() => {
             if (contentLoader.item && contentLoader.item.searchField) {
-                contentLoader.item.searchField.text = "";
-                contentLoader.item.searchField.forceActiveFocus();
+                contentLoader.item.searchField.text = ""
+                contentLoader.item.searchField.forceActiveFocus()
             }
-        });
+        })
     }
 
     function updateApplicationList() {
-        applicationsModel.clear();
-        const apps = AppSearchService.applications;
-        const usageHistory = usageHistoryKey && SettingsData[usageHistoryKey] ? SettingsData[usageHistoryKey] : {};
-        let filteredApps = [];
+        applicationsModel.clear()
+        const apps = AppSearchService.applications
+        const usageHistory = usageHistoryKey && SettingsData[usageHistoryKey] ? SettingsData[usageHistoryKey] : {}
+        let filteredApps = []
 
         for (const app of apps) {
-            if (!app || !app.categories)
-                continue;
-            let matchesCategory = categoryFilter.length === 0;
+            if (!app || !app.categories) continue
+
+            let matchesCategory = categoryFilter.length === 0
 
             if (categoryFilter.length > 0) {
                 try {
                     for (const cat of app.categories) {
                         if (categoryFilter.includes(cat)) {
-                            matchesCategory = true;
-                            break;
+                            matchesCategory = true
+                            break
                         }
                     }
                 } catch (e) {
-                    log.warn("AppPicker: Error iterating categories for", app.name, ":", e);
-                    continue;
+                    console.warn("AppPicker: Error iterating categories for", app.name, ":", e)
+                    continue
                 }
             }
 
             if (matchesCategory) {
-                const name = app.name || "";
-                const lowerName = name.toLowerCase();
-                const lowerQuery = searchQuery.toLowerCase();
+                const name = app.name || ""
+                const lowerName = name.toLowerCase()
+                const lowerQuery = searchQuery.toLowerCase()
 
                 if (searchQuery === "" || lowerName.includes(lowerQuery)) {
                     filteredApps.push({
@@ -84,21 +84,21 @@ DankModal {
                         exec: app.exec || app.execString || "",
                         startupClass: app.startupWMClass || "",
                         appData: app
-                    });
+                    })
                 }
             }
         }
 
         filteredApps.sort((a, b) => {
-            const aId = a.appData.id || a.appData.execString || a.appData.exec || "";
-            const bId = b.appData.id || b.appData.execString || b.appData.exec || "";
-            const aUsage = usageHistory[aId] ? usageHistory[aId].count : 0;
-            const bUsage = usageHistory[bId] ? usageHistory[bId].count : 0;
+            const aId = a.appData.id || a.appData.execString || a.appData.exec || ""
+            const bId = b.appData.id || b.appData.execString || b.appData.exec || ""
+            const aUsage = usageHistory[aId] ? usageHistory[aId].count : 0
+            const bUsage = usageHistory[bId] ? usageHistory[bId].count : 0
             if (aUsage !== bUsage) {
-                return bUsage - aUsage;
+                return bUsage - aUsage
             }
-            return (a.name || "").localeCompare(b.name || "");
-        });
+            return (a.name || "").localeCompare(b.name || "")
+        })
 
         filteredApps.forEach(app => {
             applicationsModel.append({
@@ -107,10 +107,10 @@ DankModal {
                 exec: app.exec,
                 startupClass: app.startupClass,
                 appId: app.appData.id || app.appData.execString || app.appData.exec || ""
-            });
-        });
+            })
+        })
 
-        log.debug("AppPicker: Found " + filteredApps.length + " applications");
+        console.log("AppPicker: Found " + filteredApps.length + " applications")
     }
 
     onSearchQueryChanged: updateApplicationList()
@@ -129,57 +129,56 @@ DankModal {
             focus: true
 
             Keys.onEscapePressed: event => {
-                root.close();
-                event.accepted = true;
+                root.close()
+                event.accepted = true
             }
 
             Keys.onPressed: event => {
-                if (applicationsModel.count === 0)
-                    return;
+                if (applicationsModel.count === 0) return
 
                 // Toggle view mode with Tab key
                 if (event.key === Qt.Key_Tab) {
-                    root.viewMode = root.viewMode === "grid" ? "list" : "grid";
-                    event.accepted = true;
-                    return;
+                    root.viewMode = root.viewMode === "grid" ? "list" : "grid"
+                    event.accepted = true
+                    return
                 }
 
                 if (root.viewMode === "grid") {
                     if (event.key === Qt.Key_Left) {
-                        root.keyboardNavigationActive = true;
-                        root.selectedIndex = Math.max(0, root.selectedIndex - 1);
-                        event.accepted = true;
+                        root.keyboardNavigationActive = true
+                        root.selectedIndex = Math.max(0, root.selectedIndex - 1)
+                        event.accepted = true
                     } else if (event.key === Qt.Key_Right) {
-                        root.keyboardNavigationActive = true;
-                        root.selectedIndex = Math.min(applicationsModel.count - 1, root.selectedIndex + 1);
-                        event.accepted = true;
+                        root.keyboardNavigationActive = true
+                        root.selectedIndex = Math.min(applicationsModel.count - 1, root.selectedIndex + 1)
+                        event.accepted = true
                     } else if (event.key === Qt.Key_Up) {
-                        root.keyboardNavigationActive = true;
-                        root.selectedIndex = Math.max(0, root.selectedIndex - root.gridColumns);
-                        event.accepted = true;
+                        root.keyboardNavigationActive = true
+                        root.selectedIndex = Math.max(0, root.selectedIndex - root.gridColumns)
+                        event.accepted = true
                     } else if (event.key === Qt.Key_Down) {
-                        root.keyboardNavigationActive = true;
-                        root.selectedIndex = Math.min(applicationsModel.count - 1, root.selectedIndex + root.gridColumns);
-                        event.accepted = true;
+                        root.keyboardNavigationActive = true
+                        root.selectedIndex = Math.min(applicationsModel.count - 1, root.selectedIndex + root.gridColumns)
+                        event.accepted = true
                     }
                 } else {
                     if (event.key === Qt.Key_Up) {
-                        root.keyboardNavigationActive = true;
-                        root.selectedIndex = Math.max(0, root.selectedIndex - 1);
-                        event.accepted = true;
+                        root.keyboardNavigationActive = true
+                        root.selectedIndex = Math.max(0, root.selectedIndex - 1)
+                        event.accepted = true
                     } else if (event.key === Qt.Key_Down) {
-                        root.keyboardNavigationActive = true;
-                        root.selectedIndex = Math.min(applicationsModel.count - 1, root.selectedIndex + 1);
-                        event.accepted = true;
+                        root.keyboardNavigationActive = true
+                        root.selectedIndex = Math.min(applicationsModel.count - 1, root.selectedIndex + 1)
+                        event.accepted = true
                     }
                 }
 
                 if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
                     if (root.selectedIndex >= 0 && root.selectedIndex < applicationsModel.count) {
-                        const app = applicationsModel.get(root.selectedIndex);
-                        launchApplication(app);
+                        const app = applicationsModel.get(root.selectedIndex)
+                        launchApplication(app)
                     }
-                    event.accepted = true;
+                    event.accepted = true
                 }
             }
 
@@ -218,7 +217,7 @@ DankModal {
                             iconColor: root.viewMode === "list" ? Theme.primary : Theme.surfaceText
                             backgroundColor: root.viewMode === "list" ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
                             onClicked: {
-                                root.viewMode = "list";
+                                root.viewMode = "list"
                             }
                         }
 
@@ -230,7 +229,7 @@ DankModal {
                             iconColor: root.viewMode === "grid" ? Theme.primary : Theme.surfaceText
                             backgroundColor: root.viewMode === "grid" ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
                             onClicked: {
-                                root.viewMode = "grid";
+                                root.viewMode = "grid"
                             }
                         }
                     }
@@ -258,42 +257,42 @@ DankModal {
                     keyForwardTargets: [appContent]
 
                     onTextEdited: {
-                        root.searchQuery = text;
+                        root.searchQuery = text
                     }
 
                     Keys.onPressed: function (event) {
                         if (event.key === Qt.Key_Escape) {
-                            root.close();
-                            event.accepted = true;
-                            return;
+                            root.close()
+                            event.accepted = true
+                            return
                         }
 
-                        const isEnterKey = [Qt.Key_Return, Qt.Key_Enter].includes(event.key);
-                        const hasText = text.length > 0;
+                        const isEnterKey = [Qt.Key_Return, Qt.Key_Enter].includes(event.key)
+                        const hasText = text.length > 0
 
                         if (isEnterKey && hasText) {
                             if (root.keyboardNavigationActive && applicationsModel.count > 0) {
-                                const app = applicationsModel.get(root.selectedIndex);
-                                launchApplication(app);
+                                const app = applicationsModel.get(root.selectedIndex)
+                                launchApplication(app)
                             } else if (applicationsModel.count > 0) {
-                                const app = applicationsModel.get(0);
-                                launchApplication(app);
+                                const app = applicationsModel.get(0)
+                                launchApplication(app)
                             }
-                            event.accepted = true;
-                            return;
+                            event.accepted = true
+                            return
                         }
 
-                        const navigationKeys = [Qt.Key_Down, Qt.Key_Up, Qt.Key_Left, Qt.Key_Right, Qt.Key_Tab, Qt.Key_Backtab];
-                        const isNavigationKey = navigationKeys.includes(event.key);
-                        const isEmptyEnter = isEnterKey && !hasText;
+                        const navigationKeys = [Qt.Key_Down, Qt.Key_Up, Qt.Key_Left, Qt.Key_Right, Qt.Key_Tab, Qt.Key_Backtab]
+                        const isNavigationKey = navigationKeys.includes(event.key)
+                        const isEmptyEnter = isEnterKey && !hasText
 
-                        event.accepted = !(isNavigationKey || isEmptyEnter);
+                        event.accepted = !(isNavigationKey || isEmptyEnter)
                     }
 
                     Connections {
                         function onShouldBeVisibleChanged() {
                             if (!root.shouldBeVisible) {
-                                searchField.focus = false;
+                                searchField.focus = false
                             }
                         }
 
@@ -304,12 +303,12 @@ DankModal {
                 Rectangle {
                     width: parent.width
                     height: {
-                        let usedHeight = 40 + Theme.spacingS;
-                        usedHeight += 52 + Theme.spacingS;
+                        let usedHeight = 40 + Theme.spacingS
+                        usedHeight += 52 + Theme.spacingS
                         if (root.showTargetData) {
-                            usedHeight += 36 + Theme.spacingS;
+                            usedHeight += 36 + Theme.spacingS
                         }
-                        return parent.height - usedHeight;
+                        return parent.height - usedHeight
                     }
                     radius: Theme.cornerRadius
                     color: "transparent"
@@ -321,14 +320,14 @@ DankModal {
                         property int itemSpacing: Theme.spacingS
 
                         function ensureVisible(index) {
-                            if (index < 0 || index >= count)
-                                return;
-                            const itemY = index * (itemHeight + itemSpacing);
-                            const itemBottom = itemY + itemHeight;
+                            if (index < 0 || index >= count) return
+
+                            const itemY = index * (itemHeight + itemSpacing)
+                            const itemBottom = itemY + itemHeight
                             if (itemY < contentY) {
-                                contentY = itemY;
+                                contentY = itemY
                             } else if (itemBottom > contentY + height) {
-                                contentY = itemBottom - height;
+                                contentY = itemBottom - height
                             }
                         }
 
@@ -344,9 +343,9 @@ DankModal {
                         spacing: itemSpacing
 
                         onCurrentIndexChanged: {
-                            root.selectedIndex = currentIndex;
+                            root.selectedIndex = currentIndex
                             if (root.keyboardNavigationActive) {
-                                ensureVisible(currentIndex);
+                                ensureVisible(currentIndex)
                             }
                         }
 
@@ -361,11 +360,11 @@ DankModal {
                             hoverUpdatesSelection: true
 
                             onItemClicked: (idx, modelData) => {
-                                launchApplication(modelData);
+                                launchApplication(modelData)
                             }
 
                             onKeyboardNavigationReset: {
-                                root.keyboardNavigationActive = false;
+                                root.keyboardNavigationActive = false
                             }
                         }
                     }
@@ -374,14 +373,14 @@ DankModal {
                         id: appGrid
 
                         function ensureVisible(index) {
-                            if (index < 0 || index >= count)
-                                return;
-                            const itemY = Math.floor(index / root.gridColumns) * cellHeight;
-                            const itemBottom = itemY + cellHeight;
+                            if (index < 0 || index >= count) return
+
+                            const itemY = Math.floor(index / root.gridColumns) * cellHeight
+                            const itemBottom = itemY + cellHeight
                             if (itemY < contentY) {
-                                contentY = itemY;
+                                contentY = itemY
                             } else if (itemBottom > contentY + height) {
-                                contentY = itemBottom - height;
+                                contentY = itemBottom - height
                             }
                         }
 
@@ -398,9 +397,9 @@ DankModal {
                         currentIndex: root.selectedIndex
 
                         onCurrentIndexChanged: {
-                            root.selectedIndex = currentIndex;
+                            root.selectedIndex = currentIndex
                             if (root.keyboardNavigationActive) {
-                                ensureVisible(currentIndex);
+                                ensureVisible(currentIndex)
                             }
                         }
 
@@ -414,11 +413,11 @@ DankModal {
                             hoverUpdatesSelection: true
 
                             onItemClicked: (idx, modelData) => {
-                                launchApplication(modelData);
+                                launchApplication(modelData)
                             }
 
                             onKeyboardNavigationReset: {
-                                root.keyboardNavigationActive = false;
+                                root.keyboardNavigationActive = false
                             }
                         }
                     }
@@ -450,22 +449,22 @@ DankModal {
             }
 
             function launchApplication(app) {
-                if (!app)
-                    return;
-                root.applicationSelected(app, root.targetData);
+                if (!app) return
+
+                root.applicationSelected(app, root.targetData)
 
                 if (usageHistoryKey && app.appId) {
-                    const usageHistory = SettingsData[usageHistoryKey] || {};
-                    const currentCount = usageHistory[app.appId] ? usageHistory[app.appId].count : 0;
+                    const usageHistory = SettingsData[usageHistoryKey] || {}
+                    const currentCount = usageHistory[app.appId] ? usageHistory[app.appId].count : 0
                     usageHistory[app.appId] = {
                         count: currentCount + 1,
                         lastUsed: Date.now(),
                         name: app.name
-                    };
-                    SettingsData.set(usageHistoryKey, usageHistory);
+                    }
+                    SettingsData.set(usageHistoryKey, usageHistory)
                 }
 
-                root.close();
+                root.close()
             }
         }
     }

quickshell/Modals/BluetoothPairingModal.qml

@@ -7,7 +7,6 @@ import qs.Widgets
 
 DankModal {
     id: root
-    readonly property var log: Log.scoped("BluetoothPairingModal")
 
     layerNamespace: "dms:bluetooth-pairing"
 
@@ -25,7 +24,7 @@ DankModal {
     property string passkeyInput: ""
 
     function show(pairingData) {
-        log.debug("BluetoothPairingModal.show() called:", JSON.stringify(pairingData));
+        console.log("BluetoothPairingModal.show() called:", JSON.stringify(pairingData));
         token = pairingData.token || "";
         deviceName = pairingData.deviceName || "";
         deviceAddress = pairingData.deviceAddr || "";
@@ -34,7 +33,7 @@ DankModal {
         pinInput = "";
         passkeyInput = "";
 
-        log.debug("Calling open()");
+        console.log("BluetoothPairingModal: Calling open()");
         open();
         Qt.callLater(() => {
             if (contentLoader.item) {

quickshell/Modals/BrowserPickerModal.qml

@@ -2,11 +2,9 @@ import QtQuick
 import Quickshell
 import qs.Common
 import qs.Modals
-import qs.Services
 
 AppPickerModal {
     id: root
-    readonly property var log: Log.scoped("BrowserPickerModal")
 
     property string url: ""
 
@@ -19,44 +17,35 @@ AppPickerModal {
     showTargetData: true
 
     function shellEscape(str) {
-        return "'" + str.replace(/'/g, "'\\''") + "'";
+        return "'" + str.replace(/'/g, "'\\''") + "'"
     }
 
     onApplicationSelected: (app, url) => {
-        if (!app)
-            return;
-        let cmd = app.exec || "";
-        const escapedUrl = shellEscape(url);
+        if (!app) return
 
-        let hasField = false;
-        if (cmd.includes("%u")) {
-            cmd = cmd.replace("%u", escapedUrl);
-            hasField = true;
-        } else if (cmd.includes("%U")) {
-            cmd = cmd.replace("%U", escapedUrl);
-            hasField = true;
-        } else if (cmd.includes("%f")) {
-            cmd = cmd.replace("%f", escapedUrl);
-            hasField = true;
-        } else if (cmd.includes("%F")) {
-            cmd = cmd.replace("%F", escapedUrl);
-            hasField = true;
-        }
+        let cmd = app.exec || ""
+        const escapedUrl = shellEscape(url)
 
-        cmd = cmd.replace(/%[ikc]/g, "");
+        let hasField = false
+        if (cmd.includes("%u")) { cmd = cmd.replace("%u", escapedUrl); hasField = true }
+        else if (cmd.includes("%U")) { cmd = cmd.replace("%U", escapedUrl); hasField = true }
+        else if (cmd.includes("%f")) { cmd = cmd.replace("%f", escapedUrl); hasField = true }
+        else if (cmd.includes("%F")) { cmd = cmd.replace("%F", escapedUrl); hasField = true }
+
+        cmd = cmd.replace(/%[ikc]/g, "")
 
         if (!hasField) {
-            cmd += " " + escapedUrl;
+            cmd += " " + escapedUrl
         }
 
-        log.debug("BrowserPicker: Launching", cmd);
+        console.log("BrowserPicker: Launching", cmd)
 
         Quickshell.execDetached({
             command: ["sh", "-c", cmd]
-        });
+        })
     }
 
     onViewModeChanged: {
-        SettingsData.set("browserPickerViewMode", viewMode);
+        SettingsData.set("browserPickerViewMode", viewMode)
     }
 }

quickshell/Modals/Clipboard/ClipboardKeyboardController.qml

@@ -53,19 +53,6 @@ QtObject {
         }
     }
 
-    function togglePinSelected() {
-        const entries = modal.activeTab === "saved" ? ClipboardService.pinnedEntries : ClipboardService.unpinnedEntries;
-        if (!entries || entries.length === 0 || ClipboardService.selectedIndex < 0 || ClipboardService.selectedIndex >= entries.length) {
-            return;
-        }
-        const selectedEntry = entries[ClipboardService.selectedIndex];
-        if (modal.activeTab === "saved") {
-            modal.unpinEntry(selectedEntry);
-        } else {
-            modal.pinEntry(selectedEntry);
-        }
-    }
-
     function handleKey(event) {
         switch (event.key) {
         case Qt.Key_Escape:
@@ -78,12 +65,6 @@ QtObject {
             return;
         case Qt.Key_Down:
         case Qt.Key_Tab:
-            if (event.key === Qt.Key_Tab && (event.modifiers & Qt.ControlModifier)) {
-                modal.activeTab = modal.activeTab === "saved" ? "recents" : "saved";
-                ClipboardService.selectedIndex = 0;
-                event.accepted = true;
-                return;
-            }
             if (!ClipboardService.keyboardNavigationActive) {
                 ClipboardService.keyboardNavigationActive = true;
                 ClipboardService.selectedIndex = 0;
@@ -94,12 +75,6 @@ QtObject {
             return;
         case Qt.Key_Up:
         case Qt.Key_Backtab:
-            if (event.key === Qt.Key_Backtab && (event.modifiers & Qt.ControlModifier)) {
-                modal.activeTab = modal.activeTab === "saved" ? "recents" : "saved";
-                ClipboardService.selectedIndex = 0;
-                event.accepted = true;
-                return;
-            }
             if (!ClipboardService.keyboardNavigationActive) {
                 ClipboardService.keyboardNavigationActive = true;
                 ClipboardService.selectedIndex = 0;
@@ -146,12 +121,6 @@ QtObject {
                     event.accepted = true;
                 }
                 return;
-            case Qt.Key_S:
-                if (ClipboardService.keyboardNavigationActive) {
-                    togglePinSelected();
-                    event.accepted = true;
-                }
-                return;
             }
         }
 

quickshell/Modals/Clipboard/ClipboardKeyboardHints.qml

@@ -9,8 +9,8 @@ Rectangle {
     property bool enterToPaste: false
     readonly property string hintsText: {
         if (!wtypeAvailable)
-            return I18n.tr("Ctrl+Tab: Switch Tab • Ctrl+S: Pin/Unpin • Shift+Del: Clear All • Esc: Close");
-        return enterToPaste ? I18n.tr("Ctrl+Tab: Switch Tab • Ctrl+S: Pin/Unpin • Shift+Enter: Copy • Shift+Del: Clear All • Esc: Close", "Keyboard hints when enter-to-paste is enabled") : I18n.tr("Ctrl+Tab: Switch Tab • Ctrl+S: Pin/Unpin • Shift+Enter: Paste • Shift+Del: Clear All • Esc: Close");
+            return I18n.tr("Shift+Del: Clear All • Esc: Close");
+        return enterToPaste ? I18n.tr("Shift+Enter: Copy • Shift+Del: Clear All • Esc: Close", "Keyboard hints when enter-to-paste is enabled") : I18n.tr("Shift+Enter: Paste • Shift+Del: Clear All • Esc: Close");
     }
 
     height: ClipboardConstants.keyboardHintsHeight
@@ -26,7 +26,9 @@ Rectangle {
         spacing: 2
 
         StyledText {
-            text: keyboardHints.enterToPaste ? I18n.tr("↑/↓: Navigate • Enter: Paste • Del: Delete • F10: Help", "Keyboard hints when enter-to-paste is enabled") : I18n.tr("↑/↓: Navigate • Enter/Ctrl+C: Copy • Del: Delete • F10: Help")
+            text: keyboardHints.enterToPaste
+                ? I18n.tr("↑/↓: Navigate • Enter: Paste • Del: Delete • F10: Help", "Keyboard hints when enter-to-paste is enabled")
+                : I18n.tr("↑/↓: Navigate • Enter/Ctrl+C: Copy • Del: Delete • F10: Help")
             font.pixelSize: Theme.fontSizeSmall
             color: Theme.surfaceText
             anchors.horizontalCenter: parent.horizontalCenter

quickshell/Modals/Clipboard/ClipboardThumbnail.qml

@@ -6,7 +6,6 @@ import qs.Widgets
 
 Item {
     id: thumbnail
-    readonly property var log: Log.scoped("ClipboardThumbnail")
 
     required property var entry
     required property string entryType
@@ -53,7 +52,7 @@ Item {
                     modal.activeImageLoads--;
                 }
                 if (response.error) {
-                    log.warn("Failed to load image:", entry.id);
+                    console.warn("ClipboardThumbnail: Failed to load image:", entry.id);
                     return;
                 }
                 const data = response.result?.data;

quickshell/Modals/Common/DankModal.qml

@@ -1,18 +1,24 @@
 import QtQuick
+import Quickshell
+import Quickshell.Wayland
 import qs.Common
 import qs.Services
+import qs.Widgets
 
 Item {
     id: root
-    readonly property var log: Log.scoped("DankModal")
 
-    readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
     property string layerNamespace: "dms:modal"
-    property Component content: null
+    property alias content: contentLoader.sourceComponent
+    property alias contentLoader: contentLoader
     property Item directContent: null
     property real modalWidth: 400
     property real modalHeight: 300
     property var targetScreen
+    readonly property var effectiveScreen: contentWindow.screen ?? targetScreen
+    readonly property real screenWidth: effectiveScreen?.width ?? 1920
+    readonly property real screenHeight: effectiveScreen?.height ?? 1080
+    readonly property real dpr: effectiveScreen ? CompositorService.getScreenScale(effectiveScreen) : 1
     property bool showBackground: true
     property real backgroundOpacity: 0.5
     property string positioning: "center"
@@ -20,16 +26,51 @@ Item {
     property bool closeOnEscapeKey: true
     property bool closeOnBackgroundClick: true
     property string animationType: "scale"
-    property int animationDuration: Theme.modalAnimationDuration
-    property real animationScaleCollapsed: 0.96
-    property real animationOffset: Theme.spacingL
-    property list<real> animationEnterCurve: Theme.expressiveCurves.expressiveDefaultSpatial
-    property list<real> animationExitCurve: Theme.expressiveCurves.emphasized
-    property color backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+
+    // Opposite side from the launcher by default; subclasses may override
+    property string preferredConnectedBarSide: SettingsData.frameModalEmergeSide
+
+    readonly property bool frameConnectedMode: SettingsData.frameEnabled
+        && Theme.isConnectedEffect
+        && !!effectiveScreen
+        && SettingsData.isScreenInPreferences(effectiveScreen, SettingsData.frameScreenPreferences)
+
+    readonly property string resolvedConnectedBarSide: frameConnectedMode ? preferredConnectedBarSide : ""
+
+    readonly property bool frameOwnsConnectedChrome: frameConnectedMode && resolvedConnectedBarSide !== ""
+
+    function _dockOccupiesSide(side) {
+        if (!SettingsData.showDock) return false;
+        switch (side) {
+        case "top":    return SettingsData.dockPosition === SettingsData.Position.Top;
+        case "bottom": return SettingsData.dockPosition === SettingsData.Position.Bottom;
+        case "left":   return SettingsData.dockPosition === SettingsData.Position.Left;
+        case "right":  return SettingsData.dockPosition === SettingsData.Position.Right;
+        }
+        return false;
+    }
+
+    readonly property bool _dockBlocksEmergence: frameOwnsConnectedChrome
+        && _dockOccupiesSide(resolvedConnectedBarSide)
+
+    readonly property bool connectedMotionParity: Theme.isConnectedEffect
+    property int animationDuration: connectedMotionParity ? Theme.popoutAnimationDuration : Theme.modalAnimationDuration
+    property real animationScaleCollapsed: Theme.effectScaleCollapsed
+    property real animationOffset: Theme.effectAnimOffset
+    property list<real> animationEnterCurve: connectedMotionParity ? Theme.variantPopoutEnterCurve : Theme.variantModalEnterCurve
+    property list<real> animationExitCurve: connectedMotionParity ? Theme.variantPopoutExitCurve : Theme.variantModalExitCurve
+    property color backgroundColor: Theme.surfaceContainer
     property color borderColor: Theme.outlineMedium
     property real borderWidth: 0
     property real cornerRadius: Theme.cornerRadius
+    readonly property bool connectedSurfaceOverride: Theme.isConnectedEffect
+    readonly property color effectiveBackgroundColor: connectedSurfaceOverride ? Theme.connectedSurfaceColor : backgroundColor
+    readonly property color effectiveBorderColor: connectedSurfaceOverride ? "transparent" : borderColor
+    readonly property real effectiveBorderWidth: connectedSurfaceOverride ? 0 : borderWidth
+    readonly property real effectiveCornerRadius: connectedSurfaceOverride ? Theme.connectedSurfaceRadius : cornerRadius
+    readonly property bool effectiveBlurEnabled: Theme.connectedSurfaceBlurEnabled
     property bool enableShadow: true
+    property alias modalFocusScope: focusScope
     property bool shouldBeVisible: false
     property bool shouldHaveFocus: shouldBeVisible
     property bool allowFocusOverride: false
@@ -38,170 +79,723 @@ Item {
     property bool keepPopoutsOpen: false
     property var customKeyboardFocus: null
     property bool useOverlayLayer: false
+    property real frozenMotionOffsetX: 0
+    property real frozenMotionOffsetY: 0
+    readonly property alias contentWindow: contentWindow
+    readonly property alias clickCatcher: clickCatcher
+    readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
+    readonly property bool useBackground: showBackground && SettingsData.modalDarkenBackground
+    readonly property bool useSingleWindow: CompositorService.isHyprland
 
     signal opened
     signal dialogClosed
     signal backgroundClicked
 
-    readonly property var contentLoader: impl.item ? impl.item.contentLoader : null
-    readonly property alias modalFocusScope: _modalFocusScope
+    property bool animationsEnabled: true
 
-    FocusScope {
-        id: _modalFocusScope
-        objectName: "modalFocusScope"
-        focus: true
-        anchors.fill: parent
+    // ─── Connected chrome sync ────────────────────────────────────────────────
+    property string _chromeClaimId: ""
+    property bool _fullSyncPending: false
+
+    function _nextChromeClaimId() {
+        return layerNamespace + ":modal:" + (new Date()).getTime() + ":" + Math.floor(Math.random() * 1000);
+    }
+
+    function _currentScreenName() {
+        return effectiveScreen ? effectiveScreen.name : "";
+    }
+
+    function _publishModalChromeState() {
+        const screenName = _currentScreenName();
+        if (!screenName) return;
+        ConnectedModeState.setModalState(screenName, {
+            "visible": shouldBeVisible || contentWindow.visible,
+            "barSide": resolvedConnectedBarSide,
+            "bodyX": alignedX,
+            "bodyY": alignedY,
+            "bodyW": alignedWidth,
+            "bodyH": alignedHeight,
+            "animX": modalContainer ? modalContainer.animX : 0,
+            "animY": modalContainer ? modalContainer.animY : 0,
+            "omitStartConnector": false,
+            "omitEndConnector": false
+        });
+    }
+
+    function _syncModalChromeState() {
+        if (!frameOwnsConnectedChrome) {
+            _releaseModalChrome();
+            return;
+        }
+        if (!_chromeClaimId)
+            _chromeClaimId = _nextChromeClaimId();
+        _publishModalChromeState();
+        if (_dockBlocksEmergence && (shouldBeVisible || contentWindow.visible))
+            ConnectedModeState.requestDockRetract(_chromeClaimId, _currentScreenName(), resolvedConnectedBarSide);
+        else
+            ConnectedModeState.releaseDockRetract(_chromeClaimId);
+    }
+
+    function _flushFullSync() {
+        _fullSyncPending = false;
+        _syncModalChromeState();
+    }
+
+    function _queueFullSync() {
+        if (_fullSyncPending) return;
+        _fullSyncPending = true;
+        Qt.callLater(() => {
+            if (root && typeof root._flushFullSync === "function")
+                root._flushFullSync();
+        });
+    }
+
+    function _syncModalAnim() {
+        if (!frameOwnsConnectedChrome || !_chromeClaimId) return;
+        const screenName = _currentScreenName();
+        if (!screenName || !modalContainer) return;
+        ConnectedModeState.setModalAnim(screenName, modalContainer.animX, modalContainer.animY);
+    }
+
+    function _syncModalBody() {
+        if (!frameOwnsConnectedChrome || !_chromeClaimId) return;
+        const screenName = _currentScreenName();
+        if (!screenName) return;
+        ConnectedModeState.setModalBody(screenName, alignedX, alignedY, alignedWidth, alignedHeight);
+    }
+
+    function _releaseModalChrome() {
+        if (_chromeClaimId) {
+            ConnectedModeState.releaseDockRetract(_chromeClaimId);
+            _chromeClaimId = "";
+        }
+        const screenName = _currentScreenName();
+        if (screenName)
+            ConnectedModeState.clearModalState(screenName);
+    }
+
+    onFrameOwnsConnectedChromeChanged: _syncModalChromeState()
+    onResolvedConnectedBarSideChanged: _queueFullSync()
+    onShouldBeVisibleChanged: _queueFullSync()
+    onAlignedXChanged: _syncModalBody()
+    onAlignedYChanged: _syncModalBody()
+    onAlignedWidthChanged: _syncModalBody()
+    onAlignedHeightChanged: _syncModalBody()
+
+    Component.onDestruction: _releaseModalChrome()
+
+    Connections {
+        target: contentWindow
+        function onVisibleChanged() {
+            if (contentWindow.visible)
+                root._syncModalChromeState();
+            else
+                root._releaseModalChrome();
+        }
     }
-    readonly property var contentWindow: impl.item ? impl.item.contentWindow : null
-    readonly property var clickCatcher: impl.item ? impl.item.clickCatcher : null
-    readonly property var effectiveScreen: impl.item ? impl.item.effectiveScreen : null
-    readonly property real screenWidth: impl.item ? impl.item.screenWidth : 1920
-    readonly property real screenHeight: impl.item ? impl.item.screenHeight : 1080
-    readonly property real dpr: impl.item ? impl.item.dpr : 1
-    readonly property bool isClosing: impl.item ? (impl.item.isClosing ?? false) : false
-    readonly property real alignedX: impl.item ? impl.item.alignedX : 0
-    readonly property real alignedY: impl.item ? impl.item.alignedY : 0
-    readonly property real alignedWidth: impl.item ? impl.item.alignedWidth : 0
-    readonly property real alignedHeight: impl.item ? impl.item.alignedHeight : 0
 
     function open() {
-        if (impl.item)
-            impl.item.open();
+        closeTimer.stop();
+        animationsEnabled = false;
+        frozenMotionOffsetX = modalContainer ? modalContainer.offsetX : 0;
+        frozenMotionOffsetY = modalContainer ? modalContainer.offsetY : animationOffset;
+
+        const focusedScreen = CompositorService.getFocusedScreen();
+        if (focusedScreen) {
+            contentWindow.screen = focusedScreen;
+            if (!useSingleWindow)
+                clickCatcher.screen = focusedScreen;
+        }
+
+        if (Theme.isDirectionalEffect || root.useBackground) {
+            if (!useSingleWindow)
+                clickCatcher.visible = true;
+            contentWindow.visible = true;
+        }
+        ModalManager.openModal(root);
+
+        Qt.callLater(() => {
+            animationsEnabled = true;
+            shouldBeVisible = true;
+            if (!useSingleWindow && !clickCatcher.visible)
+                clickCatcher.visible = true;
+            if (!contentWindow.visible)
+                contentWindow.visible = true;
+            shouldHaveFocus = false;
+            Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible));
+        });
     }
 
     function close() {
-        if (impl.item)
-            impl.item.close();
+        shouldBeVisible = false;
+        shouldHaveFocus = false;
+        ModalManager.closeModal(root);
+        closeTimer.restart();
     }
 
     function instantClose() {
-        if (impl.item && typeof impl.item.instantClose === "function")
-            impl.item.instantClose();
+        animationsEnabled = false;
+        shouldBeVisible = false;
+        shouldHaveFocus = false;
+        ModalManager.closeModal(root);
+        closeTimer.stop();
+        contentWindow.visible = false;
+        if (!useSingleWindow)
+            clickCatcher.visible = false;
+        dialogClosed();
+        Qt.callLater(() => animationsEnabled = true);
     }
 
     function toggle() {
-        if (impl.item)
-            impl.item.toggle();
-    }
-
-    readonly property var _desiredBackend: SettingsData.connectedFrameModeActive ? connectedComp : standaloneComp
-    property var _resolvedBackend: null
-
-    Component.onCompleted: _resolvedBackend = _desiredBackend
-
-    Connections {
-        target: SettingsData
-        function onConnectedFrameModeActiveChanged() {
-            root._maybeResolveBackend();
-        }
-    }
-
-    // Defer Loader source-component swap until impl is fully closed; avoids
-    // tearing down a modal mid-animation when frame mode is toggled.
-    function _maybeResolveBackend() {
-        if (_resolvedBackend === _desiredBackend)
-            return;
-        if (impl.item && (impl.item.shouldBeVisible || impl.item.isClosing))
-            return;
-        _resolvedBackend = _desiredBackend;
-    }
-
-    Loader {
-        id: impl
-        sourceComponent: root._resolvedBackend
-        onItemChanged: if (item)
-            root._wireBackend(item)
-    }
-
-    Component {
-        id: standaloneComp
-        DankModalStandalone {}
-    }
-
-    Component {
-        id: connectedComp
-        DankModalConnected {}
-    }
-
-    function _wireBackend(it) {
-        if (!it)
-            return;
-
-        it.modalHandle = root;
-        it.layerNamespace = Qt.binding(() => root.layerNamespace);
-        it.content = Qt.binding(() => root.content);
-        it.directContent = Qt.binding(() => root.directContent);
-        it.modalWidth = Qt.binding(() => root.modalWidth);
-        it.modalHeight = Qt.binding(() => root.modalHeight);
-        it.targetScreen = Qt.binding(() => root.targetScreen);
-        it.showBackground = Qt.binding(() => root.showBackground);
-        it.backgroundOpacity = Qt.binding(() => root.backgroundOpacity);
-        it.positioning = Qt.binding(() => root.positioning);
-        it.customPosition = Qt.binding(() => root.customPosition);
-        it.closeOnEscapeKey = Qt.binding(() => root.closeOnEscapeKey);
-        it.closeOnBackgroundClick = Qt.binding(() => root.closeOnBackgroundClick);
-        it.animationType = Qt.binding(() => root.animationType);
-        it.animationDuration = Qt.binding(() => root.animationDuration);
-        it.animationScaleCollapsed = Qt.binding(() => root.animationScaleCollapsed);
-        it.animationOffset = Qt.binding(() => root.animationOffset);
-        it.animationEnterCurve = Qt.binding(() => root.animationEnterCurve);
-        it.animationExitCurve = Qt.binding(() => root.animationExitCurve);
-        it.backgroundColor = Qt.binding(() => root.backgroundColor);
-        it.borderColor = Qt.binding(() => root.borderColor);
-        it.borderWidth = Qt.binding(() => root.borderWidth);
-        it.cornerRadius = Qt.binding(() => root.cornerRadius);
-        it.enableShadow = Qt.binding(() => root.enableShadow);
-        it.allowFocusOverride = Qt.binding(() => root.allowFocusOverride);
-        it.allowStacking = Qt.binding(() => root.allowStacking);
-        it.keepContentLoaded = Qt.binding(() => root.keepContentLoaded);
-        it.keepPopoutsOpen = Qt.binding(() => root.keepPopoutsOpen);
-        it.customKeyboardFocus = Qt.binding(() => root.customKeyboardFocus);
-        it.useOverlayLayer = Qt.binding(() => root.useOverlayLayer);
-
-        it.shouldBeVisible = root.shouldBeVisible;
-        it.shouldHaveFocus = root.shouldHaveFocus;
-
-        if (it.modalFocusScope)
-            _modalFocusScope.parent = it.modalFocusScope;
+        shouldBeVisible ? close() : open();
     }
 
     Connections {
-        target: root
-        function onShouldBeVisibleChanged() {
-            if (impl.item && impl.item.shouldBeVisible !== root.shouldBeVisible)
-                impl.item.shouldBeVisible = root.shouldBeVisible;
-        }
-        function onShouldHaveFocusChanged() {
-            if (impl.item && impl.item.shouldHaveFocus !== root.shouldHaveFocus)
-                impl.item.shouldHaveFocus = root.shouldHaveFocus;
+        target: ModalManager
+        function onCloseAllModalsExcept(excludedModal) {
+            if (excludedModal !== root && !allowStacking && shouldBeVisible)
+                close();
         }
     }
 
     Connections {
-        target: impl.item
-        ignoreUnknownSignals: true
+        target: Quickshell
+        function onScreensChanged() {
+            if (!contentWindow.screen)
+                return;
+            const currentScreenName = contentWindow.screen.name;
+            let screenStillExists = false;
+            for (let i = 0; i < Quickshell.screens.length; i++) {
+                if (Quickshell.screens[i].name === currentScreenName) {
+                    screenStillExists = true;
+                    break;
+                }
+            }
+            if (screenStillExists)
+                return;
+            const newScreen = CompositorService.getFocusedScreen();
+            if (newScreen) {
+                contentWindow.screen = newScreen;
+                if (!useSingleWindow)
+                    clickCatcher.screen = newScreen;
+            }
+        }
+    }
 
-        function onShouldBeVisibleChanged() {
-            if (impl.item && root.shouldBeVisible !== impl.item.shouldBeVisible)
-                root.shouldBeVisible = impl.item.shouldBeVisible;
+    Timer {
+        id: closeTimer
+        interval: Theme.variantCloseInterval(animationDuration)
+        onTriggered: {
+            if (shouldBeVisible)
+                return;
+            contentWindow.visible = false;
+            if (!useSingleWindow)
+                clickCatcher.visible = false;
+            dialogClosed();
+        }
+    }
+
+    // shadowRenderPadding is zeroed when frame owns the chrome
+    // Wayland then clips any content translating past
+    readonly property var shadowLevel: Theme.elevationLevel3
+    readonly property real shadowFallbackOffset: 6
+    readonly property real shadowRenderPadding: (!frameOwnsConnectedChrome && root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
+    readonly property real shadowMotionPadding: {
+        if (Theme.isConnectedEffect)
+            return 0;
+        if (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode > 0 && Theme.isDirectionalEffect)
+            return 0; // Wayland native overlap mask
+        if (animationType === "slide")
+            return 30;
+        if (Theme.isDirectionalEffect)
+            return Math.max(Math.max(0, animationOffset), Math.max(alignedWidth, alignedHeight) * 0.9);
+        if (Theme.isDepthEffect)
+            return Math.max(Math.max(0, animationOffset), Math.max(alignedWidth, alignedHeight) * 0.35);
+        return Math.max(0, animationOffset);
+    }
+    readonly property real shadowBuffer: Theme.snap(shadowRenderPadding + shadowMotionPadding, dpr)
+    readonly property real alignedWidth: Theme.px(modalWidth, dpr)
+    readonly property real alignedHeight: Theme.px(modalHeight, dpr)
+
+    function _frameEdgeInset(side) {
+        if (!effectiveScreen) return 0;
+        return SettingsData.frameEdgeInsetForSide(effectiveScreen, side);
+    }
+
+    // frameEdgeInsetForSide is the full inset; do not add frameBarSize
+    readonly property real _connectedAlignedX: {
+        switch (resolvedConnectedBarSide) {
+        case "top":
+        case "bottom": {
+            const insetL = _frameEdgeInset("left");
+            const insetR = _frameEdgeInset("right");
+            const usable = Math.max(0, screenWidth - insetL - insetR);
+            return insetL + Math.max(0, (usable - alignedWidth) / 2);
+        }
+        case "left":
+            return _frameEdgeInset("left");
+        case "right":
+            return screenWidth - alignedWidth - _frameEdgeInset("right");
+        }
+        return 0;
+    }
+
+    readonly property real _connectedAlignedY: {
+        switch (resolvedConnectedBarSide) {
+        case "top":
+            return _frameEdgeInset("top");
+        case "bottom":
+            return screenHeight - alignedHeight - _frameEdgeInset("bottom");
+        case "left":
+        case "right": {
+            const insetT = _frameEdgeInset("top");
+            const insetB = _frameEdgeInset("bottom");
+            const usable = Math.max(0, screenHeight - insetT - insetB);
+            return insetT + Math.max(0, (usable - alignedHeight) / 2);
+        }
+        }
+        return 0;
+    }
+
+    readonly property real alignedX: Theme.snap(frameOwnsConnectedChrome ? _connectedAlignedX : (() => {
+            switch (positioning) {
+            case "center":
+                return (screenWidth - alignedWidth) / 2;
+            case "top-right":
+                return Math.max(Theme.spacingL, screenWidth - alignedWidth - Theme.spacingL);
+            case "custom":
+                return customPosition.x;
+            default:
+                return 0;
+            }
+        })(), dpr)
+
+    readonly property real alignedY: Theme.snap(frameOwnsConnectedChrome ? _connectedAlignedY : (() => {
+            switch (positioning) {
+            case "center":
+                return (screenHeight - alignedHeight) / 2;
+            case "top-right":
+                return Theme.barHeight + Theme.spacingXS;
+            case "custom":
+                return customPosition.y;
+            default:
+                return 0;
+            }
+        })(), dpr)
+
+    PanelWindow {
+        id: clickCatcher
+        visible: false
+        color: "transparent"
+
+        WlrLayershell.namespace: root.layerNamespace + ":clickcatcher"
+        WlrLayershell.layer: WlrLayershell.Top
+        WlrLayershell.exclusiveZone: -1
+        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
+
+        anchors {
+            top: true
+            left: true
+            right: true
+            bottom: true
         }
 
-        function onShouldHaveFocusChanged() {
-            if (impl.item && root.shouldHaveFocus !== impl.item.shouldHaveFocus)
-                root.shouldHaveFocus = impl.item.shouldHaveFocus;
+        mask: Region {
+            item: Rectangle {
+                x: root.alignedX
+                y: root.alignedY
+                width: root.alignedWidth
+                height: root.alignedHeight
+            }
+            intersection: Intersection.Xor
         }
 
-        function onOpened() {
-            root.opened();
+        MouseArea {
+            anchors.fill: parent
+            enabled: !root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
+            onClicked: root.backgroundClicked()
         }
 
-        function onDialogClosed() {
-            root.dialogClosed();
-            root._maybeResolveBackend();
+        Rectangle {
+            anchors.fill: parent
+            z: -1
+            color: "black"
+            opacity: (!root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
+            visible: opacity > 0
+
+            Behavior on opacity {
+                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
+                NumberAnimation {
+                    duration: Math.round(Theme.variantDuration(root.animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
+        }
+    }
+
+    PanelWindow {
+        id: contentWindow
+        visible: false
+        color: "transparent"
+
+        WindowBlur {
+            targetWindow: contentWindow
+            blurEnabled: root.effectiveBlurEnabled && !root.frameOwnsConnectedChrome
+            readonly property real s: Math.min(1, modalContainer.scaleValue)
+            blurX: modalContainer.x + modalContainer.width * (1 - s) * 0.5 + Theme.snap(modalContainer.animX, root.dpr)
+            blurY: modalContainer.y + modalContainer.height * (1 - s) * 0.5 + Theme.snap(modalContainer.animY, root.dpr)
+            blurWidth: (root.shouldBeVisible && animatedContent.opacity > 0 && !root.frameOwnsConnectedChrome) ? modalContainer.width * s : 0
+            blurHeight: (root.shouldBeVisible && animatedContent.opacity > 0 && !root.frameOwnsConnectedChrome) ? modalContainer.height * s : 0
+            blurRadius: root.effectiveCornerRadius
         }
 
-        function onBackgroundClicked() {
-            root.backgroundClicked();
+        WlrLayershell.namespace: root.layerNamespace
+        WlrLayershell.layer: {
+            if (root.useOverlayLayer)
+                return WlrLayershell.Overlay;
+            switch (Quickshell.env("DMS_MODAL_LAYER")) {
+            case "bottom":
+                console.error("DankModal: 'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
+                return WlrLayershell.Top;
+            case "background":
+                console.error("DankModal: 'background' layer is not valid for modals. Defaulting to 'top' layer.");
+                return WlrLayershell.Top;
+            case "overlay":
+                return WlrLayershell.Overlay;
+            default:
+                return WlrLayershell.Top;
+            }
+        }
+        WlrLayershell.exclusiveZone: -1
+        WlrLayershell.keyboardFocus: {
+            if (customKeyboardFocus !== null)
+                return customKeyboardFocus;
+            if (!shouldHaveFocus)
+                return WlrKeyboardFocus.None;
+            if (root.useHyprlandFocusGrab)
+                return WlrKeyboardFocus.OnDemand;
+            return WlrKeyboardFocus.Exclusive;
+        }
+
+        anchors {
+            left: true
+            top: true
+            right: root.useSingleWindow
+            bottom: root.useSingleWindow
+        }
+
+        readonly property real actualMarginLeft: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedX - shadowBuffer, dpr))
+        readonly property real actualMarginTop: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedY - shadowBuffer, dpr))
+
+        WlrLayershell.margins {
+            left: actualMarginLeft
+            top: actualMarginTop
+            right: 0
+            bottom: 0
+        }
+
+        implicitWidth: root.useSingleWindow ? 0 : root.alignedWidth + (shadowBuffer * 2)
+        implicitHeight: root.useSingleWindow ? 0 : root.alignedHeight + (shadowBuffer * 2)
+
+        onVisibleChanged: {
+            if (visible) {
+                opened();
+            } else {
+                if (Qt.inputMethod) {
+                    Qt.inputMethod.hide();
+                    Qt.inputMethod.reset();
+                }
+            }
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            enabled: root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
+            z: -2
+            onClicked: root.backgroundClicked()
+        }
+
+        Rectangle {
+            anchors.fill: parent
+            z: -1
+            color: "black"
+            opacity: (root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
+            visible: opacity > 0
+
+            Behavior on opacity {
+                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
+                NumberAnimation {
+                    duration: Math.round(Theme.variantDuration(root.animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
+        }
+
+        Item {
+            id: modalContainer
+            x: (root.useSingleWindow ? root.alignedX : (root.alignedX - contentWindow.actualMarginLeft)) + Theme.snap(animX, root.dpr)
+            y: (root.useSingleWindow ? root.alignedY : (root.alignedY - contentWindow.actualMarginTop)) + Theme.snap(animY, root.dpr)
+
+            width: root.alignedWidth
+            height: root.alignedHeight
+
+            MouseArea {
+                anchors.fill: parent
+                enabled: root.useSingleWindow && root.shouldBeVisible
+                hoverEnabled: false
+                acceptedButtons: Qt.AllButtons
+                onPressed: mouse.accepted = true
+                onClicked: mouse.accepted = true
+                z: -1
+            }
+
+            readonly property bool slide: root.animationType === "slide"
+            readonly property bool directionalEffect: Theme.isDirectionalEffect
+            readonly property bool depthEffect: Theme.isDepthEffect
+            readonly property real directionalTravel: Math.max(root.animationOffset, Math.max(root.alignedWidth, root.alignedHeight) * 0.8)
+            readonly property real depthTravel: Math.max(root.animationOffset * 0.8, 36)
+            readonly property real customAnchorX: root.alignedX + root.alignedWidth * 0.5
+            readonly property real customAnchorY: root.alignedY + root.alignedHeight * 0.5
+            readonly property real customDistLeft: customAnchorX
+            readonly property real customDistRight: root.screenWidth - customAnchorX
+            readonly property real customDistTop: customAnchorY
+            readonly property real customDistBottom: root.screenHeight - customAnchorY
+            // Connected emergence: travel from the resolved bar edge, matching DankPopout cadence.
+            readonly property real connectedEmergenceTravelX: Math.max(root.animationOffset, root.alignedWidth + Theme.spacingL)
+            readonly property real connectedEmergenceTravelY: Math.max(root.animationOffset, root.alignedHeight + Theme.spacingL)
+            readonly property real offsetX: {
+                if (root.frameOwnsConnectedChrome) {
+                    switch (root.resolvedConnectedBarSide) {
+                    case "left":  return -connectedEmergenceTravelX;
+                    case "right": return connectedEmergenceTravelX;
+                    }
+                    return 0;
+                }
+                if (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 && Theme.isDirectionalEffect)
+                    return 0;
+                if (slide && !directionalEffect && !depthEffect)
+                    return 15;
+                if (directionalEffect) {
+                    switch (root.positioning) {
+                    case "top-right":
+                        return 0;
+                    case "custom":
+                        if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
+                            return -directionalTravel;
+                        if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
+                            return directionalTravel;
+                        return 0;
+                    default:
+                        return 0;
+                    }
+                }
+                if (depthEffect) {
+                    switch (root.positioning) {
+                    case "top-right":
+                        return 0;
+                    case "custom":
+                        if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
+                            return -depthTravel;
+                        if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
+                            return depthTravel;
+                        return 0;
+                    default:
+                        return 0;
+                    }
+                }
+                return 0;
+            }
+            readonly property real offsetY: {
+                if (root.frameOwnsConnectedChrome) {
+                    switch (root.resolvedConnectedBarSide) {
+                    case "top":    return -connectedEmergenceTravelY;
+                    case "bottom": return connectedEmergenceTravelY;
+                    }
+                    return 0;
+                }
+                if (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 && Theme.isDirectionalEffect)
+                    return 0;
+                if (slide && !directionalEffect && !depthEffect)
+                    return -30;
+                if (directionalEffect) {
+                    switch (root.positioning) {
+                    case "top-right":
+                        return -Math.max(directionalTravel * 0.65, 96);
+                    case "custom":
+                        if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
+                            return -directionalTravel;
+                        if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
+                            return directionalTravel;
+                        return 0;
+                    default:
+                        // Default to sliding down from top when centered
+                        return -Math.max(directionalTravel, root.screenHeight * 0.24);
+                    }
+                }
+                if (depthEffect) {
+                    switch (root.positioning) {
+                    case "top-right":
+                        return -depthTravel * 0.75;
+                    case "custom":
+                        if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
+                            return -depthTravel;
+                        if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
+                            return depthTravel;
+                        return depthTravel * 0.45;
+                    default:
+                        return -depthTravel;
+                    }
+                }
+                return root.animationOffset;
+            }
+
+            property real animX: root.shouldBeVisible ? 0 : root.frozenMotionOffsetX
+            property real animY: root.shouldBeVisible ? 0 : root.frozenMotionOffsetY
+
+            onAnimXChanged: if (root.frameOwnsConnectedChrome) root._syncModalAnim()
+            onAnimYChanged: if (root.frameOwnsConnectedChrome) root._syncModalAnim()
+
+            readonly property real computedScaleCollapsed: (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 && Theme.isDirectionalEffect) ? 0.0 : root.animationScaleCollapsed
+            property real scaleValue: root.shouldBeVisible ? 1.0 : computedScaleCollapsed
+
+            Behavior on animX {
+                enabled: root.animationsEnabled
+                NumberAnimation {
+                    duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
+
+            Behavior on animY {
+                enabled: root.animationsEnabled
+                NumberAnimation {
+                    duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
+
+            Behavior on scaleValue {
+                enabled: root.animationsEnabled
+                NumberAnimation {
+                    duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
+
+            Item {
+                id: contentContainer
+                anchors.centerIn: parent
+                width: parent.width
+                height: parent.height
+                clip: false
+
+                Item {
+                    id: animatedContent
+                    anchors.fill: parent
+                    clip: false
+                    opacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (root.shouldBeVisible ? 1 : 0)
+                    scale: modalContainer.scaleValue
+                    transformOrigin: Item.Center
+
+                    Behavior on opacity {
+                        enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
+                        NumberAnimation {
+                            duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
+                            easing.type: Easing.BezierSpline
+                            easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                        }
+                    }
+
+                    ElevationShadow {
+                        id: modalShadowLayer
+                        anchors.fill: parent
+                        level: root.shadowLevel
+                        fallbackOffset: root.shadowFallbackOffset
+                        targetRadius: root.effectiveCornerRadius
+                        targetColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBackgroundColor
+                        borderColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBorderColor
+                        borderWidth: root.frameOwnsConnectedChrome ? 0 : root.effectiveBorderWidth
+                        shadowEnabled: !root.frameOwnsConnectedChrome && root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
+                    }
+
+                    Rectangle {
+                        anchors.fill: parent
+                        radius: root.effectiveCornerRadius
+                        color: "transparent"
+                        border.color: (root.connectedSurfaceOverride || root.frameOwnsConnectedChrome) ? "transparent" : BlurService.borderColor
+                        border.width: (root.connectedSurfaceOverride || root.frameOwnsConnectedChrome) ? 0 : BlurService.borderWidth
+                        z: 100
+                    }
+
+                    FocusScope {
+                        anchors.fill: parent
+                        focus: root.shouldBeVisible
+                        clip: false
+
+                        Item {
+                            id: directContentWrapper
+                            anchors.fill: parent
+                            visible: root.directContent !== null
+                            focus: true
+                            clip: false
+
+                            Component.onCompleted: {
+                                if (root.directContent) {
+                                    root.directContent.parent = directContentWrapper;
+                                    root.directContent.anchors.fill = directContentWrapper;
+                                    Qt.callLater(() => root.directContent.forceActiveFocus());
+                                }
+                            }
+
+                            Connections {
+                                target: root
+                                function onDirectContentChanged() {
+                                    if (root.directContent) {
+                                        root.directContent.parent = directContentWrapper;
+                                        root.directContent.anchors.fill = directContentWrapper;
+                                        Qt.callLater(() => root.directContent.forceActiveFocus());
+                                    }
+                                }
+                            }
+                        }
+
+                        Loader {
+                            id: contentLoader
+                            anchors.fill: parent
+                            active: root.directContent === null && (root.keepContentLoaded || root.shouldBeVisible || contentWindow.visible)
+                            asynchronous: false
+                            focus: true
+                            clip: false
+                            visible: root.directContent === null
+
+                            onLoaded: {
+                                if (item) {
+                                    Qt.callLater(() => item.forceActiveFocus());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        FocusScope {
+            id: focusScope
+            objectName: "modalFocusScope"
+            anchors.fill: parent
+            visible: root.shouldBeVisible || contentWindow.visible
+            focus: root.shouldBeVisible
+            Keys.onEscapePressed: event => {
+                if (root.closeOnEscapeKey && shouldHaveFocus) {
+                    root.close();
+                    event.accepted = true;
+                }
+            }
         }
     }
 }

quickshell/Modals/Common/DankModalConnected.qml

@@ -1,838 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-    readonly property var log: Log.scoped("DankModalConnected")
-
-    property var modalHandle: root
-    property string layerNamespace: "dms:modal"
-    property alias content: contentLoader.sourceComponent
-    property alias contentLoader: contentLoader
-    property Item directContent: null
-    property real modalWidth: 400
-    property real modalHeight: 300
-    property var targetScreen
-    readonly property var effectiveScreen: contentWindow.screen ?? targetScreen
-    readonly property real screenWidth: effectiveScreen?.width ?? 1920
-    readonly property real screenHeight: effectiveScreen?.height ?? 1080
-    readonly property real dpr: effectiveScreen ? CompositorService.getScreenScale(effectiveScreen) : 1
-    property bool showBackground: true
-    property real backgroundOpacity: 0.5
-    property string positioning: "center"
-    property point customPosition: Qt.point(0, 0)
-    property bool closeOnEscapeKey: true
-    property bool closeOnBackgroundClick: true
-    property string animationType: "scale"
-
-    // Opposite side from the launcher by default; subclasses may override
-    property string preferredConnectedBarSide: SettingsData.frameModalEmergeSide
-
-    readonly property bool frameConnectedMode: SettingsData.frameEnabled && Theme.isConnectedEffect && !!effectiveScreen && SettingsData.isScreenInPreferences(effectiveScreen, SettingsData.frameScreenPreferences)
-
-    readonly property string resolvedConnectedBarSide: frameConnectedMode ? preferredConnectedBarSide : ""
-
-    readonly property bool frameOwnsConnectedChrome: frameConnectedMode && resolvedConnectedBarSide !== ""
-
-    function _dockOccupiesSide(side) {
-        if (!SettingsData.showDock)
-            return false;
-        switch (side) {
-        case "top":
-            return SettingsData.dockPosition === SettingsData.Position.Top;
-        case "bottom":
-            return SettingsData.dockPosition === SettingsData.Position.Bottom;
-        case "left":
-            return SettingsData.dockPosition === SettingsData.Position.Left;
-        case "right":
-            return SettingsData.dockPosition === SettingsData.Position.Right;
-        }
-        return false;
-    }
-
-    readonly property bool _dockBlocksEmergence: frameOwnsConnectedChrome && _dockOccupiesSide(resolvedConnectedBarSide)
-
-    readonly property bool connectedMotionParity: Theme.isConnectedEffect
-    property int animationDuration: connectedMotionParity ? Theme.popoutAnimationDuration : Theme.modalAnimationDuration
-    property real animationScaleCollapsed: Theme.effectScaleCollapsed
-    property real animationOffset: Theme.effectAnimOffset
-    property list<real> animationEnterCurve: connectedMotionParity ? Theme.variantPopoutEnterCurve : Theme.variantModalEnterCurve
-    property list<real> animationExitCurve: connectedMotionParity ? Theme.variantPopoutExitCurve : Theme.variantModalExitCurve
-    property color backgroundColor: Theme.surfaceContainer
-    property color borderColor: Theme.outlineMedium
-    property real borderWidth: 0
-    property real cornerRadius: Theme.cornerRadius
-    readonly property bool connectedSurfaceOverride: Theme.isConnectedEffect
-    readonly property color effectiveBackgroundColor: connectedSurfaceOverride ? Theme.connectedSurfaceColor : backgroundColor
-    readonly property color effectiveBorderColor: connectedSurfaceOverride ? "transparent" : borderColor
-    readonly property real effectiveBorderWidth: connectedSurfaceOverride ? 0 : borderWidth
-    readonly property real effectiveCornerRadius: connectedSurfaceOverride ? Theme.connectedSurfaceRadius : cornerRadius
-    readonly property bool effectiveBlurEnabled: Theme.connectedSurfaceBlurEnabled
-    property bool enableShadow: true
-    property alias modalFocusScope: focusScope
-    property bool shouldBeVisible: false
-    property bool shouldHaveFocus: shouldBeVisible
-    property bool allowFocusOverride: false
-    property bool allowStacking: false
-    property bool keepContentLoaded: false
-    property bool keepPopoutsOpen: false
-    property var customKeyboardFocus: null
-    property bool useOverlayLayer: false
-    property real frozenMotionOffsetX: 0
-    property real frozenMotionOffsetY: 0
-    readonly property alias contentWindow: contentWindow
-    readonly property alias clickCatcher: clickCatcher
-    readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
-    readonly property bool useBackground: false
-    readonly property bool useSingleWindow: CompositorService.isHyprland
-
-    signal opened
-    signal dialogClosed
-    signal backgroundClicked
-
-    // Coalesce per-channel dirty bits; one ConnectedModeState write per tick.
-    Timer {
-        id: _syncTimer
-        interval: 0
-        onTriggered: root._flushSync()
-    }
-
-    property bool animationsEnabled: true
-
-    property string _chromeClaimId: ""
-    property bool _fullSyncPending: false
-
-    function _nextChromeClaimId() {
-        return layerNamespace + ":modal:" + (new Date()).getTime() + ":" + Math.floor(Math.random() * 1000);
-    }
-
-    function _currentScreenName() {
-        return effectiveScreen ? effectiveScreen.name : "";
-    }
-
-    function _publishModalChromeState() {
-        const screenName = _currentScreenName();
-        if (!screenName)
-            return;
-        ConnectedModeState.setModalState(screenName, {
-            "visible": shouldBeVisible || contentWindow.visible,
-            "barSide": resolvedConnectedBarSide,
-            "bodyX": alignedX,
-            "bodyY": alignedY,
-            "bodyW": alignedWidth,
-            "bodyH": alignedHeight,
-            "animX": modalContainer ? modalContainer.animX : 0,
-            "animY": modalContainer ? modalContainer.animY : 0,
-            "omitStartConnector": false,
-            "omitEndConnector": false
-        });
-    }
-
-    function _syncModalChromeState() {
-        if (!frameOwnsConnectedChrome) {
-            _releaseModalChrome();
-            return;
-        }
-        if (!_chromeClaimId)
-            _chromeClaimId = _nextChromeClaimId();
-        _publishModalChromeState();
-        if (_dockBlocksEmergence && (shouldBeVisible || contentWindow.visible))
-            ConnectedModeState.requestDockRetract(_chromeClaimId, _currentScreenName(), resolvedConnectedBarSide);
-        else
-            ConnectedModeState.releaseDockRetract(_chromeClaimId);
-    }
-
-    property bool _animSyncQueued: false
-    property bool _bodySyncQueued: false
-
-    function _queueFullSync() {
-        _fullSyncPending = true;
-        if (!_syncTimer.running)
-            _syncTimer.restart();
-    }
-    function _queueAnimSync() {
-        _animSyncQueued = true;
-        if (!_syncTimer.running)
-            _syncTimer.restart();
-    }
-    function _queueBodySync() {
-        _bodySyncQueued = true;
-        if (!_syncTimer.running)
-            _syncTimer.restart();
-    }
-    function _flushSync() {
-        const fullDirty = _fullSyncPending;
-        const animDirty = _animSyncQueued;
-        const bodyDirty = _bodySyncQueued;
-        _fullSyncPending = false;
-        _animSyncQueued = false;
-        _bodySyncQueued = false;
-        if (fullDirty)
-            _syncModalChromeState();
-        if (animDirty)
-            _syncModalAnim();
-        if (bodyDirty)
-            _syncModalBody();
-    }
-
-    function _syncModalAnim() {
-        if (!frameOwnsConnectedChrome || !_chromeClaimId)
-            return;
-        const screenName = _currentScreenName();
-        if (!screenName || !modalContainer)
-            return;
-        ConnectedModeState.setModalAnim(screenName, modalContainer.animX, modalContainer.animY);
-    }
-
-    function _syncModalBody() {
-        if (!frameOwnsConnectedChrome || !_chromeClaimId)
-            return;
-        const screenName = _currentScreenName();
-        if (!screenName)
-            return;
-        ConnectedModeState.setModalBody(screenName, alignedX, alignedY, alignedWidth, alignedHeight);
-    }
-
-    function _releaseModalChrome() {
-        if (_chromeClaimId) {
-            ConnectedModeState.releaseDockRetract(_chromeClaimId);
-            _chromeClaimId = "";
-        }
-        const screenName = _currentScreenName();
-        if (screenName)
-            ConnectedModeState.clearModalState(screenName);
-    }
-
-    onFrameOwnsConnectedChromeChanged: _syncModalChromeState()
-    onResolvedConnectedBarSideChanged: _queueFullSync()
-    onShouldBeVisibleChanged: _queueFullSync()
-    onAlignedXChanged: _queueBodySync()
-    onAlignedYChanged: _queueBodySync()
-    onAlignedWidthChanged: _queueBodySync()
-    onAlignedHeightChanged: _queueBodySync()
-
-    Component.onDestruction: _releaseModalChrome()
-
-    Connections {
-        target: contentWindow
-        function onVisibleChanged() {
-            if (contentWindow.visible)
-                root._syncModalChromeState();
-            else
-                root._releaseModalChrome();
-        }
-    }
-
-    function open() {
-        closeTimer.stop();
-        animationsEnabled = false;
-        frozenMotionOffsetX = modalContainer ? modalContainer.offsetX : 0;
-        frozenMotionOffsetY = modalContainer ? modalContainer.offsetY : animationOffset;
-
-        const focusedScreen = CompositorService.getFocusedScreen();
-        if (focusedScreen) {
-            contentWindow.screen = focusedScreen;
-            if (!useSingleWindow)
-                clickCatcher.screen = focusedScreen;
-        }
-
-        if (Theme.isDirectionalEffect || root.useBackground) {
-            if (!useSingleWindow)
-                clickCatcher.visible = true;
-            contentWindow.visible = true;
-        }
-        ModalManager.openModal(modalHandle);
-
-        Qt.callLater(() => {
-            animationsEnabled = true;
-            shouldBeVisible = true;
-            if (!useSingleWindow && !clickCatcher.visible)
-                clickCatcher.visible = true;
-            if (!contentWindow.visible)
-                contentWindow.visible = true;
-            shouldHaveFocus = false;
-            Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible));
-        });
-    }
-
-    function close() {
-        shouldBeVisible = false;
-        shouldHaveFocus = false;
-        ModalManager.closeModal(modalHandle);
-        closeTimer.restart();
-    }
-
-    function instantClose() {
-        animationsEnabled = false;
-        shouldBeVisible = false;
-        shouldHaveFocus = false;
-        ModalManager.closeModal(modalHandle);
-        closeTimer.stop();
-        contentWindow.visible = false;
-        if (!useSingleWindow)
-            clickCatcher.visible = false;
-        dialogClosed();
-        Qt.callLater(() => animationsEnabled = true);
-    }
-
-    function toggle() {
-        shouldBeVisible ? close() : open();
-    }
-
-    Connections {
-        target: ModalManager
-        function onCloseAllModalsExcept(excludedModal) {
-            if (excludedModal !== modalHandle && !allowStacking && shouldBeVisible)
-                close();
-        }
-    }
-
-    Connections {
-        target: Quickshell
-        function onScreensChanged() {
-            if (!contentWindow.screen)
-                return;
-            const currentScreenName = contentWindow.screen.name;
-            let screenStillExists = false;
-            for (let i = 0; i < Quickshell.screens.length; i++) {
-                if (Quickshell.screens[i].name === currentScreenName) {
-                    screenStillExists = true;
-                    break;
-                }
-            }
-            if (screenStillExists)
-                return;
-            const newScreen = CompositorService.getFocusedScreen();
-            if (newScreen) {
-                contentWindow.screen = newScreen;
-                if (!useSingleWindow)
-                    clickCatcher.screen = newScreen;
-            }
-        }
-    }
-
-    Timer {
-        id: closeTimer
-        interval: Theme.variantCloseInterval(animationDuration)
-        onTriggered: {
-            if (shouldBeVisible)
-                return;
-            contentWindow.visible = false;
-            if (!useSingleWindow)
-                clickCatcher.visible = false;
-            dialogClosed();
-        }
-    }
-
-    // shadowRenderPadding is zeroed when frame owns the chrome
-    // Wayland then clips any content translating past
-    readonly property var shadowLevel: Theme.elevationLevel3
-    readonly property real shadowFallbackOffset: 6
-    readonly property real shadowRenderPadding: (!frameOwnsConnectedChrome && root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
-    readonly property real shadowMotionPadding: {
-        if (Theme.isConnectedEffect)
-            return 0;
-        if (animationType === "slide")
-            return 30;
-        if (Theme.isDirectionalEffect)
-            return Math.max(Math.max(0, animationOffset), Math.max(alignedWidth, alignedHeight) * 0.9);
-        if (Theme.isDepthEffect)
-            return Math.max(Math.max(0, animationOffset), Math.max(alignedWidth, alignedHeight) * 0.35);
-        return Math.max(0, animationOffset);
-    }
-    readonly property real shadowBuffer: Theme.snap(shadowRenderPadding + shadowMotionPadding, dpr)
-    readonly property real alignedWidth: Theme.px(modalWidth, dpr)
-    readonly property real alignedHeight: Theme.px(modalHeight, dpr)
-
-    function _frameEdgeInset(side) {
-        if (!effectiveScreen)
-            return 0;
-        return SettingsData.frameEdgeInsetForSide(effectiveScreen, side);
-    }
-
-    // frameEdgeInsetForSide is the full inset; do not add frameBarSize
-    readonly property real _connectedAlignedX: {
-        switch (resolvedConnectedBarSide) {
-        case "top":
-        case "bottom":
-            {
-                const insetL = _frameEdgeInset("left");
-                const insetR = _frameEdgeInset("right");
-                const usable = Math.max(0, screenWidth - insetL - insetR);
-                return insetL + Math.max(0, (usable - alignedWidth) / 2);
-            }
-        case "left":
-            return _frameEdgeInset("left");
-        case "right":
-            return screenWidth - alignedWidth - _frameEdgeInset("right");
-        }
-        return 0;
-    }
-
-    readonly property real _connectedAlignedY: {
-        switch (resolvedConnectedBarSide) {
-        case "top":
-            return _frameEdgeInset("top");
-        case "bottom":
-            return screenHeight - alignedHeight - _frameEdgeInset("bottom");
-        case "left":
-        case "right":
-            {
-                const insetT = _frameEdgeInset("top");
-                const insetB = _frameEdgeInset("bottom");
-                const usable = Math.max(0, screenHeight - insetT - insetB);
-                return insetT + Math.max(0, (usable - alignedHeight) / 2);
-            }
-        }
-        return 0;
-    }
-
-    readonly property real alignedX: Theme.snap(frameOwnsConnectedChrome ? _connectedAlignedX : (() => {
-            switch (positioning) {
-            case "center":
-                return (screenWidth - alignedWidth) / 2;
-            case "top-right":
-                return Math.max(Theme.spacingL, screenWidth - alignedWidth - Theme.spacingL);
-            case "custom":
-                return customPosition.x;
-            default:
-                return 0;
-            }
-        })(), dpr)
-
-    readonly property real alignedY: Theme.snap(frameOwnsConnectedChrome ? _connectedAlignedY : (() => {
-            switch (positioning) {
-            case "center":
-                return (screenHeight - alignedHeight) / 2;
-            case "top-right":
-                return Theme.barHeight + Theme.spacingXS;
-            case "custom":
-                return customPosition.y;
-            default:
-                return 0;
-            }
-        })(), dpr)
-
-    PanelWindow {
-        id: clickCatcher
-        visible: false
-        color: "transparent"
-
-        WlrLayershell.namespace: root.layerNamespace + ":clickcatcher"
-        WlrLayershell.layer: WlrLayershell.Top
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-
-        anchors {
-            top: true
-            left: true
-            right: true
-            bottom: true
-        }
-
-        mask: Region {
-            item: Rectangle {
-                x: root.alignedX
-                y: root.alignedY
-                width: root.alignedWidth
-                height: root.alignedHeight
-            }
-            intersection: Intersection.Xor
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: !root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
-            onClicked: root.backgroundClicked()
-        }
-
-        Rectangle {
-            anchors.fill: parent
-            z: -1
-            color: "black"
-            opacity: (!root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-            visible: opacity > 0
-
-            Behavior on opacity {
-                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                NumberAnimation {
-                    duration: Math.round(Theme.variantDuration(root.animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                }
-            }
-        }
-    }
-
-    PanelWindow {
-        id: contentWindow
-        visible: false
-        color: "transparent"
-
-        WindowBlur {
-            targetWindow: contentWindow
-            blurEnabled: root.effectiveBlurEnabled && !root.frameOwnsConnectedChrome
-            readonly property real s: Math.min(1, modalContainer.scaleValue)
-            blurX: modalContainer.x + modalContainer.width * (1 - s) * 0.5 + Theme.snap(modalContainer.animX, root.dpr)
-            blurY: modalContainer.y + modalContainer.height * (1 - s) * 0.5 + Theme.snap(modalContainer.animY, root.dpr)
-            blurWidth: (root.shouldBeVisible && !root.frameOwnsConnectedChrome) ? modalContainer.width * s : 0
-            blurHeight: (root.shouldBeVisible && !root.frameOwnsConnectedChrome) ? modalContainer.height * s : 0
-            blurRadius: root.effectiveCornerRadius
-        }
-
-        WlrLayershell.namespace: root.layerNamespace
-        WlrLayershell.layer: {
-            if (root.useOverlayLayer)
-                return WlrLayershell.Overlay;
-            switch (Quickshell.env("DMS_MODAL_LAYER")) {
-            case "bottom":
-                log.error("'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "background":
-                log.error("'background' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "overlay":
-                return WlrLayershell.Overlay;
-            default:
-                return WlrLayershell.Top;
-            }
-        }
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: {
-            if (customKeyboardFocus !== null)
-                return customKeyboardFocus;
-            if (!shouldHaveFocus)
-                return WlrKeyboardFocus.None;
-            if (root.useHyprlandFocusGrab)
-                return WlrKeyboardFocus.OnDemand;
-            return WlrKeyboardFocus.Exclusive;
-        }
-
-        anchors {
-            left: true
-            top: true
-            right: root.useSingleWindow
-            bottom: root.useSingleWindow
-        }
-
-        readonly property real actualMarginLeft: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedX - shadowBuffer, dpr))
-        readonly property real actualMarginTop: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedY - shadowBuffer, dpr))
-
-        WlrLayershell.margins {
-            left: actualMarginLeft
-            top: actualMarginTop
-            right: 0
-            bottom: 0
-        }
-
-        implicitWidth: root.useSingleWindow ? 0 : root.alignedWidth + (shadowBuffer * 2)
-        implicitHeight: root.useSingleWindow ? 0 : root.alignedHeight + (shadowBuffer * 2)
-
-        onVisibleChanged: {
-            if (visible) {
-                opened();
-            } else {
-                if (Qt.inputMethod) {
-                    Qt.inputMethod.hide();
-                    Qt.inputMethod.reset();
-                }
-            }
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
-            z: -2
-            onClicked: root.backgroundClicked()
-        }
-
-        Rectangle {
-            anchors.fill: parent
-            z: -1
-            color: "black"
-            opacity: (root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-            visible: opacity > 0
-
-            Behavior on opacity {
-                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                NumberAnimation {
-                    duration: Math.round(Theme.variantDuration(root.animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                }
-            }
-        }
-
-        Item {
-            id: modalContainer
-            x: (root.useSingleWindow ? root.alignedX : (root.alignedX - contentWindow.actualMarginLeft)) + Theme.snap(animX, root.dpr)
-            y: (root.useSingleWindow ? root.alignedY : (root.alignedY - contentWindow.actualMarginTop)) + Theme.snap(animY, root.dpr)
-
-            width: root.alignedWidth
-            height: root.alignedHeight
-
-            MouseArea {
-                anchors.fill: parent
-                enabled: root.useSingleWindow && root.shouldBeVisible
-                hoverEnabled: false
-                acceptedButtons: Qt.AllButtons
-                onPressed: mouse.accepted = true
-                onClicked: mouse.accepted = true
-                z: -1
-            }
-
-            readonly property bool slide: root.animationType === "slide"
-            readonly property bool directionalEffect: Theme.isDirectionalEffect
-            readonly property bool depthEffect: Theme.isDepthEffect
-            readonly property real directionalTravel: Math.max(root.animationOffset, Math.max(root.alignedWidth, root.alignedHeight) * 0.8)
-            readonly property real depthTravel: Math.max(root.animationOffset * 0.8, 36)
-            readonly property real customAnchorX: root.alignedX + root.alignedWidth * 0.5
-            readonly property real customAnchorY: root.alignedY + root.alignedHeight * 0.5
-            readonly property real customDistLeft: customAnchorX
-            readonly property real customDistRight: root.screenWidth - customAnchorX
-            readonly property real customDistTop: customAnchorY
-            readonly property real customDistBottom: root.screenHeight - customAnchorY
-            // Connected emergence: travel from the resolved bar edge, matching DankPopout cadence.
-            readonly property real connectedEmergenceTravelX: Math.max(root.animationOffset, root.alignedWidth + Theme.spacingL)
-            readonly property real connectedEmergenceTravelY: Math.max(root.animationOffset, root.alignedHeight + Theme.spacingL)
-            readonly property real offsetX: {
-                if (root.frameOwnsConnectedChrome) {
-                    switch (root.resolvedConnectedBarSide) {
-                    case "left":
-                        return -connectedEmergenceTravelX;
-                    case "right":
-                        return connectedEmergenceTravelX;
-                    }
-                    return 0;
-                }
-                if (slide && !directionalEffect && !depthEffect)
-                    return 15;
-                if (directionalEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return 0;
-                    case "custom":
-                        if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
-                            return -directionalTravel;
-                        if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
-                            return directionalTravel;
-                        return 0;
-                    default:
-                        return 0;
-                    }
-                }
-                if (depthEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return 0;
-                    case "custom":
-                        if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
-                            return -depthTravel;
-                        if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
-                            return depthTravel;
-                        return 0;
-                    default:
-                        return 0;
-                    }
-                }
-                return 0;
-            }
-            readonly property real offsetY: {
-                if (root.frameOwnsConnectedChrome) {
-                    switch (root.resolvedConnectedBarSide) {
-                    case "top":
-                        return -connectedEmergenceTravelY;
-                    case "bottom":
-                        return connectedEmergenceTravelY;
-                    }
-                    return 0;
-                }
-                if (slide && !directionalEffect && !depthEffect)
-                    return -30;
-                if (directionalEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return -Math.max(directionalTravel * 0.65, 96);
-                    case "custom":
-                        if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
-                            return -directionalTravel;
-                        if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
-                            return directionalTravel;
-                        return 0;
-                    default:
-                        // Default to sliding down from top when centered
-                        return -Math.max(directionalTravel, root.screenHeight * 0.24);
-                    }
-                }
-                if (depthEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return -depthTravel * 0.75;
-                    case "custom":
-                        if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
-                            return -depthTravel;
-                        if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
-                            return depthTravel;
-                        return depthTravel * 0.45;
-                    default:
-                        return -depthTravel;
-                    }
-                }
-                return root.animationOffset;
-            }
-
-            readonly property real computedScaleCollapsed: root.animationScaleCollapsed
-
-            // openProgress: 0 = closed (at frozenMotionOffset, scaleCollapsed), 1 = open (at 0, scale 1).
-            QtObject {
-                id: morph
-                property real openProgress: root.shouldBeVisible ? 1 : 0
-                Behavior on openProgress {
-                    enabled: root.animationsEnabled
-                    NumberAnimation {
-                        duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
-                        easing.type: Easing.BezierSpline
-                        easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                    }
-                }
-            }
-
-            readonly property real animX: root.frozenMotionOffsetX * (1 - morph.openProgress)
-            readonly property real animY: root.frozenMotionOffsetY * (1 - morph.openProgress)
-            readonly property real scaleValue: computedScaleCollapsed + (1.0 - computedScaleCollapsed) * morph.openProgress
-
-            onAnimXChanged: if (root.frameOwnsConnectedChrome)
-                root._queueAnimSync()
-            onAnimYChanged: if (root.frameOwnsConnectedChrome)
-                root._queueAnimSync()
-
-            Item {
-                id: contentContainer
-                anchors.centerIn: parent
-                width: parent.width
-                height: parent.height
-                clip: false
-
-                Item {
-                    id: animatedContent
-                    anchors.fill: parent
-                    clip: false
-
-                    property real publishedOpacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (root.shouldBeVisible ? 1 : 0)
-
-                    opacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (root.shouldBeVisible ? 1 : 0)
-                    scale: modalContainer.scaleValue
-                    transformOrigin: Item.Center
-
-                    Behavior on opacity {
-                        enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                        NumberAnimation {
-                            duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                            easing.type: Easing.BezierSpline
-                            easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                        }
-                    }
-
-                    Behavior on publishedOpacity {
-                        enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                        NumberAnimation {
-                            duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                            easing.type: Easing.BezierSpline
-                            easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                        }
-                    }
-
-                    ElevationShadow {
-                        id: modalShadowLayer
-                        anchors.fill: parent
-                        level: root.shadowLevel
-                        fallbackOffset: root.shadowFallbackOffset
-                        targetRadius: root.effectiveCornerRadius
-                        targetColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBackgroundColor
-                        borderColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBorderColor
-                        borderWidth: root.frameOwnsConnectedChrome ? 0 : root.effectiveBorderWidth
-                        shadowEnabled: !root.frameOwnsConnectedChrome && root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        radius: root.effectiveCornerRadius
-                        color: "transparent"
-                        border.color: (root.connectedSurfaceOverride || root.frameOwnsConnectedChrome) ? "transparent" : BlurService.borderColor
-                        border.width: (root.connectedSurfaceOverride || root.frameOwnsConnectedChrome) ? 0 : BlurService.borderWidth
-                        z: 100
-                    }
-
-                    FocusScope {
-                        anchors.fill: parent
-                        focus: root.shouldBeVisible
-                        clip: false
-
-                        Item {
-                            id: directContentWrapper
-                            anchors.fill: parent
-                            visible: root.directContent !== null
-                            focus: true
-                            clip: false
-
-                            Component.onCompleted: {
-                                if (root.directContent) {
-                                    root.directContent.parent = directContentWrapper;
-                                    root.directContent.anchors.fill = directContentWrapper;
-                                    Qt.callLater(() => root.directContent.forceActiveFocus());
-                                }
-                            }
-
-                            Connections {
-                                target: root
-                                function onDirectContentChanged() {
-                                    if (root.directContent) {
-                                        root.directContent.parent = directContentWrapper;
-                                        root.directContent.anchors.fill = directContentWrapper;
-                                        Qt.callLater(() => root.directContent.forceActiveFocus());
-                                    }
-                                }
-                            }
-                        }
-
-                        Loader {
-                            id: contentLoader
-                            anchors.fill: parent
-                            active: root.directContent === null && (root.keepContentLoaded || root.shouldBeVisible || contentWindow.visible)
-                            asynchronous: false
-                            focus: true
-                            clip: false
-                            visible: root.directContent === null
-
-                            onLoaded: {
-                                if (item) {
-                                    Qt.callLater(() => item.forceActiveFocus());
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        FocusScope {
-            id: focusScope
-            objectName: "modalFocusScope"
-            anchors.fill: parent
-            visible: root.shouldBeVisible || contentWindow.visible
-            focus: root.shouldBeVisible
-            Keys.onEscapePressed: event => {
-                if (root.closeOnEscapeKey && shouldHaveFocus) {
-                    root.close();
-                    event.accepted = true;
-                }
-            }
-        }
-    }
-}

quickshell/Modals/Common/DankModalStandalone.qml

@@ -1,484 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-    readonly property var log: Log.scoped("DankModalStandalone")
-
-    property var modalHandle: root
-    property string layerNamespace: "dms:modal"
-    property alias content: contentLoader.sourceComponent
-    property alias contentLoader: contentLoader
-    property Item directContent: null
-    property real modalWidth: 400
-    property real modalHeight: 300
-    property var targetScreen
-    readonly property var effectiveScreen: contentWindow.screen ?? targetScreen
-    readonly property real screenWidth: effectiveScreen?.width ?? 1920
-    readonly property real screenHeight: effectiveScreen?.height ?? 1080
-    readonly property real dpr: effectiveScreen ? CompositorService.getScreenScale(effectiveScreen) : 1
-    property bool showBackground: true
-    property real backgroundOpacity: 0.5
-    property string positioning: "center"
-    property point customPosition: Qt.point(0, 0)
-    property bool closeOnEscapeKey: true
-    property bool closeOnBackgroundClick: true
-    property string animationType: "scale"
-    property int animationDuration: Theme.modalAnimationDuration
-    property real animationScaleCollapsed: 0.96
-    property real animationOffset: Theme.spacingL
-    property list<real> animationEnterCurve: Theme.expressiveCurves.expressiveDefaultSpatial
-    property list<real> animationExitCurve: Theme.expressiveCurves.emphasized
-    property color backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-    property color borderColor: Theme.outlineMedium
-    property real borderWidth: 0
-    property real cornerRadius: Theme.cornerRadius
-    property bool enableShadow: true
-    property alias modalFocusScope: focusScope
-    property bool shouldBeVisible: false
-    property bool isClosing: false
-    property bool shouldHaveFocus: shouldBeVisible
-    property bool allowFocusOverride: false
-    property bool allowStacking: false
-    property bool keepContentLoaded: false
-    property bool keepPopoutsOpen: false
-    property var customKeyboardFocus: null
-    property bool useOverlayLayer: false
-    readonly property alias contentWindow: contentWindow
-    readonly property alias clickCatcher: clickCatcher
-    readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
-    readonly property bool useBackground: showBackground && SettingsData.modalDarkenBackground
-    readonly property bool useSingleWindow: CompositorService.isHyprland || useBackground
-
-    signal opened
-    signal dialogClosed
-    signal backgroundClicked
-
-    property bool animationsEnabled: true
-
-    function open() {
-        closeTimer.stop();
-        isClosing = false;
-        const focusedScreen = CompositorService.getFocusedScreen();
-        const screenChanged = focusedScreen && contentWindow.screen !== focusedScreen;
-        if (focusedScreen) {
-            if (screenChanged)
-                contentWindow.visible = false;
-            contentWindow.screen = focusedScreen;
-            if (!useSingleWindow) {
-                if (screenChanged)
-                    clickCatcher.visible = false;
-                clickCatcher.screen = focusedScreen;
-            }
-        }
-        if (screenChanged) {
-            Qt.callLater(() => root._finishOpen());
-        } else {
-            _finishOpen();
-        }
-    }
-
-    function _finishOpen() {
-        ModalManager.openModal(modalHandle);
-        shouldBeVisible = true;
-        if (!useSingleWindow)
-            clickCatcher.visible = true;
-        contentWindow.visible = true;
-        shouldHaveFocus = false;
-        Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible));
-    }
-
-    function close() {
-        isClosing = true;
-        shouldBeVisible = false;
-        shouldHaveFocus = false;
-        ModalManager.closeModal(modalHandle);
-        closeTimer.restart();
-    }
-
-    function instantClose() {
-        animationsEnabled = false;
-        isClosing = false;
-        shouldBeVisible = false;
-        shouldHaveFocus = false;
-        ModalManager.closeModal(modalHandle);
-        closeTimer.stop();
-        contentWindow.visible = false;
-        if (!useSingleWindow)
-            clickCatcher.visible = false;
-        dialogClosed();
-        Qt.callLater(() => animationsEnabled = true);
-    }
-
-    function toggle() {
-        shouldBeVisible ? close() : open();
-    }
-
-    Connections {
-        target: ModalManager
-        function onCloseAllModalsExcept(excludedModal) {
-            if (excludedModal !== modalHandle && !allowStacking && shouldBeVisible)
-                close();
-        }
-    }
-
-    Connections {
-        target: Quickshell
-        function onScreensChanged() {
-            if (!contentWindow.screen)
-                return;
-            const currentScreenName = contentWindow.screen.name;
-            let screenStillExists = false;
-            for (let i = 0; i < Quickshell.screens.length; i++) {
-                if (Quickshell.screens[i].name === currentScreenName) {
-                    screenStillExists = true;
-                    break;
-                }
-            }
-            if (screenStillExists)
-                return;
-            const newScreen = CompositorService.getFocusedScreen();
-            if (newScreen) {
-                contentWindow.screen = newScreen;
-                if (!useSingleWindow)
-                    clickCatcher.screen = newScreen;
-            }
-        }
-    }
-
-    Timer {
-        id: closeTimer
-        interval: animationDuration + 50
-        onTriggered: {
-            if (shouldBeVisible)
-                return;
-            isClosing = false;
-            contentWindow.visible = false;
-            if (!useSingleWindow)
-                clickCatcher.visible = false;
-            dialogClosed();
-        }
-    }
-
-    readonly property var shadowLevel: Theme.elevationLevel3
-    readonly property real shadowFallbackOffset: 6
-    readonly property real shadowRenderPadding: (root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
-    readonly property real shadowMotionPadding: animationType === "slide" ? 30 : Math.max(0, animationOffset)
-    readonly property real shadowBuffer: Theme.snap(shadowRenderPadding + shadowMotionPadding, dpr)
-    readonly property real alignedWidth: Theme.px(modalWidth, dpr)
-    readonly property real alignedHeight: Theme.px(modalHeight, dpr)
-
-    readonly property real alignedX: Theme.snap((() => {
-            switch (positioning) {
-            case "center":
-                return (screenWidth - alignedWidth) / 2;
-            case "top-right":
-                return Math.max(Theme.spacingL, screenWidth - alignedWidth - Theme.spacingL);
-            case "custom":
-                return customPosition.x;
-            default:
-                return 0;
-            }
-        })(), dpr)
-
-    readonly property real alignedY: Theme.snap((() => {
-            switch (positioning) {
-            case "center":
-                return (screenHeight - alignedHeight) / 2;
-            case "top-right":
-                return Theme.barHeight + Theme.spacingXS;
-            case "custom":
-                return customPosition.y;
-            default:
-                return 0;
-            }
-        })(), dpr)
-
-    PanelWindow {
-        id: clickCatcher
-        visible: false
-        color: "transparent"
-
-        WlrLayershell.namespace: root.layerNamespace + ":clickcatcher"
-        WlrLayershell.layer: WlrLayershell.Top
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-
-        anchors {
-            top: true
-            left: true
-            right: true
-            bottom: true
-        }
-
-        mask: Region {
-            item: Rectangle {
-                x: root.alignedX
-                y: root.alignedY
-                width: root.alignedWidth
-                height: root.alignedHeight
-            }
-            intersection: Intersection.Xor
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: root.closeOnBackgroundClick && root.shouldBeVisible
-            onClicked: root.backgroundClicked()
-        }
-    }
-
-    PanelWindow {
-        id: contentWindow
-        visible: false
-        color: "transparent"
-
-        WindowBlur {
-            targetWindow: contentWindow
-            readonly property real s: Math.min(1, modalContainer.scaleValue)
-            blurX: modalContainer.x + modalContainer.width * (1 - s) * 0.5 + Theme.snap(modalContainer.animX, root.dpr)
-            blurY: modalContainer.y + modalContainer.height * (1 - s) * 0.5 + Theme.snap(modalContainer.animY, root.dpr)
-            blurWidth: shouldBeVisible ? modalContainer.width * s : 0
-            blurHeight: shouldBeVisible ? modalContainer.height * s : 0
-            blurRadius: root.cornerRadius
-        }
-
-        WlrLayershell.namespace: root.layerNamespace
-        WlrLayershell.layer: {
-            if (root.useOverlayLayer)
-                return WlrLayershell.Overlay;
-            switch (Quickshell.env("DMS_MODAL_LAYER")) {
-            case "bottom":
-                log.error("'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "background":
-                log.error("'background' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "overlay":
-                return WlrLayershell.Overlay;
-            default:
-                return WlrLayershell.Top;
-            }
-        }
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: {
-            if (customKeyboardFocus !== null)
-                return customKeyboardFocus;
-            if (!shouldHaveFocus)
-                return WlrKeyboardFocus.None;
-            if (root.useHyprlandFocusGrab)
-                return WlrKeyboardFocus.OnDemand;
-            return WlrKeyboardFocus.Exclusive;
-        }
-
-        anchors {
-            left: true
-            top: true
-            right: root.useSingleWindow
-            bottom: root.useSingleWindow
-        }
-
-        WlrLayershell.margins {
-            left: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedX - shadowBuffer, dpr))
-            top: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedY - shadowBuffer, dpr))
-            right: 0
-            bottom: 0
-        }
-
-        implicitWidth: root.useSingleWindow ? 0 : root.alignedWidth + (shadowBuffer * 2)
-        implicitHeight: root.useSingleWindow ? 0 : root.alignedHeight + (shadowBuffer * 2)
-
-        onVisibleChanged: {
-            if (visible) {
-                opened();
-            } else {
-                if (Qt.inputMethod) {
-                    Qt.inputMethod.hide();
-                    Qt.inputMethod.reset();
-                }
-            }
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
-            z: -2
-            onClicked: root.backgroundClicked()
-        }
-
-        Rectangle {
-            anchors.fill: parent
-            z: -1
-            color: "black"
-            opacity: root.useBackground ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-            visible: root.useBackground
-
-            Behavior on opacity {
-                enabled: root.animationsEnabled
-                NumberAnimation {
-                    easing.type: Easing.BezierSpline
-                    duration: root.animationDuration
-                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                }
-            }
-        }
-
-        Item {
-            id: modalContainer
-            x: root.useSingleWindow ? root.alignedX : shadowBuffer
-            y: root.useSingleWindow ? root.alignedY : shadowBuffer
-
-            width: root.alignedWidth
-            height: root.alignedHeight
-
-            MouseArea {
-                anchors.fill: parent
-                enabled: root.useSingleWindow && root.shouldBeVisible
-                hoverEnabled: false
-                acceptedButtons: Qt.AllButtons
-                onPressed: mouse.accepted = true
-                onClicked: mouse.accepted = true
-                z: -1
-            }
-
-            readonly property bool slide: root.animationType === "slide"
-            readonly property real offsetX: slide ? 15 : 0
-            readonly property real offsetY: slide ? -30 : root.animationOffset
-
-            // openProgress: 0 = closed (at offset, scaleCollapsed), 1 = open (at 0, scale 1).
-            QtObject {
-                id: morph
-                property real openProgress: root.shouldBeVisible ? 1 : 0
-                Behavior on openProgress {
-                    enabled: root.animationsEnabled
-                    DankAnim {
-                        duration: root.animationDuration
-                        easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                    }
-                }
-            }
-
-            readonly property real animX: modalContainer.offsetX * (1 - morph.openProgress)
-            readonly property real animY: modalContainer.offsetY * (1 - morph.openProgress)
-            readonly property real scaleValue: root.animationScaleCollapsed + (1.0 - root.animationScaleCollapsed) * morph.openProgress
-
-            Item {
-                id: contentContainer
-                anchors.centerIn: parent
-                width: parent.width
-                height: parent.height
-                clip: false
-
-                Item {
-                    id: animatedContent
-                    anchors.fill: parent
-                    clip: false
-
-                    opacity: root.shouldBeVisible ? 1 : 0
-                    scale: modalContainer.scaleValue
-                    x: Theme.snap(modalContainer.animX, root.dpr) + (parent.width - width) * (1 - modalContainer.scaleValue) * 0.5
-                    y: Theme.snap(modalContainer.animY, root.dpr) + (parent.height - height) * (1 - modalContainer.scaleValue) * 0.5
-
-                    Behavior on opacity {
-                        enabled: root.animationsEnabled
-                        NumberAnimation {
-                            duration: animationDuration
-                            easing.type: Easing.BezierSpline
-                            easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                        }
-                    }
-
-                    ElevationShadow {
-                        id: modalShadowLayer
-                        anchors.fill: parent
-                        level: root.shadowLevel
-                        fallbackOffset: root.shadowFallbackOffset
-                        targetRadius: root.cornerRadius
-                        targetColor: root.backgroundColor
-                        borderColor: root.borderColor
-                        borderWidth: root.borderWidth
-                        shadowEnabled: root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        radius: root.cornerRadius
-                        color: "transparent"
-                        border.color: BlurService.borderColor
-                        border.width: BlurService.borderWidth
-                        z: 100
-                    }
-
-                    FocusScope {
-                        anchors.fill: parent
-                        focus: root.shouldBeVisible
-                        clip: false
-
-                        Item {
-                            id: directContentWrapper
-                            anchors.fill: parent
-                            visible: root.directContent !== null
-                            focus: true
-                            clip: false
-
-                            Component.onCompleted: {
-                                if (root.directContent) {
-                                    root.directContent.parent = directContentWrapper;
-                                    root.directContent.anchors.fill = directContentWrapper;
-                                    Qt.callLater(() => root.directContent.forceActiveFocus());
-                                }
-                            }
-
-                            Connections {
-                                target: root
-                                function onDirectContentChanged() {
-                                    if (root.directContent) {
-                                        root.directContent.parent = directContentWrapper;
-                                        root.directContent.anchors.fill = directContentWrapper;
-                                        Qt.callLater(() => root.directContent.forceActiveFocus());
-                                    }
-                                }
-                            }
-                        }
-
-                        Loader {
-                            id: contentLoader
-                            anchors.fill: parent
-                            active: root.directContent === null && (root.keepContentLoaded || root.shouldBeVisible || contentWindow.visible)
-                            asynchronous: false
-                            focus: true
-                            clip: false
-                            visible: root.directContent === null
-
-                            onLoaded: {
-                                if (item) {
-                                    Qt.callLater(() => item.forceActiveFocus());
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        FocusScope {
-            id: focusScope
-            objectName: "modalFocusScope"
-            anchors.fill: parent
-            visible: root.shouldBeVisible || contentWindow.visible
-            focus: root.shouldBeVisible
-            Keys.onEscapePressed: event => {
-                if (root.closeOnEscapeKey && shouldHaveFocus) {
-                    root.close();
-                    event.accepted = true;
-                }
-            }
-        }
-    }
-}

quickshell/Modals/DankColorPickerModal.qml

@@ -9,7 +9,6 @@ import qs.Widgets
 
 DankModal {
     id: root
-    readonly property var log: Log.scoped("DankColorPickerModal")
 
     layerNamespace: "dms:color-picker"
 
@@ -51,17 +50,17 @@ DankModal {
 
     function toggle() {
         if (shouldBeVisible) {
-            hide();
+          hide();
         } else {
-            show();
+          show();
         }
     }
 
     function toggleInstant() {
         if (shouldBeVisible) {
-            hideInstant();
+          hideInstant();
         } else {
-            show();
+          show();
         }
     }
 
@@ -112,7 +111,7 @@ DankModal {
         hideInstant();
         Proc.runCommand("dms-color-pick", ["dms", "color", "pick", "--json"], (output, exitCode) => {
             if (exitCode !== 0) {
-                log.warn("dms color pick exited with code:", exitCode);
+                console.warn("dms color pick exited with code:", exitCode);
                 root.show();
                 return;
             }
@@ -121,11 +120,11 @@ DankModal {
                 if (result.hex) {
                     applyPickedColor(result.hex);
                 } else {
-                    log.warn("Failed to parse dms color pick output: missing hex");
+                    console.warn("Failed to parse dms color pick output: missing hex");
                     root.show();
                 }
             } catch (e) {
-                log.warn("Failed to parse dms color pick JSON:", e);
+                console.warn("Failed to parse dms color pick JSON:", e);
                 root.show();
             }
         }, 0, Proc.noTimeout);
@@ -143,39 +142,39 @@ DankModal {
     onBackgroundClicked: hide()
 
     IpcHandler {
-        function open(): string {
-            root.show();
-            return "COLOR_PICKER_MODAL_OPEN_SUCCESS";
-        }
+      function open(): string {
+        root.show();
+        return "COLOR_PICKER_MODAL_OPEN_SUCCESS";
+      }
 
-        function openColor(color: string): string {
-            root.selectedColor = Qt.color(color);
-            root.currentColor = Qt.color(color);
-            root.updateFromColor(Qt.color(color));
-            return open();
-        }
+      function openColor(color: string): string {
+        root.selectedColor = Qt.color(color);
+        root.currentColor = Qt.color(color);
+        root.updateFromColor(Qt.color(color));
+        return open();
+      }
 
-        function close(): string {
-            root.hide();
-            return "COLOR_PICKER_MODAL_CLOSE_SUCCESS";
-        }
+      function close(): string {
+        root.hide();
+        return "COLOR_PICKER_MODAL_CLOSE_SUCCESS";
+      }
 
-        function closeInstant(): string {
-            root.hideInstant();
-            return "COLOR_PICKER_MODAL_CLOSE_INSTANT_SUCCESS";
-        }
+      function closeInstant(): string {
+        root.hideInstant();
+        return "COLOR_PICKER_MODAL_CLOSE_INSTANT_SUCCESS";
+      }
 
-        function toggle(): string {
-            root.toggle();
-            return "COLOR_PICKER_MODAL_TOGGLE_SUCCESS";
-        }
+      function toggle(): string {
+        root.toggle();
+        return "COLOR_PICKER_MODAL_TOGGLE_SUCCESS";
+      }
 
-        function toggleInstant(): string {
-            root.toggleInstant();
-            return "COLOR_PICKER_MODAL_TOGGLE_INSTANT_SUCCESS";
-        }
+      function toggleInstant(): string {
+        root.toggleInstant();
+        return "COLOR_PICKER_MODAL_TOGGLE_INSTANT_SUCCESS";
+      }
 
-        target: "color-picker"
+      target: "color-picker"
     }
 
     content: Component {

quickshell/Modals/DankLauncherV2/Controller.qml

@@ -1442,8 +1442,7 @@ Item {
                     section: it.section || "",
                     isCore: it.isCore || false,
                     isBuiltInLauncher: it.isBuiltInLauncher || false,
-                    pluginId: it.pluginId || "",
-                    source: it.source || ""
+                    pluginId: it.pluginId || ""
                 });
             }
             serializable.push({
@@ -1498,7 +1497,6 @@ Item {
                     isCore: it.isCore || false,
                     isBuiltInLauncher: it.isBuiltInLauncher || false,
                     pluginId: it.pluginId || "",
-                    source: it.source || "",
                     data: {
                         id: it.id
                     },
@@ -1881,7 +1879,7 @@ Item {
     function openTerminal(path) {
         if (!path)
             return;
-        var terminal = SessionData.resolveTerminal() || "xterm";
+        var terminal = Quickshell.env("TERMINAL") || "xterm";
         Quickshell.execDetached({
             command: [terminal],
             workingDirectory: path

quickshell/Modals/DankLauncherV2/ControllerUtils.js

@@ -101,39 +101,6 @@ function detectIconType(iconName) {
     return "material";
 }
 
-function classifyAppSource(app) {
-    if (!app)
-        return "";
-
-    var execRaw = app.execString || app.exec || "";
-    if (!execRaw && !app.id)
-        return "";
-
-    var exec = execRaw.toLowerCase();
-    var cmd0 = (app.command && app.command.length > 0) ? String(app.command[0]).toLowerCase() : "";
-    var id = (app.id || "").toLowerCase();
-
-    if (cmd0 === "flatpak" || exec.indexOf("flatpak run ") !== -1)
-        return "flatpak";
-
-    if (cmd0 === "snap"
-        || exec.indexOf("bamf_desktop_file_hint=") !== -1
-        || exec.indexOf("/snap/bin/") !== -1
-        || exec.indexOf("/snap/core") !== -1
-        || exec.indexOf("snap run ") === 0)
-        return "snap";
-
-    if (/\.appimage(\s|$|")/i.test(execRaw) || id.indexOf("appimagekit_") === 0)
-        return "appimage";
-
-    if (exec.indexOf("/nix/store/") !== -1
-        || exec.indexOf("/run/current-system/sw/") !== -1
-        || exec.indexOf("/etc/profiles/per-user/") !== -1)
-        return "nix";
-
-    return "system";
-}
-
 function sortPluginIdsByOrder(pluginIds, order) {
     if (!order || order.length === 0)
         return pluginIds;

quickshell/Modals/DankLauncherV2/DankLauncherV2Modal.qml

@@ -1,118 +1,826 @@
 import QtQuick
+import QtQuick.Effects
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Hyprland
 import qs.Common
 import qs.Services
+import qs.Widgets
 
 Item {
     id: root
-    readonly property var log: Log.scoped("DankLauncherV2Modal")
 
-    readonly property bool spotlightOpen: impl.item ? impl.item.spotlightOpen : false
-    readonly property bool isClosing: impl.item ? impl.item.isClosing : false
-    readonly property bool keyboardActive: impl.item ? impl.item.keyboardActive : false
-    readonly property bool contentVisible: impl.item ? impl.item.contentVisible : false
-    readonly property var spotlightContent: impl.item ? impl.item.spotlightContent : null
-    readonly property bool openedFromOverview: impl.item ? impl.item.openedFromOverview : false
-    readonly property var effectiveScreen: impl.item ? impl.item.effectiveScreen : null
-    readonly property real screenWidth: impl.item ? impl.item.screenWidth : 1920
-    readonly property real screenHeight: impl.item ? impl.item.screenHeight : 1080
-    readonly property real dpr: impl.item ? impl.item.dpr : 1
-    readonly property int modalWidth: impl.item ? impl.item.modalWidth : 620
-    readonly property int modalHeight: impl.item ? impl.item.modalHeight : 600
-    readonly property real modalX: impl.item ? impl.item.modalX : 0
-    readonly property real modalY: impl.item ? impl.item.modalY : 0
-    readonly property bool frameOwnsConnectedChrome: impl.item ? (impl.item.frameOwnsConnectedChrome ?? false) : false
-    readonly property string resolvedConnectedBarSide: impl.item ? (impl.item.resolvedConnectedBarSide ?? "") : ""
-    readonly property bool launcherArcExtenderActive: impl.item ? (impl.item.launcherArcExtenderActive ?? false) : false
+    visible: false
+
+    property bool spotlightOpen: false
+    property bool keyboardActive: false
+    property bool contentVisible: false
+    readonly property bool launcherMotionVisible: Theme.isConnectedEffect ? _motionActive : (Theme.isDirectionalEffect ? spotlightOpen : _motionActive)
+    property var spotlightContent: launcherContentLoader.item
+    property bool openedFromOverview: false
+    property bool isClosing: false
+    property bool _windowEnabled: true
+    property bool _pendingInitialize: false
+    property string _pendingQuery: ""
+    property string _pendingMode: ""
+    readonly property bool unloadContentOnClose: SettingsData.dankLauncherV2UnloadOnClose
+
+    // Animation state — matches DankPopout/DankModal pattern
+    property bool animationsEnabled: true
+    property bool _motionActive: false
+    property real _frozenMotionX: 0
+    property real _frozenMotionY: 0
+
+    readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
+    readonly property var effectiveScreen: contentWindow.screen
+    readonly property real screenWidth: effectiveScreen?.width ?? 1920
+    readonly property real screenHeight: effectiveScreen?.height ?? 1080
+    readonly property real dpr: effectiveScreen ? CompositorService.getScreenScale(effectiveScreen) : 1
+
+    readonly property int baseWidth: {
+        switch (SettingsData.dankLauncherV2Size) {
+        case "micro":
+            return 500;
+        case "medium":
+            return 720;
+        case "large":
+            return 860;
+        default:
+            return 620;
+        }
+    }
+    readonly property int baseHeight: {
+        switch (SettingsData.dankLauncherV2Size) {
+        case "micro":
+            return 480;
+        case "medium":
+            return 720;
+        case "large":
+            return 860;
+        default:
+            return 600;
+        }
+    }
+    readonly property int modalWidth: Math.min(baseWidth, screenWidth - 100)
+    readonly property int modalHeight: Math.min(baseHeight, screenHeight - 100)
+
+    readonly property string preferredConnectedBarSide: SettingsData.frameLauncherEmergeSide
+
+    readonly property bool frameConnectedMode: SettingsData.frameEnabled
+        && Theme.isConnectedEffect
+        && !!effectiveScreen
+        && SettingsData.isScreenInPreferences(effectiveScreen, SettingsData.frameScreenPreferences)
+
+    readonly property string resolvedConnectedBarSide: frameConnectedMode ? preferredConnectedBarSide : ""
+
+    readonly property bool frameOwnsConnectedChrome: frameConnectedMode && resolvedConnectedBarSide !== ""
+
+    function _dockOccupiesSide(side) {
+        if (!SettingsData.showDock) return false;
+        switch (side) {
+        case "top":    return SettingsData.dockPosition === SettingsData.Position.Top;
+        case "bottom": return SettingsData.dockPosition === SettingsData.Position.Bottom;
+        case "left":   return SettingsData.dockPosition === SettingsData.Position.Left;
+        case "right":  return SettingsData.dockPosition === SettingsData.Position.Right;
+        }
+        return false;
+    }
+    readonly property bool _dockBlocksEmergence: frameOwnsConnectedChrome && _dockOccupiesSide(resolvedConnectedBarSide)
+
+    function _frameEdgeInset(side) {
+        if (!effectiveScreen) return 0;
+        return SettingsData.frameEdgeInsetForSide(effectiveScreen, side);
+    }
+
+    // frameEdgeInsetForSide is the full inset; do not add frameBarSize
+    readonly property real _connectedModalX: {
+        switch (resolvedConnectedBarSide) {
+        case "top":
+        case "bottom": {
+            const insetL = _frameEdgeInset("left");
+            const insetR = _frameEdgeInset("right");
+            const usable = Math.max(0, screenWidth - insetL - insetR);
+            return insetL + Math.max(0, (usable - modalWidth) / 2);
+        }
+        case "left":
+            return _frameEdgeInset("left");
+        case "right":
+            return screenWidth - modalWidth - _frameEdgeInset("right");
+        }
+        return (screenWidth - modalWidth) / 2;
+    }
+
+    readonly property real _connectedModalY: {
+        switch (resolvedConnectedBarSide) {
+        case "top":
+            return _frameEdgeInset("top");
+        case "bottom":
+            return screenHeight - modalHeight - _frameEdgeInset("bottom");
+        case "left":
+        case "right": {
+            const insetT = _frameEdgeInset("top");
+            const insetB = _frameEdgeInset("bottom");
+            const usable = Math.max(0, screenHeight - insetT - insetB);
+            return insetT + Math.max(0, (usable - modalHeight) / 2);
+        }
+        }
+        return (screenHeight - modalHeight) / 2;
+    }
+
+    readonly property real modalX: frameOwnsConnectedChrome ? _connectedModalX : ((screenWidth - modalWidth) / 2)
+    readonly property real modalY: frameOwnsConnectedChrome ? _connectedModalY : ((screenHeight - modalHeight) / 2)
+
+    readonly property bool connectedSurfaceOverride: Theme.isConnectedEffect
+    readonly property int launcherAnimationDuration: Theme.isConnectedEffect ? Theme.popoutAnimationDuration : Theme.modalAnimationDuration
+    readonly property list<real> launcherEnterCurve: Theme.isConnectedEffect ? Theme.variantPopoutEnterCurve : Theme.variantModalEnterCurve
+    readonly property list<real> launcherExitCurve: Theme.isConnectedEffect ? Theme.variantPopoutExitCurve : Theme.variantModalExitCurve
+    readonly property color backgroundColor: connectedSurfaceOverride ? Theme.connectedSurfaceColor : Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    readonly property real cornerRadius: connectedSurfaceOverride ? Theme.connectedSurfaceRadius : Theme.cornerRadius
+    readonly property color borderColor: {
+        if (!SettingsData.dankLauncherV2BorderEnabled)
+            return Theme.outlineMedium;
+        switch (SettingsData.dankLauncherV2BorderColor) {
+        case "primary":
+            return Theme.primary;
+        case "secondary":
+            return Theme.secondary;
+        case "outline":
+            return Theme.outline;
+        case "surfaceText":
+            return Theme.surfaceText;
+        default:
+            return Theme.primary;
+        }
+    }
+    readonly property int borderWidth: SettingsData.dankLauncherV2BorderEnabled ? SettingsData.dankLauncherV2BorderThickness : 0
+    readonly property color effectiveBorderColor: connectedSurfaceOverride ? "transparent" : borderColor
+    readonly property int effectiveBorderWidth: connectedSurfaceOverride ? 0 : borderWidth
+    readonly property bool effectiveBlurEnabled: Theme.connectedSurfaceBlurEnabled
+
+    // Shadow padding for the content window (render padding only, no motion padding).
+    // Zeroed when frame owns the chrome and Wayland clips past the bar edge
+    readonly property var shadowLevel: Theme.elevationLevel3
+    readonly property real shadowFallbackOffset: 6
+    readonly property real shadowRenderPadding: (!frameOwnsConnectedChrome && Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
+    readonly property real shadowPad: Theme.snap(shadowRenderPadding, dpr)
+    readonly property real alignedWidth: Theme.px(modalWidth, dpr)
+    readonly property real alignedHeight: Theme.px(modalHeight, dpr)
+    readonly property real alignedX: Theme.snap(modalX, dpr)
+    readonly property real alignedY: Theme.snap(modalY, dpr)
+
+    // For directional/depth: window extends from screen top (content slides within)
+    // For standard: small window tightly around the modal + shadow padding
+    readonly property bool _needsExtendedWindow: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) || Theme.isDepthEffect
+    // Content window geometry
+    readonly property real _cwMarginLeft: Theme.snap(alignedX - shadowPad, dpr)
+    readonly property real _cwMarginTop: _needsExtendedWindow ? 0 : Theme.snap(alignedY - shadowPad, dpr)
+    readonly property real _cwWidth: alignedWidth + shadowPad * 2
+    readonly property real _cwHeight: {
+        if (Theme.isDirectionalEffect && !Theme.isConnectedEffect)
+            return screenHeight + shadowPad;
+        if (Theme.isDepthEffect)
+            return alignedY + alignedHeight + shadowPad;
+        return alignedHeight + shadowPad * 2;
+    }
+    // Where the content container sits inside the content window
+    readonly property real _ccX: shadowPad
+    readonly property real _ccY: _needsExtendedWindow ? alignedY : shadowPad
 
     signal dialogClosed
 
+    // ─── Connected chrome sync ────────────────────────────────────────────────
+    property string _chromeClaimId: ""
+    property bool _fullSyncPending: false
+
+    function _nextChromeClaimId() {
+        return "dms:launcher-v2:" + (new Date()).getTime() + ":" + Math.floor(Math.random() * 1000);
+    }
+
+    function _currentScreenName() {
+        return effectiveScreen ? effectiveScreen.name : "";
+    }
+
+    function _publishModalChromeState() {
+        const screenName = _currentScreenName();
+        if (!screenName) return;
+        ConnectedModeState.setModalState(screenName, {
+            "visible": spotlightOpen || contentWindow.visible,
+            "barSide": resolvedConnectedBarSide,
+            "bodyX": alignedX,
+            "bodyY": alignedY,
+            "bodyW": alignedWidth,
+            "bodyH": alignedHeight,
+            "animX": contentContainer ? contentContainer.animX : 0,
+            "animY": contentContainer ? contentContainer.animY : 0,
+            "omitStartConnector": false,
+            "omitEndConnector": false
+        });
+    }
+
+    function _syncModalChromeState() {
+        if (!frameOwnsConnectedChrome) {
+            _releaseModalChrome();
+            return;
+        }
+        if (!_chromeClaimId)
+            _chromeClaimId = _nextChromeClaimId();
+        _publishModalChromeState();
+        if (_dockBlocksEmergence && (spotlightOpen || contentWindow.visible))
+            ConnectedModeState.requestDockRetract(_chromeClaimId, _currentScreenName(), resolvedConnectedBarSide);
+        else
+            ConnectedModeState.releaseDockRetract(_chromeClaimId);
+    }
+
+    function _flushFullSync() {
+        _fullSyncPending = false;
+        _syncModalChromeState();
+    }
+
+    function _queueFullSync() {
+        if (_fullSyncPending) return;
+        _fullSyncPending = true;
+        Qt.callLater(() => {
+            if (root && typeof root._flushFullSync === "function")
+                root._flushFullSync();
+        });
+    }
+
+    function _syncModalAnim() {
+        if (!frameOwnsConnectedChrome || !_chromeClaimId) return;
+        const screenName = _currentScreenName();
+        if (!screenName || !contentContainer) return;
+        ConnectedModeState.setModalAnim(screenName, contentContainer.animX, contentContainer.animY);
+    }
+
+    function _syncModalBody() {
+        if (!frameOwnsConnectedChrome || !_chromeClaimId) return;
+        const screenName = _currentScreenName();
+        if (!screenName) return;
+        ConnectedModeState.setModalBody(screenName, alignedX, alignedY, alignedWidth, alignedHeight);
+    }
+
+    function _releaseModalChrome() {
+        if (_chromeClaimId) {
+            ConnectedModeState.releaseDockRetract(_chromeClaimId);
+            _chromeClaimId = "";
+        }
+        const screenName = _currentScreenName();
+        if (screenName)
+            ConnectedModeState.clearModalState(screenName);
+    }
+
+    onFrameOwnsConnectedChromeChanged: _syncModalChromeState()
+    onResolvedConnectedBarSideChanged: _queueFullSync()
+    onSpotlightOpenChanged: _queueFullSync()
+    onAlignedXChanged: _syncModalBody()
+    onAlignedYChanged: _syncModalBody()
+    onAlignedWidthChanged: _syncModalBody()
+    onAlignedHeightChanged: _syncModalBody()
+
+    Component.onDestruction: _releaseModalChrome()
+
+    Connections {
+        target: contentWindow
+        function onVisibleChanged() {
+            if (contentWindow.visible)
+                root._syncModalChromeState();
+            else
+                root._releaseModalChrome();
+        }
+    }
+
+    function _ensureContentLoadedAndInitialize(query, mode) {
+        _pendingQuery = query || "";
+        _pendingMode = mode || "";
+        _pendingInitialize = true;
+        contentVisible = true;
+        launcherContentLoader.active = true;
+
+        if (spotlightContent) {
+            _initializeAndShow(_pendingQuery, _pendingMode);
+            _pendingInitialize = false;
+        }
+    }
+
+    function _initializeAndShow(query, mode) {
+        if (!spotlightContent)
+            return;
+        contentVisible = true;
+        // NOTE: forceActiveFocus() is deliberately NOT called here.
+        // It is deferred to after animation starts to avoid compositor IPC stalls.
+
+        if (spotlightContent.searchField) {
+            spotlightContent.searchField.text = query;
+        }
+        if (spotlightContent.controller) {
+            var targetMode = mode || SessionData.launcherLastMode || "all";
+            spotlightContent.controller.searchMode = targetMode;
+            spotlightContent.controller.activePluginId = "";
+            spotlightContent.controller.activePluginName = "";
+            spotlightContent.controller.pluginFilter = "";
+            spotlightContent.controller.fileSearchType = "all";
+            spotlightContent.controller.fileSearchExt = "";
+            spotlightContent.controller.fileSearchFolder = "";
+            spotlightContent.controller.fileSearchSort = "score";
+            spotlightContent.controller.collapsedSections = {};
+            spotlightContent.controller.selectedFlatIndex = 0;
+            spotlightContent.controller.selectedItem = null;
+            if (query) {
+                spotlightContent.controller.setSearchQuery(query);
+            } else {
+                spotlightContent.controller.searchQuery = "";
+                spotlightContent.controller.performSearch();
+            }
+        }
+        if (spotlightContent.resetScroll) {
+            spotlightContent.resetScroll();
+        }
+        if (spotlightContent.actionPanel) {
+            spotlightContent.actionPanel.hide();
+        }
+    }
+
+    function _openCommon(query, mode) {
+        closeCleanupTimer.stop();
+        isClosing = false;
+        openedFromOverview = false;
+
+        // Disable animations so the snap is instant
+        animationsEnabled = false;
+
+        // Freeze the collapsed offsets (they depend on height which could change)
+        _frozenMotionX = contentContainer ? contentContainer.collapsedMotionX : 0;
+        _frozenMotionY = contentContainer ? contentContainer.collapsedMotionY : (Theme.isDirectionalEffect ? Math.max(root.screenHeight - root._ccY + root.shadowPad, Theme.effectAnimOffset * 1.1) : -Theme.effectAnimOffset);
+
+        var focusedScreen = CompositorService.getFocusedScreen();
+        if (focusedScreen) {
+            backgroundWindow.screen = focusedScreen;
+            contentWindow.screen = focusedScreen;
+        }
+
+        // _motionActive = false ensures motionX/Y snap to frozen collapsed position
+        _motionActive = false;
+
+        // Make windows visible but do NOT request keyboard focus yet
+        ModalManager.openModal(root);
+        spotlightOpen = true;
+        backgroundWindow.visible = true;
+        contentWindow.visible = true;
+        if (useHyprlandFocusGrab)
+            focusGrab.active = true;
+
+        // Load content and initialize (but no forceActiveFocus — that's deferred)
+        _ensureContentLoadedAndInitialize(query || "", mode || "");
+
+        // Frame 1: enable animations and trigger enter motion
+        Qt.callLater(() => {
+            root.animationsEnabled = true;
+            root._motionActive = true;
+
+            // Frame 2: request keyboard focus + activate search field
+            // Double-deferred to avoid compositor IPC competing with animation frames
+            Qt.callLater(() => {
+                root.keyboardActive = true;
+                if (root.spotlightContent && root.spotlightContent.searchField)
+                    root.spotlightContent.searchField.forceActiveFocus();
+            });
+        });
+    }
+
     function show() {
-        if (impl.item)
-            impl.item.show();
+        _openCommon("", "");
     }
 
     function showWithQuery(query) {
-        if (impl.item)
-            impl.item.showWithQuery(query);
-    }
-
-    function showWithMode(mode) {
-        if (impl.item)
-            impl.item.showWithMode(mode);
+        _openCommon(query, "");
     }
 
     function hide() {
-        if (impl.item)
-            impl.item.hide();
+        if (!spotlightOpen)
+            return;
+        openedFromOverview = false;
+        isClosing = true;
+        // For directional effects, defer contentVisible=false so content stays rendered during exit slide
+        if (!Theme.isDirectionalEffect)
+            contentVisible = false;
+
+        // Trigger exit animation — Behaviors will animate motionX/Y to frozen collapsed position
+        _motionActive = false;
+
+        keyboardActive = false;
+        spotlightOpen = false;
+        focusGrab.active = false;
+        ModalManager.closeModal(root);
+        closeCleanupTimer.start();
     }
 
     function toggle() {
-        if (impl.item)
-            impl.item.toggle();
+        spotlightOpen ? hide() : show();
     }
 
-    function toggleWithQuery(query) {
-        if (impl.item)
-            impl.item.toggleWithQuery(query);
+    function showWithMode(mode) {
+        _openCommon("", mode);
     }
 
     function toggleWithMode(mode) {
-        if (impl.item)
-            impl.item.toggleWithMode(mode);
-    }
-
-    readonly property var _desiredBackend: SettingsData.connectedFrameModeActive ? connectedComp : standaloneComp
-    property var _resolvedBackend: null
-
-    Component.onCompleted: _resolvedBackend = _desiredBackend
-
-    Connections {
-        target: SettingsData
-        function onConnectedFrameModeActiveChanged() {
-            root._maybeResolveBackend();
+        if (spotlightOpen) {
+            hide();
+        } else {
+            showWithMode(mode);
         }
     }
 
-    // Defer Loader source-component swap until impl is fully closed; avoids
-    // tearing down the launcher mid-animation when frame mode is toggled.
-    function _maybeResolveBackend() {
-        if (_resolvedBackend === _desiredBackend)
-            return;
-        if (impl.item && (impl.item.spotlightOpen || impl.item.isClosing))
-            return;
-        _resolvedBackend = _desiredBackend;
+    function toggleWithQuery(query) {
+        if (spotlightOpen) {
+            hide();
+        } else {
+            showWithQuery(query);
+        }
     }
 
-    Loader {
-        id: impl
-        sourceComponent: root._resolvedBackend
-        onItemChanged: if (item)
-            root._wireBackend(item)
-    }
-
-    Component {
-        id: standaloneComp
-        DankLauncherV2ModalStandalone {}
-    }
-
-    Component {
-        id: connectedComp
-        DankLauncherV2ModalConnected {}
-    }
-
-    function _wireBackend(it) {
-        if (!it)
-            return;
-        it.modalHandle = root;
+    Timer {
+        id: closeCleanupTimer
+        interval: Theme.variantCloseInterval(root.launcherAnimationDuration)
+        repeat: false
+        onTriggered: {
+            isClosing = false;
+            contentVisible = false;
+            contentWindow.visible = false;
+            backgroundWindow.visible = false;
+            if (root.unloadContentOnClose)
+                launcherContentLoader.active = false;
+            dialogClosed();
+        }
     }
 
     Connections {
-        target: impl.item
-        ignoreUnknownSignals: true
-
-        function onDialogClosed() {
-            root.dialogClosed();
-            root._maybeResolveBackend();
+        target: spotlightContent?.controller ?? null
+        function onModeChanged(mode) {
+            if (spotlightContent.controller.autoSwitchedToFiles)
+                return;
+            SessionData.setLauncherLastMode(mode);
         }
     }
+
+    HyprlandFocusGrab {
+        id: focusGrab
+        windows: [contentWindow]
+        active: false
+
+        onCleared: {
+            if (spotlightOpen) {
+                hide();
+            }
+        }
+    }
+
+    Connections {
+        target: ModalManager
+        function onCloseAllModalsExcept(excludedModal) {
+            if (excludedModal !== root && spotlightOpen) {
+                hide();
+            }
+        }
+    }
+
+    Connections {
+        target: Quickshell
+        function onScreensChanged() {
+            if (Quickshell.screens.length === 0)
+                return;
+
+            const screen = contentWindow.screen;
+            const screenName = screen?.name;
+
+            let needsReset = !screen || !screenName;
+            if (!needsReset) {
+                needsReset = true;
+                for (let i = 0; i < Quickshell.screens.length; i++) {
+                    if (Quickshell.screens[i].name === screenName) {
+                        needsReset = false;
+                        break;
+                    }
+                }
+            }
+
+            if (!needsReset)
+                return;
+
+            const newScreen = CompositorService.getFocusedScreen() ?? Quickshell.screens[0];
+            if (!newScreen)
+                return;
+
+            root._windowEnabled = false;
+            backgroundWindow.screen = newScreen;
+            contentWindow.screen = newScreen;
+            Qt.callLater(() => {
+                root._windowEnabled = true;
+            });
+        }
+    }
+
+    // ── Background window: fullscreen, handles darkening + click-to-dismiss ──
+    PanelWindow {
+        id: backgroundWindow
+        visible: false
+        color: "transparent"
+
+        WlrLayershell.namespace: "dms:spotlight:bg"
+        WlrLayershell.layer: WlrLayershell.Top
+        WlrLayershell.exclusiveZone: -1
+        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
+
+        WlrLayershell.margins {
+            top: contentContainer.dockTop ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 0 ? Theme.px(42, root.dpr) : 0)
+            bottom: contentContainer.dockBottom ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 1 ? Theme.px(42, root.dpr) : 0)
+            left: contentContainer.dockLeft ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 2 ? Theme.px(42, root.dpr) : 0)
+            right: contentContainer.dockRight ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 3 ? Theme.px(42, root.dpr) : 0)
+        }
+
+        anchors {
+            top: true
+            bottom: true
+            left: true
+            right: true
+        }
+
+        mask: Region {
+            item: (spotlightOpen || isClosing) ? bgFullScreenMask : null
+        }
+
+        Item {
+            id: bgFullScreenMask
+            anchors.fill: parent
+        }
+
+        Rectangle {
+            id: backgroundDarken
+            anchors.fill: parent
+            color: "black"
+            opacity: launcherMotionVisible && SettingsData.modalDarkenBackground ? 0.5 : 0
+            visible: launcherMotionVisible || opacity > 0
+
+            Behavior on opacity {
+                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
+                DankAnim {
+                    duration: Math.round(Theme.variantDuration(root.launcherAnimationDuration, launcherMotionVisible) * Theme.variantOpacityDurationScale)
+                    easing.bezierCurve: launcherMotionVisible ? root.launcherEnterCurve : root.launcherExitCurve
+                }
+            }
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            enabled: spotlightOpen
+            onClicked: root.hide()
+        }
+    }
+
+    // ── Content window: SMALL, positioned with margins — only renders the modal area ──
+    PanelWindow {
+        id: contentWindow
+        visible: false
+        color: "transparent"
+
+        WindowBlur {
+            targetWindow: contentWindow
+            blurEnabled: root.effectiveBlurEnabled && !root.frameOwnsConnectedChrome
+            readonly property real s: Math.min(1, contentContainer.scaleValue)
+            blurX: root._ccX + root.alignedWidth * (1 - s) * 0.5 + Theme.snap(contentContainer.animX, root.dpr)
+            blurY: root._ccY + root.alignedHeight * (1 - s) * 0.5 + Theme.snap(contentContainer.animY, root.dpr)
+            blurWidth: (root.spotlightOpen || root.isClosing) && contentWrapper.opacity > 0 && !root.frameOwnsConnectedChrome ? root.alignedWidth * s : 0
+            blurHeight: (root.spotlightOpen || root.isClosing) && contentWrapper.opacity > 0 && !root.frameOwnsConnectedChrome ? root.alignedHeight * s : 0
+            blurRadius: root.cornerRadius
+        }
+
+        WlrLayershell.namespace: "dms:spotlight"
+        WlrLayershell.layer: {
+            switch (Quickshell.env("DMS_MODAL_LAYER")) {
+            case "bottom":
+                console.error("DankLauncherV2Modal: 'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
+                return WlrLayershell.Top;
+            case "background":
+                console.error("DankLauncherV2Modal: 'background' layer is not valid for modals. Defaulting to 'top' layer.");
+                return WlrLayershell.Top;
+            case "overlay":
+                return WlrLayershell.Overlay;
+            default:
+                return WlrLayershell.Top;
+            }
+        }
+        WlrLayershell.exclusiveZone: -1
+        WlrLayershell.keyboardFocus: keyboardActive ? (root.useHyprlandFocusGrab ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.Exclusive) : WlrKeyboardFocus.None
+
+        anchors {
+            left: true
+            top: true
+        }
+
+        WlrLayershell.margins {
+            left: root._cwMarginLeft
+            top: root._cwMarginTop
+        }
+
+        implicitWidth: root._cwWidth
+        implicitHeight: root._cwHeight
+
+        mask: Region {
+            item: contentInputMask
+        }
+
+        Item {
+            id: contentInputMask
+            visible: false
+            x: contentContainer.x + contentWrapper.x
+            y: contentContainer.y + contentWrapper.y
+            width: root.alignedWidth
+            height: root.alignedHeight
+        }
+
+        Item {
+            id: contentContainer
+
+            // For directional/depth: contentContainer is at alignedY from window top (window starts at screen top)
+            // For standard: contentContainer is at shadowPad from window top (window starts near modal)
+            x: root._ccX
+            y: root._ccY
+            width: root.alignedWidth
+            height: root.alignedHeight
+
+            readonly property int dockEdge: typeof SettingsData !== "undefined" ? SettingsData.dockPosition : 1
+            readonly property bool dockTop: dockEdge === 0
+            readonly property bool dockBottom: dockEdge === 1
+            readonly property bool dockLeft: dockEdge === 2
+            readonly property bool dockRight: dockEdge === 3
+
+            readonly property real dockThickness: typeof SettingsData !== "undefined" && SettingsData.showDock ? Theme.px(SettingsData.dockIconSize + (SettingsData.dockMargin * 2) + SettingsData.dockSpacing + 8, root.dpr) : Theme.px(60, root.dpr)
+
+            readonly property bool directionalEffect: Theme.isDirectionalEffect
+            readonly property bool depthEffect: Theme.isDepthEffect
+            readonly property real _connectedTravelX: Math.max(Theme.effectAnimOffset, root.alignedWidth + Theme.spacingL)
+            readonly property real _connectedTravelY: Math.max(Theme.effectAnimOffset, root.alignedHeight + Theme.spacingL)
+            readonly property real collapsedMotionX: {
+                if (root.frameOwnsConnectedChrome) {
+                    switch (root.resolvedConnectedBarSide) {
+                    case "left":  return -_connectedTravelX;
+                    case "right": return _connectedTravelX;
+                    }
+                    return 0;
+                }
+                if (directionalEffect) {
+                    if (dockLeft)
+                        return -(root._ccX + root.alignedWidth + Theme.effectAnimOffset);
+                    if (dockRight)
+                        return root.screenWidth - root._ccX + Theme.effectAnimOffset;
+                }
+                if (depthEffect)
+                    return Theme.effectAnimOffset * 0.25;
+                return 0;
+            }
+            readonly property real collapsedMotionY: {
+                if (root.frameOwnsConnectedChrome) {
+                    switch (root.resolvedConnectedBarSide) {
+                    case "top":    return -_connectedTravelY;
+                    case "bottom": return _connectedTravelY;
+                    }
+                    return 0;
+                }
+                if (directionalEffect) {
+                    if (dockTop)
+                        return -(root._ccY + root.alignedHeight + Theme.effectAnimOffset);
+                    if (dockBottom)
+                        return root.screenHeight - root._ccY + root.shadowPad + Theme.effectAnimOffset;
+                    return 0;
+                }
+                if (depthEffect)
+                    return -Math.max(Theme.effectAnimOffset * 0.85, 34);
+                return -Math.max((root.shadowPad || 0) + Theme.effectAnimOffset, 40);
+            }
+
+            // Declarative bindings — snap applied at render layer (contentWrapper x/y)
+            property real animX: root._motionActive ? 0 : root._frozenMotionX
+            property real animY: root._motionActive ? 0 : root._frozenMotionY
+            property real scaleValue: root._motionActive ? 1.0 : (Theme.isDirectionalEffect && typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 ? Theme.effectScaleCollapsed : (Theme.isDirectionalEffect ? 1 : Theme.effectScaleCollapsed))
+
+            onAnimXChanged: if (root.frameOwnsConnectedChrome) root._syncModalAnim()
+            onAnimYChanged: if (root.frameOwnsConnectedChrome) root._syncModalAnim()
+
+            Behavior on animX {
+                enabled: root.animationsEnabled
+                DankAnim {
+                    duration: Theme.variantDuration(root.launcherAnimationDuration, root._motionActive)
+                    easing.bezierCurve: root._motionActive ? root.launcherEnterCurve : root.launcherExitCurve
+                }
+            }
+
+            Behavior on animY {
+                enabled: root.animationsEnabled
+                DankAnim {
+                    duration: Theme.variantDuration(root.launcherAnimationDuration, root._motionActive)
+                    easing.bezierCurve: root._motionActive ? root.launcherEnterCurve : root.launcherExitCurve
+                }
+            }
+
+            Behavior on scaleValue {
+                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2))
+                DankAnim {
+                    duration: Theme.variantDuration(root.launcherAnimationDuration, root._motionActive)
+                    easing.bezierCurve: root._motionActive ? root.launcherEnterCurve : root.launcherExitCurve
+                }
+            }
+
+            Item {
+                id: directionalClipMask
+                readonly property bool shouldClip: Theme.isDirectionalEffect && typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode > 0
+                readonly property real clipOversize: 2000
+
+                clip: shouldClip
+
+                x: shouldClip ? (contentContainer.dockRight ? -clipOversize : (contentContainer.dockLeft ? contentContainer.dockThickness - root._ccX : -clipOversize)) : 0
+                y: shouldClip ? (contentContainer.dockBottom ? -clipOversize : (contentContainer.dockTop ? contentContainer.dockThickness - root._ccY : -clipOversize)) : 0
+
+                width: shouldClip ? parent.width + clipOversize + (contentContainer.dockRight ? (root.screenWidth - contentContainer.dockThickness - root._ccX - parent.width) : (contentContainer.dockLeft ? clipOversize : clipOversize)) : parent.width
+                height: shouldClip ? parent.height + clipOversize + (contentContainer.dockBottom ? (root.screenHeight - contentContainer.dockThickness - root._ccY - parent.height) : (contentContainer.dockTop ? clipOversize : clipOversize)) : parent.height
+
+                Item {
+                    id: aligner
+                    x: directionalClipMask.x !== 0 ? -directionalClipMask.x : 0
+                    y: directionalClipMask.y !== 0 ? -directionalClipMask.y : 0
+                    width: contentContainer.width
+                    height: contentContainer.height
+
+                    // Shadow mirrors contentWrapper position/scale/opacity
+                    ElevationShadow {
+                        id: launcherShadowLayer
+                        width: parent.width
+                        height: parent.height
+                        opacity: contentWrapper.opacity
+                        scale: contentWrapper.scale
+                        x: contentWrapper.x
+                        y: contentWrapper.y
+                        level: root.shadowLevel
+                        fallbackOffset: root.shadowFallbackOffset
+                        targetColor: root.frameOwnsConnectedChrome ? "transparent" : root.backgroundColor
+                        borderColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBorderColor
+                        borderWidth: root.frameOwnsConnectedChrome ? 0 : root.effectiveBorderWidth
+                        targetRadius: root.cornerRadius
+                        shadowEnabled: !root.frameOwnsConnectedChrome && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
+                    }
+
+                    // contentWrapper moves inside static contentContainer — DankPopout pattern
+                    Item {
+                        id: contentWrapper
+                        width: parent.width
+                        height: parent.height
+                        opacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (launcherMotionVisible ? 1 : 0)
+                        visible: opacity > 0
+                        scale: contentContainer.scaleValue
+                        x: Theme.snap(contentContainer.animX + (parent.width - width) * (1 - contentContainer.scaleValue) * 0.5, root.dpr)
+                        y: Theme.snap(contentContainer.animY + (parent.height - height) * (1 - contentContainer.scaleValue) * 0.5, root.dpr)
+
+                        Behavior on opacity {
+                            enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
+                            DankAnim {
+                                duration: Math.round(Theme.variantDuration(root.launcherAnimationDuration, launcherMotionVisible) * Theme.variantOpacityDurationScale)
+                                easing.bezierCurve: launcherMotionVisible ? root.launcherEnterCurve : root.launcherExitCurve
+                            }
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            onPressed: mouse => mouse.accepted = true
+                        }
+
+                        FocusScope {
+                            anchors.fill: parent
+                            focus: keyboardActive
+
+                            Loader {
+                                id: launcherContentLoader
+                                anchors.fill: parent
+                                active: !root.unloadContentOnClose || root.spotlightOpen || root.isClosing || root.contentVisible || root._pendingInitialize
+                                asynchronous: false
+                                sourceComponent: LauncherContent {
+                                    focus: true
+                                    parentModal: root
+                                }
+
+                                onLoaded: {
+                                    if (root._pendingInitialize) {
+                                        root._initializeAndShow(root._pendingQuery, root._pendingMode);
+                                        root._pendingInitialize = false;
+                                    }
+                                }
+                            }
+
+                            Keys.onEscapePressed: event => {
+                                root.hide();
+                                event.accepted = true;
+                            }
+                        }
+                    } // contentWrapper
+                } // aligner
+            } // directionalClipMask
+        } // contentContainer
+    } // PanelWindow
 }

quickshell/Modals/DankLauncherV2/DankLauncherV2ModalConnected.qml

@@ -1,922 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-    readonly property var log: Log.scoped("DankLauncherV2ModalConnected")
-
-    property var modalHandle: root
-
-    visible: false
-
-    property bool spotlightOpen: false
-    property bool keyboardActive: false
-    property bool contentVisible: false
-    readonly property bool launcherMotionVisible: Theme.isConnectedEffect ? _motionActive : (Theme.isDirectionalEffect ? spotlightOpen : _motionActive)
-    property var spotlightContent: launcherContentLoader.item
-    property bool openedFromOverview: false
-    property bool isClosing: false
-    property bool _windowEnabled: true
-    property bool _pendingInitialize: false
-    property string _pendingQuery: ""
-    property string _pendingMode: ""
-    readonly property bool unloadContentOnClose: SettingsData.dankLauncherV2UnloadOnClose
-
-    // Animation state — matches DankPopout/DankModal pattern
-    property bool animationsEnabled: true
-    property bool _motionActive: false
-    property real _frozenMotionX: 0
-    property real _frozenMotionY: 0
-
-    readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
-    readonly property var effectiveScreen: contentWindow.screen
-    readonly property real screenWidth: effectiveScreen?.width ?? 1920
-    readonly property real screenHeight: effectiveScreen?.height ?? 1080
-    readonly property real dpr: effectiveScreen ? CompositorService.getScreenScale(effectiveScreen) : 1
-
-    readonly property int baseWidth: {
-        switch (SettingsData.dankLauncherV2Size) {
-        case "micro":
-            return 500;
-        case "medium":
-            return 720;
-        case "large":
-            return 860;
-        default:
-            return 620;
-        }
-    }
-    readonly property int baseHeight: {
-        switch (SettingsData.dankLauncherV2Size) {
-        case "micro":
-            return 480;
-        case "medium":
-            return 720;
-        case "large":
-            return 860;
-        default:
-            return 600;
-        }
-    }
-    readonly property int modalWidth: Math.min(baseWidth, screenWidth - 100)
-    readonly property int modalHeight: Math.min(baseHeight, screenHeight - 100)
-
-    readonly property string preferredConnectedBarSide: SettingsData.frameLauncherEmergeSide
-
-    readonly property bool frameConnectedMode: SettingsData.frameEnabled && Theme.isConnectedEffect && !!effectiveScreen && SettingsData.isScreenInPreferences(effectiveScreen, SettingsData.frameScreenPreferences)
-
-    readonly property string resolvedConnectedBarSide: frameConnectedMode ? preferredConnectedBarSide : ""
-
-    readonly property bool frameOwnsConnectedChrome: frameConnectedMode && resolvedConnectedBarSide !== ""
-    readonly property bool launcherArcExtenderActive: frameOwnsConnectedChrome && SettingsData.frameLauncherArcExtender && (resolvedConnectedBarSide === "top" || resolvedConnectedBarSide === "bottom")
-
-    function _dockOccupiesSide(side) {
-        if (!SettingsData.showDock)
-            return false;
-        switch (side) {
-        case "top":
-            return SettingsData.dockPosition === SettingsData.Position.Top;
-        case "bottom":
-            return SettingsData.dockPosition === SettingsData.Position.Bottom;
-        case "left":
-            return SettingsData.dockPosition === SettingsData.Position.Left;
-        case "right":
-            return SettingsData.dockPosition === SettingsData.Position.Right;
-        }
-        return false;
-    }
-    readonly property bool _dockBlocksEmergence: frameOwnsConnectedChrome && _dockOccupiesSide(resolvedConnectedBarSide)
-
-    function _frameEdgeInset(side) {
-        if (!effectiveScreen)
-            return 0;
-        return SettingsData.frameEdgeInsetForSide(effectiveScreen, side);
-    }
-
-    // frameEdgeInsetForSide is the full inset; do not add frameBarSize.
-    // Positions the modal flush to the emerge side, centered on the cross axis.
-    readonly property var _connectedModalPos: {
-        const fallback = {
-            "x": (screenWidth - modalWidth) / 2,
-            "y": (screenHeight - modalHeight) / 2
-        };
-        switch (resolvedConnectedBarSide) {
-        case "top":
-        case "bottom":
-            {
-                const insetL = _frameEdgeInset("left");
-                const insetR = _frameEdgeInset("right");
-                const insetT = _frameEdgeInset("top");
-                const insetB = _frameEdgeInset("bottom");
-                const usable = Math.max(0, screenWidth - insetL - insetR);
-                const usableH = Math.max(0, screenHeight - insetT - insetB);
-                return {
-                    "x": insetL + Math.max(0, (usable - modalWidth) / 2),
-                    "y": launcherArcExtenderActive ? insetT + Math.max(0, (usableH - modalHeight) / 2) : (resolvedConnectedBarSide === "top" ? insetT : screenHeight - modalHeight - insetB)
-                };
-            }
-        case "left":
-        case "right":
-            {
-                const insetT = _frameEdgeInset("top");
-                const insetB = _frameEdgeInset("bottom");
-                const usable = Math.max(0, screenHeight - insetT - insetB);
-                return {
-                    "x": resolvedConnectedBarSide === "left" ? _frameEdgeInset("left") : screenWidth - modalWidth - _frameEdgeInset("right"),
-                    "y": insetT + Math.max(0, (usable - modalHeight) / 2)
-                };
-            }
-        }
-        return fallback;
-    }
-
-    readonly property real modalX: frameOwnsConnectedChrome ? _connectedModalPos.x : ((screenWidth - modalWidth) / 2)
-    readonly property real modalY: frameOwnsConnectedChrome ? _connectedModalPos.y : ((screenHeight - modalHeight) / 2)
-
-    readonly property bool connectedSurfaceOverride: Theme.isConnectedEffect
-    readonly property int launcherAnimationDuration: Theme.isConnectedEffect ? Theme.popoutAnimationDuration : Theme.modalAnimationDuration
-    readonly property list<real> launcherEnterCurve: Theme.isConnectedEffect ? Theme.variantPopoutEnterCurve : Theme.variantModalEnterCurve
-    readonly property list<real> launcherExitCurve: Theme.isConnectedEffect ? Theme.variantPopoutExitCurve : Theme.variantModalExitCurve
-    readonly property color backgroundColor: connectedSurfaceOverride ? Theme.connectedSurfaceColor : Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-    readonly property real cornerRadius: connectedSurfaceOverride ? Theme.connectedSurfaceRadius : Theme.cornerRadius
-    readonly property color borderColor: {
-        if (!SettingsData.dankLauncherV2BorderEnabled)
-            return Theme.outlineMedium;
-        switch (SettingsData.dankLauncherV2BorderColor) {
-        case "primary":
-            return Theme.primary;
-        case "secondary":
-            return Theme.secondary;
-        case "outline":
-            return Theme.outline;
-        case "surfaceText":
-            return Theme.surfaceText;
-        default:
-            return Theme.primary;
-        }
-    }
-    readonly property int borderWidth: SettingsData.dankLauncherV2BorderEnabled ? SettingsData.dankLauncherV2BorderThickness : 0
-    readonly property color effectiveBorderColor: connectedSurfaceOverride ? "transparent" : borderColor
-    readonly property int effectiveBorderWidth: connectedSurfaceOverride ? 0 : borderWidth
-    readonly property bool effectiveBlurEnabled: Theme.connectedSurfaceBlurEnabled
-
-    // Shadow padding for the content window (render padding only, no motion padding).
-    // Zeroed when frame owns the chrome and Wayland clips past the bar edge
-    readonly property var shadowLevel: Theme.elevationLevel3
-    readonly property real shadowFallbackOffset: 6
-    readonly property real shadowRenderPadding: (!frameOwnsConnectedChrome && Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
-    readonly property real shadowPad: Theme.snap(shadowRenderPadding, dpr)
-    readonly property real alignedWidth: Theme.px(modalWidth, dpr)
-    readonly property real alignedHeight: Theme.px(modalHeight, dpr)
-    readonly property real alignedX: Theme.snap(modalX, dpr)
-    readonly property real alignedY: Theme.snap(modalY, dpr)
-    readonly property real _connectedChromeX: alignedX
-    readonly property real _connectedChromeY: {
-        if (!launcherArcExtenderActive)
-            return alignedY;
-        return resolvedConnectedBarSide === "top" ? Theme.snap(_frameEdgeInset("top"), dpr) : alignedY;
-    }
-    readonly property real _connectedChromeWidth: alignedWidth
-    readonly property real _connectedChromeHeight: {
-        if (!launcherArcExtenderActive)
-            return alignedHeight;
-        if (resolvedConnectedBarSide === "top")
-            return Theme.snap(Math.max(alignedHeight, alignedY + alignedHeight - _frameEdgeInset("top")), dpr);
-        if (resolvedConnectedBarSide === "bottom")
-            return Theme.snap(Math.max(alignedHeight, screenHeight - _frameEdgeInset("bottom") - alignedY), dpr);
-        return alignedHeight;
-    }
-    readonly property real contentSurfaceHeight: launcherArcExtenderActive ? _connectedChromeHeight : alignedHeight
-
-    // For directional/depth: window extends from screen top (content slides within)
-    // For standard: small window tightly around the modal + shadow padding
-    readonly property bool _needsExtendedWindow: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) || Theme.isDepthEffect
-    // Content window geometry
-    readonly property real _cwMarginLeft: Theme.snap(alignedX - shadowPad, dpr)
-    readonly property real _cwMarginTop: launcherArcExtenderActive ? _connectedChromeY : (_needsExtendedWindow ? 0 : Theme.snap(alignedY - shadowPad, dpr))
-    readonly property real _cwWidth: alignedWidth + shadowPad * 2
-    readonly property real _cwHeight: {
-        if (launcherArcExtenderActive)
-            return _connectedChromeHeight;
-        if (Theme.isDirectionalEffect && !Theme.isConnectedEffect)
-            return screenHeight + shadowPad;
-        if (Theme.isDepthEffect)
-            return alignedY + alignedHeight + shadowPad;
-        return alignedHeight + shadowPad * 2;
-    }
-    // Where the content container sits inside the content window
-    readonly property real _ccX: shadowPad
-    readonly property real _ccY: launcherArcExtenderActive ? 0 : (_needsExtendedWindow ? alignedY : shadowPad)
-
-    signal dialogClosed
-
-    // Coalesce per-channel dirty bits; one ConnectedModeState write per tick.
-    Timer {
-        id: _syncTimer
-        interval: 0
-        onTriggered: root._flushSync()
-    }
-
-    property string _chromeClaimId: ""
-    property bool _fullSyncPending: false
-
-    function _nextChromeClaimId() {
-        return "dms:launcher-v2:" + (new Date()).getTime() + ":" + Math.floor(Math.random() * 1000);
-    }
-
-    function _currentScreenName() {
-        return effectiveScreen ? effectiveScreen.name : "";
-    }
-
-    function _publishModalChromeState() {
-        const screenName = _currentScreenName();
-        if (!screenName)
-            return;
-        ConnectedModeState.setModalState(screenName, {
-            "visible": spotlightOpen || contentWindow.visible,
-            "barSide": resolvedConnectedBarSide,
-            "bodyX": _connectedChromeX,
-            "bodyY": _connectedChromeY,
-            "bodyW": _connectedChromeWidth,
-            "bodyH": _connectedChromeHeight,
-            "animX": contentContainer ? contentContainer.animX : 0,
-            "animY": contentContainer ? contentContainer.animY : 0,
-            "omitStartConnector": false,
-            "omitEndConnector": false
-        });
-    }
-
-    function _syncModalChromeState() {
-        if (!frameOwnsConnectedChrome) {
-            _releaseModalChrome();
-            return;
-        }
-        if (!_chromeClaimId)
-            _chromeClaimId = _nextChromeClaimId();
-        _publishModalChromeState();
-        if (_dockBlocksEmergence && (spotlightOpen || contentWindow.visible))
-            ConnectedModeState.requestDockRetract(_chromeClaimId, _currentScreenName(), resolvedConnectedBarSide);
-        else
-            ConnectedModeState.releaseDockRetract(_chromeClaimId);
-    }
-
-    property bool _animSyncQueued: false
-    property bool _bodySyncQueued: false
-
-    function _queueFullSync() {
-        _fullSyncPending = true;
-        if (!_syncTimer.running)
-            _syncTimer.restart();
-    }
-    function _queueAnimSync() {
-        _animSyncQueued = true;
-        if (!_syncTimer.running)
-            _syncTimer.restart();
-    }
-    function _queueBodySync() {
-        _bodySyncQueued = true;
-        if (!_syncTimer.running)
-            _syncTimer.restart();
-    }
-    function _flushSync() {
-        const fullDirty = _fullSyncPending;
-        const animDirty = _animSyncQueued;
-        const bodyDirty = _bodySyncQueued;
-        _fullSyncPending = false;
-        _animSyncQueued = false;
-        _bodySyncQueued = false;
-        if (fullDirty)
-            _syncModalChromeState();
-        if (animDirty)
-            _syncModalAnim();
-        if (bodyDirty)
-            _syncModalBody();
-    }
-
-    function _syncModalAnim() {
-        if (!frameOwnsConnectedChrome || !_chromeClaimId)
-            return;
-        const screenName = _currentScreenName();
-        if (!screenName || !contentContainer)
-            return;
-        ConnectedModeState.setModalAnim(screenName, contentContainer.animX, contentContainer.animY);
-    }
-
-    function _syncModalBody() {
-        if (!frameOwnsConnectedChrome || !_chromeClaimId)
-            return;
-        const screenName = _currentScreenName();
-        if (!screenName)
-            return;
-        ConnectedModeState.setModalBody(screenName, _connectedChromeX, _connectedChromeY, _connectedChromeWidth, _connectedChromeHeight);
-    }
-
-    function _releaseModalChrome() {
-        if (_chromeClaimId) {
-            ConnectedModeState.releaseDockRetract(_chromeClaimId);
-            _chromeClaimId = "";
-        }
-        const screenName = _currentScreenName();
-        if (screenName)
-            ConnectedModeState.clearModalState(screenName);
-    }
-
-    onFrameOwnsConnectedChromeChanged: _syncModalChromeState()
-    onLauncherArcExtenderActiveChanged: _queueFullSync()
-    onResolvedConnectedBarSideChanged: _queueFullSync()
-    onSpotlightOpenChanged: _queueFullSync()
-    onAlignedXChanged: _queueBodySync()
-    onAlignedYChanged: _queueBodySync()
-    onAlignedWidthChanged: _queueBodySync()
-    onAlignedHeightChanged: _queueBodySync()
-
-    Component.onDestruction: _releaseModalChrome()
-
-    Connections {
-        target: contentWindow
-        function onVisibleChanged() {
-            if (contentWindow.visible)
-                root._syncModalChromeState();
-            else
-                root._releaseModalChrome();
-        }
-    }
-
-    function _ensureContentLoadedAndInitialize(query, mode) {
-        _pendingQuery = query || "";
-        _pendingMode = mode || "";
-        _pendingInitialize = true;
-        contentVisible = true;
-        launcherContentLoader.active = true;
-
-        if (spotlightContent) {
-            _initializeAndShow(_pendingQuery, _pendingMode);
-            _pendingInitialize = false;
-        }
-    }
-
-    function _initializeAndShow(query, mode) {
-        if (!spotlightContent)
-            return;
-        contentVisible = true;
-        // NOTE: forceActiveFocus() is deliberately NOT called here.
-        // It is deferred to after animation starts to avoid compositor IPC stalls.
-
-        if (spotlightContent.searchField) {
-            spotlightContent.searchField.text = query;
-        }
-        if (spotlightContent.controller) {
-            var targetMode = mode || SessionData.launcherLastMode || "all";
-            spotlightContent.controller.searchMode = targetMode;
-            spotlightContent.controller.activePluginId = "";
-            spotlightContent.controller.activePluginName = "";
-            spotlightContent.controller.pluginFilter = "";
-            spotlightContent.controller.fileSearchType = "all";
-            spotlightContent.controller.fileSearchExt = "";
-            spotlightContent.controller.fileSearchFolder = "";
-            spotlightContent.controller.fileSearchSort = "score";
-            spotlightContent.controller.collapsedSections = {};
-            spotlightContent.controller.selectedFlatIndex = 0;
-            spotlightContent.controller.selectedItem = null;
-            if (query) {
-                spotlightContent.controller.setSearchQuery(query);
-            } else {
-                spotlightContent.controller.searchQuery = "";
-                spotlightContent.controller.performSearch();
-            }
-        }
-        if (spotlightContent.resetScroll) {
-            spotlightContent.resetScroll();
-        }
-        if (spotlightContent.actionPanel) {
-            spotlightContent.actionPanel.hide();
-        }
-    }
-
-    function _openCommon(query, mode) {
-        closeCleanupTimer.stop();
-        isClosing = false;
-        openedFromOverview = false;
-
-        // Disable animations so the snap is instant
-        animationsEnabled = false;
-
-        // Freeze the collapsed offsets (they depend on height which could change)
-        _frozenMotionX = contentContainer ? contentContainer.collapsedMotionX : 0;
-        _frozenMotionY = contentContainer ? contentContainer.collapsedMotionY : (Theme.isDirectionalEffect ? Math.max(root.screenHeight - root._ccY + root.shadowPad, Theme.effectAnimOffset * 1.1) : -Theme.effectAnimOffset);
-
-        var focusedScreen = CompositorService.getFocusedScreen();
-        if (focusedScreen) {
-            backgroundWindow.screen = focusedScreen;
-            contentWindow.screen = focusedScreen;
-        }
-
-        // _motionActive = false ensures motionX/Y snap to frozen collapsed position
-        _motionActive = false;
-
-        // Make windows visible but do NOT request keyboard focus yet
-        ModalManager.openModal(modalHandle);
-        spotlightOpen = true;
-        backgroundWindow.visible = true;
-        contentWindow.visible = true;
-        if (useHyprlandFocusGrab)
-            focusGrab.active = true;
-
-        // Load content and initialize (but no forceActiveFocus — that's deferred)
-        _ensureContentLoadedAndInitialize(query || "", mode || "");
-
-        // Frame 1: enable animations and trigger enter motion
-        Qt.callLater(() => {
-            root.animationsEnabled = true;
-            root._motionActive = true;
-
-            // Frame 2: request keyboard focus + activate search field
-            // Double-deferred to avoid compositor IPC competing with animation frames
-            Qt.callLater(() => {
-                root.keyboardActive = true;
-                if (root.spotlightContent && root.spotlightContent.searchField)
-                    root.spotlightContent.searchField.forceActiveFocus();
-            });
-        });
-    }
-
-    function show() {
-        _openCommon("", "");
-    }
-
-    function showWithQuery(query) {
-        _openCommon(query, "");
-    }
-
-    function hide() {
-        if (!spotlightOpen)
-            return;
-        openedFromOverview = false;
-        isClosing = true;
-        // For directional effects, defer contentVisible=false so content stays rendered during exit slide
-        if (!Theme.isDirectionalEffect)
-            contentVisible = false;
-
-        // Trigger exit animation — Behaviors will animate motionX/Y to frozen collapsed position
-        _motionActive = false;
-
-        keyboardActive = false;
-        spotlightOpen = false;
-        focusGrab.active = false;
-        ModalManager.closeModal(modalHandle);
-        closeCleanupTimer.start();
-    }
-
-    function toggle() {
-        spotlightOpen ? hide() : show();
-    }
-
-    function showWithMode(mode) {
-        _openCommon("", mode);
-    }
-
-    function toggleWithMode(mode) {
-        if (spotlightOpen) {
-            hide();
-        } else {
-            showWithMode(mode);
-        }
-    }
-
-    function toggleWithQuery(query) {
-        if (spotlightOpen) {
-            hide();
-        } else {
-            showWithQuery(query);
-        }
-    }
-
-    Timer {
-        id: closeCleanupTimer
-        interval: Theme.variantCloseInterval(root.launcherAnimationDuration)
-        repeat: false
-        onTriggered: {
-            isClosing = false;
-            contentVisible = false;
-            contentWindow.visible = false;
-            backgroundWindow.visible = false;
-            if (root.unloadContentOnClose)
-                launcherContentLoader.active = false;
-            dialogClosed();
-        }
-    }
-
-    Connections {
-        target: spotlightContent?.controller ?? null
-        function onModeChanged(mode) {
-            if (spotlightContent.controller.autoSwitchedToFiles)
-                return;
-            SessionData.setLauncherLastMode(mode);
-        }
-    }
-
-    HyprlandFocusGrab {
-        id: focusGrab
-        windows: [contentWindow]
-        active: false
-
-        onCleared: {
-            if (spotlightOpen) {
-                hide();
-            }
-        }
-    }
-
-    Connections {
-        target: ModalManager
-        function onCloseAllModalsExcept(excludedModal) {
-            if (excludedModal !== modalHandle && spotlightOpen) {
-                hide();
-            }
-        }
-    }
-
-    Connections {
-        target: Quickshell
-        function onScreensChanged() {
-            if (Quickshell.screens.length === 0)
-                return;
-
-            const screen = contentWindow.screen;
-            const screenName = screen?.name;
-
-            let needsReset = !screen || !screenName;
-            if (!needsReset) {
-                needsReset = true;
-                for (let i = 0; i < Quickshell.screens.length; i++) {
-                    if (Quickshell.screens[i].name === screenName) {
-                        needsReset = false;
-                        break;
-                    }
-                }
-            }
-
-            if (!needsReset)
-                return;
-
-            const newScreen = CompositorService.getFocusedScreen() ?? Quickshell.screens[0];
-            if (!newScreen)
-                return;
-
-            root._windowEnabled = false;
-            backgroundWindow.screen = newScreen;
-            contentWindow.screen = newScreen;
-            Qt.callLater(() => {
-                root._windowEnabled = true;
-            });
-        }
-    }
-
-    PanelWindow {
-        id: backgroundWindow
-        visible: false
-        color: "transparent"
-
-        readonly property real _topMargin: contentContainer.dockTop ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 0 ? Theme.px(42, root.dpr) : 0)
-        readonly property real _bottomMargin: contentContainer.dockBottom ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 1 ? Theme.px(42, root.dpr) : 0)
-        readonly property real _leftMargin: contentContainer.dockLeft ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 2 ? Theme.px(42, root.dpr) : 0)
-        readonly property real _rightMargin: contentContainer.dockRight ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 3 ? Theme.px(42, root.dpr) : 0)
-
-        WlrLayershell.namespace: "dms:spotlight:bg"
-        WlrLayershell.layer: WlrLayershell.Top
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-
-        WlrLayershell.margins {
-            top: backgroundWindow._topMargin
-            bottom: backgroundWindow._bottomMargin
-            left: backgroundWindow._leftMargin
-            right: backgroundWindow._rightMargin
-        }
-
-        anchors {
-            top: true
-            bottom: true
-            left: true
-            right: true
-        }
-
-        mask: Region {
-            item: (spotlightOpen || isClosing) ? bgFullScreenMask : null
-
-            Region {
-                item: bgContentHole
-                intersection: Intersection.Subtract
-            }
-        }
-
-        Item {
-            id: bgFullScreenMask
-            anchors.fill: parent
-        }
-
-        Item {
-            id: bgContentHole
-            visible: false
-            x: root._cwMarginLeft + contentContainer.x - backgroundWindow._leftMargin
-            y: root._cwMarginTop + contentContainer.y - backgroundWindow._topMargin
-            width: root.alignedWidth
-            height: root.contentSurfaceHeight
-        }
-
-        Rectangle {
-            id: backgroundDarken
-            anchors.fill: parent
-            color: "black"
-            opacity: launcherMotionVisible && SettingsData.modalDarkenBackground ? 0.5 : 0
-            visible: launcherMotionVisible || opacity > 0
-
-            Behavior on opacity {
-                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                NumberAnimation {
-                    easing.type: Easing.BezierSpline
-                    duration: Math.round(Theme.variantDuration(root.launcherAnimationDuration, launcherMotionVisible) * Theme.variantOpacityDurationScale)
-                    easing.bezierCurve: launcherMotionVisible ? root.launcherEnterCurve : root.launcherExitCurve
-                }
-            }
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: spotlightOpen
-            onClicked: root.hide()
-        }
-    }
-
-    PanelWindow {
-        id: contentWindow
-        visible: false
-        color: "transparent"
-
-        WindowBlur {
-            targetWindow: contentWindow
-            blurEnabled: root.effectiveBlurEnabled && !root.frameOwnsConnectedChrome
-            readonly property real s: Math.min(1, contentContainer.scaleValue)
-            blurX: root._ccX + root.alignedWidth * (1 - s) * 0.5 + Theme.snap(contentContainer.animX, root.dpr)
-            blurY: root._ccY + root.alignedHeight * (1 - s) * 0.5 + Theme.snap(contentContainer.animY, root.dpr)
-            blurWidth: (root.spotlightOpen || root.isClosing) && !root.frameOwnsConnectedChrome ? root.alignedWidth * s : 0
-            blurHeight: (root.spotlightOpen || root.isClosing) && !root.frameOwnsConnectedChrome ? root.alignedHeight * s : 0
-            blurRadius: root.cornerRadius
-        }
-
-        WlrLayershell.namespace: "dms:spotlight"
-        WlrLayershell.layer: {
-            switch (Quickshell.env("DMS_MODAL_LAYER")) {
-            case "bottom":
-                log.error("'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "background":
-                log.error("'background' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "overlay":
-                return WlrLayershell.Overlay;
-            default:
-                return WlrLayershell.Top;
-            }
-        }
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: keyboardActive ? (root.useHyprlandFocusGrab ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.Exclusive) : WlrKeyboardFocus.None
-
-        anchors {
-            left: true
-            top: true
-        }
-
-        WlrLayershell.margins {
-            left: root._cwMarginLeft
-            top: root._cwMarginTop
-        }
-
-        implicitWidth: root._cwWidth
-        implicitHeight: root._cwHeight
-
-        mask: Region {
-            item: contentInputMask
-        }
-
-        Item {
-            id: contentInputMask
-            visible: false
-            x: contentContainer.x
-            y: contentContainer.y
-            width: root.alignedWidth
-            height: root.contentSurfaceHeight
-        }
-
-        Item {
-            id: contentContainer
-
-            // For directional/depth: contentContainer is at alignedY from window top (window starts at screen top)
-            // For standard: contentContainer is at shadowPad from window top (window starts near modal)
-            x: root._ccX
-            y: root._ccY
-            width: root.alignedWidth
-            height: root.contentSurfaceHeight
-
-            readonly property int dockEdge: typeof SettingsData !== "undefined" ? SettingsData.dockPosition : 1
-            readonly property bool dockTop: dockEdge === 0
-            readonly property bool dockBottom: dockEdge === 1
-            readonly property bool dockLeft: dockEdge === 2
-            readonly property bool dockRight: dockEdge === 3
-
-            readonly property real dockThickness: typeof SettingsData !== "undefined" && SettingsData.showDock ? Theme.px(SettingsData.dockIconSize + (SettingsData.dockMargin * 2) + SettingsData.dockSpacing + 8, root.dpr) : Theme.px(60, root.dpr)
-
-            readonly property bool directionalEffect: Theme.isDirectionalEffect
-            readonly property bool depthEffect: Theme.isDepthEffect
-            readonly property real _connectedTravelX: Math.max(Theme.effectAnimOffset, root.alignedWidth + Theme.spacingL)
-            readonly property real _connectedTravelY: root.launcherArcExtenderActive ? root._connectedChromeHeight : Math.max(Theme.effectAnimOffset, root.alignedHeight + Theme.spacingL)
-            readonly property real collapsedMotionX: {
-                if (root.frameOwnsConnectedChrome) {
-                    switch (root.resolvedConnectedBarSide) {
-                    case "left":
-                        return -_connectedTravelX;
-                    case "right":
-                        return _connectedTravelX;
-                    }
-                    return 0;
-                }
-                if (directionalEffect) {
-                    if (dockLeft)
-                        return -(root._ccX + root.alignedWidth + Theme.effectAnimOffset);
-                    if (dockRight)
-                        return root.screenWidth - root._ccX + Theme.effectAnimOffset;
-                }
-                if (depthEffect)
-                    return Theme.effectAnimOffset * 0.25;
-                return 0;
-            }
-            readonly property real collapsedMotionY: {
-                if (root.frameOwnsConnectedChrome) {
-                    switch (root.resolvedConnectedBarSide) {
-                    case "top":
-                        return -_connectedTravelY;
-                    case "bottom":
-                        return _connectedTravelY;
-                    }
-                    return 0;
-                }
-                if (directionalEffect) {
-                    if (dockTop)
-                        return -(root._ccY + root.alignedHeight + Theme.effectAnimOffset);
-                    if (dockBottom)
-                        return root.screenHeight - root._ccY + root.shadowPad + Theme.effectAnimOffset;
-                    return 0;
-                }
-                if (depthEffect)
-                    return -Math.max(Theme.effectAnimOffset * 0.85, 34);
-                return -Math.max((root.shadowPad || 0) + Theme.effectAnimOffset, 40);
-            }
-
-            // openProgress: 0 = closed (at frozenMotion, scaleCollapsed), 1 = open (at 0, scale 1).
-            QtObject {
-                id: morph
-                property real openProgress: root._motionActive ? 1 : 0
-                Behavior on openProgress {
-                    enabled: root.animationsEnabled
-                    DankAnim {
-                        duration: Theme.variantDuration(root.launcherAnimationDuration, root._motionActive)
-                        easing.bezierCurve: root._motionActive ? root.launcherEnterCurve : root.launcherExitCurve
-                    }
-                }
-            }
-
-            readonly property real animX: root._frozenMotionX * (1 - morph.openProgress)
-            readonly property real animY: root._frozenMotionY * (1 - morph.openProgress)
-            readonly property real scaleValue: Theme.effectScaleCollapsed + (1.0 - Theme.effectScaleCollapsed) * morph.openProgress
-
-            onAnimXChanged: if (root.frameOwnsConnectedChrome)
-                root._queueAnimSync()
-            onAnimYChanged: if (root.frameOwnsConnectedChrome)
-                root._queueAnimSync()
-
-            Item {
-                id: directionalClipMask
-                readonly property bool shouldClip: Theme.isDirectionalEffect
-                readonly property real clipOversize: 2000
-
-                clip: shouldClip
-
-                x: shouldClip ? (contentContainer.dockRight ? -clipOversize : (contentContainer.dockLeft ? contentContainer.dockThickness - root._ccX : -clipOversize)) : 0
-                y: shouldClip ? (contentContainer.dockBottom ? -clipOversize : (contentContainer.dockTop ? contentContainer.dockThickness - root._ccY : -clipOversize)) : 0
-
-                width: shouldClip ? parent.width + clipOversize + (contentContainer.dockRight ? (root.screenWidth - contentContainer.dockThickness - root._ccX - parent.width) : (contentContainer.dockLeft ? clipOversize : clipOversize)) : parent.width
-                height: shouldClip ? parent.height + clipOversize + (contentContainer.dockBottom ? (root.screenHeight - contentContainer.dockThickness - root._ccY - parent.height) : (contentContainer.dockTop ? clipOversize : clipOversize)) : parent.height
-
-                Item {
-                    id: aligner
-                    x: directionalClipMask.x !== 0 ? -directionalClipMask.x : 0
-                    y: directionalClipMask.y !== 0 ? -directionalClipMask.y : 0
-                    width: contentContainer.width
-                    height: contentContainer.height
-
-                    // Shadow mirrors contentWrapper position/scale/opacity
-                    ElevationShadow {
-                        id: launcherShadowLayer
-                        width: parent.width
-                        height: parent.height
-                        opacity: contentWrapper.publishedOpacity
-                        scale: contentWrapper.scale
-                        x: contentWrapper.x
-                        y: contentWrapper.y
-                        level: root.shadowLevel
-                        fallbackOffset: root.shadowFallbackOffset
-                        targetColor: root.frameOwnsConnectedChrome ? "transparent" : root.backgroundColor
-                        borderColor: root.frameOwnsConnectedChrome ? "transparent" : root.effectiveBorderColor
-                        borderWidth: root.frameOwnsConnectedChrome ? 0 : root.effectiveBorderWidth
-                        targetRadius: root.cornerRadius
-                        shadowEnabled: !root.frameOwnsConnectedChrome && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
-                    }
-
-                    // contentWrapper moves inside static contentContainer — DankPopout pattern
-                    Item {
-                        id: contentWrapper
-                        width: parent.width
-                        height: parent.height
-
-                        property bool _renderActive: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) || launcherMotionVisible
-                        property real publishedOpacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (launcherMotionVisible ? 1 : 0)
-
-                        opacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (launcherMotionVisible ? 1 : 0)
-                        visible: _renderActive
-                        scale: contentContainer.scaleValue
-                        x: Theme.snap(contentContainer.animX + (parent.width - width) * (1 - contentContainer.scaleValue) * 0.5, root.dpr)
-                        y: Theme.snap(contentContainer.animY + (parent.height - height) * (1 - contentContainer.scaleValue) * 0.5, root.dpr)
-
-                        Behavior on opacity {
-                            enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                            NumberAnimation {
-                                easing.type: Easing.BezierSpline
-                                duration: Math.round(Theme.variantDuration(root.launcherAnimationDuration, launcherMotionVisible) * Theme.variantOpacityDurationScale)
-                                easing.bezierCurve: launcherMotionVisible ? root.launcherEnterCurve : root.launcherExitCurve
-                            }
-                        }
-
-                        Behavior on publishedOpacity {
-                            enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
-                            NumberAnimation {
-                                easing.type: Easing.BezierSpline
-                                duration: Math.round(Theme.variantDuration(root.launcherAnimationDuration, launcherMotionVisible) * Theme.variantOpacityDurationScale)
-                                easing.bezierCurve: launcherMotionVisible ? root.launcherEnterCurve : root.launcherExitCurve
-                                onRunningChanged: if (!running && contentWrapper.publishedOpacity === 0)
-                                    contentWrapper._renderActive = false
-                            }
-                        }
-
-                        Connections {
-                            target: root
-                            function onLauncherMotionVisibleChanged() {
-                                if (root.launcherMotionVisible)
-                                    contentWrapper._renderActive = true;
-                            }
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            onPressed: mouse => mouse.accepted = true
-                        }
-
-                        FocusScope {
-                            anchors.fill: parent
-                            focus: keyboardActive
-
-                            Loader {
-                                id: launcherContentLoader
-                                anchors.fill: parent
-                                active: !root.unloadContentOnClose || root.spotlightOpen || root.isClosing || root.contentVisible || root._pendingInitialize
-                                asynchronous: false
-                                sourceComponent: LauncherContent {
-                                    focus: true
-                                    parentModal: root
-                                }
-
-                                onLoaded: {
-                                    if (root._pendingInitialize) {
-                                        root._initializeAndShow(root._pendingQuery, root._pendingMode);
-                                        root._pendingInitialize = false;
-                                    }
-                                }
-                            }
-
-                            Keys.onEscapePressed: event => {
-                                root.hide();
-                                event.accepted = true;
-                            }
-                        }
-                    } // contentWrapper
-                } // aligner
-            } // directionalClipMask
-        } // contentContainer
-    } // PanelWindow
-}

quickshell/Modals/DankLauncherV2/DankLauncherV2ModalStandalone.qml

@@ -1,512 +0,0 @@
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Hyprland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-    readonly property var log: Log.scoped("DankLauncherV2ModalStandalone")
-
-    property var modalHandle: root
-
-    visible: false
-
-    property bool spotlightOpen: false
-    property bool keyboardActive: false
-    property bool contentVisible: false
-    property var spotlightContent: launcherContentLoader.item
-    property bool openedFromOverview: false
-    property bool isClosing: false
-    property bool _pendingInitialize: false
-    property string _pendingQuery: ""
-    property string _pendingMode: ""
-    readonly property bool unloadContentOnClose: SettingsData.dankLauncherV2UnloadOnClose
-
-    readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
-    readonly property var effectiveScreen: launcherWindow.screen
-    readonly property real screenWidth: effectiveScreen?.width ?? 1920
-    readonly property real screenHeight: effectiveScreen?.height ?? 1080
-    readonly property real dpr: effectiveScreen ? CompositorService.getScreenScale(effectiveScreen) : 1
-
-    readonly property bool frameOwnsConnectedChrome: SettingsData.connectedFrameModeActive && !!effectiveScreen && SettingsData.isScreenInPreferences(effectiveScreen, SettingsData.frameScreenPreferences)
-    readonly property string resolvedConnectedBarSide: frameOwnsConnectedChrome ? (SettingsData.frameLauncherEmergeSide || "bottom") : ""
-
-    readonly property int baseWidth: {
-        switch (SettingsData.dankLauncherV2Size) {
-        case "micro":
-            return 500;
-        case "medium":
-            return 720;
-        case "large":
-            return 860;
-        default:
-            return 620;
-        }
-    }
-    readonly property int baseHeight: {
-        switch (SettingsData.dankLauncherV2Size) {
-        case "micro":
-            return 480;
-        case "medium":
-            return 720;
-        case "large":
-            return 860;
-        default:
-            return 600;
-        }
-    }
-    readonly property int modalWidth: Math.min(baseWidth, screenWidth - 100)
-    readonly property int modalHeight: Math.min(baseHeight, screenHeight - 100)
-    readonly property real modalX: (screenWidth - modalWidth) / 2
-    readonly property real modalY: (screenHeight - modalHeight) / 2
-    readonly property var shadowLevel: Theme.elevationLevel3
-    readonly property real shadowFallbackOffset: 6
-    readonly property real shadowRenderPadding: (Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
-    readonly property real shadowPad: Theme.snap(shadowRenderPadding, dpr)
-    readonly property real alignedWidth: Theme.px(modalWidth, dpr)
-    readonly property real alignedHeight: Theme.px(modalHeight, dpr)
-    readonly property real alignedX: Theme.snap(modalX, dpr)
-    readonly property real alignedY: Theme.snap(modalY, dpr)
-    readonly property real windowX: Math.max(0, Theme.snap(alignedX - shadowPad, dpr))
-    readonly property real windowY: Math.max(0, Theme.snap(alignedY - shadowPad, dpr))
-    readonly property real contentX: Theme.snap(alignedX - windowX, dpr)
-    readonly property real contentY: Theme.snap(alignedY - windowY, dpr)
-    readonly property real windowWidth: alignedWidth + contentX + shadowPad
-    readonly property real windowHeight: alignedHeight + contentY + shadowPad
-
-    readonly property color backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-    readonly property real cornerRadius: Theme.cornerRadius
-    readonly property color borderColor: {
-        if (!SettingsData.dankLauncherV2BorderEnabled)
-            return Theme.outlineMedium;
-        switch (SettingsData.dankLauncherV2BorderColor) {
-        case "primary":
-            return Theme.primary;
-        case "secondary":
-            return Theme.secondary;
-        case "outline":
-            return Theme.outline;
-        case "surfaceText":
-            return Theme.surfaceText;
-        default:
-            return Theme.primary;
-        }
-    }
-    readonly property int borderWidth: SettingsData.dankLauncherV2BorderEnabled ? SettingsData.dankLauncherV2BorderThickness : 0
-
-    signal dialogClosed
-
-    function _ensureContentLoadedAndInitialize(query, mode) {
-        _pendingQuery = query || "";
-        _pendingMode = mode || "";
-        _pendingInitialize = true;
-        contentVisible = true;
-        launcherContentLoader.active = true;
-
-        if (spotlightContent) {
-            _initializeAndShow(_pendingQuery, _pendingMode);
-            _pendingInitialize = false;
-        }
-    }
-
-    function _initializeAndShow(query, mode) {
-        if (!spotlightContent)
-            return;
-        contentVisible = true;
-        spotlightContent.searchField.forceActiveFocus();
-
-        var targetQuery = "";
-
-        if (query) {
-            targetQuery = query;
-        } else if (SettingsData.rememberLastQuery) {
-            targetQuery = SessionData.launcherLastQuery || "";
-        }
-
-        if (spotlightContent.searchField) {
-            spotlightContent.searchField.text = targetQuery;
-        }
-        if (spotlightContent.controller) {
-            var targetMode = mode || SessionData.launcherLastMode || "all";
-            spotlightContent.controller.searchMode = targetMode;
-            spotlightContent.controller.activePluginId = "";
-            spotlightContent.controller.activePluginName = "";
-            spotlightContent.controller.pluginFilter = "";
-            spotlightContent.controller.fileSearchType = "all";
-            spotlightContent.controller.fileSearchExt = "";
-            spotlightContent.controller.fileSearchFolder = "";
-            spotlightContent.controller.fileSearchSort = "score";
-            spotlightContent.controller.collapsedSections = {};
-            spotlightContent.controller.selectedFlatIndex = 0;
-            spotlightContent.controller.selectedItem = null;
-            spotlightContent.controller.historyIndex = -1;
-            spotlightContent.controller.searchQuery = targetQuery;
-
-            spotlightContent.controller.performSearch();
-        }
-        if (spotlightContent.resetScroll) {
-            spotlightContent.resetScroll();
-        }
-        if (spotlightContent.actionPanel) {
-            spotlightContent.actionPanel.hide();
-        }
-    }
-
-    function _finishShow(query, mode) {
-        spotlightOpen = true;
-        isClosing = false;
-        openedFromOverview = false;
-
-        keyboardActive = true;
-        ModalManager.openModal(modalHandle);
-        if (useHyprlandFocusGrab)
-            focusGrab.active = true;
-
-        _ensureContentLoadedAndInitialize(query || "", mode || "");
-    }
-
-    function _openCommon(query, mode) {
-        closeCleanupTimer.stop();
-        const focusedScreen = CompositorService.getFocusedScreen();
-        if (focusedScreen && launcherWindow.screen !== focusedScreen) {
-            spotlightOpen = false;
-            isClosing = false;
-            launcherWindow.screen = focusedScreen;
-            Qt.callLater(() => root._finishShow(query, mode));
-            return;
-        }
-        _finishShow(query, mode);
-    }
-
-    function show() {
-        _openCommon("", "");
-    }
-    function showWithQuery(query) {
-        _openCommon(query, "");
-    }
-    function showWithMode(mode) {
-        _openCommon("", mode);
-    }
-
-    function hide() {
-        if (!spotlightOpen)
-            return;
-        openedFromOverview = false;
-        isClosing = true;
-        contentVisible = false;
-
-        keyboardActive = false;
-        spotlightOpen = false;
-        focusGrab.active = false;
-        ModalManager.closeModal(modalHandle);
-
-        closeCleanupTimer.start();
-    }
-
-    function toggle() {
-        spotlightOpen ? hide() : show();
-    }
-
-    function toggleWithMode(mode) {
-        if (spotlightOpen) {
-            hide();
-        } else {
-            showWithMode(mode);
-        }
-    }
-
-    function toggleWithQuery(query) {
-        if (spotlightOpen) {
-            hide();
-        } else {
-            showWithQuery(query);
-        }
-    }
-
-    Timer {
-        id: closeCleanupTimer
-        interval: Theme.modalAnimationDuration + 50
-        repeat: false
-        onTriggered: {
-            isClosing = false;
-            if (root.unloadContentOnClose)
-                launcherContentLoader.active = false;
-            dialogClosed();
-        }
-    }
-
-    Connections {
-        target: spotlightContent?.controller ?? null
-
-        function onModeChanged(mode) {
-            if (spotlightContent.controller.autoSwitchedToFiles)
-                return;
-            SessionData.setLauncherLastMode(mode);
-        }
-    }
-
-    HyprlandFocusGrab {
-        id: focusGrab
-        windows: [launcherWindow]
-        active: false
-
-        onCleared: {
-            if (spotlightOpen) {
-                hide();
-            }
-        }
-    }
-
-    Connections {
-        target: ModalManager
-        function onCloseAllModalsExcept(excludedModal) {
-            if (excludedModal !== modalHandle && spotlightOpen) {
-                hide();
-            }
-        }
-    }
-
-    Connections {
-        target: Quickshell
-        function onScreensChanged() {
-            if (Quickshell.screens.length === 0)
-                return;
-
-            const screenName = launcherWindow.screen?.name;
-            if (screenName) {
-                for (let i = 0; i < Quickshell.screens.length; i++) {
-                    if (Quickshell.screens[i].name === screenName)
-                        return;
-                }
-            }
-
-            if (spotlightOpen)
-                hide();
-
-            const newScreen = CompositorService.getFocusedScreen() ?? Quickshell.screens[0];
-            if (newScreen)
-                launcherWindow.screen = newScreen;
-        }
-    }
-
-    PanelWindow {
-        id: clickCatcher
-        screen: launcherWindow.screen
-        visible: spotlightOpen
-        color: "transparent"
-        updatesEnabled: false
-
-        WlrLayershell.namespace: "dms:spotlight:clickcatcher"
-        WlrLayershell.layer: WlrLayershell.Top
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-
-        anchors {
-            top: true
-            bottom: true
-            left: true
-            right: true
-        }
-
-        mask: Region {
-            item: outsideClickMask
-
-            Region {
-                item: outsideClickHole
-                intersection: Intersection.Subtract
-            }
-        }
-
-        Item {
-            id: outsideClickMask
-            visible: false
-            anchors.fill: parent
-        }
-
-        Rectangle {
-            id: outsideClickHole
-            visible: false
-            color: "transparent"
-            x: root.alignedX
-            y: root.alignedY
-            width: root.alignedWidth
-            height: root.alignedHeight
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            enabled: spotlightOpen
-            onClicked: root.hide()
-        }
-    }
-
-    PanelWindow {
-        id: launcherWindow
-        visible: spotlightOpen || isClosing
-        color: "transparent"
-        exclusionMode: ExclusionMode.Ignore
-
-        WindowBlur {
-            targetWindow: launcherWindow
-            readonly property real s: Math.min(1, modalContainer.publishedScale)
-            blurX: modalContainer.x + modalContainer.width * (1 - s) * 0.5
-            blurY: modalContainer.y + modalContainer.height * (1 - s) * 0.5
-            blurWidth: contentVisible ? modalContainer.width * s : 0
-            blurHeight: contentVisible ? modalContainer.height * s : 0
-            blurRadius: root.cornerRadius
-        }
-
-        WlrLayershell.namespace: "dms:spotlight"
-        WlrLayershell.layer: {
-            switch (Quickshell.env("DMS_MODAL_LAYER")) {
-            case "bottom":
-                log.error("'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "background":
-                log.error("'background' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "overlay":
-                return WlrLayershell.Overlay;
-            default:
-                return WlrLayershell.Top;
-            }
-        }
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: keyboardActive ? (root.useHyprlandFocusGrab ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.Exclusive) : WlrKeyboardFocus.None
-
-        anchors {
-            top: true
-            left: true
-        }
-
-        WlrLayershell.margins {
-            left: root.windowX
-            top: root.windowY
-            right: 0
-            bottom: 0
-        }
-
-        implicitWidth: root.windowWidth
-        implicitHeight: root.windowHeight
-
-        mask: Region {
-            item: launcherInputMask
-        }
-
-        Rectangle {
-            id: launcherInputMask
-            visible: false
-            color: "transparent"
-            x: modalContainer.x
-            y: modalContainer.y
-            width: modalContainer.width
-            height: modalContainer.height
-        }
-
-        Item {
-            id: modalContainer
-            x: root.contentX
-            y: root.contentY
-            width: root.alignedWidth
-            height: root.alignedHeight
-            visible: _renderActive
-
-            property bool _renderActive: contentVisible
-            property real publishedScale: contentVisible ? 1 : 0.96
-
-            opacity: contentVisible ? 1 : 0
-            scale: contentVisible ? 1 : 0.96
-            transformOrigin: Item.Center
-
-            Behavior on opacity {
-                NumberAnimation {
-                    easing.type: Easing.BezierSpline
-                    duration: Theme.modalAnimationDuration
-                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
-                    onRunningChanged: if (!running && !root.contentVisible)
-                        modalContainer._renderActive = false
-                }
-            }
-
-            Behavior on scale {
-                NumberAnimation {
-                    easing.type: Easing.BezierSpline
-                    duration: Theme.modalAnimationDuration
-                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
-                }
-            }
-
-            Behavior on publishedScale {
-                NumberAnimation {
-                    easing.type: Easing.BezierSpline
-                    duration: Theme.modalAnimationDuration
-                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
-                }
-            }
-
-            Connections {
-                target: root
-                function onContentVisibleChanged() {
-                    if (root.contentVisible)
-                        modalContainer._renderActive = true;
-                }
-            }
-
-            ElevationShadow {
-                id: launcherShadowLayer
-                anchors.fill: parent
-                level: root.shadowLevel
-                fallbackOffset: root.shadowFallbackOffset
-                targetColor: root.backgroundColor
-                borderColor: root.borderColor
-                borderWidth: root.borderWidth
-                targetRadius: root.cornerRadius
-                shadowEnabled: Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onPressed: mouse => mouse.accepted = true
-            }
-
-            FocusScope {
-                anchors.fill: parent
-                focus: keyboardActive
-
-                Loader {
-                    id: launcherContentLoader
-                    anchors.fill: parent
-                    active: !root.unloadContentOnClose || root.spotlightOpen || root.isClosing || root.contentVisible || root._pendingInitialize
-                    asynchronous: false
-                    sourceComponent: LauncherContent {
-                        focus: true
-                        parentModal: root
-                    }
-
-                    onLoaded: {
-                        if (root._pendingInitialize) {
-                            root._initializeAndShow(root._pendingQuery, root._pendingMode);
-                            root._pendingInitialize = false;
-                        }
-                    }
-                }
-
-                Keys.onEscapePressed: event => {
-                    root.hide();
-                    event.accepted = true;
-                }
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                radius: root.cornerRadius
-                color: "transparent"
-                border.color: BlurService.borderColor
-                border.width: BlurService.borderWidth
-            }
-        }
-    }
-}

quickshell/Modals/DankLauncherV2/GridItem.qml

@@ -44,15 +44,6 @@ Rectangle {
         cornerRadius: root.radius
     }
 
-    SourceBadge {
-        anchors.top: parent.top
-        anchors.right: parent.right
-        anchors.margins: Theme.spacingXS
-        source: root.item?.type === "app" ? (root.item.source || "") : ""
-        glyphSize: 14
-        z: 1
-    }
-
     Column {
         anchors.centerIn: parent
         anchors.margins: Theme.spacingS

quickshell/Modals/DankLauncherV2/ItemTransformers.js

@@ -27,7 +27,6 @@ function transformApp(app, override, defaultActions, primaryActionLabel) {
         data: app,
         keywords: app.keywords || [],
         actions: actions,
-        source: Utils.classifyAppSource(app),
         primaryAction: {
             name: primaryActionLabel,
             icon: "open_in_new",

quickshell/Modals/DankLauncherV2/LauncherContent.qml

@@ -274,16 +274,14 @@ FocusScope {
 
         Item {
             id: footerBar
-            readonly property bool _connectedBottomEmerge: (root.parentModal?.frameOwnsConnectedChrome ?? false) && (root.parentModal?.resolvedConnectedBarSide === "bottom")
-            readonly property bool _connectedArcAtFooter: _connectedBottomEmerge && !(root.parentModal?.launcherArcExtenderActive ?? false)
-            readonly property bool showFooter: SettingsData.dankLauncherV2Size !== "micro" && SettingsData.dankLauncherV2ShowFooter
-
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom
             anchors.leftMargin: root.parentModal?.borderWidth ?? 1
             anchors.rightMargin: root.parentModal?.borderWidth ?? 1
-            anchors.bottomMargin: _connectedBottomEmerge ? Theme.spacingM : (root.parentModal?.borderWidth ?? 1)
+            anchors.bottomMargin: root.parentModal?.borderWidth ?? 1
+            readonly property bool showFooter: SettingsData.dankLauncherV2Size !== "micro" && SettingsData.dankLauncherV2ShowFooter
+            readonly property bool _connectedArcAtFooter: (root.parentModal?.frameOwnsConnectedChrome ?? false) && (root.parentModal?.resolvedConnectedBarSide === "bottom")
             height: showFooter ? (_connectedArcAtFooter ? 76 : 36) : 0
             visible: showFooter
             clip: true

quickshell/Modals/DankLauncherV2/LauncherContextMenu.qml

@@ -372,7 +372,7 @@ Popup {
             anchors.fill: parent
             implicitWidth: Math.max(180, menuColumn.implicitWidth + Theme.spacingS * 2)
             implicitHeight: menuColumn.implicitHeight + Theme.spacingS * 2
-            color: Theme.floatingSurface
+            color: BlurService.enabled ? Theme.surfaceContainer : Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             border.color: BlurService.enabled ? BlurService.borderColor : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
             border.width: BlurService.enabled ? BlurService.borderWidth : 1

quickshell/Modals/DankLauncherV2/ResultItem.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import qs.Common
 import qs.Widgets
-import "../../Common/htmlElide.js" as HtmlElide
 
 Rectangle {
     id: root
@@ -73,159 +72,125 @@ Rectangle {
         }
     }
 
-    AppIconRenderer {
-        id: iconRenderer
-        width: 36
-        height: 36
-        anchors.left: parent.left
-        anchors.leftMargin: Theme.spacingM
-        anchors.verticalCenter: parent.verticalCenter
-        iconValue: root.iconValue
-        iconSize: 36
-        fallbackText: (root.item?.name?.length > 0) ? root.item.name.charAt(0).toUpperCase() : "?"
-        materialIconSizeAdjustment: 12
-    }
-
-    Item {
-        id: textColumn
-        anchors.left: iconRenderer.right
-        anchors.leftMargin: Theme.spacingM
-        anchors.right: rightContent.left
-        anchors.rightMargin: rightContent.width > 0 ? Theme.spacingM : 0
-        anchors.verticalCenter: parent.verticalCenter
-        height: nameText.implicitHeight + (subText.visible ? subText.height + 2 : 0)
-
-        Text {
-            id: nameText
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: parent.top
-            text: root.item?._hName ?? root.item?.name ?? ""
-            textFormat: root.item?._hRich ? Text.RichText : Text.PlainText
-            font.pixelSize: Theme.fontSizeMedium
-            font.weight: Font.Medium
-            font.family: Theme.fontFamily
-            color: Theme.surfaceText
-            wrapMode: Text.WordWrap
-            maximumLineCount: 1
-            elide: Text.ElideRight
-            horizontalAlignment: Text.AlignLeft
-        }
-
-        TextMetrics {
-            id: subProbe
-            font.pixelSize: Theme.fontSizeSmall
-            font.family: Theme.fontFamily
-            elide: Qt.ElideRight
-            elideWidth: textColumn.width
-            text: root.item?._hRich ? HtmlElide.stripHtmlTags(root.item?._hSub ?? "") : ""
-        }
-
-        readonly property int _richBudget: {
-            if (!subProbe.text)
-                return 0;
-            var e = subProbe.elidedText;
-            return e.endsWith("…") ? e.length - 1 : e.length;
-        }
-
-        Text {
-            id: subText
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: nameText.bottom
-            anchors.topMargin: 2
-            text: root.item?._hRich ? HtmlElide.elideRichText(root.item._hSub ?? "", textColumn._richBudget) : (root.item?.subtitle ?? "")
-            textFormat: root.item?._hRich ? Text.RichText : Text.PlainText
-            font.pixelSize: Theme.fontSizeSmall
-            font.family: Theme.fontFamily
-            color: Theme.surfaceVariantText
-            wrapMode: Text.WordWrap
-            maximumLineCount: 1
-            elide: Text.ElideRight
-            visible: (root.item?.subtitle ?? "").length > 0
-            horizontalAlignment: Text.AlignLeft
-        }
-    }
-
     Row {
-        id: rightContent
-        anchors.right: parent.right
+        anchors.fill: parent
+        anchors.leftMargin: Theme.spacingM
         anchors.rightMargin: Theme.spacingM
-        anchors.verticalCenter: parent.verticalCenter
-        spacing: Theme.spacingS
+        spacing: Theme.spacingM
 
-        Rectangle {
-            id: allModeToggle
-            visible: root.item?.type === "plugin_browse"
-            width: 28
-            height: 28
-            radius: 14
+        AppIconRenderer {
+            width: 36
+            height: 36
             anchors.verticalCenter: parent.verticalCenter
-            color: allModeToggleArea.containsMouse ? Theme.surfaceHover : "transparent"
+            iconValue: root.iconValue
+            iconSize: 36
+            fallbackText: (root.item?.name?.length > 0) ? root.item.name.charAt(0).toUpperCase() : "?"
+            materialIconSizeAdjustment: 12
+        }
 
-            property bool isAllowed: {
-                if (root.item?.type !== "plugin_browse")
-                    return false;
-                var pluginId = root.item?.data?.pluginId;
-                if (!pluginId)
-                    return false;
-                SettingsData.launcherPluginVisibility;
-                return SettingsData.getPluginAllowWithoutTrigger(pluginId);
+        Column {
+            anchors.verticalCenter: parent.verticalCenter
+            width: parent.width - 36 - Theme.spacingM * 3 - rightContent.width
+            spacing: 2
+
+            Text {
+                width: parent.width
+                text: root.item?._hName ?? root.item?.name ?? ""
+                textFormat: root.item?._hRich ? Text.RichText : Text.PlainText
+                font.pixelSize: Theme.fontSizeMedium
+                font.weight: Font.Medium
+                font.family: Theme.fontFamily
+                color: Theme.surfaceText
+                elide: Text.ElideRight
+                horizontalAlignment: Text.AlignLeft
             }
 
-            DankIcon {
-                anchors.centerIn: parent
-                name: allModeToggle.isAllowed ? "visibility" : "visibility_off"
-                size: 18
-                color: allModeToggle.isAllowed ? Theme.primary : Theme.surfaceVariantText
+            Text {
+                width: parent.width
+                text: root.item?._hSub ?? root.item?.subtitle ?? ""
+                textFormat: root.item?._hRich ? Text.RichText : Text.PlainText
+                font.pixelSize: Theme.fontSizeSmall
+                font.family: Theme.fontFamily
+                color: Theme.surfaceVariantText
+                elide: Text.ElideRight
+                clip: true
+                visible: (root.item?.subtitle ?? "").length > 0
+                horizontalAlignment: Text.AlignLeft
             }
+        }
 
-            MouseArea {
-                id: allModeToggleArea
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
+        Row {
+            id: rightContent
+            anchors.verticalCenter: parent.verticalCenter
+            spacing: Theme.spacingS
+
+            Rectangle {
+                id: allModeToggle
+                visible: root.item?.type === "plugin_browse"
+                width: 28
+                height: 28
+                radius: 14
+                anchors.verticalCenter: parent.verticalCenter
+                color: allModeToggleArea.containsMouse ? Theme.surfaceHover : "transparent"
+
+                property bool isAllowed: {
+                    if (root.item?.type !== "plugin_browse")
+                        return false;
                     var pluginId = root.item?.data?.pluginId;
                     if (!pluginId)
-                        return;
-                    SettingsData.setPluginAllowWithoutTrigger(pluginId, !allModeToggle.isAllowed);
+                        return false;
+                    SettingsData.launcherPluginVisibility;
+                    return SettingsData.getPluginAllowWithoutTrigger(pluginId);
                 }
-            }
-        }
 
-        Rectangle {
-            visible: !!root.item?.type && root.item.type !== "app" && root.item.type !== "plugin_browse"
-            width: typeBadge.implicitWidth + Theme.spacingS * 2
-            height: 20
-            radius: 10
-            color: Theme.surfaceVariantAlpha
-            anchors.verticalCenter: parent.verticalCenter
+                DankIcon {
+                    anchors.centerIn: parent
+                    name: allModeToggle.isAllowed ? "visibility" : "visibility_off"
+                    size: 18
+                    color: allModeToggle.isAllowed ? Theme.primary : Theme.surfaceVariantText
+                }
 
-            StyledText {
-                id: typeBadge
-                anchors.centerIn: parent
-                text: {
-                    if (!root.item)
-                        return "";
-                    switch (root.item.type) {
-                    case "plugin":
-                        return I18n.tr("Plugin");
-                    case "file":
-                        return root.item.data?.is_dir ? I18n.tr("Folder") : I18n.tr("File");
-                    default:
-                        return "";
+                MouseArea {
+                    id: allModeToggleArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        var pluginId = root.item?.data?.pluginId;
+                        if (!pluginId)
+                            return;
+                        SettingsData.setPluginAllowWithoutTrigger(pluginId, !allModeToggle.isAllowed);
                     }
                 }
-                font.pixelSize: Theme.fontSizeSmall - 2
-                color: Theme.surfaceVariantText
             }
-        }
 
-        SourceBadge {
-            anchors.verticalCenter: parent.verticalCenter
-            source: root.item?.type === "app" ? (root.item.source || "") : ""
-            glyphSize: 14
+            Rectangle {
+                visible: !!root.item?.type && root.item.type !== "app" && root.item.type !== "plugin_browse"
+                width: typeBadge.implicitWidth + Theme.spacingS * 2
+                height: 20
+                radius: 10
+                color: Theme.surfaceVariantAlpha
+                anchors.verticalCenter: parent.verticalCenter
+
+                StyledText {
+                    id: typeBadge
+                    anchors.centerIn: parent
+                    text: {
+                        if (!root.item)
+                            return "";
+                        switch (root.item.type) {
+                        case "plugin":
+                            return I18n.tr("Plugin");
+                        case "file":
+                            return root.item.data?.is_dir ? I18n.tr("Folder") : I18n.tr("File");
+                        default:
+                            return "";
+                        }
+                    }
+                    font.pixelSize: Theme.fontSizeSmall - 2
+                    color: Theme.surfaceVariantText
+                }
+            }
         }
     }
 }

quickshell/Modals/DankLauncherV2/ResultsList.qml

@@ -58,9 +58,9 @@ Item {
                         item: items[i],
                         flatIndex: flatIdx,
                         sectionId: sectionId,
-                        height: 56
+                        height: 52
                     });
-                    cumY += 56;
+                    cumY += 52;
                 }
             } else {
                 var cols = root.controller?.getGridColumns(sectionId) ?? root.gridColumns;
@@ -190,136 +190,125 @@ Item {
         }
     }
 
-    Item {
-        id: listClip
+    DankListView {
+        id: mainListView
         anchors.fill: parent
-        anchors.topMargin: BlurService.enabled && stickyHeader.visible ? 32 : 0
         clip: true
+        scrollBarTopMargin: (root.controller?.sections?.length > 0) ? 32 : 0
 
-        DankListView {
-            id: mainListView
-            y: -listClip.anchors.topMargin
-            width: parent.width
-            height: parent.height + listClip.anchors.topMargin
-            clip: true
-            scrollBarTopMargin: (root.controller?.sections?.length > 0) ? 32 : 0
+        model: ScriptModel {
+            values: root._visualRows
+            objectProp: "_rowId"
+        }
 
-            model: ScriptModel {
-                values: root._visualRows
-                objectProp: "_rowId"
+        add: null
+        remove: null
+        displaced: null
+        move: null
+
+        delegate: Item {
+            id: delegateRoot
+            required property var modelData
+            required property int index
+
+            width: mainListView.width
+            height: modelData?.height ?? 52
+
+            SectionHeader {
+                anchors.fill: parent
+                visible: delegateRoot.modelData?.type === "header"
+                section: delegateRoot.modelData?.section ?? null
+                controller: root.controller
+                viewMode: {
+                    var vt = root.controller?.viewModeVersion ?? 0;
+                    void (vt);
+                    return root.controller?.getSectionViewMode(delegateRoot.modelData?.sectionId ?? "") ?? "list";
+                }
+                canChangeViewMode: {
+                    var vt = root.controller?.viewModeVersion ?? 0;
+                    void (vt);
+                    return root.controller?.canChangeSectionViewMode(delegateRoot.modelData?.sectionId ?? "") ?? false;
+                }
+                canCollapse: root.controller?.canCollapseSection(delegateRoot.modelData?.sectionId ?? "") ?? false
             }
 
-            add: null
-            remove: null
-            displaced: null
-            move: null
+            ResultItem {
+                anchors.fill: parent
+                visible: delegateRoot.modelData?.type === "list_item"
+                item: delegateRoot.modelData?.type === "list_item" ? (delegateRoot.modelData?.item ?? null) : null
+                isSelected: delegateRoot.modelData?.type === "list_item" && (delegateRoot.modelData?.flatIndex ?? -1) === root.controller?.selectedFlatIndex
+                controller: root.controller
+                flatIndex: delegateRoot.modelData?.type === "list_item" ? (delegateRoot.modelData?.flatIndex ?? -1) : -1
 
-            delegate: Item {
-                id: delegateRoot
-                required property var modelData
-                required property int index
-
-                width: mainListView.width
-                height: modelData?.height ?? 52
-
-                SectionHeader {
-                    anchors.fill: parent
-                    visible: delegateRoot.modelData?.type === "header"
-                    section: delegateRoot.modelData?.section ?? null
-                    controller: root.controller
-                    viewMode: {
-                        var vt = root.controller?.viewModeVersion ?? 0;
-                        void (vt);
-                        return root.controller?.getSectionViewMode(delegateRoot.modelData?.sectionId ?? "") ?? "list";
-                    }
-                    canChangeViewMode: {
-                        var vt = root.controller?.viewModeVersion ?? 0;
-                        void (vt);
-                        return root.controller?.canChangeSectionViewMode(delegateRoot.modelData?.sectionId ?? "") ?? false;
-                    }
-                    canCollapse: root.controller?.canCollapseSection(delegateRoot.modelData?.sectionId ?? "") ?? false
-                }
-
-                ResultItem {
-                    anchors.fill: parent
-                    anchors.topMargin: 2
-                    anchors.bottomMargin: 2
-                    visible: delegateRoot.modelData?.type === "list_item"
-                    item: delegateRoot.modelData?.type === "list_item" ? (delegateRoot.modelData?.item ?? null) : null
-                    isSelected: delegateRoot.modelData?.type === "list_item" && (delegateRoot.modelData?.flatIndex ?? -1) === root.controller?.selectedFlatIndex
-                    controller: root.controller
-                    flatIndex: delegateRoot.modelData?.type === "list_item" ? (delegateRoot.modelData?.flatIndex ?? -1) : -1
-
-                    onClicked: {
-                        if (root.controller && delegateRoot.modelData?.item) {
-                            root.controller.executeItem(delegateRoot.modelData.item);
-                        }
-                    }
-
-                    onRightClicked: (mouseX, mouseY) => {
-                        root.itemRightClicked(delegateRoot.modelData?.flatIndex ?? -1, delegateRoot.modelData?.item ?? null, mouseX, mouseY);
+                onClicked: {
+                    if (root.controller && delegateRoot.modelData?.item) {
+                        root.controller.executeItem(delegateRoot.modelData.item);
                     }
                 }
 
-                Row {
-                    id: gridRowContent
-                    anchors.fill: parent
-                    visible: delegateRoot.modelData?.type === "grid_row"
+                onRightClicked: (mouseX, mouseY) => {
+                    root.itemRightClicked(delegateRoot.modelData?.flatIndex ?? -1, delegateRoot.modelData?.item ?? null, mouseX, mouseY);
+                }
+            }
 
-                    Repeater {
-                        model: delegateRoot.modelData?.type === "grid_row" ? (delegateRoot.modelData?.items ?? []) : []
+            Row {
+                id: gridRowContent
+                anchors.fill: parent
+                visible: delegateRoot.modelData?.type === "grid_row"
 
-                        Item {
-                            id: gridCellDelegate
-                            required property var modelData
-                            required property int index
+                Repeater {
+                    model: delegateRoot.modelData?.type === "grid_row" ? (delegateRoot.modelData?.items ?? []) : []
 
-                            readonly property real cellWidth: delegateRoot.modelData?.viewMode === "tile" ? Math.floor(delegateRoot.width / 3) : Math.floor(delegateRoot.width / (delegateRoot.modelData?.cols ?? root.gridColumns))
+                    Item {
+                        id: gridCellDelegate
+                        required property var modelData
+                        required property int index
 
-                            width: cellWidth
-                            height: delegateRoot.height
+                        readonly property real cellWidth: delegateRoot.modelData?.viewMode === "tile" ? Math.floor(delegateRoot.width / 3) : Math.floor(delegateRoot.width / (delegateRoot.modelData?.cols ?? root.gridColumns))
 
-                            GridItem {
-                                width: parent.width - 4
-                                height: parent.height - 4
-                                anchors.centerIn: parent
-                                visible: delegateRoot.modelData?.viewMode === "grid"
-                                item: gridCellDelegate.modelData?.item ?? null
-                                isSelected: (gridCellDelegate.modelData?.flatIndex ?? -1) === root.controller?.selectedFlatIndex
-                                controller: root.controller
-                                flatIndex: gridCellDelegate.modelData?.flatIndex ?? -1
+                        width: cellWidth
+                        height: delegateRoot.height
 
-                                onClicked: {
-                                    if (root.controller && gridCellDelegate.modelData?.item) {
-                                        root.controller.executeItem(gridCellDelegate.modelData.item);
-                                    }
-                                }
+                        GridItem {
+                            width: parent.width - 4
+                            height: parent.height - 4
+                            anchors.centerIn: parent
+                            visible: delegateRoot.modelData?.viewMode === "grid"
+                            item: gridCellDelegate.modelData?.item ?? null
+                            isSelected: (gridCellDelegate.modelData?.flatIndex ?? -1) === root.controller?.selectedFlatIndex
+                            controller: root.controller
+                            flatIndex: gridCellDelegate.modelData?.flatIndex ?? -1
 
-                                onRightClicked: (mouseX, mouseY) => {
-                                    root.itemRightClicked(gridCellDelegate.modelData?.flatIndex ?? -1, gridCellDelegate.modelData?.item ?? null, mouseX, mouseY);
+                            onClicked: {
+                                if (root.controller && gridCellDelegate.modelData?.item) {
+                                    root.controller.executeItem(gridCellDelegate.modelData.item);
                                 }
                             }
 
-                            TileItem {
-                                width: parent.width - 4
-                                height: parent.height - 4
-                                anchors.centerIn: parent
-                                visible: delegateRoot.modelData?.viewMode === "tile"
-                                item: gridCellDelegate.modelData?.item ?? null
-                                isSelected: (gridCellDelegate.modelData?.flatIndex ?? -1) === root.controller?.selectedFlatIndex
-                                controller: root.controller
-                                flatIndex: gridCellDelegate.modelData?.flatIndex ?? -1
+                            onRightClicked: (mouseX, mouseY) => {
+                                root.itemRightClicked(gridCellDelegate.modelData?.flatIndex ?? -1, gridCellDelegate.modelData?.item ?? null, mouseX, mouseY);
+                            }
+                        }
 
-                                onClicked: {
-                                    if (root.controller && gridCellDelegate.modelData?.item) {
-                                        root.controller.executeItem(gridCellDelegate.modelData.item);
-                                    }
-                                }
+                        TileItem {
+                            width: parent.width - 4
+                            height: parent.height - 4
+                            anchors.centerIn: parent
+                            visible: delegateRoot.modelData?.viewMode === "tile"
+                            item: gridCellDelegate.modelData?.item ?? null
+                            isSelected: (gridCellDelegate.modelData?.flatIndex ?? -1) === root.controller?.selectedFlatIndex
+                            controller: root.controller
+                            flatIndex: gridCellDelegate.modelData?.flatIndex ?? -1
 
-                                onRightClicked: (mouseX, mouseY) => {
-                                    root.itemRightClicked(gridCellDelegate.modelData?.flatIndex ?? -1, gridCellDelegate.modelData?.item ?? null, mouseX, mouseY);
+                            onClicked: {
+                                if (root.controller && gridCellDelegate.modelData?.item) {
+                                    root.controller.executeItem(gridCellDelegate.modelData.item);
                                 }
                             }
+
+                            onRightClicked: (mouseX, mouseY) => {
+                                root.itemRightClicked(gridCellDelegate.modelData?.flatIndex ?? -1, gridCellDelegate.modelData?.item ?? null, mouseX, mouseY);
+                            }
                         }
                     }
                 }
@@ -376,7 +365,7 @@ Item {
         anchors.top: parent.top
         height: 32
         z: 101
-        color: Theme.floatingSurface
+        color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
         visible: stickyHeaderSection !== null
 
         readonly property int versionTrigger: root.controller?.viewModeVersion ?? 0

quickshell/Modals/DankLauncherV2/Section.qml

@@ -50,7 +50,7 @@ Item {
             id: listComponent
 
             Column {
-                spacing: 4
+                spacing: 2
                 width: contentLoader.width
 
                 Repeater {

quickshell/Modals/DankLauncherV2/SourceBadge.qml

@@ -1,32 +0,0 @@
-import QtQuick
-import Quickshell.Widgets
-
-Item {
-    id: root
-
-    property string source: ""
-    property int glyphSize: 14
-
-    readonly property var sourceAsset: ({
-            "flatpak": "../../assets/package-sources/flatpak.svg",
-            "snap": "../../assets/package-sources/snap.svg",
-            "appimage": "../../assets/package-sources/appimage.svg",
-            "nix": "../../assets/package-sources/nix.svg"
-        })
-
-    readonly property string assetPath: sourceAsset[source] || ""
-
-    visible: assetPath.length > 0
-    implicitWidth: glyphSize
-    implicitHeight: glyphSize
-
-    IconImage {
-        anchors.fill: parent
-        source: root.assetPath ? Qt.resolvedUrl(root.assetPath) : ""
-        implicitSize: root.glyphSize * 2
-        backer.sourceSize: Qt.size(root.glyphSize * 2, root.glyphSize * 2)
-        smooth: true
-        mipmap: true
-        asynchronous: true
-    }
-}

quickshell/Modals/DankLauncherV2/TileItem.qml

@@ -168,15 +168,6 @@ Rectangle {
                     mipmap: true
                 }
             }
-
-            SourceBadge {
-                anchors.top: parent.top
-                anchors.right: parent.right
-                anchors.margins: Theme.spacingXS
-                source: root.item?.type === "app" ? (root.item.source || "") : ""
-                glyphSize: 16
-                visible: !root.isSelected && !!source
-            }
         }
     }
 

quickshell/Modals/FileBrowser/FileBrowserContent.qml

@@ -158,13 +158,6 @@ FocusScope {
         selectedFileIsDir = isDir;
     }
 
-    function openItemContextMenu(sender, localX, localY, path, name, isDir) {
-        if (!sender)
-            return;
-        const pos = sender.mapToItem(root, localX, localY);
-        itemContextMenu.showAt(root, pos.x, pos.y, path, name, isDir);
-    }
-
     function navigateUp() {
         const path = currentPath;
         if (path === homeDir)
@@ -766,9 +759,6 @@ FocusScope {
                                 onItemSelected: (index, path, name, isDir) => {
                                     setSelectedFileData(path, name, isDir);
                                 }
-                                onItemContextMenuRequested: (sender, localX, localY, path, name, isDir) => {
-                                    root.openItemContextMenu(sender, localX, localY, path, name, isDir);
-                                }
 
                                 Connections {
                                     function onKeyboardSelectionRequestedChanged() {
@@ -827,9 +817,6 @@ FocusScope {
                                 onItemSelected: (index, path, name, isDir) => {
                                     setSelectedFileData(path, name, isDir);
                                 }
-                                onItemContextMenuRequested: (sender, localX, localY, path, name, isDir) => {
-                                    root.openItemContextMenu(sender, localX, localY, path, name, isDir);
-                                }
 
                                 Connections {
                                     function onKeyboardSelectionRequestedChanged() {
@@ -930,9 +917,4 @@ FocusScope {
             }
         }
     }
-
-    FileBrowserItemContextMenu {
-        id: itemContextMenu
-        parentFocusItem: root
-    }
 }

quickshell/Modals/FileBrowser/FileBrowserGridDelegate.qml

@@ -19,7 +19,6 @@ StyledRect {
 
     signal itemClicked(int index, string path, string name, bool isDir)
     signal itemSelected(int index, string path, string name, bool isDir)
-    signal itemContextMenuRequested(var sender, real localX, real localY, string path, string name, bool isDir)
 
     function getFileExtension(fileName) {
         const parts = fileName.split('.');
@@ -108,11 +107,11 @@ StyledRect {
         const size = _thumbnailPx;
         const fp = delegateRoot.filePath;
         Paths.mkdir(thumbDir);
-        Proc.runCommand(null, ["test", "-f", thumbPath], function (output, exitCode) {
+        Proc.runCommand(null, ["test", "-f", thumbPath], function(output, exitCode) {
             if (exitCode === 0) {
                 _videoThumb = thumbPath;
             } else {
-                Proc.runCommand(null, ["ffmpegthumbnailer", "-i", fp, "-o", thumbPath, "-s", String(size), "-f"], function (output, exitCode) {
+                Proc.runCommand(null, ["ffmpegthumbnailer", "-i", fp, "-o", thumbPath, "-s", String(size), "-f"], function(output, exitCode) {
                     if (exitCode === 0)
                         _videoThumb = thumbPath;
                 });
@@ -247,16 +246,8 @@ StyledRect {
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onClicked: mouse => {
-            switch (mouse.button) {
-            case Qt.LeftButton:
-                itemClicked(delegateRoot.index, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir);
-                break;
-            case Qt.RightButton:
-                itemContextMenuRequested(delegateRoot, mouse.x, mouse.y, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir);
-                break;
-            }
+        onClicked: {
+            itemClicked(delegateRoot.index, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir);
         }
     }
 }

quickshell/Modals/FileBrowser/FileBrowserItemContextMenu.qml

@@ -1,153 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Popup {
-    id: root
-
-    property string filePath: ""
-    property string fileName: ""
-    property bool fileIsDir: false
-    property var parentFocusItem: null
-
-    signal trashed
-    signal menuClosed
-
-    readonly property var menuItems: [
-        {
-            text: I18n.tr("Move to Trash"),
-            icon: "delete",
-            action: trashItem,
-            enabled: filePath.length > 0,
-            dangerous: true
-        },
-        {
-            text: I18n.tr("Copy Path"),
-            icon: "content_copy",
-            action: copyPath,
-            enabled: filePath.length > 0
-        }
-    ]
-
-    function showAt(parentItem, localX, localY, path, name, isDir) {
-        if (!parentItem)
-            return;
-        parent = parentItem;
-        filePath = path || "";
-        fileName = name || "";
-        fileIsDir = !!isDir;
-        x = Math.max(0, Math.min(parentItem.width - width, localX));
-        y = Math.max(0, Math.min(parentItem.height - height, localY));
-        open();
-    }
-
-    function trashItem() {
-        if (!filePath)
-            return;
-        TrashService.trashPath(filePath, ok => {
-            if (ok)
-                root.trashed();
-        });
-        close();
-    }
-
-    function copyPath() {
-        if (!filePath)
-            return;
-        Quickshell.execDetached(["dms", "cl", "copy", filePath]);
-        close();
-    }
-
-    width: 220
-    height: menuColumn.implicitHeight + Theme.spacingS * 2
-    padding: 0
-    modal: false
-    closePolicy: Popup.CloseOnEscape
-
-    onClosed: {
-        closePolicy = Popup.CloseOnEscape;
-        menuClosed();
-        if (parentFocusItem)
-            Qt.callLater(() => parentFocusItem.forceActiveFocus());
-    }
-
-    onOpened: outsideClickTimer.start()
-
-    Timer {
-        id: outsideClickTimer
-        interval: 100
-        onTriggered: root.closePolicy = Popup.CloseOnEscape | Popup.CloseOnPressOutside
-    }
-
-    background: Rectangle {
-        color: "transparent"
-    }
-
-    contentItem: Rectangle {
-        color: Theme.floatingSurface
-        radius: Theme.cornerRadius
-        border.color: BlurService.enabled ? BlurService.borderColor : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-        border.width: BlurService.enabled ? BlurService.borderWidth : 1
-
-        Column {
-            id: menuColumn
-            anchors.fill: parent
-            anchors.margins: Theme.spacingS
-            spacing: 1
-
-            Repeater {
-                model: root.menuItems
-
-                Rectangle {
-                    width: parent.width
-                    height: 32
-                    radius: Theme.cornerRadius
-                    opacity: modelData.enabled ? 1 : 0.5
-                    color: {
-                        if (!modelData.enabled || !area.containsMouse)
-                            return "transparent";
-                        if (modelData.dangerous)
-                            return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12);
-                        return BlurService.hoverColor(Theme.widgetBaseHoverColor);
-                    }
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            anchors.verticalCenter: parent.verticalCenter
-                            name: modelData.icon
-                            size: 16
-                            color: modelData.dangerous && area.containsMouse && modelData.enabled ? Theme.error : Theme.surfaceText
-                        }
-
-                        StyledText {
-                            anchors.verticalCenter: parent.verticalCenter
-                            text: modelData.text
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: modelData.dangerous && area.containsMouse && modelData.enabled ? Theme.error : Theme.surfaceText
-                            elide: Text.ElideRight
-                        }
-                    }
-
-                    MouseArea {
-                        id: area
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        enabled: modelData.enabled
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: modelData.action()
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modals/FileBrowser/FileBrowserListDelegate.qml

@@ -18,7 +18,6 @@ StyledRect {
 
     signal itemClicked(int index, string path, string name, bool isDir)
     signal itemSelected(int index, string path, string name, bool isDir)
-    signal itemContextMenuRequested(var sender, real localX, real localY, string path, string name, bool isDir)
 
     function getFileExtension(fileName) {
         const parts = fileName.split('.');
@@ -103,11 +102,11 @@ StyledRect {
         const thumbPath = videoThumbnailPath;
         const fp = listDelegateRoot.filePath;
         Paths.mkdir(_xdgCacheHome + "/thumbnails/normal");
-        Proc.runCommand(null, ["test", "-f", thumbPath], function (output, exitCode) {
+        Proc.runCommand(null, ["test", "-f", thumbPath], function(output, exitCode) {
             if (exitCode === 0) {
                 _videoThumb = thumbPath;
             } else {
-                Proc.runCommand(null, ["ffmpegthumbnailer", "-i", fp, "-o", thumbPath, "-s", "128", "-f"], function (output, exitCode) {
+                Proc.runCommand(null, ["ffmpegthumbnailer", "-i", fp, "-o", thumbPath, "-s", "128", "-f"], function(output, exitCode) {
                     if (exitCode === 0)
                         _videoThumb = thumbPath;
                 });
@@ -252,16 +251,8 @@ StyledRect {
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onClicked: mouse => {
-            switch (mouse.button) {
-            case Qt.LeftButton:
-                itemClicked(listDelegateRoot.index, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir);
-                break;
-            case Qt.RightButton:
-                itemContextMenuRequested(listDelegateRoot, mouse.x, mouse.y, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir);
-                break;
-            }
+        onClicked: {
+            itemClicked(listDelegateRoot.index, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir);
         }
     }
 }

quickshell/Modals/FileBrowser/FileInfo.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import QtCore
 import Quickshell.Io
 import qs.Common
 import qs.Widgets
@@ -21,9 +22,9 @@ Rectangle {
 
     onShowFileInfoChanged: {
         if (showFileInfo && currentFileName && currentPath) {
-            const fullPath = currentPath + "/" + currentFileName;
-            fileStatProcess.selectedFilePath = fullPath;
-            fileStatProcess.running = true;
+            const fullPath = currentPath + "/" + currentFileName
+            fileStatProcess.selectedFilePath = fullPath
+            fileStatProcess.running = true
         }
     }
 
@@ -37,14 +38,14 @@ Rectangle {
         stdout: StdioCollector {
             onStreamFinished: {
                 if (text && text.trim()) {
-                    const parts = text.trim().split('|');
+                    const parts = text.trim().split('|')
                     if (parts.length >= 4) {
                         fileStatProcess.fileStats = {
                             "modifiedTime": parts[0],
                             "permissions": parts[1],
                             "size": parseInt(parts[2]) || 0,
                             "fullPath": parts[3]
-                        };
+                        }
                     }
                 }
             }
@@ -59,31 +60,31 @@ Rectangle {
 
     onCurrentFileNameChanged: {
         if (showFileInfo && currentFileName && currentPath) {
-            const fullPath = currentPath + "/" + currentFileName;
+            const fullPath = currentPath + "/" + currentFileName
             if (fullPath !== fileStatProcess.selectedFilePath) {
-                fileStatProcess.selectedFilePath = fullPath;
-                fileStatProcess.running = true;
+                fileStatProcess.selectedFilePath = fullPath
+                fileStatProcess.running = true
             }
         }
     }
 
     function updateFileInfo(filePath, fileName, isDirectory) {
         if (filePath && filePath !== fileStatProcess.selectedFilePath) {
-            fileStatProcess.selectedFilePath = filePath;
-            currentFileName = fileName || "";
-            currentFileIsDir = isDirectory || false;
+            fileStatProcess.selectedFilePath = filePath
+            currentFileName = fileName || ""
+            currentFileIsDir = isDirectory || false
 
-            let ext = "";
+            let ext = ""
             if (!isDirectory && fileName) {
-                const lastDot = fileName.lastIndexOf('.');
+                const lastDot = fileName.lastIndexOf('.')
                 if (lastDot > 0) {
-                    ext = fileName.substring(lastDot + 1).toLowerCase();
+                    ext = fileName.substring(lastDot + 1).toLowerCase()
                 }
             }
-            currentFileExtension = ext;
+            currentFileExtension = ext
 
             if (showFileInfo) {
-                fileStatProcess.running = true;
+                fileStatProcess.running = true
             }
         }
     }
@@ -99,10 +100,10 @@ Rectangle {
                 "permissions": "",
                 "extension": "",
                 "position": "N/A"
-            };
+            }
         }
 
-        const hasValidFile = currentFileName !== "";
+        const hasValidFile = currentFileName !== ""
         return {
             "exists": hasValidFile,
             "name": hasValidFile ? currentFileName : "Loading...",
@@ -112,7 +113,7 @@ Rectangle {
             "permissions": fileStatProcess.fileStats ? fileStatProcess.fileStats.permissions : "Loading...",
             "extension": currentFileExtension,
             "position": sourceFolderModel ? ((selectedIndex + 1) + " of " + sourceFolderModel.count) : "N/A"
-        };
+        }
     }
 
     Column {
@@ -208,23 +209,23 @@ Rectangle {
 
     function formatFileSize(bytes) {
         if (bytes === 0 || !bytes) {
-            return "0 B";
+            return "0 B"
         }
-        const k = 1024;
-        const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
-        const i = Math.floor(Math.log(bytes) / Math.log(k));
-        return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i];
+        const k = 1024
+        const sizes = ['B', 'KB', 'MB', 'GB', 'TB']
+        const i = Math.floor(Math.log(bytes) / Math.log(k))
+        return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i]
     }
 
     function formatDateTime(dateTimeString) {
         if (!dateTimeString) {
-            return "Unknown";
+            return "Unknown"
         }
-        const parts = dateTimeString.split(' ');
+        const parts = dateTimeString.split(' ')
         if (parts.length >= 2) {
-            return parts[0] + " " + parts[1].split('.')[0];
+            return parts[0] + " " + parts[1].split('.')[0]
         }
-        return dateTimeString;
+        return dateTimeString
     }
 
     Behavior on opacity {

quickshell/Modals/Greeter/GreeterDoctorPage.qml

@@ -1,12 +1,10 @@
 import QtQuick
 import Quickshell.Io
 import qs.Common
-import qs.Services
 import qs.Widgets
 
 Item {
     id: root
-    readonly property var log: Log.scoped("GreeterDoctorPage")
 
     property bool isRunning: false
     property bool hasRun: false
@@ -61,22 +59,26 @@ Item {
                     border.color: Theme.primary
                     opacity: 0
 
-                    OpacityAnimator on opacity {
+                    SequentialAnimation on opacity {
                         running: root.isRunning
                         loops: Animation.Infinite
-                        from: 0.8
-                        to: 0
-                        duration: 1500
-                        easing.type: Easing.OutQuad
+                        NumberAnimation {
+                            from: 0.8
+                            to: 0
+                            duration: 1500
+                            easing.type: Easing.OutQuad
+                        }
                     }
 
-                    ScaleAnimator on scale {
+                    SequentialAnimation on scale {
                         running: root.isRunning
                         loops: Animation.Infinite
-                        from: 0.5
-                        to: 1.5
-                        duration: 1500
-                        easing.type: Easing.OutQuad
+                        NumberAnimation {
+                            from: 0.5
+                            to: 1.5
+                            duration: 1500
+                            easing.type: Easing.OutQuad
+                        }
                     }
                 }
 
@@ -91,22 +93,26 @@ Item {
                     border.color: Theme.secondary
                     opacity: 0
 
-                    OpacityAnimator on opacity {
+                    SequentialAnimation on opacity {
                         running: root.isRunning
                         loops: Animation.Infinite
-                        from: 0.8
-                        to: 0
-                        duration: 1500
-                        easing.type: Easing.OutQuad
+                        NumberAnimation {
+                            from: 0.8
+                            to: 0
+                            duration: 1500
+                            easing.type: Easing.OutQuad
+                        }
                     }
 
-                    ScaleAnimator on scale {
+                    SequentialAnimation on scale {
                         running: root.isRunning
                         loops: Animation.Infinite
-                        from: 0.3
-                        to: 1.3
-                        duration: 1500
-                        easing.type: Easing.OutQuad
+                        NumberAnimation {
+                            from: 0.3
+                            to: 1.3
+                            duration: 1500
+                            easing.type: Easing.OutQuad
+                        }
                     }
                 }
 
@@ -222,7 +228,9 @@ Item {
                         text: {
                             if (root.errorCount === 0)
                                 return I18n.tr("All checks passed", "greeter doctor page success");
-                            return root.errorCount === 1 ? I18n.tr("%1 issue found", "greeter doctor page error count").arg(root.errorCount) : I18n.tr("%1 issues found", "greeter doctor page error count").arg(root.errorCount);
+                            return root.errorCount === 1
+                                ? I18n.tr("%1 issue found", "greeter doctor page error count").arg(root.errorCount)
+                                : I18n.tr("%1 issues found", "greeter doctor page error count").arg(root.errorCount);
                         }
                         font.pixelSize: Theme.fontSizeMedium
                         color: root.errorCount > 0 ? Theme.error : Theme.surfaceVariantText
@@ -404,7 +412,7 @@ Item {
                     else
                         root.selectedFilter = "ok";
                 } catch (e) {
-                    log.error("Failed to parse doctor output:", e);
+                    console.error("GreeterDoctorPage: Failed to parse doctor output:", e);
                 }
             }
         }

quickshell/Modals/Greeter/GreeterModal.qml

@@ -7,7 +7,6 @@ import qs.Widgets
 
 FloatingWindow {
     id: root
-    readonly property var log: Log.scoped("GreeterModal")
 
     property bool disablePopupTransparency: true
     property int currentPage: 0
@@ -106,7 +105,7 @@ FloatingWindow {
                     root.cheatsheetData = JSON.parse(trimmed);
                     root.cheatsheetLoaded = true;
                 } catch (e) {
-                    log.warn("Greeter: Failed to parse cheatsheet:", e);
+                    console.warn("Greeter: Failed to parse cheatsheet:", e);
                 }
             }
         }

quickshell/Modals/ProcessListModal.qml

@@ -9,7 +9,6 @@ import qs.Widgets
 
 FloatingWindow {
     id: processListModal
-    readonly property var log: Log.scoped("ProcessListModal")
 
     property bool disablePopupTransparency: true
     property int currentTab: 0
@@ -23,7 +22,7 @@ FloatingWindow {
 
     function show() {
         if (!DgopService.dgopAvailable) {
-            log.warn("dgop is not available");
+            console.warn("ProcessListModal: dgop is not available");
             return;
         }
         visible = true;
@@ -37,7 +36,7 @@ FloatingWindow {
 
     function toggle() {
         if (!DgopService.dgopAvailable) {
-            log.warn("dgop is not available");
+            console.warn("ProcessListModal: dgop is not available");
             return;
         }
         visible = !visible;
@@ -45,7 +44,7 @@ FloatingWindow {
 
     function focusOrToggle() {
         if (!DgopService.dgopAvailable) {
-            log.warn("dgop is not available");
+            console.warn("ProcessListModal: dgop is not available");
             return;
         }
         if (visible) {