blur: fix dankbar auto-hide blur, fix synchronization in popouts and

modals

core/.pre-commit-config.yaml

@@ -1,13 +1,26 @@
 repos:
-  - repo: https://github.com/golangci/golangci-lint
-    rev: v2.10.1
-    hooks:
-      - id: golangci-lint-fmt
-        require_serial: true
-      - id: golangci-lint-full
-      - id: golangci-lint-config-verify
   - repo: local
     hooks:
+      - id: golangci-lint-fmt
+        name: golangci-lint-fmt
+        entry: go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.11.3 fmt
+        language: system
+        require_serial: true
+        types: [go]
+        pass_filenames: false
+      - id: golangci-lint-full
+        name: golangci-lint-full
+        entry: go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.11.3 run --fix
+        language: system
+        require_serial: true
+        types: [go]
+        pass_filenames: false
+      - id: golangci-lint-config-verify
+        name: golangci-lint-config-verify
+        entry: go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.11.3 config verify
+        language: system
+        files: \.golangci\.(?:yml|yaml|toml|json)
+        pass_filenames: false
       - id: go-test
         name: go test
         entry: go test ./...

core/README.md

@@ -10,7 +10,7 @@ Go-based backend for DankMaterialShell providing system integration, IPC, and in
 Command-line interface and daemon for shell management and system control.
 
 **dankinstall**
-Distribution-aware installer for deploying DMS and compositor configurations on Arch, Fedora, Debian, Ubuntu, openSUSE, and Gentoo. Supports both an interactive TUI and a headless (unattended) mode via CLI flags.
+Distribution-aware installer with TUI for deploying DMS and compositor configurations on Arch, Fedora, Debian, Ubuntu, openSUSE, and Gentoo.
 
 ## System Integration
 
@@ -147,50 +147,10 @@ go-wayland-scanner -i internal/proto/xml/wlr-gamma-control-unstable-v1.xml \
 
 ## Installation via dankinstall
 
-**Interactive (TUI):**
-
 ```bash
 curl -fsSL https://install.danklinux.com | sh
 ```
 
-**Headless (unattended):**
-
-Headless mode requires cached sudo credentials. Run `sudo -v` first:
-
-```bash
-sudo -v && curl -fsSL https://install.danklinux.com | sh -s -- -c niri -t ghostty -y
-sudo -v && curl -fsSL https://install.danklinux.com | sh -s -- -c hyprland -t kitty --include-deps dms-greeter -y
-```
-
-| Flag | Short | Description |
-|------|-------|-------------|
-| `--compositor <niri|hyprland>` | `-c` | Compositor/WM to install (required for headless) |
-| `--term <ghostty|kitty|alacritty>` | `-t` | Terminal emulator (required for headless) |
-| `--include-deps <name,...>` | | Enable optional dependencies (e.g. `dms-greeter`) |
-| `--exclude-deps <name,...>` | | Skip specific dependencies |
-| `--replace-configs <name,...>` | | Replace specific configuration files (mutually exclusive with `--replace-configs-all`) |
-| `--replace-configs-all` | | Replace all configuration files (mutually exclusive with `--replace-configs`) |
-| `--yes` | `-y` | Required for headless mode — confirms installation without interactive prompts |
-
-Headless mode requires `--yes` to proceed; without it, the installer exits with an error.
-Configuration files are not replaced by default unless `--replace-configs` or `--replace-configs-all` is specified.
-`dms-greeter` is disabled by default; use `--include-deps dms-greeter` to enable it.
-
-When no flags are provided, `dankinstall` launches the interactive TUI.
-
-### Headless mode validation rules
-
-Headless mode activates when `--compositor` or `--term` is provided.
-
-- Both `--compositor` and `--term` are required; providing only one results in an error.
-- Headless-only flags (`--include-deps`, `--exclude-deps`, `--replace-configs`, `--replace-configs-all`, `--yes`) are rejected in TUI mode.
-- Positional arguments are not accepted.
-
-### Log file location
-
-`dankinstall` writes logs to `/tmp` by default.
-Set the `DANKINSTALL_LOG_DIR` environment variable to override the log directory.
-
 ## Supported Distributions
 
 Arch, Fedora, Debian, Ubuntu, openSUSE, Gentoo (and derivatives)

core/cmd/dankinstall/main.go

@@ -3,152 +3,20 @@ package main
 import (
 	"fmt"
 	"os"
-	"strings"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/headless"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/tui"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/spf13/cobra"
 )
 
 var Version = "dev"
 
-// Flag variables bound via pflag
-var (
-	compositor        string
-	term              string
-	includeDeps       []string
-	excludeDeps       []string
-	replaceConfigs    []string
-	replaceConfigsAll bool
-	yes               bool
-)
-
-var rootCmd = &cobra.Command{
-	Use:   "dankinstall",
-	Short: "Install DankMaterialShell and its dependencies",
-	Long: `dankinstall sets up DankMaterialShell with your chosen compositor and terminal.
-
-Without flags, it launches an interactive TUI. Providing either --compositor
-or --term activates headless (unattended) mode, which requires both flags.
-
-Headless mode requires cached sudo credentials. Run 'sudo -v' beforehand, or
-configure passwordless sudo for your user.`,
-	Args:          cobra.NoArgs,
-	RunE:          runDankinstall,
-	SilenceErrors: true,
-	SilenceUsage:  true,
-}
-
-func init() {
-	rootCmd.Flags().StringVarP(&compositor, "compositor", "c", "", "Compositor/WM to install: niri or hyprland (enables headless mode)")
-	rootCmd.Flags().StringVarP(&term, "term", "t", "", "Terminal emulator to install: ghostty, kitty, or alacritty (enables headless mode)")
-	rootCmd.Flags().StringSliceVar(&includeDeps, "include-deps", []string{}, "Optional deps to enable (e.g. dms-greeter)")
-	rootCmd.Flags().StringSliceVar(&excludeDeps, "exclude-deps", []string{}, "Deps to skip during installation")
-	rootCmd.Flags().StringSliceVar(&replaceConfigs, "replace-configs", []string{}, "Deploy only named configs (e.g. niri,ghostty)")
-	rootCmd.Flags().BoolVar(&replaceConfigsAll, "replace-configs-all", false, "Deploy and replace all configurations")
-	rootCmd.Flags().BoolVarP(&yes, "yes", "y", false, "Auto-confirm all prompts")
-}
-
 func main() {
 	if os.Getuid() == 0 {
 		fmt.Fprintln(os.Stderr, "Error: dankinstall must not be run as root")
 		os.Exit(1)
 	}
 
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-		os.Exit(1)
-	}
-}
-
-func runDankinstall(cmd *cobra.Command, args []string) error {
-	headlessMode := compositor != "" || term != ""
-
-	if !headlessMode {
-		// Reject headless-only flags when running in TUI mode.
-		headlessOnly := []string{
-			"include-deps",
-			"exclude-deps",
-			"replace-configs",
-			"replace-configs-all",
-			"yes",
-		}
-		var set []string
-		for _, name := range headlessOnly {
-			if cmd.Flags().Changed(name) {
-				set = append(set, "--"+name)
-			}
-		}
-		if len(set) > 0 {
-			return fmt.Errorf("flags %s are only valid in headless mode (requires both --compositor and --term)", strings.Join(set, ", "))
-		}
-	}
-
-	if headlessMode {
-		return runHeadless()
-	}
-	return runTUI()
-}
-
-func runHeadless() error {
-	// Validate required flags
-	if compositor == "" {
-		return fmt.Errorf("--compositor is required for headless mode (niri or hyprland)")
-	}
-	if term == "" {
-		return fmt.Errorf("--term is required for headless mode (ghostty, kitty, or alacritty)")
-	}
-
-	cfg := headless.Config{
-		Compositor:        compositor,
-		Terminal:          term,
-		IncludeDeps:       includeDeps,
-		ExcludeDeps:       excludeDeps,
-		ReplaceConfigs:    replaceConfigs,
-		ReplaceConfigsAll: replaceConfigsAll,
-		Yes:               yes,
-	}
-
-	runner := headless.NewRunner(cfg)
-
-	// Set up file logging
-	fileLogger, err := log.NewFileLogger()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Warning: Failed to create log file: %v\n", err)
-	}
-
-	if fileLogger != nil {
-		fmt.Printf("Logging to: %s\n", fileLogger.GetLogPath())
-		fileLogger.StartListening(runner.GetLogChan())
-		defer func() {
-			if err := fileLogger.Close(); err != nil {
-				fmt.Fprintf(os.Stderr, "Warning: Failed to close log file: %v\n", err)
-			}
-		}()
-	} else {
-		// Drain the log channel to prevent blocking sends from deadlocking
-		// downstream components (distros, config deployer) that write to it.
-		// Use an explicit stop signal because this code does not own the
-		// runner log channel and cannot assume it will be closed.
-		defer drainLogChan(runner.GetLogChan())()
-	}
-
-	if err := runner.Run(); err != nil {
-		if fileLogger != nil {
-			fmt.Fprintf(os.Stderr, "\nFull logs are available at: %s\n", fileLogger.GetLogPath())
-		}
-		return err
-	}
-
-	if fileLogger != nil {
-		fmt.Printf("\nFull logs are available at: %s\n", fileLogger.GetLogPath())
-	}
-	return nil
-}
-
-func runTUI() error {
 	fileLogger, err := log.NewFileLogger()
 	if err != nil {
 		fmt.Printf("Warning: Failed to create log file: %v\n", err)
@@ -170,50 +38,18 @@ func runTUI() error {
 
 	if fileLogger != nil {
 		fileLogger.StartListening(model.GetLogChan())
-	} else {
-		// Drain the log channel to prevent blocking sends from deadlocking
-		// downstream components (distros, config deployer) that write to it.
-		// Use an explicit stop signal because this code does not own the
-		// model log channel and cannot assume it will be closed.
-		defer drainLogChan(model.GetLogChan())()
 	}
 
 	p := tea.NewProgram(model, tea.WithAltScreen())
 	if _, err := p.Run(); err != nil {
+		fmt.Printf("Error running program: %v\n", err)
 		if logFilePath != "" {
-			fmt.Fprintf(os.Stderr, "\nFull logs are available at: %s\n", logFilePath)
+			fmt.Printf("\nFull logs are available at: %s\n", logFilePath)
 		}
-		return fmt.Errorf("error running program: %w", err)
+		os.Exit(1)
 	}
 
 	if logFilePath != "" {
 		fmt.Printf("\nFull logs are available at: %s\n", logFilePath)
 	}
-	return nil
-}
-
-// drainLogChan starts a goroutine that discards all messages from logCh,
-// preventing blocking sends from deadlocking downstream components. It returns
-// a cleanup function that signals the goroutine to stop and waits for it to
-// exit. Callers should defer the returned function.
-func drainLogChan(logCh <-chan string) func() {
-	drainStop := make(chan struct{})
-	drainDone := make(chan struct{})
-	go func() {
-		defer close(drainDone)
-		for {
-			select {
-			case <-drainStop:
-				return
-			case _, ok := <-logCh:
-				if !ok {
-					return
-				}
-			}
-		}
-	}()
-	return func() {
-		close(drainStop)
-		<-drainDone
-	}
 }

core/cmd/dms/commands_blur.go

@@ -1,40 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/blur"
-	"github.com/spf13/cobra"
-)
-
-var blurCmd = &cobra.Command{
-	Use:   "blur",
-	Short: "Background blur utilities",
-}
-
-var blurCheckCmd = &cobra.Command{
-	Use:   "check",
-	Short: "Check if the compositor supports background blur (ext-background-effect-v1)",
-	Args:  cobra.NoArgs,
-	Run:   runBlurCheck,
-}
-
-func init() {
-	blurCmd.AddCommand(blurCheckCmd)
-}
-
-func runBlurCheck(cmd *cobra.Command, args []string) {
-	supported, err := blur.ProbeSupport()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
-		os.Exit(1)
-	}
-
-	switch supported {
-	case true:
-		fmt.Println("supported")
-	default:
-		fmt.Println("unsupported")
-	}
-}

core/cmd/dms/commands_brightness.go

@@ -236,7 +236,6 @@ func runBrightnessSet(cmd *cobra.Command, args []string) {
 			defer ddc.Close()
 			time.Sleep(100 * time.Millisecond)
 			if err := ddc.SetBrightnessWithExponent(deviceID, percent, exponential, exponent, nil); err == nil {
-				ddc.WaitPending()
 				fmt.Printf("Set %s to %d%%\n", deviceID, percent)
 				return
 			}

core/cmd/dms/commands_common.go

@@ -525,6 +525,5 @@ func getCommonCommands() []*cobra.Command {
 		configCmd,
 		dlCmd,
 		randrCmd,
-		blurCmd,
 	}
 }

core/cmd/dms/commands_doctor.go

@@ -82,7 +82,7 @@ func (ds *DoctorStatus) OKCount() int {
 }
 
 var (
-	quickshellVersionRegex = regexp.MustCompile(`(?i)quickshell (\d+\.\d+\.\d+)`)
+	quickshellVersionRegex = regexp.MustCompile(`quickshell (\d+\.\d+\.\d+)`)
 	hyprlandVersionRegex   = regexp.MustCompile(`v?(\d+\.\d+\.\d+)`)
 	niriVersionRegex       = regexp.MustCompile(`niri (\d+\.\d+)`)
 	swayVersionRegex       = regexp.MustCompile(`sway version (\d+\.\d+)`)
@@ -820,14 +820,10 @@ func checkOptionalDependencies() []checkResult {
 	results = append(results, checkImageFormatPlugins()...)
 
 	terminals := []string{"ghostty", "kitty", "alacritty", "foot", "wezterm"}
-	terminals = slices.DeleteFunc(terminals, func(t string) bool {
-		return !utils.CommandExists(t)
-	})
-
-	if len(terminals) > 0 {
-		results = append(results, checkResult{catOptionalFeatures, "Terminal", statusOK, strings.Join(terminals, ", "), "", optionalFeaturesURL})
+	if idx := slices.IndexFunc(terminals, utils.CommandExists); idx >= 0 {
+		results = append(results, checkResult{catOptionalFeatures, "Terminal", statusOK, terminals[idx], "", optionalFeaturesURL})
 	} else {
-		results = append(results, checkResult{catOptionalFeatures, "Terminal", statusWarn, "None found", "Install ghostty, kitty, foot or alacritty", optionalFeaturesURL})
+		results = append(results, checkResult{catOptionalFeatures, "Terminal", statusWarn, "None found", "Install ghostty, kitty, or alacritty", optionalFeaturesURL})
 	}
 
 	networkResult, err := network.DetectNetworkStack()

core/cmd/dms/commands_features.go

@@ -109,41 +109,16 @@ func updateArchLinux() error {
 	}
 
 	var packageName string
-	var isAUR bool
-	if isArchPackageInstalled("dms-shell") {
-		packageName = "dms-shell"
+	if isArchPackageInstalled("dms-shell-bin") {
+		packageName = "dms-shell-bin"
 	} else if isArchPackageInstalled("dms-shell-git") {
 		packageName = "dms-shell-git"
-		isAUR = true
-	} else if isArchPackageInstalled("dms-shell-bin") {
-		packageName = "dms-shell-bin"
-		isAUR = true
 	} else {
-		fmt.Println("Info: No dms-shell package found.")
+		fmt.Println("Info: Neither dms-shell-bin nor dms-shell-git package found.")
 		fmt.Println("Info: Falling back to git-based update method...")
 		return updateOtherDistros()
 	}
 
-	if !isAUR {
-		fmt.Printf("This will update %s using pacman.\n", packageName)
-		if !confirmUpdate() {
-			return errdefs.ErrUpdateCancelled
-		}
-
-		fmt.Printf("\nRunning: sudo pacman -S %s\n", packageName)
-		cmd := exec.Command("sudo", "pacman", "-S", "--noconfirm", packageName)
-		cmd.Stdin = os.Stdin
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		if err := cmd.Run(); err != nil {
-			fmt.Printf("Error: Failed to update using pacman: %v\n", err)
-			return err
-		}
-
-		fmt.Println("dms successfully updated")
-		return nil
-	}
-
 	var helper string
 	var updateCmd *exec.Cmd
 

core/cmd/dms/main.go

@@ -5,7 +5,6 @@ package main
 import (
 	"os"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 )
 
@@ -31,9 +30,7 @@ func init() {
 }
 
 func main() {
-	clipboard.MaybeServeAndExit()
-
-	if os.Geteuid() == 0 && !isReadOnlyCommand(os.Args) {
+	if os.Geteuid() == 0 {
 		log.Fatal("This program should not be run as root. Exiting.")
 	}
 

core/cmd/dms/main_distro.go

@@ -5,7 +5,6 @@ package main
 import (
 	"os"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 )
 
@@ -28,9 +27,7 @@ func init() {
 }
 
 func main() {
-	clipboard.MaybeServeAndExit()
-
-	if os.Geteuid() == 0 && !isReadOnlyCommand(os.Args) {
+	if os.Geteuid() == 0 {
 		log.Fatal("This program should not be run as root. Exiting.")
 	}
 

core/cmd/dms/utils.go

@@ -7,22 +7,6 @@ import (
 	"strings"
 )
 
-// isReadOnlyCommand returns true if the CLI args indicate a command that is
-// safe to run as root (e.g. shell completion, help).
-func isReadOnlyCommand(args []string) bool {
-	for _, arg := range args[1:] {
-		if strings.HasPrefix(arg, "-") {
-			continue
-		}
-		switch arg {
-		case "completion", "help", "__complete":
-			return true
-		}
-		return false
-	}
-	return false
-}
-
 func isArchPackageInstalled(packageName string) bool {
 	cmd := exec.Command("pacman", "-Q", packageName)
 	err := cmd.Run()

core/internal/blur/probe.go

@@ -1,35 +0,0 @@
-package blur
-
-import (
-	wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client"
-	client "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
-)
-
-const extBackgroundEffectInterface = "ext_background_effect_manager_v1"
-
-func ProbeSupport() (bool, error) {
-	display, err := client.Connect("")
-	if err != nil {
-		return false, err
-	}
-	defer display.Context().Close()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return false, err
-	}
-
-	found := false
-	registry.SetGlobalHandler(func(e client.RegistryGlobalEvent) {
-		switch e.Interface {
-		case extBackgroundEffectInterface:
-			found = true
-		}
-	})
-
-	if err := wlhelpers.Roundtrip(display, display.Context()); err != nil {
-		return false, err
-	}
-
-	return found, nil
-}

core/internal/clipboard/clipboard.go

@@ -1,6 +1,7 @@
 package clipboard
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"os"
@@ -12,142 +13,66 @@ import (
 	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
 )
 
-const envServe = "_DMS_CLIPBOARD_SERVE"
-const envMime = "_DMS_CLIPBOARD_MIME"
-const envPasteOnce = "_DMS_CLIPBOARD_PASTE_ONCE"
-const envCacheFile = "_DMS_CLIPBOARD_CACHE"
-
-// MaybeServeAndExit intercepts before cobra when re-exec'd as a clipboard
-// child. Reads source data into memory, deletes any cache file, then serves.
-func MaybeServeAndExit() {
-	if os.Getenv(envServe) == "" {
-		return
-	}
-
-	mimeType := os.Getenv(envMime)
-	pasteOnce := os.Getenv(envPasteOnce) == "1"
-	cachePath := os.Getenv(envCacheFile)
-
-	var data []byte
-	var err error
-
-	switch {
-	case cachePath != "":
-		data, err = os.ReadFile(cachePath)
-		os.Remove(cachePath)
-	default:
-		data, err = io.ReadAll(os.Stdin)
-	}
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "clipboard: read source: %v\n", err)
-		os.Exit(1)
-	}
-
-	if err := serveClipboard(data, mimeType, pasteOnce); err != nil {
-		fmt.Fprintf(os.Stderr, "clipboard: serve: %v\n", err)
-		os.Exit(1)
-	}
-	os.Exit(0)
-}
-
 func Copy(data []byte, mimeType string) error {
-	return copyForkCached(data, mimeType, false)
+	return CopyReader(bytes.NewReader(data), mimeType, false, false)
 }
 
 func CopyOpts(data []byte, mimeType string, foreground, pasteOnce bool) error {
 	if foreground {
-		return serveClipboard(data, mimeType, pasteOnce)
+		return copyServeWithWriter(func(writer io.Writer) error {
+			total := 0
+			for total < len(data) {
+				n, err := writer.Write(data[total:])
+				total += n
+				if err != nil {
+					return err
+				}
+			}
+			if total != len(data) {
+				return io.ErrShortWrite
+			}
+			return nil
+		}, mimeType, pasteOnce)
 	}
-	return copyForkCached(data, mimeType, pasteOnce)
+	return CopyReader(bytes.NewReader(data), mimeType, foreground, pasteOnce)
 }
 
 func CopyReader(data io.Reader, mimeType string, foreground, pasteOnce bool) error {
-	if foreground {
-		buf, err := io.ReadAll(data)
-		if err != nil {
-			return fmt.Errorf("read source: %w", err)
-		}
-		return serveClipboard(buf, mimeType, pasteOnce)
+	if !foreground {
+		return copyFork(data, mimeType, pasteOnce)
 	}
-	return copyFork(data, mimeType, pasteOnce)
+	return copyServeReader(data, mimeType, pasteOnce)
 }
 
-func newForkCmd(mimeType string, pasteOnce bool, extra ...string) *exec.Cmd {
-	cmd := exec.Command(os.Args[0])
+func copyFork(data io.Reader, mimeType string, pasteOnce bool) error {
+	args := []string{os.Args[0], "cl", "copy", "--foreground"}
+	if pasteOnce {
+		args = append(args, "--paste-once")
+	}
+	args = append(args, "--type", mimeType)
+
+	cmd := exec.Command(args[0], args[1:]...)
 	cmd.Stderr = nil
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
-	cmd.Env = append(os.Environ(),
-		envServe+"=1",
-		envMime+"="+mimeType,
-	)
-	if pasteOnce {
-		cmd.Env = append(cmd.Env, envPasteOnce+"=1")
-	}
-	cmd.Env = append(cmd.Env, extra...)
-	return cmd
-}
+	cmd.Env = append(os.Environ(), "DMS_CLIP_FORKED=1")
 
-func waitReady(cmd *exec.Cmd) error {
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		return fmt.Errorf("stdout pipe: %w", err)
 	}
-	if err := cmd.Start(); err != nil {
-		return fmt.Errorf("start: %w", err)
-	}
-	var buf [1]byte
-	if _, err := stdout.Read(buf[:]); err != nil {
-		return fmt.Errorf("waiting for clipboard ready: %w", err)
-	}
-	return nil
-}
-
-func copyForkCached(data []byte, mimeType string, pasteOnce bool) error {
-	cacheFile, err := createClipboardCacheFile()
-	if err != nil {
-		return fmt.Errorf("create cache file: %w", err)
-	}
-	cachePath := cacheFile.Name()
-
-	if _, err := cacheFile.Write(data); err != nil {
-		cacheFile.Close()
-		os.Remove(cachePath)
-		return fmt.Errorf("write cache file: %w", err)
-	}
-	if err := cacheFile.Close(); err != nil {
-		os.Remove(cachePath)
-		return fmt.Errorf("close cache file: %w", err)
-	}
-
-	cmd := newForkCmd(mimeType, pasteOnce, envCacheFile+"="+cachePath)
-	cmd.Stdin = nil
-	if err := waitReady(cmd); err != nil {
-		os.Remove(cachePath)
-		return err
-	}
-	return nil
-}
-
-func copyFork(data io.Reader, mimeType string, pasteOnce bool) error {
-	cmd := newForkCmd(mimeType, pasteOnce)
 
 	switch src := data.(type) {
 	case *os.File:
 		cmd.Stdin = src
-		return waitReady(cmd)
+		if err := cmd.Start(); err != nil {
+			return fmt.Errorf("start: %w", err)
+		}
 
 	default:
 		stdin, err := cmd.StdinPipe()
 		if err != nil {
 			return fmt.Errorf("stdin pipe: %w", err)
 		}
-
-		stdout, err := cmd.StdoutPipe()
-		if err != nil {
-			return fmt.Errorf("stdout pipe: %w", err)
-		}
-
 		if err := cmd.Start(); err != nil {
 			return fmt.Errorf("start: %w", err)
 		}
@@ -158,22 +83,50 @@ func copyFork(data io.Reader, mimeType string, pasteOnce bool) error {
 		if err := stdin.Close(); err != nil {
 			return fmt.Errorf("close stdin: %w", err)
 		}
-
-		var buf [1]byte
-		if _, err := stdout.Read(buf[:]); err != nil {
-			return fmt.Errorf("waiting for clipboard ready: %w", err)
-		}
-		return nil
 	}
+
+	var buf [1]byte
+	if _, err := stdout.Read(buf[:]); err != nil {
+		return fmt.Errorf("waiting for clipboard ready: %w", err)
+	}
+	return nil
 }
 
 func signalReady() {
-	if os.Getenv(envServe) == "" {
+	if os.Getenv("DMS_CLIP_FORKED") == "" {
 		return
 	}
 	os.Stdout.Write([]byte{1})
 }
 
+func copyServeReader(data io.Reader, mimeType string, pasteOnce bool) error {
+	cachedData, err := createClipboardCacheFile()
+	if err != nil {
+		return fmt.Errorf("create clipboard cache file: %w", err)
+	}
+	defer os.Remove(cachedData.Name())
+
+	if _, err := io.Copy(cachedData, data); err != nil {
+		return fmt.Errorf("cache clipboard data: %w", err)
+	}
+	if err := cachedData.Close(); err != nil {
+		return fmt.Errorf("close temp cache file: %w", err)
+	}
+
+	return copyServeWithWriter(func(writer io.Writer) error {
+		cachedFile, err := os.Open(cachedData.Name())
+		if err != nil {
+			return fmt.Errorf("open temp cache file: %w", err)
+		}
+		defer cachedFile.Close()
+
+		if _, err := io.Copy(writer, cachedFile); err != nil {
+			return fmt.Errorf("write clipboard data: %w", err)
+		}
+		return nil
+	}, mimeType, pasteOnce)
+}
+
 func createClipboardCacheFile() (*os.File, error) {
 	preferredDirs := []string{}
 
@@ -194,7 +147,7 @@ func createClipboardCacheFile() (*os.File, error) {
 	return os.CreateTemp("", "dms-clipboard-*")
 }
 
-func serveClipboard(data []byte, mimeType string, pasteOnce bool) error {
+func copyServeWithWriter(writeTo func(io.Writer) error, mimeType string, pasteOnce bool) error {
 	display, err := wlclient.Connect("")
 	if err != nil {
 		return fmt.Errorf("wayland connect: %w", err)
@@ -236,10 +189,12 @@ func serveClipboard(data []byte, mimeType string, pasteOnce bool) error {
 	if bindErr != nil {
 		return fmt.Errorf("registry bind: %w", bindErr)
 	}
+
 	if dataControlMgr == nil {
 		return fmt.Errorf("compositor does not support ext_data_control_manager_v1")
 	}
 	defer dataControlMgr.Destroy()
+
 	if seat == nil {
 		return fmt.Errorf("no seat available")
 	}
@@ -278,12 +233,18 @@ func serveClipboard(data []byte, mimeType string, pasteOnce bool) error {
 
 	cancelled := make(chan struct{})
 	pasted := make(chan struct{}, 1)
+	sendErr := make(chan error, 1)
 
 	source.SetSendHandler(func(e ext_data_control.ExtDataControlSourceV1SendEvent) {
-		_ = syscall.SetNonblock(e.Fd, false)
+		defer syscall.Close(e.Fd)
 		file := os.NewFile(uintptr(e.Fd), "pipe")
 		defer file.Close()
-		_, _ = file.Write(data)
+		if err := writeTo(file); err != nil {
+			select {
+			case sendErr <- err:
+			default:
+			}
+		}
 		select {
 		case pasted <- struct{}{}:
 		default:
@@ -305,6 +266,8 @@ func serveClipboard(data []byte, mimeType string, pasteOnce bool) error {
 		select {
 		case <-cancelled:
 			return nil
+		case err := <-sendErr:
+			return err
 		case <-pasted:
 			if pasteOnce {
 				return nil
@@ -558,10 +521,12 @@ func copyMultiServe(offers []Offer, pasteOnce bool) error {
 	if bindErr != nil {
 		return fmt.Errorf("registry bind: %w", bindErr)
 	}
+
 	if dataControlMgr == nil {
 		return fmt.Errorf("compositor does not support ext_data_control_manager_v1")
 	}
 	defer dataControlMgr.Destroy()
+
 	if seat == nil {
 		return fmt.Errorf("no seat available")
 	}
@@ -589,12 +554,12 @@ func copyMultiServe(offers []Offer, pasteOnce bool) error {
 	pasted := make(chan struct{}, 1)
 
 	source.SetSendHandler(func(e ext_data_control.ExtDataControlSourceV1SendEvent) {
-		_ = syscall.SetNonblock(e.Fd, false)
+		defer syscall.Close(e.Fd)
 		file := os.NewFile(uintptr(e.Fd), "pipe")
 		defer file.Close()
 
 		if data, ok := offerMap[e.MimeType]; ok {
-			_, _ = file.Write(data)
+			file.Write(data)
 		}
 
 		select {

core/internal/colorpicker/picker.go

@@ -39,10 +39,11 @@ type LayerSurface struct {
 	wlSurface   *client.Surface
 	layerSurf   *wlr_layer_shell.ZwlrLayerSurfaceV1
 	viewport    *wp_viewporter.WpViewport
-	wlPools     [2]*client.ShmPool
-	wlBuffers   [2]*client.Buffer
-	slotBusy    [2]bool
-	needsRedraw bool
+	wlPool      *client.ShmPool
+	wlBuffer    *client.Buffer
+	bufferBusy  bool
+	oldPool     *client.ShmPool
+	oldBuffer   *client.Buffer
 	scopyBuffer *client.Buffer
 	configured  bool
 	hidden      bool
@@ -135,7 +136,6 @@ func (p *Picker) Run() (*Color, error) {
 			break
 		}
 
-		p.flushRedraws()
 		p.checkDone()
 	}
 
@@ -164,15 +164,6 @@ func (p *Picker) checkDone() {
 	}
 }
 
-func (p *Picker) flushRedraws() {
-	for _, ls := range p.surfaces {
-		if !ls.needsRedraw {
-			continue
-		}
-		p.redrawSurface(ls)
-	}
-}
-
 func (p *Picker) connect() error {
 	display, err := client.Connect("")
 	if err != nil {
@@ -516,45 +507,47 @@ func (p *Picker) captureForSurface(ls *LayerSurface) {
 }
 
 func (p *Picker) redrawSurface(ls *LayerSurface) {
-	slot := ls.state.FrontIndex()
-	if ls.slotBusy[slot] {
-		ls.needsRedraw = true
-		return
-	}
-
 	var renderBuf *ShmBuffer
-	switch {
-	case ls.hidden:
+	if ls.hidden {
 		renderBuf = ls.state.RedrawScreenOnly()
-	default:
+	} else {
 		renderBuf = ls.state.Redraw()
 	}
 	if renderBuf == nil {
 		return
 	}
 
-	ls.needsRedraw = false
-
-	if ls.wlPools[slot] == nil {
-		pool, err := p.shm.CreatePool(renderBuf.Fd(), int32(renderBuf.Size()))
-		if err != nil {
-			return
-		}
-		ls.wlPools[slot] = pool
-
-		wlBuffer, err := pool.CreateBuffer(0, int32(renderBuf.Width), int32(renderBuf.Height), int32(renderBuf.Stride), uint32(ls.state.ScreenFormat()))
-		if err != nil {
-			return
-		}
-		ls.wlBuffers[slot] = wlBuffer
-
-		s := slot
-		wlBuffer.SetReleaseHandler(func(e client.BufferReleaseEvent) {
-			ls.slotBusy[s] = false
-		})
+	if ls.oldBuffer != nil {
+		ls.oldBuffer.Destroy()
+		ls.oldBuffer = nil
+	}
+	if ls.oldPool != nil {
+		ls.oldPool.Destroy()
+		ls.oldPool = nil
 	}
 
-	ls.slotBusy[slot] = true
+	ls.oldPool = ls.wlPool
+	ls.oldBuffer = ls.wlBuffer
+	ls.wlPool = nil
+	ls.wlBuffer = nil
+
+	pool, err := p.shm.CreatePool(renderBuf.Fd(), int32(renderBuf.Size()))
+	if err != nil {
+		return
+	}
+	ls.wlPool = pool
+
+	wlBuffer, err := pool.CreateBuffer(0, int32(renderBuf.Width), int32(renderBuf.Height), int32(renderBuf.Stride), uint32(ls.state.ScreenFormat()))
+	if err != nil {
+		return
+	}
+	ls.wlBuffer = wlBuffer
+
+	lsRef := ls
+	wlBuffer.SetReleaseHandler(func(e client.BufferReleaseEvent) {
+		lsRef.bufferBusy = false
+	})
+	ls.bufferBusy = true
 
 	logicalW, logicalH := ls.state.LogicalSize()
 	if logicalW == 0 || logicalH == 0 {
@@ -573,7 +566,7 @@ func (p *Picker) redrawSurface(ls *LayerSurface) {
 		}
 		_ = ls.wlSurface.SetBufferScale(bufferScale)
 	}
-	_ = ls.wlSurface.Attach(ls.wlBuffers[slot], 0, 0)
+	_ = ls.wlSurface.Attach(wlBuffer, 0, 0)
 	_ = ls.wlSurface.Damage(0, 0, int32(logicalW), int32(logicalH))
 	_ = ls.wlSurface.Commit()
 
@@ -641,7 +634,7 @@ func (p *Picker) setupPointerHandlers() {
 		}
 
 		p.activeSurface.state.OnPointerMotion(e.SurfaceX, e.SurfaceY)
-		p.activeSurface.needsRedraw = true
+		p.redrawSurface(p.activeSurface)
 	})
 
 	p.pointer.SetLeaveHandler(func(e client.PointerLeaveEvent) {
@@ -662,7 +655,7 @@ func (p *Picker) setupPointerHandlers() {
 			return
 		}
 		p.activeSurface.state.OnPointerMotion(e.SurfaceX, e.SurfaceY)
-		p.activeSurface.needsRedraw = true
+		p.redrawSurface(p.activeSurface)
 	})
 
 	p.pointer.SetButtonHandler(func(e client.PointerButtonEvent) {
@@ -686,13 +679,17 @@ func (p *Picker) cleanup() {
 		if ls.scopyBuffer != nil {
 			ls.scopyBuffer.Destroy()
 		}
-		for i := range ls.wlBuffers {
-			if ls.wlBuffers[i] != nil {
-				ls.wlBuffers[i].Destroy()
-			}
-			if ls.wlPools[i] != nil {
-				ls.wlPools[i].Destroy()
-			}
+		if ls.oldBuffer != nil {
+			ls.oldBuffer.Destroy()
+		}
+		if ls.oldPool != nil {
+			ls.oldPool.Destroy()
+		}
+		if ls.wlBuffer != nil {
+			ls.wlBuffer.Destroy()
+		}
+		if ls.wlPool != nil {
+			ls.wlPool.Destroy()
 		}
 		if ls.viewport != nil {
 			ls.viewport.Destroy()

core/internal/colorpicker/state.go

@@ -274,12 +274,6 @@ func (s *SurfaceState) FrontRenderBuffer() *ShmBuffer {
 	return s.renderBufs[s.front]
 }
 
-func (s *SurfaceState) FrontIndex() int {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.front
-}
-
 func (s *SurfaceState) SwapBuffers() {
 	s.mu.Lock()
 	s.front ^= 1

core/internal/config/deployer.go

@@ -62,31 +62,12 @@ func (cd *ConfigDeployer) DeployConfigurationsSelectiveWithReinstalls(ctx contex
 func (cd *ConfigDeployer) deployConfigurationsInternal(ctx context.Context, wm deps.WindowManager, terminal deps.Terminal, installedDeps []deps.Dependency, replaceConfigs map[string]bool, reinstallItems map[string]bool, useSystemd bool) ([]DeploymentResult, error) {
 	var results []DeploymentResult
 
-	// Primary config file paths used to detect fresh installs.
-	configPrimaryPaths := map[string]string{
-		"Niri":      filepath.Join(os.Getenv("HOME"), ".config", "niri", "config.kdl"),
-		"Hyprland":  filepath.Join(os.Getenv("HOME"), ".config", "hypr", "hyprland.conf"),
-		"Ghostty":   filepath.Join(os.Getenv("HOME"), ".config", "ghostty", "config"),
-		"Kitty":     filepath.Join(os.Getenv("HOME"), ".config", "kitty", "kitty.conf"),
-		"Alacritty": filepath.Join(os.Getenv("HOME"), ".config", "alacritty", "alacritty.toml"),
-	}
-
 	shouldReplaceConfig := func(configType string) bool {
 		if replaceConfigs == nil {
 			return true
 		}
 		replace, exists := replaceConfigs[configType]
-		if !exists || replace {
-			return true
-		}
-		// Config is explicitly set to "don't replace" — but still deploy
-		// if the config file doesn't exist yet (fresh install scenario).
-		if primaryPath, ok := configPrimaryPaths[configType]; ok {
-			if _, err := os.Stat(primaryPath); os.IsNotExist(err) {
-				return true
-			}
-		}
-		return false
+		return !exists || replace
 	}
 
 	switch wm {

core/internal/config/deployer_test.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"context"
 	"os"
 	"path/filepath"
 	"testing"
@@ -625,168 +624,3 @@ func TestAlacrittyConfigDeployment(t *testing.T) {
 		assert.Contains(t, string(newContent), "decorations = \"None\"")
 	})
 }
-
-func TestShouldReplaceConfigDeployIfMissing(t *testing.T) {
-	allFalse := map[string]bool{
-		"Niri":      false,
-		"Hyprland":  false,
-		"Ghostty":   false,
-		"Kitty":     false,
-		"Alacritty": false,
-	}
-
-	t.Run("replaceConfigs nil deploys config", func(t *testing.T) {
-		tempDir, err := os.MkdirTemp("", "dankinstall-replace-nil-test")
-		require.NoError(t, err)
-		defer os.RemoveAll(tempDir)
-
-		originalHome := os.Getenv("HOME")
-		os.Setenv("HOME", tempDir)
-		defer os.Setenv("HOME", originalHome)
-
-		logChan := make(chan string, 100)
-		cd := NewConfigDeployer(logChan)
-
-		results, err := cd.DeployConfigurationsSelectiveWithReinstalls(
-			context.Background(),
-			deps.WindowManagerNiri,
-			deps.TerminalGhostty,
-			nil, // installedDeps
-			nil, // replaceConfigs
-			nil, // reinstallItems
-		)
-		require.NoError(t, err)
-
-		// With replaceConfigs=nil, all configs should be deployed
-		hasDeployed := false
-		for _, r := range results {
-			if r.Deployed {
-				hasDeployed = true
-				break
-			}
-		}
-		assert.True(t, hasDeployed, "expected at least one config to be deployed when replaceConfigs is nil")
-	})
-
-	t.Run("replaceConfigs all false and config missing deploys config", func(t *testing.T) {
-		tempDir, err := os.MkdirTemp("", "dankinstall-replace-missing-test")
-		require.NoError(t, err)
-		defer os.RemoveAll(tempDir)
-
-		originalHome := os.Getenv("HOME")
-		os.Setenv("HOME", tempDir)
-		defer os.Setenv("HOME", originalHome)
-
-		logChan := make(chan string, 100)
-		cd := NewConfigDeployer(logChan)
-
-		results, err := cd.DeployConfigurationsSelectiveWithReinstalls(
-			context.Background(),
-			deps.WindowManagerNiri,
-			deps.TerminalGhostty,
-			nil,      // installedDeps
-			allFalse, // replaceConfigs — all false
-			nil,      // reinstallItems
-		)
-		require.NoError(t, err)
-
-		// Config files don't exist on disk, so they should still be deployed
-		hasDeployed := false
-		for _, r := range results {
-			if r.Deployed {
-				hasDeployed = true
-				break
-			}
-		}
-		assert.True(t, hasDeployed, "expected configs to be deployed when files are missing, even with replaceConfigs all false")
-	})
-
-	t.Run("replaceConfigs false and config exists skips config", func(t *testing.T) {
-		tempDir, err := os.MkdirTemp("", "dankinstall-replace-exists-test")
-		require.NoError(t, err)
-		defer os.RemoveAll(tempDir)
-
-		originalHome := os.Getenv("HOME")
-		os.Setenv("HOME", tempDir)
-		defer os.Setenv("HOME", originalHome)
-
-		// Create the Ghostty primary config file so shouldReplaceConfig returns false
-		ghosttyPath := filepath.Join(tempDir, ".config", "ghostty", "config")
-		err = os.MkdirAll(filepath.Dir(ghosttyPath), 0o755)
-		require.NoError(t, err)
-		err = os.WriteFile(ghosttyPath, []byte("# existing ghostty config\n"), 0o644)
-		require.NoError(t, err)
-
-		// Also create the Niri primary config file
-		niriPath := filepath.Join(tempDir, ".config", "niri", "config.kdl")
-		err = os.MkdirAll(filepath.Dir(niriPath), 0o755)
-		require.NoError(t, err)
-		err = os.WriteFile(niriPath, []byte("// existing niri config\n"), 0o644)
-		require.NoError(t, err)
-
-		logChan := make(chan string, 100)
-		cd := NewConfigDeployer(logChan)
-
-		results, err := cd.DeployConfigurationsSelectiveWithReinstalls(
-			context.Background(),
-			deps.WindowManagerNiri,
-			deps.TerminalGhostty,
-			nil,      // installedDeps
-			allFalse, // replaceConfigs — all false
-			nil,      // reinstallItems
-		)
-		require.NoError(t, err)
-
-		// Both Niri and Ghostty config files exist, so with all false they should be skipped
-		for _, r := range results {
-			assert.Fail(t, "expected no configs to be deployed", "got deployed config: %s", r.ConfigType)
-		}
-	})
-
-	t.Run("replaceConfigs true and config exists deploys config", func(t *testing.T) {
-		tempDir, err := os.MkdirTemp("", "dankinstall-replace-true-test")
-		require.NoError(t, err)
-		defer os.RemoveAll(tempDir)
-
-		originalHome := os.Getenv("HOME")
-		os.Setenv("HOME", tempDir)
-		defer os.Setenv("HOME", originalHome)
-
-		// Create the Ghostty primary config file
-		ghosttyPath := filepath.Join(tempDir, ".config", "ghostty", "config")
-		err = os.MkdirAll(filepath.Dir(ghosttyPath), 0o755)
-		require.NoError(t, err)
-		err = os.WriteFile(ghosttyPath, []byte("# existing ghostty config\n"), 0o644)
-		require.NoError(t, err)
-
-		logChan := make(chan string, 100)
-		cd := NewConfigDeployer(logChan)
-
-		replaceConfigs := map[string]bool{
-			"Niri":      false,
-			"Hyprland":  false,
-			"Ghostty":   true, // explicitly true
-			"Kitty":     false,
-			"Alacritty": false,
-		}
-
-		results, err := cd.DeployConfigurationsSelectiveWithReinstalls(
-			context.Background(),
-			deps.WindowManagerNiri,
-			deps.TerminalGhostty,
-			nil,            // installedDeps
-			replaceConfigs, // Ghostty=true, rest=false
-			nil,            // reinstallItems
-		)
-		require.NoError(t, err)
-
-		// Ghostty should be deployed because replaceConfigs["Ghostty"]=true
-		foundGhostty := false
-		for _, r := range results {
-			if r.ConfigType == "Ghostty" && r.Deployed {
-				foundGhostty = true
-			}
-		}
-		assert.True(t, foundGhostty, "expected Ghostty config to be deployed when replaceConfigs is true")
-	})
-}

core/internal/config/embedded/hypr-binds.conf

@@ -137,7 +137,7 @@ bind = SUPER, bracketright, layoutmsg, preselect r
 
 # === Sizing & Layout ===
 bind = SUPER, R, layoutmsg, togglesplit
-bind = SUPER CTRL, F, resizeactive, exact 100% 100%
+bind = SUPER CTRL, F, resizeactive, exact 100%
 
 # === Move/resize windows with mainMod + LMB/RMB and dragging ===
 bindmd = SUPER, mouse:272, Move window, movewindow

core/internal/config/embedded/hyprland.conf

@@ -94,7 +94,6 @@ windowrule = tile on, match:class ^(gnome-control-center)$
 windowrule = tile on, match:class ^(pavucontrol)$
 windowrule = tile on, match:class ^(nm-connection-editor)$
 
-windowrule = float on, match:class ^(org\.gnome\.Calculator)$
 windowrule = float on, match:class ^(gnome-calculator)$
 windowrule = float on, match:class ^(galculator)$
 windowrule = float on, match:class ^(blueman-manager)$

core/internal/config/embedded/niri.kdl

@@ -224,7 +224,6 @@ window-rule {
     open-floating false
 }
 window-rule {
-    match app-id=r#"^org\.gnome\.Calculator$"#
     match app-id=r#"^gnome-calculator$"#
     match app-id=r#"^galculator$"#
     match app-id=r#"^blueman-manager$"#

core/internal/distros/arch.go

@@ -242,7 +242,11 @@ func (a *ArchDistribution) getDMSMapping(variant deps.PackageVariant) PackageMap
 		return PackageMapping{Name: "dms-shell-git", Repository: RepoTypeAUR}
 	}
 
-	return PackageMapping{Name: "dms-shell", Repository: RepoTypeSystem}
+	if a.packageInstalled("dms-shell-bin") {
+		return PackageMapping{Name: "dms-shell-bin", Repository: RepoTypeAUR}
+	}
+
+	return PackageMapping{Name: "dms-shell-bin", Repository: RepoTypeAUR}
 }
 
 func (a *ArchDistribution) detectXwaylandSatellite() deps.Dependency {
@@ -324,13 +328,6 @@ func (a *ArchDistribution) InstallPackages(ctx context.Context, dependencies []d
 
 	systemPkgs, aurPkgs, manualPkgs, variantMap := a.categorizePackages(dependencies, wm, reinstallFlags, disabledFlags)
 
-	if slices.Contains(aurPkgs, "quickshell-git") && slices.Contains(systemPkgs, "dms-shell") {
-		if err := a.preinstallQuickshellGit(ctx, sudoPassword, progressChan); err != nil {
-			return fmt.Errorf("failed to preinstall quickshell-git: %w", err)
-		}
-		aurPkgs = slices.DeleteFunc(aurPkgs, func(p string) bool { return p == "quickshell-git" })
-	}
-
 	// Phase 3: System Packages
 	if len(systemPkgs) > 0 {
 		progressChan <- InstallProgressMsg{
@@ -448,37 +445,6 @@ func (a *ArchDistribution) categorizePackages(dependencies []deps.Dependency, wm
 	return systemPkgs, aurPkgs, manualPkgs, variantMap
 }
 
-func (a *ArchDistribution) preinstallQuickshellGit(ctx context.Context, sudoPassword string, progressChan chan<- InstallProgressMsg) error {
-	if a.packageInstalled("quickshell-git") {
-		return nil
-	}
-
-	if a.packageInstalled("quickshell") {
-		progressChan <- InstallProgressMsg{
-			Phase:       PhaseAURPackages,
-			Progress:    0.15,
-			Step:        "Removing stable quickshell...",
-			IsComplete:  false,
-			NeedsSudo:   true,
-			CommandInfo: "sudo pacman -Rdd --noconfirm quickshell",
-			LogOutput:   "Removing stable quickshell so quickshell-git can be installed",
-		}
-		cmd := ExecSudoCommand(ctx, sudoPassword, "pacman -Rdd --noconfirm quickshell")
-		if err := a.runWithProgress(cmd, progressChan, PhaseAURPackages, 0.15, 0.18); err != nil {
-			return fmt.Errorf("failed to remove stable quickshell: %w", err)
-		}
-	}
-
-	progressChan <- InstallProgressMsg{
-		Phase:       PhaseAURPackages,
-		Progress:    0.18,
-		Step:        "Building quickshell-git before system packages...",
-		IsComplete:  false,
-		CommandInfo: "Installing quickshell-git ahead of dms-shell to avoid conflict",
-	}
-	return a.installSingleAURPackage(ctx, "quickshell-git", sudoPassword, progressChan, 0.18, 0.32)
-}
-
 func (a *ArchDistribution) installSystemPackages(ctx context.Context, packages []string, sudoPassword string, progressChan chan<- InstallProgressMsg) error {
 	if len(packages) == 0 {
 		return nil
@@ -487,9 +453,6 @@ func (a *ArchDistribution) installSystemPackages(ctx context.Context, packages [
 	a.log(fmt.Sprintf("Installing system packages: %s", strings.Join(packages, ", ")))
 
 	args := []string{"pacman", "-S", "--needed", "--noconfirm"}
-	if slices.Contains(packages, "dms-shell") {
-		args = append(args, "--assume-installed", "dms-shell-compositor=1")
-	}
 	args = append(args, packages...)
 
 	progressChan <- InstallProgressMsg{
@@ -577,7 +540,7 @@ func (a *ArchDistribution) reorderAURPackages(packages []string) []string {
 	var dmsShell []string
 
 	for _, pkg := range packages {
-		if pkg == "dms-shell-git" {
+		if pkg == "dms-shell-git" || pkg == "dms-shell-bin" {
 			dmsShell = append(dmsShell, pkg)
 		} else {
 			isDep := false
@@ -658,7 +621,7 @@ func (a *ArchDistribution) installSingleAURPackageInternal(ctx context.Context,
 		}
 	}
 
-	if pkg == "dms-shell-git" {
+	if pkg == "dms-shell-git" || pkg == "dms-shell-bin" {
 		srcinfoPath := filepath.Join(packageDir, ".SRCINFO")
 		depsToRemove := []string{
 			"depends = quickshell",
@@ -681,7 +644,15 @@ func (a *ArchDistribution) installSingleAURPackageInternal(ctx context.Context,
 	}
 
 	srcinfoPath = filepath.Join(packageDir, ".SRCINFO")
-	{
+	if pkg == "dms-shell-bin" {
+		progressChan <- InstallProgressMsg{
+			Phase:      PhaseAURPackages,
+			Progress:   startProgress + 0.35*(endProgress-startProgress),
+			Step:       fmt.Sprintf("Skipping dependency installation for %s (manually managed)...", pkg),
+			IsComplete: false,
+			LogOutput:  fmt.Sprintf("Dependencies for %s are installed separately", pkg),
+		}
+	} else {
 		progressChan <- InstallProgressMsg{
 			Phase:       PhaseAURPackages,
 			Progress:    startProgress + 0.3*(endProgress-startProgress),
@@ -768,9 +739,42 @@ func (a *ArchDistribution) installSingleAURPackageInternal(ctx context.Context,
 		CommandInfo: "sudo pacman -U built-package",
 	}
 
+	// Find .pkg.tar* files - for split packages, install the base and any installed compositor variants
 	var files []string
-	matches, _ := filepath.Glob(filepath.Join(packageDir, "*.pkg.tar*"))
-	files = matches
+	if pkg == "dms-shell-git" || pkg == "dms-shell-bin" {
+		// For DMS split packages, install base package
+		pattern := filepath.Join(packageDir, fmt.Sprintf("%s-%s*.pkg.tar*", pkg, "*"))
+		matches, err := filepath.Glob(pattern)
+		if err == nil {
+			for _, match := range matches {
+				basename := filepath.Base(match)
+				// Always include base package
+				if !strings.Contains(basename, "hyprland") && !strings.Contains(basename, "niri") {
+					files = append(files, match)
+				}
+			}
+		}
+
+		// Also update compositor-specific packages if they're installed
+		if strings.HasSuffix(pkg, "-git") {
+			if a.packageInstalled("dms-shell-hyprland-git") {
+				hyprlandPattern := filepath.Join(packageDir, "dms-shell-hyprland-git-*.pkg.tar*")
+				if hyprlandMatches, err := filepath.Glob(hyprlandPattern); err == nil && len(hyprlandMatches) > 0 {
+					files = append(files, hyprlandMatches[0])
+				}
+			}
+			if a.packageInstalled("dms-shell-niri-git") {
+				niriPattern := filepath.Join(packageDir, "dms-shell-niri-git-*.pkg.tar*")
+				if niriMatches, err := filepath.Glob(niriPattern); err == nil && len(niriMatches) > 0 {
+					files = append(files, niriMatches[0])
+				}
+			}
+		}
+	} else {
+		// For other packages, install all built packages
+		matches, _ := filepath.Glob(filepath.Join(packageDir, "*.pkg.tar*"))
+		files = matches
+	}
 
 	if len(files) == 0 {
 		return fmt.Errorf("no package files found after building %s", pkg)

core/internal/headless/runner.go

@@ -1,418 +0,0 @@
-package headless
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/config"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/distros"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/greeter"
-)
-
-// ErrConfirmationRequired is returned when --yes is not set and the user
-// must explicitly confirm the operation.
-var ErrConfirmationRequired = fmt.Errorf("confirmation required: pass --yes to proceed")
-
-// validConfigNames maps lowercase CLI input to the deployer key used in
-// replaceConfigs. Keep in sync with the config types checked by
-// shouldReplaceConfig in deployer.go.
-var validConfigNames = map[string]string{
-	"niri":      "Niri",
-	"hyprland":  "Hyprland",
-	"ghostty":   "Ghostty",
-	"kitty":     "Kitty",
-	"alacritty": "Alacritty",
-}
-
-// orderedConfigNames defines the canonical order for config names in output.
-// Must be kept in sync with validConfigNames.
-var orderedConfigNames = []string{"niri", "hyprland", "ghostty", "kitty", "alacritty"}
-
-// Config holds all CLI parameters for unattended installation.
-type Config struct {
-	Compositor        string // "niri" or "hyprland"
-	Terminal          string // "ghostty", "kitty", or "alacritty"
-	IncludeDeps       []string
-	ExcludeDeps       []string
-	ReplaceConfigs    []string // specific configs to deploy (e.g. "niri", "ghostty")
-	ReplaceConfigsAll bool     // deploy/replace all configurations
-	Yes               bool
-}
-
-// Runner orchestrates unattended (headless) installation.
-type Runner struct {
-	cfg     Config
-	logChan chan string
-}
-
-// NewRunner creates a new headless runner.
-func NewRunner(cfg Config) *Runner {
-	return &Runner{
-		cfg:     cfg,
-		logChan: make(chan string, 1000),
-	}
-}
-
-// GetLogChan returns the log channel for file logging.
-func (r *Runner) GetLogChan() <-chan string {
-	return r.logChan
-}
-
-// Run executes the full unattended installation flow.
-func (r *Runner) Run() error {
-	r.log("Starting headless installation")
-
-	// 1. Parse compositor and terminal selections
-	wm, err := r.parseWindowManager()
-	if err != nil {
-		return err
-	}
-
-	terminal, err := r.parseTerminal()
-	if err != nil {
-		return err
-	}
-
-	// 2. Build replace-configs map
-	replaceConfigs, err := r.buildReplaceConfigs()
-	if err != nil {
-		return err
-	}
-
-	// 3. Detect OS
-	r.log("Detecting operating system...")
-	osInfo, err := distros.GetOSInfo()
-	if err != nil {
-		return fmt.Errorf("OS detection failed: %w", err)
-	}
-
-	if distros.IsUnsupportedDistro(osInfo.Distribution.ID, osInfo.VersionID) {
-		return fmt.Errorf("unsupported distribution: %s %s", osInfo.PrettyName, osInfo.VersionID)
-	}
-
-	fmt.Fprintf(os.Stdout, "Detected: %s (%s)\n", osInfo.PrettyName, osInfo.Architecture)
-
-	// 4. Create distribution instance
-	distro, err := distros.NewDistribution(osInfo.Distribution.ID, r.logChan)
-	if err != nil {
-		return fmt.Errorf("failed to initialize distribution: %w", err)
-	}
-
-	// 5. Detect dependencies
-	r.log("Detecting dependencies...")
-	fmt.Fprintln(os.Stdout, "Detecting dependencies...")
-	dependencies, err := distro.DetectDependenciesWithTerminal(context.Background(), wm, terminal)
-	if err != nil {
-		return fmt.Errorf("dependency detection failed: %w", err)
-	}
-
-	// 5. Apply include/exclude filters and build the disabled-items map.
-	// Headless mode does not currently collect any explicit reinstall selections,
-	// so keep reinstallItems nil instead of constructing an always-empty map.
-	disabledItems, err := r.buildDisabledItems(dependencies)
-	if err != nil {
-		return err
-	}
-	var reinstallItems map[string]bool
-
-	// Print dependency summary
-	fmt.Fprintln(os.Stdout, "\nDependencies:")
-	for _, dep := range dependencies {
-		marker := "  "
-		status := ""
-		if disabledItems[dep.Name] {
-			marker = "  SKIP "
-			status = "(disabled)"
-		} else {
-			switch dep.Status {
-			case deps.StatusInstalled:
-				marker = "  OK   "
-				status = "(installed)"
-			case deps.StatusMissing:
-				marker = "  NEW  "
-				status = "(will install)"
-			case deps.StatusNeedsUpdate:
-				marker = "  UPD  "
-				status = "(will update)"
-			case deps.StatusNeedsReinstall:
-				marker = "  RE   "
-				status = "(will reinstall)"
-			}
-		}
-		fmt.Fprintf(os.Stdout, "%s%-30s %s\n", marker, dep.Name, status)
-	}
-	fmt.Fprintln(os.Stdout)
-
-	// 6b. Require explicit confirmation unless --yes is set
-	if !r.cfg.Yes {
-		if replaceConfigs == nil {
-			// --replace-configs-all
-			fmt.Fprintln(os.Stdout, "Packages will be installed and all configurations will be replaced.")
-			fmt.Fprintln(os.Stdout, "Existing config files will be backed up before replacement.")
-		} else if r.anyConfigEnabled(replaceConfigs) {
-			var names []string
-			for _, cliName := range orderedConfigNames {
-				deployerKey := validConfigNames[cliName]
-				if replaceConfigs[deployerKey] {
-					names = append(names, deployerKey)
-				}
-			}
-			fmt.Fprintf(os.Stdout, "Packages will be installed. The following configurations will be replaced (with backups): %s\n", strings.Join(names, ", "))
-		} else {
-			fmt.Fprintln(os.Stdout, "Packages will be installed. No configurations will be deployed.")
-		}
-		fmt.Fprintln(os.Stdout, "Re-run with --yes (-y) to proceed.")
-		r.log("Aborted: --yes not set")
-		return ErrConfirmationRequired
-	}
-
-	// 7. Authenticate sudo
-	sudoPassword, err := r.resolveSudoPassword()
-	if err != nil {
-		return err
-	}
-
-	// 8. Install packages
-	fmt.Fprintln(os.Stdout, "Installing packages...")
-	r.log("Starting package installation")
-
-	progressChan := make(chan distros.InstallProgressMsg, 100)
-
-	installErr := make(chan error, 1)
-	go func() {
-		defer close(progressChan)
-		installErr <- distro.InstallPackages(
-			context.Background(),
-			dependencies,
-			wm,
-			sudoPassword,
-			reinstallItems,
-			disabledItems,
-			false, // skipGlobalUseFlags
-			progressChan,
-		)
-	}()
-
-	// Consume progress messages and print them
-	for msg := range progressChan {
-		if msg.Error != nil {
-			fmt.Fprintf(os.Stderr, "Error: %v\n", msg.Error)
-		} else if msg.Step != "" {
-			fmt.Fprintf(os.Stdout, "  [%3.0f%%] %s\n", msg.Progress*100, msg.Step)
-		}
-		if msg.LogOutput != "" {
-			r.log(msg.LogOutput)
-			fmt.Fprintf(os.Stdout, "    %s\n", msg.LogOutput)
-		}
-	}
-
-	if err := <-installErr; err != nil {
-		return fmt.Errorf("package installation failed: %w", err)
-	}
-
-	// 9. Greeter setup (if dms-greeter was included)
-	if !disabledItems["dms-greeter"] && r.depExists(dependencies, "dms-greeter") {
-		compositorName := "niri"
-		if wm == deps.WindowManagerHyprland {
-			compositorName = "Hyprland"
-		}
-		fmt.Fprintln(os.Stdout, "Configuring DMS greeter...")
-		logFunc := func(line string) {
-			r.log(line)
-			fmt.Fprintf(os.Stdout, "  greeter: %s\n", line)
-		}
-		if err := greeter.AutoSetupGreeter(compositorName, sudoPassword, logFunc); err != nil {
-			// Non-fatal, matching TUI behavior
-			fmt.Fprintf(os.Stderr, "Warning: greeter setup issue (non-fatal): %v\n", err)
-		}
-	}
-
-	// 10. Deploy configurations
-	fmt.Fprintln(os.Stdout, "Deploying configurations...")
-	r.log("Starting configuration deployment")
-
-	deployer := config.NewConfigDeployer(r.logChan)
-	results, err := deployer.DeployConfigurationsSelectiveWithReinstalls(
-		context.Background(),
-		wm,
-		terminal,
-		dependencies,
-		replaceConfigs,
-		reinstallItems,
-	)
-	if err != nil {
-		return fmt.Errorf("configuration deployment failed: %w", err)
-	}
-
-	for _, result := range results {
-		if result.Deployed {
-			msg := fmt.Sprintf("  Deployed: %s", result.ConfigType)
-			if result.BackupPath != "" {
-				msg += fmt.Sprintf(" (backup: %s)", result.BackupPath)
-			}
-			fmt.Fprintln(os.Stdout, msg)
-		}
-		if result.Error != nil {
-			fmt.Fprintf(os.Stderr, "  Error deploying %s: %v\n", result.ConfigType, result.Error)
-		}
-	}
-
-	fmt.Fprintln(os.Stdout, "\nInstallation complete!")
-	r.log("Headless installation completed successfully")
-	return nil
-}
-
-// buildDisabledItems computes the set of dependencies that should be skipped
-// during installation, applying the --include-deps and --exclude-deps filters.
-// dms-greeter is disabled by default (opt-in), matching TUI behavior.
-func (r *Runner) buildDisabledItems(dependencies []deps.Dependency) (map[string]bool, error) {
-	disabledItems := make(map[string]bool)
-
-	// dms-greeter is opt-in (disabled by default), matching TUI behavior
-	for i := range dependencies {
-		if dependencies[i].Name == "dms-greeter" {
-			disabledItems["dms-greeter"] = true
-			break
-		}
-	}
-
-	// Process --include-deps (enable items that are disabled by default)
-	for _, name := range r.cfg.IncludeDeps {
-		name = strings.TrimSpace(name)
-		if name == "" {
-			continue
-		}
-		if !r.depExists(dependencies, name) {
-			return nil, fmt.Errorf("--include-deps: unknown dependency %q", name)
-		}
-		delete(disabledItems, name)
-	}
-
-	// Process --exclude-deps (disable items)
-	for _, name := range r.cfg.ExcludeDeps {
-		name = strings.TrimSpace(name)
-		if name == "" {
-			continue
-		}
-		if !r.depExists(dependencies, name) {
-			return nil, fmt.Errorf("--exclude-deps: unknown dependency %q", name)
-		}
-		// Don't allow excluding DMS itself
-		if name == "dms (DankMaterialShell)" {
-			return nil, fmt.Errorf("--exclude-deps: cannot exclude required package %q", name)
-		}
-		disabledItems[name] = true
-	}
-
-	return disabledItems, nil
-}
-
-// buildReplaceConfigs converts the --replace-configs / --replace-configs-all
-// flags into the map[string]bool consumed by the config deployer.
-//
-// Returns:
-//   - nil when --replace-configs-all is set (deployer treats nil as "replace all")
-//   - a map with all known configs set to false when neither flag is set (deploy only if config file is missing on disk)
-//   - a map with requested configs true, all others false for --replace-configs
-//   - an error when both flags are set or an invalid config name is given
-func (r *Runner) buildReplaceConfigs() (map[string]bool, error) {
-	hasSpecific := len(r.cfg.ReplaceConfigs) > 0
-	if hasSpecific && r.cfg.ReplaceConfigsAll {
-		return nil, fmt.Errorf("--replace-configs and --replace-configs-all are mutually exclusive")
-	}
-
-	if r.cfg.ReplaceConfigsAll {
-		return nil, nil
-	}
-
-	// Build a map with all known configs explicitly set to false
-	result := make(map[string]bool, len(validConfigNames))
-	for _, cliName := range orderedConfigNames {
-		result[validConfigNames[cliName]] = false
-	}
-
-	// Enable only the requested configs
-	for _, name := range r.cfg.ReplaceConfigs {
-		name = strings.TrimSpace(name)
-		if name == "" {
-			continue
-		}
-		deployerKey, ok := validConfigNames[strings.ToLower(name)]
-		if !ok {
-			return nil, fmt.Errorf("--replace-configs: unknown config %q; valid values: niri, hyprland, ghostty, kitty, alacritty", name)
-		}
-		result[deployerKey] = true
-	}
-
-	return result, nil
-}
-
-func (r *Runner) log(message string) {
-	select {
-	case r.logChan <- message:
-	default:
-	}
-}
-
-func (r *Runner) parseWindowManager() (deps.WindowManager, error) {
-	switch strings.ToLower(r.cfg.Compositor) {
-	case "niri":
-		return deps.WindowManagerNiri, nil
-	case "hyprland":
-		return deps.WindowManagerHyprland, nil
-	default:
-		return 0, fmt.Errorf("invalid --compositor value %q: must be 'niri' or 'hyprland'", r.cfg.Compositor)
-	}
-}
-
-func (r *Runner) parseTerminal() (deps.Terminal, error) {
-	switch strings.ToLower(r.cfg.Terminal) {
-	case "ghostty":
-		return deps.TerminalGhostty, nil
-	case "kitty":
-		return deps.TerminalKitty, nil
-	case "alacritty":
-		return deps.TerminalAlacritty, nil
-	default:
-		return 0, fmt.Errorf("invalid --term value %q: must be 'ghostty', 'kitty', or 'alacritty'", r.cfg.Terminal)
-	}
-}
-
-func (r *Runner) resolveSudoPassword() (string, error) {
-	// Check if sudo credentials are cached (via sudo -v or NOPASSWD)
-	cmd := exec.Command("sudo", "-n", "true")
-	if err := cmd.Run(); err == nil {
-		r.log("sudo cache is valid, no password needed")
-		fmt.Fprintln(os.Stdout, "sudo: using cached credentials")
-		return "", nil
-	}
-
-	return "", fmt.Errorf(
-		"sudo authentication required but no cached credentials found\n" +
-			"Options:\n" +
-			"  1. Run 'sudo -v' before dankinstall to cache credentials\n" +
-			"  2. Configure passwordless sudo for your user",
-	)
-}
-
-func (r *Runner) anyConfigEnabled(m map[string]bool) bool {
-	for _, v := range m {
-		if v {
-			return true
-		}
-	}
-	return false
-}
-
-func (r *Runner) depExists(dependencies []deps.Dependency, name string) bool {
-	for _, dep := range dependencies {
-		if dep.Name == name {
-			return true
-		}
-	}
-	return false
-}

core/internal/headless/runner_test.go

@@ -1,459 +0,0 @@
-package headless
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
-)
-
-func TestParseWindowManager(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		want    deps.WindowManager
-		wantErr bool
-	}{
-		{"niri lowercase", "niri", deps.WindowManagerNiri, false},
-		{"niri mixed case", "Niri", deps.WindowManagerNiri, false},
-		{"hyprland lowercase", "hyprland", deps.WindowManagerHyprland, false},
-		{"hyprland mixed case", "Hyprland", deps.WindowManagerHyprland, false},
-		{"invalid", "sway", 0, true},
-		{"empty", "", 0, true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			r := NewRunner(Config{Compositor: tt.input})
-			got, err := r.parseWindowManager()
-			if (err != nil) != tt.wantErr {
-				t.Errorf("parseWindowManager() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !tt.wantErr && got != tt.want {
-				t.Errorf("parseWindowManager() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestParseTerminal(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		want    deps.Terminal
-		wantErr bool
-	}{
-		{"ghostty lowercase", "ghostty", deps.TerminalGhostty, false},
-		{"ghostty mixed case", "Ghostty", deps.TerminalGhostty, false},
-		{"kitty lowercase", "kitty", deps.TerminalKitty, false},
-		{"alacritty lowercase", "alacritty", deps.TerminalAlacritty, false},
-		{"alacritty uppercase", "ALACRITTY", deps.TerminalAlacritty, false},
-		{"invalid", "wezterm", 0, true},
-		{"empty", "", 0, true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			r := NewRunner(Config{Terminal: tt.input})
-			got, err := r.parseTerminal()
-			if (err != nil) != tt.wantErr {
-				t.Errorf("parseTerminal() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !tt.wantErr && got != tt.want {
-				t.Errorf("parseTerminal() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestDepExists(t *testing.T) {
-	dependencies := []deps.Dependency{
-		{Name: "niri", Status: deps.StatusInstalled},
-		{Name: "ghostty", Status: deps.StatusMissing},
-		{Name: "dms (DankMaterialShell)", Status: deps.StatusInstalled},
-		{Name: "dms-greeter", Status: deps.StatusMissing},
-	}
-
-	tests := []struct {
-		name string
-		dep  string
-		want bool
-	}{
-		{"existing dep", "niri", true},
-		{"existing dep with special chars", "dms (DankMaterialShell)", true},
-		{"existing optional dep", "dms-greeter", true},
-		{"non-existing dep", "firefox", false},
-		{"empty name", "", false},
-	}
-
-	r := NewRunner(Config{})
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := r.depExists(dependencies, tt.dep); got != tt.want {
-				t.Errorf("depExists(%q) = %v, want %v", tt.dep, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestNewRunner(t *testing.T) {
-	cfg := Config{
-		Compositor:  "niri",
-		Terminal:    "ghostty",
-		IncludeDeps: []string{"dms-greeter"},
-		ExcludeDeps: []string{"some-pkg"},
-		Yes:         true,
-	}
-	r := NewRunner(cfg)
-
-	if r == nil {
-		t.Fatal("NewRunner returned nil")
-	}
-	if r.cfg.Compositor != "niri" {
-		t.Errorf("cfg.Compositor = %q, want %q", r.cfg.Compositor, "niri")
-	}
-	if r.cfg.Terminal != "ghostty" {
-		t.Errorf("cfg.Terminal = %q, want %q", r.cfg.Terminal, "ghostty")
-	}
-	if !r.cfg.Yes {
-		t.Error("cfg.Yes = false, want true")
-	}
-	if r.logChan == nil {
-		t.Error("logChan is nil")
-	}
-}
-
-func TestGetLogChan(t *testing.T) {
-	r := NewRunner(Config{})
-	ch := r.GetLogChan()
-	if ch == nil {
-		t.Fatal("GetLogChan returned nil")
-	}
-
-	// Verify the channel is readable by sending a message
-	go func() {
-		r.logChan <- "test message"
-	}()
-	msg := <-ch
-	if msg != "test message" {
-		t.Errorf("received %q, want %q", msg, "test message")
-	}
-}
-
-func TestLog(t *testing.T) {
-	r := NewRunner(Config{})
-
-	// log should not block even if channel is full
-	for i := 0; i < 1100; i++ {
-		r.log("message")
-	}
-	// If we reach here without hanging, the non-blocking send works
-}
-
-func TestRunRequiresYes(t *testing.T) {
-	// Verify that ErrConfirmationRequired is a distinct sentinel error
-	if ErrConfirmationRequired == nil {
-		t.Fatal("ErrConfirmationRequired should not be nil")
-	}
-	expected := "confirmation required: pass --yes to proceed"
-	if ErrConfirmationRequired.Error() != expected {
-		t.Errorf("ErrConfirmationRequired = %q, want %q", ErrConfirmationRequired.Error(), expected)
-	}
-}
-
-func TestConfigYesStoredCorrectly(t *testing.T) {
-	// Yes=false (default) should be stored
-	rNo := NewRunner(Config{Compositor: "niri", Terminal: "ghostty", Yes: false})
-	if rNo.cfg.Yes {
-		t.Error("cfg.Yes = true, want false")
-	}
-
-	// Yes=true should be stored
-	rYes := NewRunner(Config{Compositor: "niri", Terminal: "ghostty", Yes: true})
-	if !rYes.cfg.Yes {
-		t.Error("cfg.Yes = false, want true")
-	}
-}
-
-func TestValidConfigNamesCompleteness(t *testing.T) {
-	// orderedConfigNames and validConfigNames must stay in sync.
-	if len(orderedConfigNames) != len(validConfigNames) {
-		t.Fatalf("orderedConfigNames has %d entries but validConfigNames has %d",
-			len(orderedConfigNames), len(validConfigNames))
-	}
-
-	// Every entry in orderedConfigNames must exist in validConfigNames.
-	for _, name := range orderedConfigNames {
-		if _, ok := validConfigNames[name]; !ok {
-			t.Errorf("orderedConfigNames contains %q which is missing from validConfigNames", name)
-		}
-	}
-
-	// validConfigNames must have no extra keys not in orderedConfigNames.
-	ordered := make(map[string]bool, len(orderedConfigNames))
-	for _, name := range orderedConfigNames {
-		ordered[name] = true
-	}
-	for key := range validConfigNames {
-		if !ordered[key] {
-			t.Errorf("validConfigNames contains %q which is missing from orderedConfigNames", key)
-		}
-	}
-}
-
-func TestBuildReplaceConfigs(t *testing.T) {
-	allDeployerKeys := []string{"Niri", "Hyprland", "Ghostty", "Kitty", "Alacritty"}
-
-	tests := []struct {
-		name           string
-		replaceConfigs []string
-		replaceAll     bool
-		wantNil        bool     // expect nil (replace all)
-		wantEnabled    []string // deployer keys that should be true
-		wantErr        bool
-	}{
-		{
-			name:        "neither flag set",
-			wantNil:     false,
-			wantEnabled: nil, // all should be false
-		},
-		{
-			name:       "replace-configs-all",
-			replaceAll: true,
-			wantNil:    true,
-		},
-		{
-			name:           "specific configs",
-			replaceConfigs: []string{"niri", "ghostty"},
-			wantNil:        false,
-			wantEnabled:    []string{"Niri", "Ghostty"},
-		},
-		{
-			name:           "both flags set",
-			replaceConfigs: []string{"niri"},
-			replaceAll:     true,
-			wantErr:        true,
-		},
-		{
-			name:           "invalid config name",
-			replaceConfigs: []string{"foo"},
-			wantErr:        true,
-		},
-		{
-			name:           "case insensitive",
-			replaceConfigs: []string{"NIRI", "Ghostty"},
-			wantNil:        false,
-			wantEnabled:    []string{"Niri", "Ghostty"},
-		},
-		{
-			name:           "single config",
-			replaceConfigs: []string{"kitty"},
-			wantNil:        false,
-			wantEnabled:    []string{"Kitty"},
-		},
-		{
-			name:           "whitespace entry",
-			replaceConfigs: []string{"  ", "niri"},
-			wantNil:        false,
-			wantEnabled:    []string{"Niri"},
-		},
-		{
-			name:           "duplicate entry",
-			replaceConfigs: []string{"niri", "niri"},
-			wantNil:        false,
-			wantEnabled:    []string{"Niri"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			r := NewRunner(Config{
-				ReplaceConfigs:    tt.replaceConfigs,
-				ReplaceConfigsAll: tt.replaceAll,
-			})
-			got, err := r.buildReplaceConfigs()
-			if (err != nil) != tt.wantErr {
-				t.Fatalf("buildReplaceConfigs() error = %v, wantErr %v", err, tt.wantErr)
-			}
-			if tt.wantErr {
-				return
-			}
-			if tt.wantNil {
-				if got != nil {
-					t.Fatalf("buildReplaceConfigs() = %v, want nil", got)
-				}
-				return
-			}
-			if got == nil {
-				t.Fatal("buildReplaceConfigs() = nil, want non-nil map")
-			}
-
-			// All known deployer keys must be present
-			for _, key := range allDeployerKeys {
-				if _, exists := got[key]; !exists {
-					t.Errorf("missing deployer key %q in result map", key)
-				}
-			}
-
-			// Build enabled set for easy lookup
-			enabledSet := make(map[string]bool)
-			for _, k := range tt.wantEnabled {
-				enabledSet[k] = true
-			}
-
-			for _, key := range allDeployerKeys {
-				want := enabledSet[key]
-				if got[key] != want {
-					t.Errorf("replaceConfigs[%q] = %v, want %v", key, got[key], want)
-				}
-			}
-		})
-	}
-}
-
-func TestConfigReplaceConfigsStoredCorrectly(t *testing.T) {
-	r := NewRunner(Config{
-		Compositor:        "niri",
-		Terminal:          "ghostty",
-		ReplaceConfigs:    []string{"niri", "ghostty"},
-		ReplaceConfigsAll: false,
-	})
-	if len(r.cfg.ReplaceConfigs) != 2 {
-		t.Errorf("len(ReplaceConfigs) = %d, want 2", len(r.cfg.ReplaceConfigs))
-	}
-	if r.cfg.ReplaceConfigsAll {
-		t.Error("ReplaceConfigsAll = true, want false")
-	}
-
-	r2 := NewRunner(Config{
-		Compositor:        "niri",
-		Terminal:          "ghostty",
-		ReplaceConfigsAll: true,
-	})
-	if !r2.cfg.ReplaceConfigsAll {
-		t.Error("ReplaceConfigsAll = false, want true")
-	}
-	if len(r2.cfg.ReplaceConfigs) != 0 {
-		t.Errorf("len(ReplaceConfigs) = %d, want 0", len(r2.cfg.ReplaceConfigs))
-	}
-}
-
-func TestBuildDisabledItems(t *testing.T) {
-	dependencies := []deps.Dependency{
-		{Name: "niri", Status: deps.StatusInstalled},
-		{Name: "ghostty", Status: deps.StatusMissing},
-		{Name: "dms (DankMaterialShell)", Status: deps.StatusInstalled},
-		{Name: "dms-greeter", Status: deps.StatusMissing},
-		{Name: "waybar", Status: deps.StatusMissing},
-	}
-
-	tests := []struct {
-		name         string
-		includeDeps  []string
-		excludeDeps  []string
-		deps         []deps.Dependency // nil means use the shared fixture
-		wantErr      bool
-		errContains  string   // substring expected in error message
-		wantDisabled []string // dep names that should be in disabledItems
-		wantEnabled  []string // dep names that should NOT be in disabledItems (extra check)
-	}{
-		{
-			name:         "no flags set, dms-greeter disabled by default",
-			wantDisabled: []string{"dms-greeter"},
-			wantEnabled:  []string{"niri", "ghostty", "waybar"},
-		},
-		{
-			name:        "include dms-greeter enables it",
-			includeDeps: []string{"dms-greeter"},
-			wantEnabled: []string{"dms-greeter"},
-		},
-		{
-			name:         "exclude a regular dep",
-			excludeDeps:  []string{"waybar"},
-			wantDisabled: []string{"dms-greeter", "waybar"},
-		},
-		{
-			name:        "include unknown dep returns error",
-			includeDeps: []string{"nonexistent"},
-			wantErr:     true,
-			errContains: "--include-deps",
-		},
-		{
-			name:        "exclude unknown dep returns error",
-			excludeDeps: []string{"nonexistent"},
-			wantErr:     true,
-			errContains: "--exclude-deps",
-		},
-		{
-			name:        "exclude DMS itself is forbidden",
-			excludeDeps: []string{"dms (DankMaterialShell)"},
-			wantErr:     true,
-			errContains: "cannot exclude required package",
-		},
-		{
-			name:         "include and exclude same dep",
-			includeDeps:  []string{"dms-greeter"},
-			excludeDeps:  []string{"dms-greeter"},
-			wantDisabled: []string{"dms-greeter"},
-		},
-		{
-			name:        "whitespace entries are skipped",
-			includeDeps: []string{"  ", "dms-greeter"},
-			wantEnabled: []string{"dms-greeter"},
-		},
-		{
-			name: "no dms-greeter in deps, nothing disabled by default",
-			deps: []deps.Dependency{
-				{Name: "niri", Status: deps.StatusInstalled},
-			},
-			wantEnabled: []string{"niri"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			r := NewRunner(Config{
-				IncludeDeps: tt.includeDeps,
-				ExcludeDeps: tt.excludeDeps,
-			})
-			d := tt.deps
-			if d == nil {
-				d = dependencies
-			}
-			got, err := r.buildDisabledItems(d)
-			if (err != nil) != tt.wantErr {
-				t.Fatalf("buildDisabledItems() error = %v, wantErr %v", err, tt.wantErr)
-			}
-			if tt.wantErr {
-				if tt.errContains != "" && !strings.Contains(err.Error(), tt.errContains) {
-					t.Errorf("error %q does not contain %q", err.Error(), tt.errContains)
-				}
-				return
-			}
-			if got == nil {
-				t.Fatal("buildDisabledItems() returned nil map, want non-nil")
-			}
-
-			// Check expected disabled items
-			for _, name := range tt.wantDisabled {
-				if !got[name] {
-					t.Errorf("expected %q to be disabled, but it is not", name)
-				}
-			}
-
-			// Check expected enabled items (should not be in the map or be false)
-			for _, name := range tt.wantEnabled {
-				if got[name] {
-					t.Errorf("expected %q to NOT be disabled, but it is", name)
-				}
-			}
-
-			// If wantDisabled is empty, the map should have length 0
-			if len(tt.wantDisabled) == 0 && len(got) != 0 {
-				t.Errorf("expected empty disabledItems map, got %v", got)
-			}
-		})
-	}
-}

core/internal/log/filelogger.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"fmt"
 	"os"
-	"path/filepath"
 	"regexp"
 	"sync"
 	"time"
@@ -22,16 +21,7 @@ type FileLogger struct {
 
 func NewFileLogger() (*FileLogger, error) {
 	timestamp := time.Now().Unix()
-
-	// Use DANKINSTALL_LOG_DIR if set, otherwise fall back to /tmp.
-	logDir := os.Getenv("DANKINSTALL_LOG_DIR")
-	if logDir == "" {
-		logDir = "/tmp"
-	}
-	if err := os.MkdirAll(logDir, 0o755); err != nil {
-		return nil, fmt.Errorf("failed to create log directory: %w", err)
-	}
-	logPath := filepath.Join(logDir, fmt.Sprintf("dankinstall-%d.log", timestamp))
+	logPath := fmt.Sprintf("/tmp/dankinstall-%d.log", timestamp)
 
 	file, err := os.Create(logPath)
 	if err != nil {

core/internal/screenshot/compositor.go

@@ -444,21 +444,20 @@ func GetFocusedMonitor() string {
 
 type outputInfo struct {
 	x, y      int32
-	scale     float64
 	transform int32
 }
 
-func getAllOutputInfos() map[string]*outputInfo {
+func getOutputInfo(outputName string) (*outputInfo, bool) {
 	display, err := client.Connect("")
 	if err != nil {
-		return nil
+		return nil, false
 	}
 	ctx := display.Context()
 	defer ctx.Close()
 
 	registry, err := display.GetRegistry()
 	if err != nil {
-		return nil
+		return nil, false
 	}
 
 	var outputManager *wlr_output_management.ZwlrOutputManagerV1
@@ -477,17 +476,16 @@ func getAllOutputInfos() map[string]*outputInfo {
 	})
 
 	if err := wlhelpers.Roundtrip(display, ctx); err != nil {
-		return nil
+		return nil, false
 	}
 
 	if outputManager == nil {
-		return nil
+		return nil, false
 	}
 
 	type headState struct {
 		name      string
 		x, y      int32
-		scale     float64
 		transform int32
 	}
 	heads := make(map[*wlr_output_management.ZwlrOutputHeadV1]*headState)
@@ -503,9 +501,6 @@ func getAllOutputInfos() map[string]*outputInfo {
 			state.x = pe.X
 			state.y = pe.Y
 		})
-		e.Head.SetScaleHandler(func(se wlr_output_management.ZwlrOutputHeadV1ScaleEvent) {
-			state.scale = se.Scale
-		})
 		e.Head.SetTransformHandler(func(te wlr_output_management.ZwlrOutputHeadV1TransformEvent) {
 			state.transform = te.Transform
 		})
@@ -516,32 +511,21 @@ func getAllOutputInfos() map[string]*outputInfo {
 
 	for !done {
 		if err := ctx.Dispatch(); err != nil {
-			return nil
+			return nil, false
 		}
 	}
 
-	result := make(map[string]*outputInfo, len(heads))
 	for _, state := range heads {
-		if state.name == "" {
-			continue
-		}
-		result[state.name] = &outputInfo{
-			x:         state.x,
-			y:         state.y,
-			scale:     state.scale,
-			transform: state.transform,
+		if state.name == outputName {
+			return &outputInfo{
+				x:         state.x,
+				y:         state.y,
+				transform: state.transform,
+			}, true
 		}
 	}
-	return result
-}
 
-func getOutputInfo(outputName string) (*outputInfo, bool) {
-	infos := getAllOutputInfos()
-	if infos == nil {
-		return nil, false
-	}
-	info, ok := infos[outputName]
-	return info, ok
+	return nil, false
 }
 
 func getDWLActiveWindow() (*WindowGeometry, error) {

core/internal/screenshot/screenshot.go

@@ -2,7 +2,6 @@ package screenshot
 
 import (
 	"fmt"
-	"math"
 	"sync"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
@@ -305,20 +304,22 @@ func (s *Screenshoter) captureAllScreens() (*CaptureResult, error) {
 	if len(outputs) == 0 {
 		return nil, fmt.Errorf("no outputs available")
 	}
+
 	if len(outputs) == 1 {
 		return s.captureWholeOutput(outputs[0])
 	}
 
-	wlrInfos := getAllOutputInfos()
-
-	type pendingOutput struct {
+	// Capture all outputs first to get actual buffer sizes
+	type capturedOutput struct {
+		output *WaylandOutput
 		result *CaptureResult
-		logX   float64
-		logY   float64
-		scale  float64
+		physX  int
+		physY  int
 	}
-	var pending []pendingOutput
-	maxScale := 1.0
+	captured := make([]capturedOutput, 0, len(outputs))
+
+	var minX, minY, maxX, maxY int
+	first := true
 
 	for _, output := range outputs {
 		result, err := s.captureWholeOutput(output)
@@ -327,74 +328,50 @@ func (s *Screenshoter) captureAllScreens() (*CaptureResult, error) {
 			continue
 		}
 
-		logX, logY := float64(output.x), float64(output.y)
+		outX, outY := output.x, output.y
 		scale := float64(output.scale)
-
 		switch DetectCompositor() {
 		case CompositorHyprland:
 			if hx, hy, _, _, ok := GetHyprlandMonitorGeometry(output.name); ok {
-				logX, logY = float64(hx), float64(hy)
+				outX, outY = hx, hy
 			}
-			if hs := GetHyprlandMonitorScale(output.name); hs > 0 {
-				scale = hs
+			if s := GetHyprlandMonitorScale(output.name); s > 0 {
+				scale = s
 			}
-		default:
-			if wlrInfos != nil {
-				if info, ok := wlrInfos[output.name]; ok {
-					logX, logY = float64(info.x), float64(info.y)
-					if info.scale > 0 {
-						scale = info.scale
-					}
-				}
+		case CompositorDWL:
+			if info, ok := getOutputInfo(output.name); ok {
+				outX, outY = info.x, info.y
 			}
 		}
-
 		if scale <= 0 {
 			scale = 1.0
 		}
 
-		pending = append(pending, pendingOutput{result: result, logX: logX, logY: logY, scale: scale})
-		if scale > maxScale {
-			maxScale = scale
-		}
-	}
+		physX := int(float64(outX) * scale)
+		physY := int(float64(outY) * scale)
 
-	if len(pending) == 0 {
-		return nil, fmt.Errorf("failed to capture any outputs")
-	}
-	if len(pending) == 1 {
-		return pending[0].result, nil
-	}
+		captured = append(captured, capturedOutput{
+			output: output,
+			result: result,
+			physX:  physX,
+			physY:  physY,
+		})
 
-	type layoutEntry struct {
-		result  *CaptureResult
-		canvasX int
-		canvasY int
-		canvasW int
-		canvasH int
-	}
-	entries := make([]layoutEntry, len(pending))
-	var minX, minY, maxX, maxY int
+		right := physX + result.Buffer.Width
+		bottom := physY + result.Buffer.Height
 
-	for i, p := range pending {
-		cx := int(math.Round(p.logX * maxScale))
-		cy := int(math.Round(p.logY * maxScale))
-		cw := int(math.Round(float64(p.result.Buffer.Width) * maxScale / p.scale))
-		ch := int(math.Round(float64(p.result.Buffer.Height) * maxScale / p.scale))
-
-		entries[i] = layoutEntry{result: p.result, canvasX: cx, canvasY: cy, canvasW: cw, canvasH: ch}
-
-		right := cx + cw
-		bottom := cy + ch
-		if i == 0 {
-			minX, minY, maxX, maxY = cx, cy, right, bottom
+		if first {
+			minX, minY = physX, physY
+			maxX, maxY = right, bottom
+			first = false
 			continue
 		}
-		if cx < minX {
-			minX = cx
+
+		if physX < minX {
+			minX = physX
 		}
-		if cy < minY {
-			minY = cy
+		if physY < minY {
+			minY = physY
 		}
 		if right > maxX {
 			maxX = right
@@ -404,26 +381,35 @@ func (s *Screenshoter) captureAllScreens() (*CaptureResult, error) {
 		}
 	}
 
+	if len(captured) == 0 {
+		return nil, fmt.Errorf("failed to capture any outputs")
+	}
+
+	if len(captured) == 1 {
+		return captured[0].result, nil
+	}
+
 	totalW := maxX - minX
 	totalH := maxY - minY
-	composite, err := CreateShmBuffer(totalW, totalH, totalW*4)
+
+	compositeStride := totalW * 4
+	composite, err := CreateShmBuffer(totalW, totalH, compositeStride)
 	if err != nil {
-		for _, e := range entries {
-			e.result.Buffer.Close()
+		for _, c := range captured {
+			c.result.Buffer.Close()
 		}
 		return nil, fmt.Errorf("create composite buffer: %w", err)
 	}
+
 	composite.Clear()
 
 	var format uint32
-	for _, e := range entries {
+	for _, c := range captured {
 		if format == 0 {
-			format = e.result.Format
+			format = c.result.Format
 		}
-		s.blitBufferScaled(composite, e.result.Buffer,
-			e.canvasX-minX, e.canvasY-minY, e.canvasW, e.canvasH,
-			e.result.YInverted)
-		e.result.Buffer.Close()
+		s.blitBuffer(composite, c.result.Buffer, c.physX-minX, c.physY-minY, c.result.YInverted)
+		c.result.Buffer.Close()
 	}
 
 	return &CaptureResult{
@@ -433,44 +419,32 @@ func (s *Screenshoter) captureAllScreens() (*CaptureResult, error) {
 	}, nil
 }
 
-func (s *Screenshoter) blitBufferScaled(dst, src *ShmBuffer, dstX, dstY, dstW, dstH int, yInverted bool) {
-	if dstW <= 0 || dstH <= 0 {
-		return
-	}
-
+func (s *Screenshoter) blitBuffer(dst, src *ShmBuffer, dstX, dstY int, yInverted bool) {
 	srcData := src.Data()
 	dstData := dst.Data()
 
-	for dy := 0; dy < dstH; dy++ {
-		canvasY := dstY + dy
-		if canvasY < 0 || canvasY >= dst.Height {
-			continue
-		}
-
-		srcY := dy * src.Height / dstH
+	for srcY := 0; srcY < src.Height; srcY++ {
+		actualSrcY := srcY
 		if yInverted {
-			srcY = src.Height - 1 - srcY
+			actualSrcY = src.Height - 1 - srcY
 		}
-		if srcY < 0 || srcY >= src.Height {
+
+		dy := dstY + srcY
+		if dy < 0 || dy >= dst.Height {
 			continue
 		}
 
-		srcRowOff := srcY * src.Stride
-		dstRowOff := canvasY * dst.Stride
+		srcRowOff := actualSrcY * src.Stride
+		dstRowOff := dy * dst.Stride
 
-		for dx := 0; dx < dstW; dx++ {
-			canvasX := dstX + dx
-			if canvasX < 0 || canvasX >= dst.Width {
-				continue
-			}
-
-			srcX := dx * src.Width / dstW
-			if srcX >= src.Width {
+		for srcX := 0; srcX < src.Width; srcX++ {
+			dx := dstX + srcX
+			if dx < 0 || dx >= dst.Width {
 				continue
 			}
 
 			si := srcRowOff + srcX*4
-			di := dstRowOff + canvasX*4
+			di := dstRowOff + dx*4
 
 			if si+3 >= len(srcData) || di+3 >= len(dstData) {
 				continue

core/internal/server/brightness/ddc.go

@@ -218,9 +218,7 @@ func (b *DDCBackend) SetBrightnessWithExponent(id string, value int, exponential
 	if timer, exists := b.debounceTimers[id]; exists {
 		timer.Reset(200 * time.Millisecond)
 	} else {
-		b.debounceWg.Add(1)
 		b.debounceTimers[id] = time.AfterFunc(200*time.Millisecond, func() {
-			defer b.debounceWg.Done()
 			b.debounceMutex.Lock()
 			pending, exists := b.debouncePending[id]
 			if exists {
@@ -492,19 +490,5 @@ func (b *DDCBackend) valueToPercent(value int, max int, exponential bool) int {
 	return percent
 }
 
-func (b *DDCBackend) WaitPending() {
-	done := make(chan struct{})
-	go func() {
-		b.debounceWg.Wait()
-		close(done)
-	}()
-
-	select {
-	case <-done:
-	case <-time.After(5 * time.Second):
-		log.Debug("WaitPending timed out waiting for DDC writes")
-	}
-}
-
 func (b *DDCBackend) Close() {
 }

core/internal/server/brightness/types.go

@@ -84,7 +84,6 @@ type DDCBackend struct {
 	debounceMutex   sync.Mutex
 	debounceTimers  map[string]*time.Timer
 	debouncePending map[string]ddcPendingSet
-	debounceWg      sync.WaitGroup
 }
 
 type ddcPendingSet struct {

core/internal/server/network/backend_networkmanager_wifi.go

@@ -158,26 +158,18 @@ func (b *NetworkManagerBackend) GetWiFiNetworkDetails(ssid string) (*NetworkInfo
 
 		channel := frequencyToChannel(freq)
 
-		isConnected := ssid == currentSSID && bssid == currentBSSID
-		rate := maxBitrate / 1000
-		if isConnected {
-			if devBitrate, err := w.GetPropertyBitrate(); err == nil && devBitrate > 0 {
-				rate = devBitrate / 1000
-			}
-		}
-
 		network := WiFiNetwork{
 			SSID:        ssid,
 			BSSID:       bssid,
 			Signal:      strength,
 			Secured:     secured,
 			Enterprise:  enterprise,
-			Connected:   isConnected,
+			Connected:   ssid == currentSSID && bssid == currentBSSID,
 			Saved:       savedSSIDs[ssid],
 			Autoconnect: autoconnectMap[ssid],
 			Frequency:   freq,
 			Mode:        modeStr,
-			Rate:        rate,
+			Rate:        maxBitrate / 1000,
 			Channel:     channel,
 		}
 
@@ -522,27 +514,19 @@ func (b *NetworkManagerBackend) updateWiFiNetworks() ([]WiFiNetwork, error) {
 
 		channel := frequencyToChannel(freq)
 
-		isConnected := ssid == currentSSID
-		rate := maxBitrate / 1000
-		if isConnected {
-			if devBitrate, err := w.GetPropertyBitrate(); err == nil && devBitrate > 0 {
-				rate = devBitrate / 1000
-			}
-		}
-
 		network := WiFiNetwork{
 			SSID:        ssid,
 			BSSID:       bssid,
 			Signal:      strength,
 			Secured:     secured,
 			Enterprise:  enterprise,
-			Connected:   isConnected,
+			Connected:   ssid == currentSSID,
 			Saved:       savedSSIDs[ssid],
 			Autoconnect: autoconnectMap[ssid],
 			Hidden:      hiddenSSIDs[ssid],
 			Frequency:   freq,
 			Mode:        modeStr,
-			Rate:        rate,
+			Rate:        maxBitrate / 1000,
 			Channel:     channel,
 		}
 
@@ -1078,27 +1062,19 @@ func (b *NetworkManagerBackend) updateAllWiFiDevices() {
 
 				channel := frequencyToChannel(freq)
 
-				isConnected := connected && apSSID == ssid
-				rate := maxBitrate / 1000
-				if isConnected {
-					if devBitrate, err := devInfo.wireless.GetPropertyBitrate(); err == nil && devBitrate > 0 {
-						rate = devBitrate / 1000
-					}
-				}
-
 				network := WiFiNetwork{
 					SSID:        apSSID,
 					BSSID:       apBSSID,
 					Signal:      strength,
 					Secured:     secured,
 					Enterprise:  enterprise,
-					Connected:   isConnected,
+					Connected:   connected && apSSID == ssid,
 					Saved:       savedSSIDs[apSSID],
 					Autoconnect: autoconnectMap[apSSID],
 					Hidden:      hiddenSSIDs[apSSID],
 					Frequency:   freq,
 					Mode:        modeStr,
-					Rate:        rate,
+					Rate:        maxBitrate / 1000,
 					Channel:     channel,
 					Device:      name,
 				}

core/internal/server/server.go

@@ -31,7 +31,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/network"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/thememode"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/trayrecovery"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlroutput"
@@ -73,7 +72,6 @@ var clipboardManager *clipboard.Manager
 var dbusManager *serverDbus.Manager
 var wlContext *wlcontext.SharedContext
 var themeModeManager *thememode.Manager
-var trayRecoveryManager *trayrecovery.Manager
 var locationManager *location.Manager
 var geoClientInstance geolocation.Client
 
@@ -396,18 +394,6 @@ func InitializeThemeModeManager() error {
 	return nil
 }
 
-func InitializeTrayRecoveryManager() error {
-	manager, err := trayrecovery.NewManager()
-	if err != nil {
-		return err
-	}
-
-	trayRecoveryManager = manager
-
-	log.Info("TrayRecovery manager initialized")
-	return nil
-}
-
 func InitializeLocationManager(geoClient geolocation.Client) error {
 	manager, err := location.NewManager(geoClient)
 	if err != nil {
@@ -1339,9 +1325,6 @@ func cleanupManagers() {
 	if themeModeManager != nil {
 		themeModeManager.Close()
 	}
-	if trayRecoveryManager != nil {
-		trayRecoveryManager.Close()
-	}
 	if wlContext != nil {
 		wlContext.Close()
 	}
@@ -1627,18 +1610,6 @@ func Start(printDocs bool) error {
 		}()
 	}
 
-	go func() {
-		<-loginctlReady
-		if loginctlManager == nil {
-			return
-		}
-		if err := InitializeTrayRecoveryManager(); err != nil {
-			log.Warnf("TrayRecovery manager unavailable: %v", err)
-		} else {
-			trayRecoveryManager.WatchLoginctl(loginctlManager)
-		}
-	}()
-
 	go func() {
 		geoClient := geolocation.NewClient()
 		geoClientInstance = geoClient

core/internal/server/trayrecovery/manager.go

@@ -1,93 +0,0 @@
-package trayrecovery
-
-import (
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl"
-	"github.com/godbus/dbus/v5"
-)
-
-const resumeDelay = 3 * time.Second
-
-type Manager struct {
-	conn     *dbus.Conn
-	stopChan chan struct{}
-	wg       sync.WaitGroup
-}
-
-func NewManager() (*Manager, error) {
-	conn, err := dbus.ConnectSessionBus()
-	if err != nil {
-		return nil, fmt.Errorf("failed to connect to session bus: %w", err)
-	}
-
-	m := &Manager{
-		conn:     conn,
-		stopChan: make(chan struct{}),
-	}
-
-	// Run a startup scan after a delay — covers the case where the process
-	// was killed during suspend and restarted by systemd (Type=dbus).
-	// The fresh process never sees the PrepareForSleep true→false transition,
-	// so the loginctl watcher alone is not enough.
-	go m.scheduleRecovery()
-
-	return m, nil
-}
-
-// WatchLoginctl subscribes to loginctl session state changes and triggers
-// tray recovery after resume from suspend (PrepareForSleep false transition).
-// This handles the case where the process survives suspend.
-func (m *Manager) WatchLoginctl(lm *loginctl.Manager) {
-	ch := lm.Subscribe("tray-recovery")
-	m.wg.Add(1)
-	go func() {
-		defer m.wg.Done()
-		defer lm.Unsubscribe("tray-recovery")
-
-		wasSleeping := false
-		for {
-			select {
-			case <-m.stopChan:
-				return
-			case state, ok := <-ch:
-				if !ok {
-					return
-				}
-				if state.PreparingForSleep {
-					wasSleeping = true
-					continue
-				}
-				if wasSleeping {
-					wasSleeping = false
-					go m.scheduleRecovery()
-				}
-			}
-		}
-	}()
-}
-
-func (m *Manager) scheduleRecovery() {
-	select {
-	case <-time.After(resumeDelay):
-		m.recoverTrayItems()
-	case <-m.stopChan:
-	}
-}
-
-func (m *Manager) Close() {
-	select {
-	case <-m.stopChan:
-		return
-	default:
-		close(m.stopChan)
-	}
-	m.wg.Wait()
-	if m.conn != nil {
-		m.conn.Close()
-	}
-	log.Info("TrayRecovery manager closed")
-}

core/internal/server/trayrecovery/recovery.go

@@ -1,262 +0,0 @@
-package trayrecovery
-
-import (
-	"context"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/godbus/dbus/v5"
-)
-
-const (
-	sniWatcherDest   = "org.kde.StatusNotifierWatcher"
-	sniWatcherPath   = "/StatusNotifierWatcher"
-	sniWatcherIface  = "org.kde.StatusNotifierWatcher"
-	sniItemIface     = "org.kde.StatusNotifierItem"
-	dbusIface        = "org.freedesktop.DBus"
-	propsIface       = "org.freedesktop.DBus.Properties"
-	probeTimeout     = 300 * time.Millisecond
-	connProbeTimeout = 150 * time.Millisecond
-	batchSize        = 30
-)
-
-var excludedPrefixes = []string{
-	"org.freedesktop.",
-	"org.gnome.",
-	"org.kde.StatusNotifier",
-	"com.canonical.AppMenu",
-	"org.mpris.",
-	"org.pipewire.",
-	"org.pulseaudio",
-	"fi.epitaph",
-	"quickshell",
-	"org.kde.quickshell",
-}
-
-func (m *Manager) recoverTrayItems() {
-	registeredItems := m.getRegisteredItems()
-	allNames := m.getDBusNames()
-	if allNames == nil {
-		return
-	}
-
-	registeredConnIDs := m.buildRegisteredConnIDs(registeredItems)
-
-	count := len(registeredItems)
-	log.Infof("TrayRecoveryService: scanning DBus for unregistered SNI items (%d already registered)...", count)
-
-	m.scanWellKnownNames(allNames, registeredItems, registeredConnIDs)
-	m.scanConnectionIDs(allNames, registeredItems, registeredConnIDs)
-}
-
-func (m *Manager) getRegisteredItems() []string {
-	obj := m.conn.Object(sniWatcherDest, sniWatcherPath)
-	variant, err := obj.GetProperty(sniWatcherIface + ".RegisteredStatusNotifierItems")
-	if err != nil {
-		log.Warnf("TrayRecoveryService: failed to get registered items: %v", err)
-		return nil
-	}
-
-	switch v := variant.Value().(type) {
-	case []string:
-		return v
-	case []any:
-		items := make([]string, 0, len(v))
-		for _, elem := range v {
-			if s, ok := elem.(string); ok {
-				items = append(items, s)
-			}
-		}
-		return items
-	}
-	return nil
-}
-
-func (m *Manager) getDBusNames() []string {
-	var names []string
-	err := m.conn.BusObject().Call(dbusIface+".ListNames", 0).Store(&names)
-	if err != nil {
-		log.Warnf("TrayRecoveryService: failed to list bus names: %v", err)
-		return nil
-	}
-	return names
-}
-
-func (m *Manager) getNameOwner(name string) string {
-	var owner string
-	err := m.conn.BusObject().Call(dbusIface+".GetNameOwner", 0, name).Store(&owner)
-	if err != nil {
-		return ""
-	}
-	return owner
-}
-
-// buildRegisteredConnIDs resolves every registered SNI item (well-known name
-// or :1.xxx connection ID) to a canonical connection ID. This prevents
-// duplicates in both directions.
-func (m *Manager) buildRegisteredConnIDs(registeredItems []string) map[string]bool {
-	connIDs := make(map[string]bool, len(registeredItems))
-	for _, item := range registeredItems {
-		name := extractName(item)
-		if strings.HasPrefix(name, ":1.") {
-			connIDs[name] = true
-		} else {
-			owner := m.getNameOwner(name)
-			if owner != "" {
-				connIDs[owner] = true
-			}
-		}
-	}
-	return connIDs
-}
-
-// scanWellKnownNames probes well-known names (e.g. DinoX, nm-applet) for
-// unregistered SNI items and re-registers them.
-func (m *Manager) scanWellKnownNames(allNames []string, registeredItems []string, registeredConnIDs map[string]bool) {
-	registeredRaw := strings.Join(registeredItems, "\n")
-
-	for _, name := range allNames {
-		if strings.HasPrefix(name, ":") {
-			continue
-		}
-
-		if strings.Contains(registeredRaw, name) {
-			continue
-		}
-
-		// Skip if this name's connection ID is already in the registered set
-		// (handles the case where the app registered via connection ID instead)
-		connForName := m.getNameOwner(name)
-		if connForName != "" && registeredConnIDs[connForName] {
-			continue
-		}
-
-		if isExcludedName(name) {
-			continue
-		}
-
-		short := shortName(name)
-		objectPaths := []string{
-			"/StatusNotifierItem",
-			"/org/ayatana/NotificationItem/" + short,
-		}
-
-		for _, objPath := range objectPaths {
-			if m.probeSNI(name, objPath, probeTimeout) {
-				m.registerSNI(name)
-				// Update set so the connection-ID section won't double-register this app
-				if connForName != "" {
-					registeredConnIDs[connForName] = true
-				}
-				break
-			}
-		}
-	}
-}
-
-// scanConnectionIDs probes all :1.xxx connections in parallel for unregistered
-// SNI items (e.g. Vesktop, Electron apps). Most non-SNI connections return an
-// error instantly, so this is fast.
-func (m *Manager) scanConnectionIDs(allNames []string, registeredItems []string, registeredConnIDs map[string]bool) {
-	registeredRaw := strings.Join(registeredItems, "\n")
-	registeredLower := strings.ToLower(registeredRaw)
-
-	var wg sync.WaitGroup
-	sem := make(chan struct{}, batchSize)
-
-	for _, name := range allNames {
-		if !strings.HasPrefix(name, ":1.") {
-			continue
-		}
-		if registeredConnIDs[name] {
-			continue
-		}
-
-		sem <- struct{}{}
-		wg.Add(1)
-		go func(conn string) {
-			defer wg.Done()
-			defer func() { <-sem }()
-
-			sniID := m.getSNIId(conn, connProbeTimeout)
-			if sniID == "" {
-				return
-			}
-
-			// Skip if an item with the same Id is already registered (case-insensitive)
-			if strings.Contains(registeredLower, strings.ToLower(sniID)) {
-				return
-			}
-
-			m.registerSNI(conn)
-			log.Infof("TrayRecovery: re-registered %s (Id: %s)", conn, sniID)
-		}(name)
-	}
-	wg.Wait()
-}
-
-func (m *Manager) probeSNI(dest, path string, timeout time.Duration) bool {
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	obj := m.conn.Object(dest, dbus.ObjectPath(path))
-	var props map[string]dbus.Variant
-	err := obj.CallWithContext(ctx, propsIface+".GetAll", 0, sniItemIface).Store(&props)
-	if err != nil {
-		return false
-	}
-
-	_, hasID := props["Id"]
-	return hasID
-}
-
-func (m *Manager) getSNIId(dest string, timeout time.Duration) string {
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	obj := m.conn.Object(dest, "/StatusNotifierItem")
-	var variant dbus.Variant
-	err := obj.CallWithContext(ctx, propsIface+".Get", 0, sniItemIface, "Id").Store(&variant)
-	if err != nil {
-		return ""
-	}
-
-	id, _ := variant.Value().(string)
-	return id
-}
-
-func (m *Manager) registerSNI(name string) {
-	obj := m.conn.Object(sniWatcherDest, sniWatcherPath)
-	call := obj.Call(sniWatcherIface+".RegisterStatusNotifierItem", 0, name)
-	if call.Err != nil {
-		log.Warnf("TrayRecovery: failed to register %s: %v", name, call.Err)
-		return
-	}
-	log.Infof("TrayRecovery: re-registered %s", name)
-}
-
-func extractName(item string) string {
-	if idx := strings.IndexByte(item, '/'); idx != -1 {
-		return item[:idx]
-	}
-	return item
-}
-
-func shortName(name string) string {
-	parts := strings.Split(name, ".")
-	if len(parts) > 0 {
-		return parts[len(parts)-1]
-	}
-	return name
-}
-
-func isExcludedName(name string) bool {
-	for _, prefix := range excludedPrefixes {
-		if strings.HasPrefix(name, prefix) {
-			return true
-		}
-	}
-	return false
-}

core/internal/server/wayland/manager.go

@@ -3,11 +3,8 @@ package wayland
 import (
 	"bytes"
 	"encoding/binary"
-	"errors"
 	"fmt"
-	"io"
 	"os"
-	"slices"
 	"syscall"
 	"time"
 
@@ -76,10 +73,7 @@ func NewManager(display wlclient.WaylandDisplay, config Config) (*Manager, error
 		m.post(func() {
 			log.Info("Gamma control enabled at startup")
 			gammaMgr := m.gammaControl.(*wlr_gamma_control.ZwlrGammaControlManagerV1)
-			m.availOutputsMu.RLock()
-			outs := slices.Clone(m.availableOutputs)
-			m.availOutputsMu.RUnlock()
-			if err := m.setupOutputControls(outs, gammaMgr); err != nil {
+			if err := m.setupOutputControls(m.availableOutputs, gammaMgr); err != nil {
 				log.Errorf("Failed to initialize gamma controls: %v", err)
 				return
 			}
@@ -176,7 +170,6 @@ func (m *Manager) setupRegistry() error {
 			})
 			if gammaMgr != nil {
 				outputs = append(outputs, output)
-				m.addAvailableOutput(output)
 			}
 			m.outputRegNames.Store(outputID, e.Name)
 
@@ -211,11 +204,6 @@ func (m *Manager) setupRegistry() error {
 			}
 			if foundOut.gammaControl != nil {
 				foundOut.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1).Destroy()
-				foundOut.gammaControl = nil
-			}
-			m.removeAvailableOutput(foundOut.output)
-			if foundOut.output != nil && !foundOut.output.IsZombie() {
-				_ = foundOut.output.Release()
 			}
 			m.outputs.Delete(foundID)
 
@@ -300,28 +288,14 @@ func (m *Manager) setupControlHandlers(state *outputState, control *wlr_gamma_co
 			if !ok {
 				return
 			}
-			if ctrl, ok := out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1); ok && ctrl != nil && !ctrl.IsZombie() {
-				ctrl.Destroy()
-			}
-			out.gammaControl = nil
 			out.failed = true
 			out.rampSize = 0
 			out.retryCount++
 			out.lastFailTime = time.Now()
 
-			if !m.outputStillValid(out) {
-				return
-			}
-
 			backoff := time.Duration(300<<uint(min(out.retryCount-1, 4))) * time.Millisecond
 			time.AfterFunc(backoff, func() {
 				m.post(func() {
-					if !m.outputStillValid(out) {
-						return
-					}
-					if _, stillTracked := m.outputs.Load(outputID); !stillTracked {
-						return
-					}
 					m.recreateOutputControl(out)
 				})
 			})
@@ -329,75 +303,12 @@ func (m *Manager) setupControlHandlers(state *outputState, control *wlr_gamma_co
 	})
 }
 
-func (m *Manager) addAvailableOutput(o *wlclient.Output) {
-	if o == nil {
-		return
-	}
-	m.availOutputsMu.Lock()
-	defer m.availOutputsMu.Unlock()
-	if slices.Contains(m.availableOutputs, o) {
-		return
-	}
-	m.availableOutputs = append(m.availableOutputs, o)
-}
-
-func (m *Manager) removeAvailableOutput(o *wlclient.Output) {
-	if o == nil {
-		return
-	}
-	m.availOutputsMu.Lock()
-	defer m.availOutputsMu.Unlock()
-	m.availableOutputs = slices.DeleteFunc(m.availableOutputs, func(existing *wlclient.Output) bool {
-		return existing == o
-	})
-}
-
-func (m *Manager) outputStillValid(out *outputState) bool {
-	switch {
-	case out == nil:
-		return false
-	case out.output == nil:
-		return false
-	case out.output.IsZombie():
-		return false
-	}
-	m.availOutputsMu.RLock()
-	defer m.availOutputsMu.RUnlock()
-	return slices.Contains(m.availableOutputs, out.output)
-}
-
-func isConnectionDeadErr(err error) bool {
-	switch {
-	case err == nil:
-		return false
-	case errors.Is(err, syscall.EPIPE):
-		return true
-	case errors.Is(err, syscall.ECONNRESET):
-		return true
-	case errors.Is(err, syscall.EBADF):
-		return true
-	case errors.Is(err, io.EOF):
-		return true
-	}
-	return false
-}
-
 func (m *Manager) addOutputControl(output *wlclient.Output) error {
-	switch {
-	case m.connectionDead.Load():
-		return nil
-	case output == nil || output.IsZombie():
-		return nil
-	}
-
 	outputID := output.ID()
 	gammaMgr := m.gammaControl.(*wlr_gamma_control.ZwlrGammaControlManagerV1)
 
 	control, err := gammaMgr.GetGammaControl(output)
 	if err != nil {
-		if isConnectionDeadErr(err) {
-			m.markConnectionDead(err)
-		}
 		return err
 	}
 
@@ -418,37 +329,26 @@ func (m *Manager) recreateOutputControl(out *outputState) error {
 	enabled := m.config.Enabled
 	m.configMutex.RUnlock()
 
-	switch {
-	case m.connectionDead.Load():
-		return nil
-	case !enabled || !m.controlsInitialized:
-		return nil
-	case out.isVirtual:
-		return nil
-	case out.retryCount >= 10:
-		return nil
-	case !m.outputStillValid(out):
+	if !enabled || !m.controlsInitialized {
 		return nil
 	}
 	if _, ok := m.outputs.Load(out.id); !ok {
 		return nil
 	}
+	if out.isVirtual {
+		return nil
+	}
+	if out.retryCount >= 10 {
+		return nil
+	}
 
 	gammaMgr, ok := m.gammaControl.(*wlr_gamma_control.ZwlrGammaControlManagerV1)
 	if !ok {
 		return fmt.Errorf("no gamma manager")
 	}
 
-	if existing, ok := out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1); ok && existing != nil && !existing.IsZombie() {
-		existing.Destroy()
-		out.gammaControl = nil
-	}
-
 	control, err := gammaMgr.GetGammaControl(out.output)
 	if err != nil {
-		if isConnectionDeadErr(err) {
-			m.markConnectionDead(err)
-		}
 		return err
 	}
 
@@ -458,13 +358,6 @@ func (m *Manager) recreateOutputControl(out *outputState) error {
 	return nil
 }
 
-func (m *Manager) markConnectionDead(err error) {
-	if m.connectionDead.Swap(true) {
-		return
-	}
-	log.Errorf("gamma: wayland connection appears dead (%v); pausing gamma operations", err)
-}
-
 func (m *Manager) recalcSchedule(now time.Time) {
 	m.configMutex.RLock()
 	config := m.config
@@ -797,12 +690,11 @@ func (m *Manager) applyGamma(temp int) {
 	gamma := m.config.Gamma
 	m.configMutex.RUnlock()
 
-	switch {
-	case m.connectionDead.Load():
+	if !m.controlsInitialized {
 		return
-	case !m.controlsInitialized:
-		return
-	case m.lastAppliedTemp == temp && m.lastAppliedGamma == gamma:
+	}
+
+	if m.lastAppliedTemp == temp && m.lastAppliedGamma == gamma {
 		return
 	}
 
@@ -822,14 +714,7 @@ func (m *Manager) applyGamma(temp int) {
 	var jobs []job
 
 	for _, out := range outs {
-		switch {
-		case out.failed:
-			continue
-		case out.rampSize == 0:
-			continue
-		case out.gammaControl == nil:
-			continue
-		case !m.outputStillValid(out):
+		if out.failed || out.rampSize == 0 {
 			continue
 		}
 		ramp := GenerateGammaRamp(out.rampSize, temp, gamma)
@@ -847,16 +732,18 @@ func (m *Manager) applyGamma(temp int) {
 	}
 
 	for _, j := range jobs {
-		err := m.setGammaBytes(j.out, j.data)
-		if err == nil {
-			continue
-		}
-		log.Warnf("gamma: failed to set output %d: %v", j.out.id, err)
-		j.out.failed = true
-		j.out.rampSize = 0
-		if isConnectionDeadErr(err) {
-			m.markConnectionDead(err)
-			return
+		if err := m.setGammaBytes(j.out, j.data); err != nil {
+			log.Warnf("gamma: failed to set output %d: %v", j.out.id, err)
+			j.out.failed = true
+			j.out.rampSize = 0
+			outID := j.out.id
+			time.AfterFunc(300*time.Millisecond, func() {
+				m.post(func() {
+					if out, ok := m.outputs.Load(outID); ok && out.failed {
+						m.recreateOutputControl(out)
+					}
+				})
+			})
 		}
 	}
 
@@ -865,14 +752,6 @@ func (m *Manager) applyGamma(temp int) {
 }
 
 func (m *Manager) setGammaBytes(out *outputState, data []byte) error {
-	if out.gammaControl == nil {
-		return fmt.Errorf("no gamma control")
-	}
-	ctrl, ok := out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1)
-	if !ok || ctrl == nil || ctrl.IsZombie() {
-		return fmt.Errorf("gamma control invalid")
-	}
-
 	fd, err := MemfdCreate("gamma-ramp", 0)
 	if err != nil {
 		return err
@@ -895,6 +774,7 @@ func (m *Manager) setGammaBytes(out *outputState, data []byte) error {
 	}
 	syscall.Seek(fd, 0, 0)
 
+	ctrl := out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1)
 	return ctrl.SetGamma(fd)
 }
 
@@ -1002,10 +882,10 @@ func (m *Manager) dbusMonitor() {
 }
 
 func (m *Manager) handleDBusSignal(sig *dbus.Signal) {
-	switch {
-	case sig.Name != "org.freedesktop.login1.Manager.PrepareForSleep":
+	if sig.Name != "org.freedesktop.login1.Manager.PrepareForSleep" {
 		return
-	case len(sig.Body) == 0:
+	}
+	if len(sig.Body) == 0 {
 		return
 	}
 	preparing, ok := sig.Body[0].(bool)
@@ -1019,34 +899,27 @@ func (m *Manager) handleDBusSignal(sig *dbus.Signal) {
 		return
 	}
 	time.AfterFunc(500*time.Millisecond, func() {
-		m.post(m.handleResume)
+		m.post(func() {
+			m.configMutex.RLock()
+			stillEnabled := m.config.Enabled
+			m.configMutex.RUnlock()
+			if !stillEnabled || !m.controlsInitialized {
+				return
+			}
+			m.outputs.Range(func(_ uint32, out *outputState) bool {
+				if out.gammaControl != nil {
+					out.gammaControl.(*wlr_gamma_control.ZwlrGammaControlV1).Destroy()
+					out.gammaControl = nil
+				}
+				out.retryCount = 0
+				out.failed = false
+				m.recreateOutputControl(out)
+				return true
+			})
+		})
 	})
 }
 
-func (m *Manager) handleResume() {
-	m.configMutex.RLock()
-	stillEnabled := m.config.Enabled
-	m.configMutex.RUnlock()
-
-	switch {
-	case !stillEnabled:
-		return
-	case !m.controlsInitialized:
-		return
-	case m.connectionDead.Load():
-		return
-	}
-
-	// Compositors (Niri, Hyprland, wlroots-based) re-apply the cached gamma
-	// ramp to DRM on resume; gamma_control objects stay valid. We just need
-	// to force a resend so the schedule catches up with the current time of
-	// day — the original #1235 regression was caused by lastAppliedTemp
-	// matching and the send being skipped.
-	m.recalcSchedule(time.Now())
-	m.lastAppliedTemp = 0
-	m.applyCurrentTemp("resume")
-}
-
 func (m *Manager) triggerUpdate() {
 	select {
 	case m.updateTrigger <- struct{}{}:
@@ -1185,10 +1058,7 @@ func (m *Manager) SetEnabled(enabled bool) {
 	case enabled && !m.controlsInitialized:
 		m.post(func() {
 			gammaMgr := m.gammaControl.(*wlr_gamma_control.ZwlrGammaControlManagerV1)
-			m.availOutputsMu.RLock()
-			outs := slices.Clone(m.availableOutputs)
-			m.availOutputsMu.RUnlock()
-			if err := m.setupOutputControls(outs, gammaMgr); err != nil {
+			if err := m.setupOutputControls(m.availableOutputs, gammaMgr); err != nil {
 				log.Errorf("gamma: failed to create controls: %v", err)
 				return
 			}

core/internal/server/wayland/types.go

@@ -3,7 +3,6 @@ package wayland
 import (
 	"math"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs"
@@ -72,11 +71,9 @@ type Manager struct {
 	registry            *wlclient.Registry
 	gammaControl        any
 	availableOutputs    []*wlclient.Output
-	availOutputsMu      sync.RWMutex
 	outputRegNames      syncmap.Map[uint32, uint32]
 	outputs             syncmap.Map[uint32, *outputState]
 	controlsInitialized bool
-	connectionDead      atomic.Bool
 
 	cmdq  chan cmd
 	alive bool

core/internal/tui/views_install.go

@@ -139,7 +139,7 @@ func dmsPackageName(distroID string, dependencies []deps.Dependency) string {
 		if isGit {
 			return "dms-shell-git"
 		}
-		return "dms-shell"
+		return "dms-shell-bin"
 	case distros.FamilyFedora, distros.FamilyUbuntu, distros.FamilyDebian, distros.FamilySUSE:
 		if isGit {
 			return "dms-git"

quickshell/Common/AnimVariants.qml

@@ -1,179 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import qs.Common
-
-// AnimVariants — Central tuning for animation and Motion Effects variants
-// (Material/Fluent/Dynamic) (Standard/Directional/Depth)
-
-Singleton {
-    id: root
-
-    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 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;
-        }
-    }
-
-    // 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> 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;
-    }
-
-    // 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 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: {
-        if (typeof SettingsData === "undefined")
-            return 1.0;
-        return SettingsData.animationVariant === 1 ? 0.55 : 1.0;
-    }
-
-    function variantDuration(baseDuration, entering) {
-        const factor = entering ? variantEnterDurationFactor : variantExitDurationFactor;
-        return Math.max(0, Math.round(baseDuration * factor));
-    }
-
-    function variantExitCleanupPadding() {
-        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
-        || (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: {
-        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/Anims.qml

@@ -22,9 +22,4 @@ Singleton {
     readonly property var standard: [0.20, 0.00, 0.00, 1.00, 1.00, 1.00]
     readonly property var standardDecel: [0.00, 0.00, 0.00, 1.00, 1.00, 1.00]
     readonly property var standardAccel: [0.30, 0.00, 1.00, 1.00, 1.00, 1.00]
-
-    // Used by AnimVariants for variant/effect logic
-    readonly property var expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
-    readonly property var expressiveFastSpatial: [0.34, 1.5, 0.2, 1.0, 1.0, 1.0]
-    readonly property var expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
 }

quickshell/Common/ConnectedModeState.qml

@@ -1,220 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-
-Singleton {
-    id: root
-
-    readonly property var emptyDockState: ({
-            "reveal": false,
-            "barSide": "bottom",
-            "bodyX": 0,
-            "bodyY": 0,
-            "bodyW": 0,
-            "bodyH": 0,
-            "slideX": 0,
-            "slideY": 0
-        })
-
-    // Popout state (updated by DankPopout when connectedFrameModeActive)
-    property string popoutOwnerId: ""
-    property bool popoutVisible: false
-    property string popoutBarSide: "top"
-    property real popoutBodyX: 0
-    property real popoutBodyY: 0
-    property real popoutBodyW: 0
-    property real popoutBodyH: 0
-    property real popoutAnimX: 0
-    property real popoutAnimY: 0
-    property string popoutScreen: ""
-
-    // Dock state (updated by Dock when connectedFrameModeActive), keyed by screen.name
-    property var dockStates: ({})
-
-    // Dock slide offsets — hot-path updates separated from full geometry state
-    property var dockSlides: ({})
-
-    function hasPopoutOwner(claimId) {
-        return !!claimId && popoutOwnerId === claimId;
-    }
-
-    function claimPopout(claimId, state) {
-        if (!claimId)
-            return false;
-
-        popoutOwnerId = claimId;
-        return updatePopout(claimId, state);
-    }
-
-    function updatePopout(claimId, state) {
-        if (!hasPopoutOwner(claimId) || !state)
-            return false;
-
-        if (state.visible !== undefined)
-            popoutVisible = !!state.visible;
-        if (state.barSide !== undefined)
-            popoutBarSide = state.barSide || "top";
-        if (state.bodyX !== undefined)
-            popoutBodyX = Number(state.bodyX);
-        if (state.bodyY !== undefined)
-            popoutBodyY = Number(state.bodyY);
-        if (state.bodyW !== undefined)
-            popoutBodyW = Number(state.bodyW);
-        if (state.bodyH !== undefined)
-            popoutBodyH = Number(state.bodyH);
-        if (state.animX !== undefined)
-            popoutAnimX = Number(state.animX);
-        if (state.animY !== undefined)
-            popoutAnimY = Number(state.animY);
-        if (state.screen !== undefined)
-            popoutScreen = state.screen || "";
-
-        return true;
-    }
-
-    function releasePopout(claimId) {
-        if (!hasPopoutOwner(claimId))
-            return false;
-
-        popoutOwnerId = "";
-        popoutVisible = false;
-        popoutBarSide = "top";
-        popoutBodyX = 0;
-        popoutBodyY = 0;
-        popoutBodyW = 0;
-        popoutBodyH = 0;
-        popoutAnimX = 0;
-        popoutAnimY = 0;
-        popoutScreen = "";
-        return true;
-    }
-
-    function setPopoutAnim(claimId, animX, animY) {
-        if (!hasPopoutOwner(claimId))
-            return false;
-        if (animX !== undefined) {
-            const nextX = Number(animX);
-            if (!isNaN(nextX) && popoutAnimX !== nextX)
-                popoutAnimX = nextX;
-        }
-        if (animY !== undefined) {
-            const nextY = Number(animY);
-            if (!isNaN(nextY) && popoutAnimY !== nextY)
-                popoutAnimY = nextY;
-        }
-        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),
-            "barSide": state && state.barSide ? state.barSide : "bottom",
-            "bodyX": Number(state && state.bodyX !== undefined ? state.bodyX : 0),
-            "bodyY": Number(state && state.bodyY !== undefined ? state.bodyY : 0),
-            "bodyW": Number(state && state.bodyW !== undefined ? state.bodyW : 0),
-            "bodyH": Number(state && state.bodyH !== undefined ? state.bodyH : 0),
-            "slideX": Number(state && state.slideX !== undefined ? state.slideX : 0),
-            "slideY": Number(state && state.slideY !== undefined ? state.slideY : 0)
-        };
-    }
-
-    function setDockState(screenName, state) {
-        if (!screenName || !state)
-            return false;
-
-        const next = _cloneDockStates();
-        next[screenName] = _normalizeDockState(state);
-        dockStates = next;
-        return true;
-    }
-
-    function clearDockState(screenName) {
-        if (!screenName || !dockStates[screenName])
-            return false;
-
-        const next = _cloneDockStates();
-        delete next[screenName];
-        dockStates = next;
-
-        // Also clear corresponding slide
-        if (dockSlides[screenName]) {
-            const nextSlides = {};
-            for (const k in dockSlides)
-                nextSlides[k] = dockSlides[k];
-            delete nextSlides[screenName];
-            dockSlides = nextSlides;
-        }
-        return true;
-    }
-
-    function setDockSlide(screenName, x, y) {
-        if (!screenName)
-            return false;
-        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
-    })
-
-    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),
-            "barSide": state && state.barSide ? state.barSide : "top",
-            "bodyX": Number(state && state.bodyX !== undefined ? state.bodyX : 0),
-            "bodyY": Number(state && state.bodyY !== undefined ? state.bodyY : 0),
-            "bodyW": Number(state && state.bodyW !== undefined ? state.bodyW : 0),
-            "bodyH": Number(state && state.bodyH !== undefined ? state.bodyH : 0)
-        };
-    }
-
-    function setNotificationState(screenName, state) {
-        if (!screenName || !state)
-            return false;
-
-        const next = _cloneNotificationStates();
-        next[screenName] = _normalizeNotificationState(state);
-        notificationStates = next;
-        return true;
-    }
-
-    function clearNotificationState(screenName) {
-        if (!screenName || !notificationStates[screenName])
-            return false;
-
-        const next = _cloneNotificationStates();
-        delete next[screenName];
-        notificationStates = next;
-        return true;
-    }
-}

quickshell/Common/ElevationShadow.qml

@@ -13,13 +13,8 @@ Item {
 
     property color targetColor: "white"
     property real targetRadius: Theme.cornerRadius
-    property real topLeftRadius: targetRadius
-    property real topRightRadius: targetRadius
-    property real bottomLeftRadius: targetRadius
-    property real bottomRightRadius: targetRadius
     property color borderColor: "transparent"
     property real borderWidth: 0
-    property bool useCustomSource: false
 
     property bool shadowEnabled: Theme.elevationEnabled
     property real shadowBlurPx: level && level.blurPx !== undefined ? level.blurPx : 0
@@ -51,11 +46,7 @@ Item {
     Rectangle {
         id: sourceRect
         anchors.fill: parent
-        visible: !root.useCustomSource
-        topLeftRadius: root.topLeftRadius
-        topRightRadius: root.topRightRadius
-        bottomLeftRadius: root.bottomLeftRadius
-        bottomRightRadius: root.bottomRightRadius
+        radius: root.targetRadius
         color: root.targetColor
         border.color: root.borderColor
         border.width: root.borderWidth

quickshell/Common/SessionData.qml

@@ -124,8 +124,6 @@ Singleton {
 
     property string vpnLastConnected: ""
 
-    property string lastPlayerIdentity: ""
-
     property var deviceMaxVolumes: ({})
     property var hiddenOutputDeviceNames: []
     property var hiddenInputDeviceNames: []

quickshell/Common/SettingsData.qml

@@ -14,7 +14,7 @@ import "settings/SettingsStore.js" as Store
 Singleton {
     id: root
 
-    readonly property int settingsConfigVersion: 11
+    readonly property int settingsConfigVersion: 5
 
     readonly property bool isGreeterMode: Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true"
 
@@ -37,18 +37,6 @@ Singleton {
         Custom
     }
 
-    enum AnimationVariant {
-        Material,
-        Fluent,
-        Dynamic
-    }
-
-    enum AnimationEffect {
-        Standard,     // 0 — M3: scale-in, rises from below
-        Directional,  // 1 — pure large slide, no scale
-        Depth         // 2 — medium slide with deep depth scale pop
-    }
-
     enum SuspendBehavior {
         Suspend,
         Hibernate,
@@ -180,12 +168,6 @@ Singleton {
     property int modalCustomAnimationDuration: 150
     property bool enableRippleEffects: true
     onEnableRippleEffectsChanged: saveSettings()
-    property int animationVariant: SettingsData.AnimationVariant.Material
-    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
@@ -204,7 +186,6 @@ Singleton {
     onPopoutElevationEnabledChanged: saveSettings()
     property bool barElevationEnabled: true
     onBarElevationEnabledChanged: saveSettings()
-
     property bool blurEnabled: false
     onBlurEnabledChanged: saveSettings()
     property string blurBorderColor: "outline"
@@ -217,50 +198,6 @@ Singleton {
     property bool blurredWallpaperLayer: false
     property bool blurWallpaperOnOverview: false
 
-    property bool frameEnabled: false
-    onFrameEnabledChanged: saveSettings()
-    property real frameThickness: 16
-    onFrameThicknessChanged: saveSettings()
-    property real frameRounding: 23
-    onFrameRoundingChanged: saveSettings()
-    property string frameColor: ""
-    onFrameColorChanged: saveSettings()
-    property real frameOpacity: 1.0
-    onFrameOpacityChanged: saveSettings()
-    property var frameScreenPreferences: ["all"]
-    onFrameScreenPreferencesChanged: saveSettings()
-    property real frameBarSize: 40
-    onFrameBarSizeChanged: saveSettings()
-    property bool frameShowOnOverview: false
-    onFrameShowOnOverviewChanged: saveSettings()
-    property bool frameBlurEnabled: true
-    onFrameBlurEnabledChanged: saveSettings()
-    property int previousDirectionalMode: 1
-    onPreviousDirectionalModeChanged: saveSettings()
-    property var connectedFrameBarStyleBackups: ({})
-    onConnectedFrameBarStyleBackupsChanged: saveSettings()
-    readonly property bool connectedFrameModeActive: frameEnabled
-        && motionEffect === SettingsData.AnimationEffect.Directional
-        && directionalAnimationMode === 3
-    onConnectedFrameModeActiveChanged: {
-        if (_loading)
-            return;
-        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;
-        return fc;
-    }
-
     property bool showLauncherButton: true
     property bool showWorkspaceSwitcher: true
     property bool showFocusedWindow: true
@@ -364,7 +301,6 @@ Singleton {
     property var workspaceNameIcons: ({})
     property bool waveProgressEnabled: true
     property bool scrollTitleEnabled: true
-    property bool mediaAdaptiveWidthEnabled: true
     property bool audioVisualizerEnabled: true
     property string audioScrollMode: "volume"
     property int audioWheelScrollAmount: 5
@@ -422,8 +358,6 @@ Singleton {
     property string dankLauncherV2BorderColor: "primary"
     property bool dankLauncherV2ShowFooter: true
     property bool dankLauncherV2UnloadOnClose: false
-    property bool dankLauncherV2IncludeFilesInAll: false
-    property bool dankLauncherV2IncludeFoldersInAll: false
 
     property string _legacyWeatherLocation: "New York, NY"
     property string _legacyWeatherCoordinates: "40.7128,-74.0060"
@@ -500,7 +434,6 @@ Singleton {
     property bool soundNewNotification: true
     property bool soundVolumeChanged: true
     property bool soundPluggedIn: true
-    property bool soundLogin: false
 
     property int acMonitorTimeout: 0
     property int acLockTimeout: 0
@@ -621,24 +554,24 @@ Singleton {
 
     property bool enableFprint: false
     property int maxFprintTries: 15
-    readonly property bool fprintdAvailable: Processes.fprintdAvailable
-    readonly property bool lockFingerprintCanEnable: Processes.lockFingerprintCanEnable
-    readonly property bool lockFingerprintReady: Processes.lockFingerprintReady
-    readonly property string lockFingerprintReason: Processes.lockFingerprintReason
-    readonly property bool greeterFingerprintCanEnable: Processes.greeterFingerprintCanEnable
-    readonly property bool greeterFingerprintReady: Processes.greeterFingerprintReady
-    readonly property string greeterFingerprintReason: Processes.greeterFingerprintReason
-    readonly property string greeterFingerprintSource: Processes.greeterFingerprintSource
+    property bool fprintdAvailable: false
+    property bool lockFingerprintCanEnable: false
+    property bool lockFingerprintReady: false
+    property string lockFingerprintReason: "probe_failed"
+    property bool greeterFingerprintCanEnable: false
+    property bool greeterFingerprintReady: false
+    property string greeterFingerprintReason: "probe_failed"
+    property string greeterFingerprintSource: "none"
     property bool enableU2f: false
     property string u2fMode: "or"
-    readonly property bool u2fAvailable: Processes.u2fAvailable
-    readonly property bool lockU2fCanEnable: Processes.lockU2fCanEnable
-    readonly property bool lockU2fReady: Processes.lockU2fReady
-    readonly property string lockU2fReason: Processes.lockU2fReason
-    readonly property bool greeterU2fCanEnable: Processes.greeterU2fCanEnable
-    readonly property bool greeterU2fReady: Processes.greeterU2fReady
-    readonly property string greeterU2fReason: Processes.greeterU2fReason
-    readonly property string greeterU2fSource: Processes.greeterU2fSource
+    property bool u2fAvailable: false
+    property bool lockU2fCanEnable: false
+    property bool lockU2fReady: false
+    property string lockU2fReason: "probe_failed"
+    property bool greeterU2fCanEnable: false
+    property bool greeterU2fReady: false
+    property string greeterU2fReason: "probe_failed"
+    property string greeterU2fSource: "none"
     property string lockScreenActiveMonitor: "all"
     property string lockScreenInactiveColor: "#000000"
     property int lockScreenNotificationMode: 0
@@ -1128,6 +1061,7 @@ Singleton {
     function refreshAuthAvailability() {
         if (isGreeterMode)
             return;
+        Processes.settingsRoot = root;
         Processes.detectAuthCapabilities();
     }
 
@@ -1349,7 +1283,6 @@ Singleton {
             _loading = false;
         }
         loadPluginSettings();
-        Qt.callLater(() => _reconcileConnectedFrameBarStyles());
     }
 
     property var _pendingMigration: null
@@ -1463,149 +1396,6 @@ Singleton {
         pluginSettingsFile.setText(JSON.stringify(pluginSettings, null, 2));
     }
 
-    function _connectedFrameBarStyleSnapshot(config) {
-        return {
-            "shadowIntensity": config?.shadowIntensity ?? 0,
-            "squareCorners": config?.squareCorners ?? false,
-            "gothCornersEnabled": config?.gothCornersEnabled ?? false,
-            "borderEnabled": config?.borderEnabled ?? false
-        };
-    }
-
-    function _hasConnectedFrameBarStyleBackups() {
-        return connectedFrameBarStyleBackups && Object.keys(connectedFrameBarStyleBackups).length > 0;
-    }
-
-    function _captureConnectedFrameBarStyleBackups(configs, overwriteExisting) {
-        if (!Array.isArray(configs))
-            return;
-
-        const nextBackups = JSON.parse(JSON.stringify(connectedFrameBarStyleBackups || {}));
-        const validIds = {};
-        let changed = false;
-
-        for (let i = 0; i < configs.length; i++) {
-            const config = configs[i];
-            if (!config?.id)
-                continue;
-            validIds[config.id] = true;
-
-            if (!overwriteExisting && nextBackups[config.id] !== undefined)
-                continue;
-
-            const snapshot = _connectedFrameBarStyleSnapshot(config);
-            if (JSON.stringify(nextBackups[config.id]) !== JSON.stringify(snapshot)) {
-                nextBackups[config.id] = snapshot;
-                changed = true;
-            }
-        }
-
-        if (overwriteExisting) {
-            for (const barId in nextBackups) {
-                if (validIds[barId])
-                    continue;
-                delete nextBackups[barId];
-                changed = true;
-            }
-        }
-
-        if (changed)
-            connectedFrameBarStyleBackups = nextBackups;
-    }
-
-    function _restoreConnectedFrameBarStyleBackups() {
-        if (!_hasConnectedFrameBarStyleBackups())
-            return;
-
-        const backups = connectedFrameBarStyleBackups || {};
-        const configs = JSON.parse(JSON.stringify(barConfigs));
-        let changed = false;
-
-        for (let i = 0; i < configs.length; i++) {
-            const backup = backups[configs[i].id];
-            if (!backup)
-                continue;
-            for (const key in backup) {
-                if (configs[i][key] === backup[key])
-                    continue;
-                configs[i][key] = backup[key];
-                changed = true;
-            }
-        }
-
-        if (changed)
-            barConfigs = configs;
-        connectedFrameBarStyleBackups = ({});
-        if (changed)
-            updateBarConfigs();
-    }
-
-    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 {
-                "configs": configs,
-                "changed": false
-            };
-
-        let changed = false;
-        const sanitizedConfigs = configs.map(config => {
-            const sanitized = _sanitizeBarConfigForConnectedFrame(config);
-            if (sanitized !== config)
-                changed = true;
-            return sanitized;
-        });
-
-        return {
-            "configs": changed ? sanitizedConfigs : configs,
-            "changed": changed
-        };
-    }
-
-    function _enforceConnectedModeBarStyleReset() {
-        const result = _sanitizeBarConfigsForConnectedFrame(barConfigs);
-        if (!result.changed)
-            return;
-        barConfigs = result.configs;
-        updateBarConfigs();
-    }
-
     function detectAvailableIconThemes() {
         const xdgDataDirs = Quickshell.env("XDG_DATA_DIRS") || "";
         const localData = Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericDataLocation));
@@ -1753,37 +1543,35 @@ Singleton {
         const spacing = barSpacing !== undefined ? barSpacing : (defaultBar?.spacing ?? 4);
         const position = barPosition !== undefined ? barPosition : (defaultBar?.position ?? SettingsData.Position.Top);
         const rawBottomGap = barConfig ? (barConfig.bottomGap !== undefined ? barConfig.bottomGap : (defaultBar?.bottomGap ?? 0)) : (defaultBar?.bottomGap ?? 0);
-        const isConnected = connectedFrameModeActive;
-        const bottomGap = isConnected ? 0 : Math.max(0, rawBottomGap);
+        const bottomGap = Math.max(0, rawBottomGap);
 
         const useAutoGaps = (barConfig && barConfig.popupGapsAuto !== undefined) ? barConfig.popupGapsAuto : (defaultBar?.popupGapsAuto ?? true);
         const manualGapValue = (barConfig && barConfig.popupGapsManual !== undefined) ? barConfig.popupGapsManual : (defaultBar?.popupGapsManual ?? 4);
-        const popupGap = isConnected ? 0 : (useAutoGaps ? Math.max(4, spacing) : manualGapValue);
-        const edgeSpacing = isConnected ? 0 : spacing;
+        const popupGap = useAutoGaps ? Math.max(4, spacing) : manualGapValue;
 
         switch (position) {
         case SettingsData.Position.Left:
             return {
-                "x": barThickness + edgeSpacing + popupGap,
+                "x": barThickness + spacing + popupGap,
                 "y": relativeY,
                 "width": widgetWidth
             };
         case SettingsData.Position.Right:
             return {
-                "x": (screen?.width || 0) - (barThickness + edgeSpacing + popupGap),
+                "x": (screen?.width || 0) - (barThickness + spacing + popupGap),
                 "y": relativeY,
                 "width": widgetWidth
             };
         case SettingsData.Position.Bottom:
             return {
                 "x": relativeX,
-                "y": (screen?.height || 0) - (barThickness + edgeSpacing + bottomGap + popupGap),
+                "y": (screen?.height || 0) - (barThickness + spacing + bottomGap + popupGap),
                 "width": widgetWidth
             };
         default:
             return {
                 "x": relativeX,
-                "y": barThickness + edgeSpacing + bottomGap + popupGap,
+                "y": barThickness + spacing + bottomGap + popupGap,
                 "width": widgetWidth
             };
         }
@@ -1877,9 +1665,7 @@ Singleton {
         const screenWidth = screen.width;
         const screenHeight = screen.height;
         const position = barPosition !== undefined ? barPosition : (defaultBar?.position ?? SettingsData.Position.Top);
-        const isConnected = connectedFrameModeActive;
-        const rawBottomGap = barConfig ? (barConfig.bottomGap !== undefined ? barConfig.bottomGap : (defaultBar?.bottomGap ?? 0)) : (defaultBar?.bottomGap ?? 0);
-        const bottomGap = isConnected ? 0 : rawBottomGap;
+        const bottomGap = barConfig ? (barConfig.bottomGap !== undefined ? barConfig.bottomGap : (defaultBar?.bottomGap ?? 0)) : (defaultBar?.bottomGap ?? 0);
 
         let topOffset = 0;
         let bottomOffset = 0;
@@ -1901,7 +1687,7 @@ Singleton {
                 const otherSpacing = other.spacing !== undefined ? other.spacing : (defaultBar?.spacing ?? 4);
                 const otherPadding = other.innerPadding !== undefined ? other.innerPadding : (defaultBar?.innerPadding ?? 4);
                 const otherThickness = Math.max(26 + otherPadding * 0.6, Theme.barHeight - 4 - (8 - otherPadding)) + otherSpacing + wingSize;
-                const otherBottomGap = isConnected ? 0 : (other.bottomGap !== undefined ? other.bottomGap : (defaultBar?.bottomGap ?? 0));
+                const otherBottomGap = other.bottomGap !== undefined ? other.bottomGap : (defaultBar?.bottomGap ?? 0);
 
                 switch (other.position) {
                 case SettingsData.Position.Top:
@@ -1992,9 +1778,7 @@ Singleton {
     function addBarConfig(config) {
         const configs = JSON.parse(JSON.stringify(barConfigs));
         configs.push(config);
-        if (connectedFrameModeActive)
-            _captureConnectedFrameBarStyleBackups(configs, false);
-        barConfigs = _sanitizeBarConfigsForConnectedFrame(configs).configs;
+        barConfigs = configs;
         updateBarConfigs();
     }
 
@@ -2006,7 +1790,7 @@ Singleton {
         const positionChanged = updates.position !== undefined && configs[index].position !== updates.position;
 
         Object.assign(configs[index], updates);
-        barConfigs = _sanitizeBarConfigsForConnectedFrame(configs).configs;
+        barConfigs = configs;
         updateBarConfigs();
 
         if (positionChanged) {
@@ -2060,11 +1844,6 @@ Singleton {
             return;
         const configs = barConfigs.filter(cfg => cfg.id !== barId);
         barConfigs = configs;
-        if (connectedFrameBarStyleBackups?.[barId] !== undefined) {
-            const nextBackups = JSON.parse(JSON.stringify(connectedFrameBarStyleBackups || {}));
-            delete nextBackups[barId];
-            connectedFrameBarStyleBackups = nextBackups;
-        }
         updateBarConfigs();
     }
 
@@ -2159,66 +1938,6 @@ Singleton {
         return filtered;
     }
 
-    function getFrameFilteredScreens() {
-        var prefs = frameScreenPreferences || ["all"];
-        if (!prefs || prefs.length === 0 || prefs.includes("all")) {
-            return Quickshell.screens;
-        }
-        return Quickshell.screens.filter(screen => isScreenInPreferences(screen, prefs));
-    }
-
-    function getActiveBarEdgeForScreen(screen) {
-        if (!screen) return "";
-        for (var i = 0; i < barConfigs.length; i++) {
-            var bc = barConfigs[i];
-            if (!bc.enabled) continue;
-            var prefs = bc.screenPreferences || ["all"];
-            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";
-            }
-        }
-        return "";
-    }
-
-    function getActiveBarEdgesForScreen(screen) {
-        if (!screen) return [];
-        var edges = [];
-        for (var i = 0; i < barConfigs.length; i++) {
-            var bc = barConfigs[i];
-            if (!bc.enabled) continue;
-            var prefs = bc.screenPreferences || ["all"];
-            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;
-            }
-        }
-        return edges;
-    }
-
-    function getActiveBarThicknessForScreen(screen) {
-        if (frameEnabled) return frameBarSize;
-        if (!screen) return frameThickness;
-        for (var i = 0; i < barConfigs.length; i++) {
-            var bc = barConfigs[i];
-            if (!bc.enabled) continue;
-            var prefs = bc.screenPreferences || ["all"];
-            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;
-            const bottomGap = bc.bottomGap ?? 0;
-            return barT + spacing + bottomGap;
-        }
-        return frameThickness;
-    }
-
     function sendTestNotifications() {
         NotificationService.dismissAllPopups();
         sendTestNotification(0);

quickshell/Common/Theme.qml

@@ -960,40 +960,6 @@ Singleton {
         "expressiveEffects": [0.34, 0.8, 0.34, 1, 1, 1]
     }
 
-    // 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
-    readonly property list<real> variantModalExitCurve: AnimVariants.variantModalExitCurve
-    readonly property list<real> variantPopoutEnterCurve: AnimVariants.variantPopoutEnterCurve
-    readonly property list<real> variantPopoutExitCurve: AnimVariants.variantPopoutExitCurve
-    readonly property real variantEnterDurationFactor: AnimVariants.variantEnterDurationFactor
-    readonly property real variantExitDurationFactor: AnimVariants.variantExitDurationFactor
-    readonly property real variantOpacityDurationScale: AnimVariants.variantOpacityDurationScale
-    readonly property bool isDirectionalEffect: AnimVariants.isDirectionalEffect
-    readonly property bool isDepthEffect: AnimVariants.isDepthEffect
-    readonly property bool isConnectedEffect: AnimVariants.isConnectedEffect
-    readonly property real connectedCornerRadius: {
-        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);
-    }
-    readonly property real connectedSurfaceRadius: isConnectedEffect ? connectedCornerRadius : cornerRadius
-    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); }
-
     readonly property var animationPresetDurations: {
         "none": 0,
         "short": 250,
@@ -1159,13 +1125,7 @@ Singleton {
     property real iconSizeLarge: 32
 
     property real panelTransparency: 0.85
-    property real popupTransparency: {
-        if (typeof SettingsData === "undefined")
-            return 1.0;
-        if (isConnectedEffect)
-            return SettingsData.frameOpacity !== undefined ? SettingsData.frameOpacity : 1.0;
-        return SettingsData.popupTransparency !== undefined ? SettingsData.popupTransparency : 1.0;
-    }
+    property real popupTransparency: typeof SettingsData !== "undefined" && SettingsData.popupTransparency !== undefined ? SettingsData.popupTransparency : 1.0
 
     function screenTransition() {
         if (CompositorService.isNiri) {
@@ -1864,12 +1824,6 @@ Singleton {
         return Qt.rgba(c.r, c.g, c.b, a);
     }
 
-    function popupLayerColor(baseColor) {
-        if (isConnectedEffect)
-            return connectedSurfaceColor;
-        return withAlpha(baseColor, popupTransparency);
-    }
-
     function blendAlpha(c, a) {
         return Qt.rgba(c.r, c.g, c.b, c.a * a);
     }

quickshell/Common/settings/Processes.qml

@@ -25,10 +25,16 @@ Singleton {
 
     property string fingerprintProbeOutput: ""
     property int fingerprintProbeExitCode: 0
-    property bool fingerprintProbeFinalized: false
+    property bool fingerprintProbeStreamFinished: false
+    property bool fingerprintProbeExited: false
+    property string fingerprintProbeState: "probe_failed"
 
-    property string pamProbeOutput: ""
-    property bool pamProbeFinalized: false
+    property string pamSupportProbeOutput: ""
+    property bool pamSupportProbeStreamFinished: false
+    property bool pamSupportProbeExited: false
+    property int pamSupportProbeExitCode: 0
+    property bool pamFprintSupportDetected: false
+    property bool pamU2fSupportDetected: false
 
     readonly property string homeDir: Quickshell.env("HOME") || ""
     readonly property string u2fKeysPath: homeDir ? homeDir + "/.config/Yubico/u2f_keys" : ""
@@ -48,189 +54,40 @@ Singleton {
 
     readonly property var forcedFprintAvailable: envFlag("DMS_FORCE_FPRINT_AVAILABLE")
     readonly property var forcedU2fAvailable: envFlag("DMS_FORCE_U2F_AVAILABLE")
+    property bool authApplyRunning: false
+    property bool authApplyQueued: false
+    property bool authApplyRerunRequested: false
+    property bool authApplyTerminalFallbackFromPrecheck: false
+    property string authApplyStdout: ""
+    property string authApplyStderr: ""
+    property string authApplySudoProbeStderr: ""
+    property string authApplyTerminalFallbackStderr: ""
 
-    // --- Derived auth probe state ---
-
-    readonly property bool pamFprintSupportDetected: pamProbeFinalized && pamProbeOutput.includes("pam_fprintd.so:true")
-    readonly property bool pamU2fSupportDetected: pamProbeFinalized && pamProbeOutput.includes("pam_u2f.so:true")
-
-    readonly property string fingerprintProbeState: {
-        if (forcedFprintAvailable !== null)
-            return forcedFprintAvailable ? "ready" : "probe_failed";
-        if (!fingerprintProbeFinalized)
-            return "probe_failed";
-        return parseFingerprintProbe(fingerprintProbeExitCode, fingerprintProbeOutput, pamFprintSupportDetected);
+    function detectQtTools() {
+        qtToolsDetectionProcess.running = true;
     }
 
-    // --- Lock fingerprint capabilities ---
-
-    readonly property bool lockFingerprintCanEnable: {
-        if (forcedFprintAvailable !== null)
-            return forcedFprintAvailable;
-        switch (fingerprintProbeState) {
-        case "ready":
-        case "missing_enrollment":
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    readonly property bool lockFingerprintReady: {
-        if (forcedFprintAvailable !== null)
-            return forcedFprintAvailable;
-        return fingerprintProbeState === "ready";
-    }
-
-    readonly property string lockFingerprintReason: {
-        if (forcedFprintAvailable !== null)
-            return forcedFprintAvailable ? "ready" : "probe_failed";
-        return fingerprintProbeState;
-    }
-
-    // --- Greeter fingerprint capabilities ---
-
-    readonly property bool greeterFingerprintCanEnable: {
-        if (forcedFprintAvailable !== null)
-            return forcedFprintAvailable;
-        if (greeterPamHasFprint)
-            return fingerprintProbeState !== "missing_reader";
-        switch (fingerprintProbeState) {
-        case "ready":
-        case "missing_enrollment":
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    readonly property bool greeterFingerprintReady: {
-        if (forcedFprintAvailable !== null)
-            return forcedFprintAvailable;
-        return fingerprintProbeState === "ready";
-    }
-
-    readonly property string greeterFingerprintReason: {
-        if (forcedFprintAvailable !== null)
-            return forcedFprintAvailable ? "ready" : "probe_failed";
-        if (greeterPamHasFprint) {
-            switch (fingerprintProbeState) {
-            case "ready":
-                return "configured_externally";
-            case "missing_enrollment":
-                return "missing_enrollment";
-            case "missing_reader":
-                return "missing_reader";
-            default:
-                return "probe_failed";
-            }
-        }
-        return fingerprintProbeState;
-    }
-
-    readonly property string greeterFingerprintSource: {
-        if (forcedFprintAvailable !== null)
-            return forcedFprintAvailable ? "dms" : "none";
-        if (greeterPamHasFprint)
-            return "pam";
-        switch (fingerprintProbeState) {
-        case "ready":
-        case "missing_enrollment":
-            return "dms";
-        default:
-            return "none";
-        }
-    }
-
-    // --- Lock U2F capabilities ---
-
-    readonly property bool lockU2fReady: {
-        if (forcedU2fAvailable !== null)
-            return forcedU2fAvailable;
-        return lockU2fCustomConfigDetected || homeU2fKeysDetected;
-    }
-
-    readonly property bool lockU2fCanEnable: {
-        if (forcedU2fAvailable !== null)
-            return forcedU2fAvailable;
-        return lockU2fReady || pamU2fSupportDetected;
-    }
-
-    readonly property string lockU2fReason: {
-        if (forcedU2fAvailable !== null)
-            return forcedU2fAvailable ? "ready" : "probe_failed";
-        if (lockU2fReady)
-            return "ready";
-        if (lockU2fCanEnable)
-            return "missing_key_registration";
-        return "missing_pam_support";
-    }
-
-    // --- Greeter U2F capabilities ---
-
-    readonly property bool greeterU2fReady: {
-        if (forcedU2fAvailable !== null)
-            return forcedU2fAvailable;
-        if (greeterPamHasU2f)
-            return true;
-        return homeU2fKeysDetected;
-    }
-
-    readonly property bool greeterU2fCanEnable: {
-        if (forcedU2fAvailable !== null)
-            return forcedU2fAvailable;
-        if (greeterPamHasU2f)
-            return true;
-        return greeterU2fReady || pamU2fSupportDetected;
-    }
-
-    readonly property string greeterU2fReason: {
-        if (forcedU2fAvailable !== null)
-            return forcedU2fAvailable ? "ready" : "probe_failed";
-        if (greeterPamHasU2f)
-            return "configured_externally";
-        if (greeterU2fReady)
-            return "ready";
-        if (greeterU2fCanEnable)
-            return "missing_key_registration";
-        return "missing_pam_support";
-    }
-
-    readonly property string greeterU2fSource: {
-        if (forcedU2fAvailable !== null)
-            return forcedU2fAvailable ? "dms" : "none";
-        if (greeterPamHasU2f)
-            return "pam";
-        if (greeterU2fCanEnable)
-            return "dms";
-        return "none";
-    }
-
-    // --- Aggregates ---
-
-    readonly property bool fprintdAvailable: lockFingerprintReady || greeterFingerprintReady
-    readonly property bool u2fAvailable: lockU2fReady || greeterU2fReady
-
-    // --- Auth detection ---
-
-    readonly property var _fprintProbeCommand: ["sh", "-c", "if command -v fprintd-list >/dev/null 2>&1; then fprintd-list \"${USER:-$(id -un)}\" 2>&1; else printf '__missing_command__\\n'; exit 127; fi"]
-    readonly property var _pamProbeCommand: ["sh", "-c", "for module in pam_fprintd.so pam_u2f.so; do found=false; for dir in /usr/lib64/security /usr/lib/security /lib/security /lib/x86_64-linux-gnu/security /usr/lib/x86_64-linux-gnu/security /usr/lib/aarch64-linux-gnu/security /run/current-system/sw/lib/security; do if [ -f \"$dir/$module\" ]; then found=true; break; fi; done; printf '%s:%s\\n' \"$module\" \"$found\"; done"]
-
     function detectAuthCapabilities() {
+        if (!settingsRoot)
+            return;
+
         if (forcedFprintAvailable === null) {
-            fingerprintProbeFinalized = false;
-            Proc.runCommand("fprint-probe", _fprintProbeCommand, (output, exitCode) => {
-                fingerprintProbeOutput = output || "";
-                fingerprintProbeExitCode = exitCode;
-                fingerprintProbeFinalized = true;
-            }, 0);
+            fingerprintProbeOutput = "";
+            fingerprintProbeStreamFinished = false;
+            fingerprintProbeExited = false;
+            fingerprintProbeProcess.running = true;
+        } else {
+            fingerprintProbeState = forcedFprintAvailable ? "ready" : "probe_failed";
         }
 
-        pamProbeFinalized = false;
-        Proc.runCommand("pam-probe", _pamProbeCommand, (output, _exitCode) => {
-            pamProbeOutput = output || "";
-            pamProbeFinalized = true;
-        }, 0);
+        pamFprintSupportDetected = false;
+        pamU2fSupportDetected = false;
+        pamSupportProbeOutput = "";
+        pamSupportProbeStreamFinished = false;
+        pamSupportProbeExited = false;
+        pamSupportDetectionProcess.running = true;
+
+        recomputeAuthCapabilities();
     }
 
     function detectFprintd() {
@@ -241,16 +98,9 @@ Singleton {
         detectAuthCapabilities();
     }
 
-    // --- Auth apply pipeline ---
-
-    property bool authApplyRunning: false
-    property bool authApplyQueued: false
-    property bool authApplyRerunRequested: false
-    property bool authApplyTerminalFallbackFromPrecheck: false
-    property string authApplyStdout: ""
-    property string authApplyStderr: ""
-    property string authApplySudoProbeStderr: ""
-    property string authApplyTerminalFallbackStderr: ""
+    function checkPluginSettings() {
+        pluginSettingsCheckProcess.running = true;
+    }
 
     function scheduleAuthApply() {
         if (!settingsRoot || settingsRoot.isGreeterMode)
@@ -296,8 +146,6 @@ Singleton {
             authApplyDebounce.restart();
     }
 
-    // --- PAM parsing helpers ---
-
     function stripPamComment(line) {
         if (!line)
             return "";
@@ -341,7 +189,15 @@ Singleton {
     function greeterPamStackHasModule(moduleName) {
         if (pamModuleEnabled(greetdPamText, moduleName))
             return true;
-        const includedPamStacks = [["system-auth", systemAuthPamText], ["common-auth", commonAuthPamText], ["password-auth", passwordAuthPamText], ["system-login", systemLoginPamText], ["system-local-login", systemLocalLoginPamText], ["common-auth-pc", commonAuthPcPamText], ["login", loginPamText]];
+        const includedPamStacks = [
+            ["system-auth", systemAuthPamText],
+            ["common-auth", commonAuthPamText],
+            ["password-auth", passwordAuthPamText],
+            ["system-login", systemLoginPamText],
+            ["system-local-login", systemLocalLoginPamText],
+            ["common-auth-pc", commonAuthPcPamText],
+            ["login", loginPamText]
+        ];
         for (let i = 0; i < includedPamStacks.length; i++) {
             const stack = includedPamStacks[i];
             if (pamTextIncludesFile(greetdPamText, stack[0]) && pamModuleEnabled(stack[1], moduleName))
@@ -350,8 +206,6 @@ Singleton {
         return false;
     }
 
-    // --- Fingerprint probe output parsing ---
-
     function hasEnrolledFingerprintOutput(output) {
         const lower = (output || "").toLowerCase();
         if (lower.includes("has fingers enrolled") || lower.includes("has fingerprints enrolled"))
@@ -369,15 +223,21 @@ Singleton {
 
     function hasMissingFingerprintEnrollmentOutput(output) {
         const lower = (output || "").toLowerCase();
-        return lower.includes("no fingers enrolled") || lower.includes("no fingerprints enrolled") || lower.includes("no prints enrolled");
+        return lower.includes("no fingers enrolled")
+            || lower.includes("no fingerprints enrolled")
+            || lower.includes("no prints enrolled");
     }
 
     function hasMissingFingerprintReaderOutput(output) {
         const lower = (output || "").toLowerCase();
-        return lower.includes("no devices available") || lower.includes("no device available") || lower.includes("no devices found") || lower.includes("list_devices failed") || lower.includes("no device");
+        return lower.includes("no devices available")
+            || lower.includes("no device available")
+            || lower.includes("no devices found")
+            || lower.includes("list_devices failed")
+            || lower.includes("no device");
     }
 
-    function parseFingerprintProbe(exitCode, output, pamFprintDetected) {
+    function parseFingerprintProbe(exitCode, output) {
         if (hasEnrolledFingerprintOutput(output))
             return "ready";
         if (hasMissingFingerprintEnrollmentOutput(output))
@@ -388,17 +248,164 @@ Singleton {
             return "missing_enrollment";
         if (exitCode === 127 || (output || "").includes("__missing_command__"))
             return "probe_failed";
-        return pamFprintDetected ? "probe_failed" : "missing_pam_support";
+        return pamFprintSupportDetected ? "probe_failed" : "missing_pam_support";
     }
 
-    // --- Qt tools detection ---
-
-    function detectQtTools() {
-        qtToolsDetectionProcess.running = true;
+    function setLockFingerprintCapability(canEnable, ready, reason) {
+        settingsRoot.lockFingerprintCanEnable = canEnable;
+        settingsRoot.lockFingerprintReady = ready;
+        settingsRoot.lockFingerprintReason = reason;
     }
 
-    function checkPluginSettings() {
-        pluginSettingsCheckProcess.running = true;
+    function setLockU2fCapability(canEnable, ready, reason) {
+        settingsRoot.lockU2fCanEnable = canEnable;
+        settingsRoot.lockU2fReady = ready;
+        settingsRoot.lockU2fReason = reason;
+    }
+
+    function setGreeterFingerprintCapability(canEnable, ready, reason, source) {
+        settingsRoot.greeterFingerprintCanEnable = canEnable;
+        settingsRoot.greeterFingerprintReady = ready;
+        settingsRoot.greeterFingerprintReason = reason;
+        settingsRoot.greeterFingerprintSource = source;
+    }
+
+    function setGreeterU2fCapability(canEnable, ready, reason, source) {
+        settingsRoot.greeterU2fCanEnable = canEnable;
+        settingsRoot.greeterU2fReady = ready;
+        settingsRoot.greeterU2fReason = reason;
+        settingsRoot.greeterU2fSource = source;
+    }
+
+    function recomputeFingerprintCapabilities() {
+        if (forcedFprintAvailable !== null) {
+            const reason = forcedFprintAvailable ? "ready" : "probe_failed";
+            const source = forcedFprintAvailable ? "dms" : "none";
+            setLockFingerprintCapability(forcedFprintAvailable, forcedFprintAvailable, reason);
+            setGreeterFingerprintCapability(forcedFprintAvailable, forcedFprintAvailable, reason, source);
+            return;
+        }
+
+        const state = fingerprintProbeState;
+
+        switch (state) {
+        case "ready":
+            setLockFingerprintCapability(true, true, "ready");
+            break;
+        case "missing_enrollment":
+            setLockFingerprintCapability(true, false, "missing_enrollment");
+            break;
+        case "missing_reader":
+            setLockFingerprintCapability(false, false, "missing_reader");
+            break;
+        case "missing_pam_support":
+            setLockFingerprintCapability(false, false, "missing_pam_support");
+            break;
+        default:
+            setLockFingerprintCapability(false, false, "probe_failed");
+            break;
+        }
+
+        if (greeterPamHasFprint) {
+            switch (state) {
+            case "ready":
+                setGreeterFingerprintCapability(true, true, "configured_externally", "pam");
+                break;
+            case "missing_enrollment":
+                setGreeterFingerprintCapability(true, false, "missing_enrollment", "pam");
+                break;
+            case "missing_reader":
+                setGreeterFingerprintCapability(false, false, "missing_reader", "pam");
+                break;
+            default:
+                setGreeterFingerprintCapability(true, false, "probe_failed", "pam");
+                break;
+            }
+            return;
+        }
+
+        switch (state) {
+        case "ready":
+            setGreeterFingerprintCapability(true, true, "ready", "dms");
+            break;
+        case "missing_enrollment":
+            setGreeterFingerprintCapability(true, false, "missing_enrollment", "dms");
+            break;
+        case "missing_reader":
+            setGreeterFingerprintCapability(false, false, "missing_reader", "none");
+            break;
+        case "missing_pam_support":
+            setGreeterFingerprintCapability(false, false, "missing_pam_support", "none");
+            break;
+        default:
+            setGreeterFingerprintCapability(false, false, "probe_failed", "none");
+            break;
+        }
+    }
+
+    function recomputeU2fCapabilities() {
+        if (forcedU2fAvailable !== null) {
+            const reason = forcedU2fAvailable ? "ready" : "probe_failed";
+            const source = forcedU2fAvailable ? "dms" : "none";
+            setLockU2fCapability(forcedU2fAvailable, forcedU2fAvailable, reason);
+            setGreeterU2fCapability(forcedU2fAvailable, forcedU2fAvailable, reason, source);
+            return;
+        }
+
+        const lockReady = lockU2fCustomConfigDetected || homeU2fKeysDetected;
+        const lockCanEnable = lockReady || pamU2fSupportDetected;
+        const lockReason = lockReady ? "ready" : (lockCanEnable ? "missing_key_registration" : "missing_pam_support");
+        setLockU2fCapability(lockCanEnable, lockReady, lockReason);
+
+        if (greeterPamHasU2f) {
+            setGreeterU2fCapability(true, true, "configured_externally", "pam");
+            return;
+        }
+
+        const greeterReady = homeU2fKeysDetected;
+        const greeterCanEnable = greeterReady || pamU2fSupportDetected;
+        const greeterReason = greeterReady ? "ready" : (greeterCanEnable ? "missing_key_registration" : "missing_pam_support");
+        setGreeterU2fCapability(greeterCanEnable, greeterReady, greeterReason, greeterCanEnable ? "dms" : "none");
+    }
+
+    function recomputeAuthCapabilities() {
+        if (!settingsRoot)
+            return;
+        recomputeFingerprintCapabilities();
+        recomputeU2fCapabilities();
+        settingsRoot.fprintdAvailable = settingsRoot.lockFingerprintReady || settingsRoot.greeterFingerprintReady;
+        settingsRoot.u2fAvailable = settingsRoot.lockU2fReady || settingsRoot.greeterU2fReady;
+    }
+
+    function finalizeFingerprintProbe() {
+        if (!fingerprintProbeStreamFinished || !fingerprintProbeExited)
+            return;
+        fingerprintProbeState = parseFingerprintProbe(fingerprintProbeExitCode, fingerprintProbeOutput);
+        recomputeAuthCapabilities();
+    }
+
+    function finalizePamSupportProbe() {
+        if (!pamSupportProbeStreamFinished || !pamSupportProbeExited)
+            return;
+
+        pamFprintSupportDetected = false;
+        pamU2fSupportDetected = false;
+
+        const lines = (pamSupportProbeOutput || "").trim().split(/\r?\n/);
+        for (let i = 0; i < lines.length; i++) {
+            const parts = lines[i].split(":");
+            if (parts.length !== 2)
+                continue;
+            if (parts[0] === "pam_fprintd.so")
+                pamFprintSupportDetected = parts[1] === "true";
+            else if (parts[0] === "pam_u2f.so")
+                pamU2fSupportDetected = parts[1] === "true";
+        }
+
+        if (forcedFprintAvailable === null && fingerprintProbeState === "missing_pam_support")
+            fingerprintProbeState = parseFingerprintProbe(fingerprintProbeExitCode, fingerprintProbeOutput);
+
+        recomputeAuthCapabilities();
     }
 
     property var qtToolsDetectionProcess: Process {
@@ -426,6 +433,44 @@ Singleton {
         }
     }
 
+    property var fingerprintProbeProcess: Process {
+        command: ["sh", "-c", "if command -v fprintd-list >/dev/null 2>&1; then fprintd-list \"${USER:-$(id -un)}\" 2>&1; else printf '__missing_command__\\n'; exit 127; fi"]
+        running: false
+
+        stdout: StdioCollector {
+            onStreamFinished: {
+                root.fingerprintProbeOutput = text || "";
+                root.fingerprintProbeStreamFinished = true;
+                root.finalizeFingerprintProbe();
+            }
+        }
+
+        onExited: function (exitCode) {
+            root.fingerprintProbeExitCode = exitCode;
+            root.fingerprintProbeExited = true;
+            root.finalizeFingerprintProbe();
+        }
+    }
+
+    property var pamSupportDetectionProcess: Process {
+        command: ["sh", "-c", "for module in pam_fprintd.so pam_u2f.so; do found=false; for dir in /usr/lib64/security /usr/lib/security /lib/security /lib/x86_64-linux-gnu/security /usr/lib/x86_64-linux-gnu/security /usr/lib/aarch64-linux-gnu/security /run/current-system/sw/lib/security; do if [ -f \"$dir/$module\" ]; then found=true; break; fi; done; printf '%s:%s\\n' \"$module\" \"$found\"; done"]
+        running: false
+
+        stdout: StdioCollector {
+            onStreamFinished: {
+                root.pamSupportProbeOutput = text || "";
+                root.pamSupportProbeStreamFinished = true;
+                root.finalizePamSupportProbe();
+            }
+        }
+
+        onExited: function (exitCode) {
+            root.pamSupportProbeExitCode = exitCode;
+            root.pamSupportProbeExited = true;
+            root.finalizePamSupportProbe();
+        }
+    }
+
     Timer {
         id: authApplyDebounce
         interval: 300
@@ -499,7 +544,9 @@ Singleton {
 
         onExited: exitCode => {
             if (exitCode === 0) {
-                const message = root.authApplyTerminalFallbackFromPrecheck ? I18n.tr("Terminal opened. Complete authentication setup there; it will close automatically when done.") : I18n.tr("Terminal fallback opened. Complete authentication setup there; it will close automatically when done.");
+                const message = root.authApplyTerminalFallbackFromPrecheck
+                    ? I18n.tr("Terminal opened. Complete authentication setup there; it will close automatically when done.")
+                    : I18n.tr("Terminal fallback opened. Complete authentication setup there; it will close automatically when done.");
                 ToastService.showInfo(message, "", "", "auth-sync");
             } else {
                 let details = (root.authApplyTerminalFallbackStderr || "").trim();
@@ -513,80 +560,140 @@ Singleton {
         id: greetdPamWatcher
         path: "/etc/pam.d/greetd"
         printErrors: false
-        onLoaded: root.greetdPamText = text()
-        onLoadFailed: root.greetdPamText = ""
+        onLoaded: {
+            root.greetdPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.greetdPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: systemAuthPamWatcher
         path: "/etc/pam.d/system-auth"
         printErrors: false
-        onLoaded: root.systemAuthPamText = text()
-        onLoadFailed: root.systemAuthPamText = ""
+        onLoaded: {
+            root.systemAuthPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.systemAuthPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: commonAuthPamWatcher
         path: "/etc/pam.d/common-auth"
         printErrors: false
-        onLoaded: root.commonAuthPamText = text()
-        onLoadFailed: root.commonAuthPamText = ""
+        onLoaded: {
+            root.commonAuthPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.commonAuthPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: passwordAuthPamWatcher
         path: "/etc/pam.d/password-auth"
         printErrors: false
-        onLoaded: root.passwordAuthPamText = text()
-        onLoadFailed: root.passwordAuthPamText = ""
+        onLoaded: {
+            root.passwordAuthPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.passwordAuthPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: systemLoginPamWatcher
         path: "/etc/pam.d/system-login"
         printErrors: false
-        onLoaded: root.systemLoginPamText = text()
-        onLoadFailed: root.systemLoginPamText = ""
+        onLoaded: {
+            root.systemLoginPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.systemLoginPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: systemLocalLoginPamWatcher
         path: "/etc/pam.d/system-local-login"
         printErrors: false
-        onLoaded: root.systemLocalLoginPamText = text()
-        onLoadFailed: root.systemLocalLoginPamText = ""
+        onLoaded: {
+            root.systemLocalLoginPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.systemLocalLoginPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: commonAuthPcPamWatcher
         path: "/etc/pam.d/common-auth-pc"
         printErrors: false
-        onLoaded: root.commonAuthPcPamText = text()
-        onLoadFailed: root.commonAuthPcPamText = ""
+        onLoaded: {
+            root.commonAuthPcPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.commonAuthPcPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: loginPamWatcher
         path: "/etc/pam.d/login"
         printErrors: false
-        onLoaded: root.loginPamText = text()
-        onLoadFailed: root.loginPamText = ""
+        onLoaded: {
+            root.loginPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.loginPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: dankshellU2fPamWatcher
         path: "/etc/pam.d/dankshell-u2f"
         printErrors: false
-        onLoaded: root.dankshellU2fPamText = text()
-        onLoadFailed: root.dankshellU2fPamText = ""
+        onLoaded: {
+            root.dankshellU2fPamText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.dankshellU2fPamText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     FileView {
         id: u2fKeysWatcher
         path: root.u2fKeysPath
         printErrors: false
-        onLoaded: root.u2fKeysText = text()
-        onLoadFailed: root.u2fKeysText = ""
+        onLoaded: {
+            root.u2fKeysText = text();
+            root.recomputeAuthCapabilities();
+        }
+        onLoadFailed: {
+            root.u2fKeysText = "";
+            root.recomputeAuthCapabilities();
+        }
     }
 
     property var pluginSettingsCheckProcess: Process {

quickshell/Common/settings/SessionSpec.js

@@ -75,8 +75,6 @@ var SPEC = {
 
     vpnLastConnected: { def: "" },
 
-    lastPlayerIdentity: { def: "" },
-
     deviceMaxVolumes: { def: {} },
     hiddenOutputDeviceNames: { def: [] },
     hiddenInputDeviceNames: { def: [] },

quickshell/Common/settings/SettingsSpec.js

@@ -49,10 +49,6 @@ var SPEC = {
     modalAnimationSpeed: { def: 1 },
     modalCustomAnimationDuration: { def: 150 },
     enableRippleEffects: { def: true },
-    animationVariant: { def: 0 },
-    motionEffect: { def: 0 },
-    directionalAnimationMode: { def: 0 },
-    previousDirectionalMode: { def: 1 },
     m3ElevationEnabled: { def: true },
     m3ElevationIntensity: { def: 12 },
     m3ElevationOpacity: { def: 30 },
@@ -144,7 +140,6 @@ var SPEC = {
     workspaceNameIcons: { def: {} },
     waveProgressEnabled: { def: true },
     scrollTitleEnabled: { def: true },
-    mediaAdaptiveWidthEnabled: { def: true },
     audioVisualizerEnabled: { def: true },
     audioScrollMode: { def: "volume" },
     audioWheelScrollAmount: { def: 5 },
@@ -208,8 +203,6 @@ var SPEC = {
     dankLauncherV2BorderColor: { def: "primary" },
     dankLauncherV2ShowFooter: { def: true },
     dankLauncherV2UnloadOnClose: { def: false },
-    dankLauncherV2IncludeFilesInAll: { def: false },
-    dankLauncherV2IncludeFoldersInAll: { def: false },
 
     useAutoLocation: { def: false },
     weatherEnabled: { def: true },
@@ -249,7 +242,6 @@ var SPEC = {
 
     soundsEnabled: { def: true },
     useSystemSoundTheme: { def: false },
-    soundLogin: { def: false },
     soundNewNotification: { def: true },
     soundVolumeChanged: { def: true },
     soundPluggedIn: { def: true },
@@ -368,8 +360,24 @@ var SPEC = {
     lockAtStartup: { def: false },
     enableFprint: { def: false, onChange: "scheduleAuthApply" },
     maxFprintTries: { def: 15 },
+    fprintdAvailable: { def: false, persist: false },
+    lockFingerprintCanEnable: { def: false, persist: false },
+    lockFingerprintReady: { def: false, persist: false },
+    lockFingerprintReason: { def: "probe_failed", persist: false },
+    greeterFingerprintCanEnable: { def: false, persist: false },
+    greeterFingerprintReady: { def: false, persist: false },
+    greeterFingerprintReason: { def: "probe_failed", persist: false },
+    greeterFingerprintSource: { def: "none", persist: false },
     enableU2f: { def: false, onChange: "scheduleAuthApply" },
     u2fMode: { def: "or" },
+    u2fAvailable: { def: false, persist: false },
+    lockU2fCanEnable: { def: false, persist: false },
+    lockU2fReady: { def: false, persist: false },
+    lockU2fReason: { def: "probe_failed", persist: false },
+    greeterU2fCanEnable: { def: false, persist: false },
+    greeterU2fReady: { def: false, persist: false },
+    greeterU2fReason: { def: "probe_failed", persist: false },
+    greeterU2fSource: { def: "none", persist: false },
     lockScreenActiveMonitor: { def: "all" },
     lockScreenInactiveColor: { def: "#000000" },
     lockScreenNotificationMode: { def: 0 },
@@ -433,7 +441,6 @@ var SPEC = {
     displayProfileAutoSelect: { def: false },
     displayShowDisconnected: { def: false },
     displaySnapToEdge: { def: true },
-    connectedFrameBarStyleBackups: { def: {} },
 
     barConfigs: {
         def: [{
@@ -540,17 +547,7 @@ var SPEC = {
     clipboardEnterToPaste: { def: false },
 
     launcherPluginVisibility: { def: {} },
-    launcherPluginOrder: { def: [] },
-
-    frameEnabled: { def: false },
-    frameThickness: { def: 16 },
-    frameRounding: { def: 23 },
-    frameColor: { def: "" },
-    frameOpacity: { def: 1.0 },
-    frameScreenPreferences: { def: ["all"] },
-    frameBarSize: { def: 40 },
-    frameShowOnOverview: { def: false },
-    frameBlurEnabled: { def: true }
+    launcherPluginOrder: { def: [] }
 };
 
 function getValidKeys() {

quickshell/Common/settings/SettingsStore.js

@@ -248,10 +248,6 @@ function migrateToVersion(obj, targetVersion) {
         settings.configVersion = 6;
     }
 
-    if (currentVersion < 11) {
-        settings.configVersion = 11;
-    }
-
     return settings;
 }
 

quickshell/DMSShell.qml

@@ -21,7 +21,6 @@ import qs.Modules.OSD
 import qs.Modules.ProcessList
 import qs.Modules.DankBar
 import qs.Modules.DankBar.Popouts
-import qs.Modules.Frame
 import qs.Modules.WorkspaceOverlays
 import qs.Services
 
@@ -177,8 +176,6 @@ Item {
         }
     }
 
-    Frame {}
-
     Repeater {
         id: dankBarRepeater
         model: ScriptModel {
@@ -224,22 +221,10 @@ Item {
         }
     }
 
-    Timer {
-        id: loginSoundTimer
-        // Half a second delay before playing login sound, otherwise the sound may be cut off
-        // 50 is the minimum that seems to work, but 500 is safer
-        interval: 500
-        repeat: false
-        onTriggered: {
-            AudioService.playLoginSoundIfApplicable();
-        }
-    }
-
     Component.onCompleted: {
         dockRecreateDebounce.start();
         // Force PolkitService singleton to initialize
         PolkitService.polkitAvailable;
-        loginSoundTimer.start();
     }
 
     Loader {

quickshell/DMSShellIPC.qml

@@ -369,7 +369,9 @@ Item {
         }
 
         function previous(): void {
-            MprisController.previousOrRewind();
+            if (MprisController.activePlayer && MprisController.activePlayer.canGoPrevious) {
+                MprisController.activePlayer.previous();
+            }
         }
 
         function next(): void {

quickshell/Modals/Clipboard/ClipboardContent.qml

@@ -122,7 +122,7 @@ Item {
             }
 
             StyledText {
-                text: clipboardContent.modal.clipboardAvailable ? I18n.tr("No recent clipboard entries found") : I18n.tr("Connecting to clipboard service…")
+                text: I18n.tr("No recent clipboard entries found")
                 anchors.centerIn: parent
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceVariantText
@@ -181,7 +181,7 @@ Item {
             }
 
             StyledText {
-                text: clipboardContent.modal.clipboardAvailable ? I18n.tr("No saved clipboard entries") : I18n.tr("Connecting to clipboard service…")
+                text: I18n.tr("No saved clipboard entries")
                 anchors.centerIn: parent
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceVariantText

quickshell/Modals/Clipboard/ClipboardHistoryModal.qml

@@ -60,23 +60,18 @@ DankModal {
     }
 
     function show() {
+        if (!clipboardAvailable) {
+            ToastService.showError(I18n.tr("Clipboard service not available"));
+            return;
+        }
         open();
         activeImageLoads = 0;
         shouldHaveFocus = true;
         ClipboardService.reset();
+        ClipboardService.refresh();
         keyboardController.reset();
 
         Qt.callLater(function () {
-            if (clipboardAvailable) {
-                if (Theme.isConnectedEffect) {
-                    Qt.callLater(() => {
-                        if (clipboardHistoryModal.shouldBeVisible)
-                            ClipboardService.refresh();
-                    });
-                } else {
-                    ClipboardService.refresh();
-                }
-            }
             if (contentLoader.item?.searchField) {
                 contentLoader.item.searchField.text = "";
                 contentLoader.item.searchField.forceActiveFocus();

quickshell/Modals/Clipboard/ClipboardHistoryPopout.qml

@@ -50,9 +50,14 @@ DankPopout {
     }
 
     function show() {
+        if (!clipboardAvailable) {
+            ToastService.showError(I18n.tr("Clipboard service not available"));
+            return;
+        }
         open();
         activeImageLoads = 0;
         ClipboardService.reset();
+        ClipboardService.refresh();
         keyboardController.reset();
 
         Qt.callLater(function () {
@@ -117,18 +122,10 @@ DankPopout {
     onBackgroundClicked: hide()
 
     onShouldBeVisibleChanged: {
-        if (!shouldBeVisible)
+        if (!shouldBeVisible) {
             return;
-        if (clipboardAvailable) {
-            if (Theme.isConnectedEffect) {
-                Qt.callLater(() => {
-                    if (root.shouldBeVisible)
-                        ClipboardService.refresh();
-                });
-            } else {
-                ClipboardService.refresh();
-            }
         }
+        ClipboardService.refresh();
         keyboardController.reset();
         Qt.callLater(function () {
             if (contentLoader.item?.searchField) {

quickshell/Modals/Common/DankModal.qml

@@ -26,22 +26,15 @@ Item {
     property bool closeOnEscapeKey: true
     property bool closeOnBackgroundClick: true
     property string animationType: "scale"
-    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 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.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
@@ -52,13 +45,11 @@ 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
+    readonly property bool useSingleWindow: CompositorService.isHyprland || useBackground
 
     signal opened
     signal dialogClosed
@@ -68,34 +59,33 @@ Item {
 
     function open() {
         closeTimer.stop();
-        animationsEnabled = false;
-        frozenMotionOffsetX = modalContainer ? modalContainer.offsetX : 0;
-        frozenMotionOffsetY = modalContainer ? modalContainer.offsetY : animationOffset;
-
         const focusedScreen = CompositorService.getFocusedScreen();
+        const screenChanged = focusedScreen && contentWindow.screen !== focusedScreen;
         if (focusedScreen) {
+            if (screenChanged)
+                contentWindow.visible = false;
             contentWindow.screen = focusedScreen;
-            if (!useSingleWindow)
+            if (!useSingleWindow) {
+                if (screenChanged)
+                    clickCatcher.visible = false;
                 clickCatcher.screen = focusedScreen;
+            }
         }
+        if (screenChanged) {
+            Qt.callLater(() => root._finishOpen());
+        } else {
+            _finishOpen();
+        }
+    }
 
-        if (Theme.isDirectionalEffect || root.useBackground) {
-            if (!useSingleWindow)
-                clickCatcher.visible = true;
-            contentWindow.visible = true;
-        }
+    function _finishOpen() {
         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));
-        });
+        shouldBeVisible = true;
+        if (!useSingleWindow)
+            clickCatcher.visible = true;
+        contentWindow.visible = true;
+        shouldHaveFocus = false;
+        Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible));
     }
 
     function close() {
@@ -156,7 +146,7 @@ Item {
 
     Timer {
         id: closeTimer
-        interval: Theme.variantCloseInterval(animationDuration)
+        interval: animationDuration + 50
         onTriggered: {
             if (shouldBeVisible)
                 return;
@@ -170,19 +160,7 @@ Item {
     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: {
-        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 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)
@@ -242,26 +220,9 @@ Item {
 
         MouseArea {
             anchors.fill: parent
-            enabled: !root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
+            enabled: 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 {
@@ -271,13 +232,12 @@ Item {
 
         WindowBlur {
             targetWindow: contentWindow
-            blurEnabled: root.effectiveBlurEnabled
             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) ? modalContainer.width * s : 0
-            blurHeight: (root.shouldBeVisible && animatedContent.opacity > 0) ? modalContainer.height * s : 0
-            blurRadius: root.effectiveCornerRadius
+            blurWidth: (shouldBeVisible && animatedContent.opacity > 0) ? modalContainer.width * s : 0
+            blurHeight: (shouldBeVisible && animatedContent.opacity > 0) ? modalContainer.height * s : 0
+            blurRadius: root.cornerRadius
         }
 
         WlrLayershell.namespace: root.layerNamespace
@@ -315,12 +275,9 @@ Item {
             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
+            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
         }
@@ -350,14 +307,13 @@ Item {
             anchors.fill: parent
             z: -1
             color: "black"
-            opacity: (root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-            visible: opacity > 0
+            opacity: root.useBackground ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
+            visible: root.useBackground
 
             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
+                enabled: root.animationsEnabled
+                DankAnim {
+                    duration: root.animationDuration
                     easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
                 }
             }
@@ -365,8 +321,8 @@ Item {
 
         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)
+            x: root.useSingleWindow ? root.alignedX : shadowBuffer
+            y: root.useSingleWindow ? root.alignedY : shadowBuffer
 
             width: root.alignedWidth
             height: root.alignedHeight
@@ -382,117 +338,45 @@ Item {
             }
 
             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
-            readonly property real offsetX: {
-                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 (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;
-            }
+            readonly property real offsetX: slide ? 15 : 0
+            readonly property real offsetY: slide ? -30 : root.animationOffset
 
-            property real animX: root.shouldBeVisible ? 0 : root.frozenMotionOffsetX
-            property real animY: root.shouldBeVisible ? 0 : root.frozenMotionOffsetY
+            property real animX: 0
+            property real animY: 0
+            property real scaleValue: root.animationScaleCollapsed
 
-            readonly property real computedScaleCollapsed: (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 && Theme.isDirectionalEffect) ? 0.0 : root.animationScaleCollapsed
-            property real scaleValue: root.shouldBeVisible ? 1.0 : computedScaleCollapsed
+            onOffsetXChanged: animX = Theme.snap(root.shouldBeVisible ? 0 : offsetX, root.dpr)
+            onOffsetYChanged: animY = Theme.snap(root.shouldBeVisible ? 0 : offsetY, root.dpr)
+
+            Connections {
+                target: root
+                function onShouldBeVisibleChanged() {
+                    modalContainer.animX = Theme.snap(root.shouldBeVisible ? 0 : modalContainer.offsetX, root.dpr);
+                    modalContainer.animY = Theme.snap(root.shouldBeVisible ? 0 : modalContainer.offsetY, root.dpr);
+                    modalContainer.scaleValue = root.shouldBeVisible ? 1.0 : root.animationScaleCollapsed;
+                }
+            }
 
             Behavior on animX {
                 enabled: root.animationsEnabled
-                NumberAnimation {
-                    duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
-                    easing.type: Easing.BezierSpline
+                DankAnim {
+                    duration: root.animationDuration
                     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
+                DankAnim {
+                    duration: root.animationDuration
                     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
+                DankAnim {
+                    duration: root.animationDuration
                     easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
                 }
             }
@@ -508,14 +392,15 @@ Item {
                     id: animatedContent
                     anchors.fill: parent
                     clip: false
-                    opacity: (Theme.isDirectionalEffect && !Theme.isConnectedEffect) ? 1 : (root.shouldBeVisible ? 1 : 0)
+                    opacity: root.shouldBeVisible ? 1 : 0
                     scale: modalContainer.scaleValue
-                    transformOrigin: Item.Center
+                    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 && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
+                        enabled: root.animationsEnabled
                         NumberAnimation {
-                            duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
+                            duration: animationDuration
                             easing.type: Easing.BezierSpline
                             easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
                         }
@@ -526,19 +411,19 @@ Item {
                         anchors.fill: parent
                         level: root.shadowLevel
                         fallbackOffset: root.shadowFallbackOffset
-                        targetRadius: root.effectiveCornerRadius
-                        targetColor: root.effectiveBackgroundColor
-                        borderColor: root.effectiveBorderColor
-                        borderWidth: root.effectiveBorderWidth
+                        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.effectiveCornerRadius
+                        radius: root.cornerRadius
                         color: "transparent"
-                        border.color: root.connectedSurfaceOverride ? "transparent" : BlurService.borderColor
-                        border.width: root.connectedSurfaceOverride ? 0 : BlurService.borderWidth
+                        border.color: BlurService.borderColor
+                        border.width: BlurService.borderWidth
                         z: 100
                     }
 

quickshell/Modals/DankColorPickerModal.qml

@@ -132,7 +132,7 @@ DankModal {
 
     modalWidth: 680
     modalHeight: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 680
-    backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    backgroundColor: Theme.surfaceContainer
     cornerRadius: Theme.cornerRadius
     borderColor: Theme.outlineMedium
     borderWidth: 1

quickshell/Modals/DankLauncherV2/Controller.qml

@@ -352,8 +352,7 @@ Item {
         searchQuery = query;
         searchDebounce.restart();
 
-        var filesInAll = searchMode === "all" && (SettingsData.dankLauncherV2IncludeFilesInAll || SettingsData.dankLauncherV2IncludeFoldersInAll);
-        if (searchMode !== "plugins" && (searchMode === "files" || query.startsWith("/") || filesInAll) && query.length > 0) {
+        if (searchMode !== "plugins" && (searchMode === "files" || query.startsWith("/")) && query.length > 0) {
             fileSearchDebounce.restart();
         }
     }
@@ -370,8 +369,7 @@ Item {
         searchMode = mode;
         modeChanged(mode);
         performSearch();
-        var filesInAll = mode === "all" && (SettingsData.dankLauncherV2IncludeFilesInAll || SettingsData.dankLauncherV2IncludeFoldersInAll) && searchQuery.length > 0;
-        if (mode === "files" || filesInAll) {
+        if (mode === "files") {
             fileSearchDebounce.restart();
         }
     }
@@ -929,22 +927,10 @@ Item {
         if (!DSearchService.dsearchAvailable)
             return;
         var fileQuery = "";
-        var effectiveType = fileSearchType || "all";
-        var includeFiles = SettingsData.dankLauncherV2IncludeFilesInAll;
-        var includeFolders = SettingsData.dankLauncherV2IncludeFoldersInAll;
-
         if (searchQuery.startsWith("/")) {
             fileQuery = searchQuery.substring(1).trim();
         } else if (searchMode === "files") {
             fileQuery = searchQuery.trim();
-        } else if (searchMode === "all" && (includeFiles || includeFolders)) {
-            fileQuery = searchQuery.trim();
-            if (includeFiles && !includeFolders)
-                effectiveType = "file";
-            else if (!includeFiles && includeFolders)
-                effectiveType = "dir";
-            else
-                effectiveType = "all";
         } else {
             return;
         }
@@ -955,129 +941,109 @@ Item {
         }
 
         isFileSearching = true;
+        var params = {
+            limit: 20,
+            fuzzy: true,
+            sort: fileSearchSort || "score",
+            desc: true
+        };
 
-        var splitBothTypes = searchMode === "all" && includeFiles && includeFolders && DSearchService.supportsTypeFilter;
-        var queryTypes = splitBothTypes ? ["file", "dir"] : [effectiveType];
-        var pending = queryTypes.length;
-        var aggregatedItems = [];
+        if (DSearchService.supportsTypeFilter) {
+            params.type = (fileSearchType && fileSearchType !== "all") ? fileSearchType : "all";
+        }
+        if (fileSearchExt) {
+            params.ext = fileSearchExt;
+        }
+        if (fileSearchFolder) {
+            params.folder = fileSearchFolder;
+        }
 
-        for (var t = 0; t < queryTypes.length; t++) {
-            var queryType = queryTypes[t];
-            var params = {
-                limit: 20,
-                fuzzy: true,
-                sort: fileSearchSort || "score",
-                desc: true
-            };
+        DSearchService.search(fileQuery, params, function (response) {
+            isFileSearching = false;
+            if (response.error)
+                return;
+            var fileItems = [];
+            var hits = response.result?.hits || [];
 
-            if (DSearchService.supportsTypeFilter) {
-                params.type = (queryType && queryType !== "all") ? queryType : "all";
-            }
-            if (fileSearchExt) {
-                params.ext = fileSearchExt;
-            }
-            if (fileSearchFolder) {
-                params.folder = fileSearchFolder;
+            for (var i = 0; i < hits.length; i++) {
+                var hit = hits[i];
+                var docTypes = hit.locations?.doc_type;
+                var isDir = docTypes ? !!docTypes["dir"] : false;
+                fileItems.push(transformFileResult({
+                    path: hit.id || "",
+                    score: hit.score || 0,
+                    is_dir: isDir
+                }));
             }
 
-            DSearchService.search(fileQuery, params, function (response) {
-                pending--;
-                if (!response.error) {
-                    var hits = response.result?.hits || [];
-                    for (var i = 0; i < hits.length; i++) {
-                        var hit = hits[i];
-                        var docTypes = hit.locations?.doc_type;
-                        var isDir = docTypes ? !!docTypes["dir"] : false;
-                        aggregatedItems.push(transformFileResult({
-                            path: hit.id || "",
-                            score: hit.score || 0,
-                            is_dir: isDir
-                        }));
-                    }
+            var fileSections = [];
+            var showType = fileSearchType || "all";
+
+            if (showType === "all" && DSearchService.supportsTypeFilter) {
+                var onlyFiles = [];
+                var onlyDirs = [];
+                for (var j = 0; j < fileItems.length; j++) {
+                    if (fileItems[j].data?.is_dir)
+                        onlyDirs.push(fileItems[j]);
+                    else
+                        onlyFiles.push(fileItems[j]);
                 }
-                if (pending > 0)
-                    return;
+                if (onlyFiles.length > 0) {
+                    fileSections.push({
+                        id: "files",
+                        title: I18n.tr("Files"),
+                        icon: "insert_drive_file",
+                        priority: 4,
+                        items: onlyFiles,
+                        collapsed: collapsedSections["files"] || false,
+                        flatStartIndex: 0
+                    });
+                }
+                if (onlyDirs.length > 0) {
+                    fileSections.push({
+                        id: "folders",
+                        title: I18n.tr("Folders"),
+                        icon: "folder",
+                        priority: 4.1,
+                        items: onlyDirs,
+                        collapsed: collapsedSections["folders"] || false,
+                        flatStartIndex: 0
+                    });
+                }
+            } else {
+                var filesIcon = showType === "dir" ? "folder" : showType === "file" ? "insert_drive_file" : "folder";
+                var filesTitle = showType === "dir" ? I18n.tr("Folders") : I18n.tr("Files");
+                if (fileItems.length > 0) {
+                    fileSections.push({
+                        id: "files",
+                        title: filesTitle,
+                        icon: filesIcon,
+                        priority: 4,
+                        items: fileItems,
+                        collapsed: collapsedSections["files"] || false,
+                        flatStartIndex: 0
+                    });
+                }
+            }
 
-                isFileSearching = false;
-                _applyFileSearchResults(aggregatedItems, effectiveType);
+            var newSections;
+            if (searchMode === "files") {
+                newSections = fileSections;
+            } else {
+                var existingNonFile = sections.filter(function (s) {
+                    return s.id !== "files" && s.id !== "folders";
+                });
+                newSections = existingNonFile.concat(fileSections);
+            }
+            newSections.sort(function (a, b) {
+                return a.priority - b.priority;
             });
-        }
-    }
-
-    function _applyFileSearchResults(fileItems, effectiveType) {
-        var fileSections = [];
-        var showType = effectiveType;
-        var order = SettingsData.launcherPluginOrder || [];
-        var filesOrderIdx = order.indexOf("__files");
-        var foldersOrderIdx = order.indexOf("__folders");
-        var filesPriority = filesOrderIdx !== -1 ? 2.6 + filesOrderIdx * 0.01 : 4;
-        var foldersPriority = foldersOrderIdx !== -1 ? 2.6 + foldersOrderIdx * 0.01 : 4.1;
-
-        if (showType === "all" && DSearchService.supportsTypeFilter) {
-            var onlyFiles = [];
-            var onlyDirs = [];
-            for (var j = 0; j < fileItems.length; j++) {
-                if (fileItems[j].data?.is_dir)
-                    onlyDirs.push(fileItems[j]);
-                else
-                    onlyFiles.push(fileItems[j]);
-            }
-            if (onlyFiles.length > 0) {
-                fileSections.push({
-                    id: "files",
-                    title: I18n.tr("Files"),
-                    icon: "insert_drive_file",
-                    priority: filesPriority,
-                    items: onlyFiles,
-                    collapsed: collapsedSections["files"] || false,
-                    flatStartIndex: 0
-                });
-            }
-            if (onlyDirs.length > 0) {
-                fileSections.push({
-                    id: "folders",
-                    title: I18n.tr("Folders"),
-                    icon: "folder",
-                    priority: foldersPriority,
-                    items: onlyDirs,
-                    collapsed: collapsedSections["folders"] || false,
-                    flatStartIndex: 0
-                });
-            }
-        } else {
-            var filesIcon = showType === "dir" ? "folder" : showType === "file" ? "insert_drive_file" : "folder";
-            var filesTitle = showType === "dir" ? I18n.tr("Folders") : I18n.tr("Files");
-            var singlePriority = showType === "dir" ? foldersPriority : filesPriority;
-            if (fileItems.length > 0) {
-                fileSections.push({
-                    id: "files",
-                    title: filesTitle,
-                    icon: filesIcon,
-                    priority: singlePriority,
-                    items: fileItems,
-                    collapsed: collapsedSections["files"] || false,
-                    flatStartIndex: 0
-                });
-            }
-        }
-
-        var newSections;
-        if (searchMode === "files") {
-            newSections = fileSections;
-        } else {
-            var existingNonFile = sections.filter(function (s) {
-                return s.id !== "files" && s.id !== "folders";
-            });
-            newSections = existingNonFile.concat(fileSections);
-        }
-        newSections.sort(function (a, b) {
-            return a.priority - b.priority;
+            _applyHighlights(newSections, searchQuery);
+            flatModel = Scorer.flattenSections(newSections);
+            sections = newSections;
+            selectedFlatIndex = getFirstItemIndex();
+            updateSelectedItem();
         });
-        _applyHighlights(newSections, searchQuery);
-        flatModel = Scorer.flattenSections(newSections);
-        sections = newSections;
-        selectedFlatIndex = getFirstItemIndex();
-        updateSelectedItem();
     }
 
     function searchApps(query) {
@@ -1310,11 +1276,7 @@ Item {
     function buildDynamicSectionDefs(items) {
         var baseDefs = sectionDefinitions.slice();
         var pluginSections = {};
-        var order = SettingsData.launcherPluginOrder || [];
-        var orderMap = {};
-        for (var k = 0; k < order.length; k++)
-            orderMap[order[k]] = k;
-        var unorderedPriority = 2.6 + order.length * 0.01;
+        var basePriority = 2.6;
 
         for (var i = 0; i < items.length; i++) {
             var section = items[i].section;
@@ -1325,25 +1287,19 @@ Item {
             var pluginId = section.substring(7);
             var meta = getPluginMetadata(pluginId);
             var viewPref = getPluginViewPref(pluginId);
-            var orderIdx = orderMap[pluginId];
-            var priority;
-            if (orderIdx !== undefined) {
-                priority = 2.6 + orderIdx * 0.01;
-            } else {
-                priority = unorderedPriority;
-                unorderedPriority += 0.01;
-            }
 
             pluginSections[section] = {
                 id: section,
                 title: meta.name,
                 icon: meta.icon,
-                priority: priority,
+                priority: basePriority,
                 defaultViewMode: viewPref.mode || "list"
             };
 
             if (viewPref.mode)
                 setPluginViewPreference(section, viewPref.mode, viewPref.enforced);
+
+            basePriority += 0.01;
         }
 
         for (var sectionId in pluginSections) {

quickshell/Modals/DankLauncherV2/DankLauncherV2Modal.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Effects
 import Quickshell
 import Quickshell.Wayland
 import Quickshell.Hyprland
@@ -15,24 +14,16 @@ Item {
     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 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
@@ -66,12 +57,8 @@ Item {
     readonly property real modalX: (screenWidth - modalWidth) / 2
     readonly property real modalY: (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 backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    readonly property real cornerRadius: Theme.cornerRadius
     readonly property color borderColor: {
         if (!SettingsData.dankLauncherV2BorderEnabled)
             return Theme.outlineMedium;
@@ -89,37 +76,6 @@ Item {
         }
     }
     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)
-    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)
-
-    // 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
 
@@ -140,11 +96,18 @@ Item {
         if (!spotlightContent)
             return;
         contentVisible = true;
-        // NOTE: forceActiveFocus() is deliberately NOT called here.
-        // It is deferred to after animation starts to avoid compositor IPC stalls.
+        spotlightContent.searchField.forceActiveFocus();
+
+        var targetQuery = "";
+
+        if (query) {
+            targetQuery = query;
+        } else if (SettingsData.rememberLastQuery) {
+            targetQuery = SessionData.launcherLastQuery || "";
+        }
 
         if (spotlightContent.searchField) {
-            spotlightContent.searchField.text = query;
+            spotlightContent.searchField.text = targetQuery;
         }
         if (spotlightContent.controller) {
             var targetMode = mode || SessionData.launcherLastMode || "all";
@@ -159,12 +122,10 @@ Item {
             spotlightContent.controller.collapsedSections = {};
             spotlightContent.controller.selectedFlatIndex = 0;
             spotlightContent.controller.selectedItem = null;
-            if (query) {
-                spotlightContent.controller.setSearchQuery(query);
-            } else {
-                spotlightContent.controller.searchQuery = "";
-                spotlightContent.controller.performSearch();
-            }
+            spotlightContent.controller.historyIndex = -1;
+            spotlightContent.controller.searchQuery = targetQuery;
+
+            spotlightContent.controller.performSearch();
         }
         if (spotlightContent.resetScroll) {
             spotlightContent.resetScroll();
@@ -174,59 +135,47 @@ Item {
         }
     }
 
-    function _openCommon(query, mode) {
-        closeCleanupTimer.stop();
+    function _finishShow(query, mode) {
+        spotlightOpen = true;
         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
+        keyboardActive = true;
         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() {
-        _openCommon("", "");
+        closeCleanupTimer.stop();
+
+        var focusedScreen = CompositorService.getFocusedScreen();
+        if (focusedScreen && launcherWindow.screen !== focusedScreen) {
+            spotlightOpen = false;
+            isClosing = false;
+            launcherWindow.screen = focusedScreen;
+            Qt.callLater(() => root._finishShow("", ""));
+            return;
+        }
+
+        _finishShow("", "");
     }
 
     function showWithQuery(query) {
-        _openCommon(query, "");
+        closeCleanupTimer.stop();
+
+        var focusedScreen = CompositorService.getFocusedScreen();
+        if (focusedScreen && launcherWindow.screen !== focusedScreen) {
+            spotlightOpen = false;
+            isClosing = false;
+            launcherWindow.screen = focusedScreen;
+            Qt.callLater(() => root._finishShow(query, ""));
+            return;
+        }
+
+        _finishShow(query, "");
     }
 
     function hide() {
@@ -234,17 +183,13 @@ Item {
             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;
+        contentVisible = false;
 
         keyboardActive = false;
         spotlightOpen = false;
         focusGrab.active = false;
         ModalManager.closeModal(root);
+
         closeCleanupTimer.start();
     }
 
@@ -253,7 +198,27 @@ Item {
     }
 
     function showWithMode(mode) {
-        _openCommon("", mode);
+        closeCleanupTimer.stop();
+
+        var focusedScreen = CompositorService.getFocusedScreen();
+        if (focusedScreen && launcherWindow.screen !== focusedScreen) {
+            spotlightOpen = false;
+            isClosing = false;
+            launcherWindow.screen = focusedScreen;
+            Qt.callLater(() => root._finishShow("", mode));
+            return;
+        }
+
+        spotlightOpen = true;
+        isClosing = false;
+        openedFromOverview = false;
+
+        keyboardActive = true;
+        ModalManager.openModal(root);
+        if (useHyprlandFocusGrab)
+            focusGrab.active = true;
+
+        _ensureContentLoadedAndInitialize("", mode);
     }
 
     function toggleWithMode(mode) {
@@ -274,13 +239,10 @@ Item {
 
     Timer {
         id: closeCleanupTimer
-        interval: Theme.variantCloseInterval(root.launcherAnimationDuration)
+        interval: Theme.modalAnimationDuration + 50
         repeat: false
         onTriggered: {
             isClosing = false;
-            contentVisible = false;
-            contentWindow.visible = false;
-            backgroundWindow.visible = false;
             if (root.unloadContentOnClose)
                 launcherContentLoader.active = false;
             dialogClosed();
@@ -289,6 +251,7 @@ Item {
 
     Connections {
         target: spotlightContent?.controller ?? null
+
         function onModeChanged(mode) {
             if (spotlightContent.controller.autoSwitchedToFiles)
                 return;
@@ -298,7 +261,7 @@ Item {
 
     HyprlandFocusGrab {
         id: focusGrab
-        windows: [contentWindow]
+        windows: [launcherWindow]
         active: false
 
         onCleared: {
@@ -323,54 +286,56 @@ Item {
             if (Quickshell.screens.length === 0)
                 return;
 
-            const screen = contentWindow.screen;
-            const screenName = screen?.name;
-
-            let needsReset = !screen || !screenName;
-            if (!needsReset) {
-                needsReset = true;
+            const screenName = launcherWindow.screen?.name;
+            if (screenName) {
                 for (let i = 0; i < Quickshell.screens.length; i++) {
-                    if (Quickshell.screens[i].name === screenName) {
-                        needsReset = false;
-                        break;
-                    }
+                    if (Quickshell.screens[i].name === screenName)
+                        return;
                 }
             }
 
-            if (!needsReset)
-                return;
+            if (spotlightOpen)
+                hide();
 
             const newScreen = CompositorService.getFocusedScreen() ?? Quickshell.screens[0];
-            if (!newScreen)
-                return;
-
-            root._windowEnabled = false;
-            backgroundWindow.screen = newScreen;
-            contentWindow.screen = newScreen;
-            Qt.callLater(() => {
-                root._windowEnabled = true;
-            });
+            if (newScreen)
+                launcherWindow.screen = newScreen;
         }
     }
 
-    // ── Background window: fullscreen, handles darkening + click-to-dismiss ──
     PanelWindow {
-        id: backgroundWindow
-        visible: false
+        id: launcherWindow
+        visible: spotlightOpen || isClosing
         color: "transparent"
+        exclusionMode: ExclusionMode.Ignore
 
-        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)
+        WindowBlur {
+            targetWindow: launcherWindow
+            readonly property real s: Math.min(1, modalContainer.scale)
+            blurX: root.modalX + root.modalWidth * (1 - s) * 0.5
+            blurY: root.modalY + root.modalHeight * (1 - s) * 0.5
+            blurWidth: (contentVisible && modalContainer.opacity > 0) ? root.modalWidth * s : 0
+            blurHeight: (contentVisible && modalContainer.opacity > 0) ? root.modalHeight * s : 0
+            blurRadius: root.cornerRadius
         }
 
+        WlrLayershell.namespace: "dms:spotlight"
+        WlrLayershell.layer: {
+            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.keyboardFocus: keyboardActive ? (root.useHyprlandFocusGrab ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.Exclusive) : WlrKeyboardFocus.None
+
         anchors {
             top: true
             bottom: true
@@ -379,11 +344,11 @@ Item {
         }
 
         mask: Region {
-            item: (spotlightOpen || isClosing) ? bgFullScreenMask : null
+            item: spotlightOpen ? fullScreenMask : null
         }
 
         Item {
-            id: bgFullScreenMask
+            id: fullScreenMask
             anchors.fill: parent
         }
 
@@ -391,14 +356,13 @@ Item {
             id: backgroundDarken
             anchors.fill: parent
             color: "black"
-            opacity: launcherMotionVisible && SettingsData.modalDarkenBackground ? 0.5 : 0
-            visible: launcherMotionVisible || opacity > 0
+            opacity: contentVisible && SettingsData.modalDarkenBackground ? 0.5 : 0
+            visible: contentVisible || 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
+                    duration: Theme.modalAnimationDuration
+                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
                 }
             }
         }
@@ -406,236 +370,96 @@ Item {
         MouseArea {
             anchors.fill: parent
             enabled: spotlightOpen
-            onClicked: root.hide()
-        }
-    }
+            onClicked: mouse => {
+                var contentX = modalContainer.x;
+                var contentY = modalContainer.y;
+                var contentW = modalContainer.width;
+                var contentH = modalContainer.height;
 
-    // ── Content window: SMALL, positioned with margins — only renders the modal area ──
-    PanelWindow {
-        id: contentWindow
-        visible: false
-        color: "transparent"
-
-        WindowBlur {
-            targetWindow: contentWindow
-            blurEnabled: root.effectiveBlurEnabled
-            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.alignedWidth * s : 0
-            blurHeight: (root.spotlightOpen || root.isClosing) && contentWrapper.opacity > 0 ? 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;
+                if (mouse.x < contentX || mouse.x > contentX + contentW || mouse.y < contentY || mouse.y > contentY + contentH) {
+                    root.hide();
+                }
             }
         }
-        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
-        }
+            id: modalContainer
+            x: root.modalX
+            y: root.modalY
+            width: root.modalWidth
+            height: root.modalHeight
+            visible: contentVisible || opacity > 0
 
-        Item {
-            id: contentContainer
+            opacity: contentVisible ? 1 : 0
+            scale: contentVisible ? 1 : 0.96
+            transformOrigin: Item.Center
 
-            // 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 collapsedMotionX: {
-                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 (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))
-
-            Behavior on animX {
-                enabled: root.animationsEnabled
+            Behavior on opacity {
                 DankAnim {
-                    duration: Theme.variantDuration(root.launcherAnimationDuration, root._motionActive)
-                    easing.bezierCurve: root._motionActive ? root.launcherEnterCurve : root.launcherExitCurve
+                    duration: Theme.modalAnimationDuration
+                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
                 }
             }
 
-            Behavior on animY {
-                enabled: root.animationsEnabled
+            Behavior on scale {
                 DankAnim {
-                    duration: Theme.variantDuration(root.launcherAnimationDuration, root._motionActive)
-                    easing.bezierCurve: root._motionActive ? root.launcherEnterCurve : root.launcherExitCurve
+                    duration: Theme.modalAnimationDuration
+                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
                 }
             }
 
-            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
-                }
+            ElevationShadow {
+                id: launcherShadowLayer
+                anchors.fill: parent
+                level: Theme.elevationLevel3
+                fallbackOffset: 6
+                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"
             }
 
-            Item {
-                id: directionalClipMask
-                readonly property bool shouldClip: Theme.isDirectionalEffect && typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode > 0
-                readonly property real clipOversize: 2000
+            MouseArea {
+                anchors.fill: parent
+                onPressed: mouse => mouse.accepted = true
+            }
 
-                clip: shouldClip
+            FocusScope {
+                anchors.fill: parent
+                focus: keyboardActive
 
-                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.backgroundColor
-                        borderColor: root.effectiveBorderColor
-                        borderWidth: root.effectiveBorderWidth
-                        targetRadius: root.cornerRadius
-                        shadowEnabled: Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
+                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
                     }
 
-                    // 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
-                            }
+                    onLoaded: {
+                        if (root._pendingInitialize) {
+                            root._initializeAndShow(root._pendingQuery, root._pendingMode);
+                            root._pendingInitialize = false;
                         }
+                    }
+                }
 
-                        MouseArea {
-                            anchors.fill: parent
-                            onPressed: mouse => mouse.accepted = true
-                        }
+                Keys.onEscapePressed: event => {
+                    root.hide();
+                    event.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
+            Rectangle {
+                anchors.fill: parent
+                radius: root.cornerRadius
+                color: "transparent"
+                border.color: BlurService.borderColor
+                border.width: BlurService.borderWidth
+            }
+        }
+    }
 }

quickshell/Modals/DankLauncherV2/LauncherContent.qml

@@ -41,6 +41,7 @@ FocusScope {
         editCommentField.text = existing?.comment || "";
         editEnvVarsField.text = existing?.envVars || "";
         editExtraFlagsField.text = existing?.extraFlags || "";
+        editDgpuToggle.checked = existing?.launchOnDgpu || false;
         editMode = true;
         Qt.callLater(() => editNameField.forceActiveFocus());
     }
@@ -64,6 +65,8 @@ FocusScope {
             override.envVars = editEnvVarsField.text.trim();
         if (editExtraFlagsField.text.trim())
             override.extraFlags = editExtraFlagsField.text.trim();
+        if (editDgpuToggle.checked)
+            override.launchOnDgpu = true;
         SessionData.setAppOverride(editAppId, override);
         closeEditMode();
     }
@@ -86,7 +89,7 @@ FocusScope {
 
     Controller {
         id: controller
-        active: root.parentModal ? (root.parentModal.spotlightOpen || root.parentModal.isClosing) : true
+        active: root.parentModal?.spotlightOpen ?? true
         viewModeContext: root.viewModeContext
 
         onItemExecuted: {
@@ -146,10 +149,18 @@ FocusScope {
             event.accepted = false;
             return;
         case Qt.Key_Down:
-            controller.selectNext();
+            if (hasCtrl) {
+                controller.navigateHistory("down");
+            } else {
+                controller.selectNext();
+            }
             return;
         case Qt.Key_Up:
-            controller.selectPrevious();
+            if (hasCtrl) {
+                controller.navigateHistory("up");
+            } else {
+                controller.selectPrevious();
+            }
             return;
         case Qt.Key_PageDown:
             controller.selectPageDown(8);
@@ -158,6 +169,10 @@ FocusScope {
             controller.selectPageUp(8);
             return;
         case Qt.Key_Right:
+            if (hasCtrl) {
+                controller.cycleMode();
+                return;
+            }
             if (controller.getCurrentSectionViewMode() !== "list") {
                 controller.selectRight();
                 return;
@@ -165,12 +180,25 @@ FocusScope {
             event.accepted = false;
             return;
         case Qt.Key_Left:
+            if (hasCtrl) {
+                const reverse = true;
+                controller.cycleMode(reverse);
+                return;
+            }
             if (controller.getCurrentSectionViewMode() !== "list") {
                 controller.selectLeft();
                 return;
             }
             event.accepted = false;
             return;
+        case Qt.Key_H:
+            if (hasCtrl) {
+                const reverse = true;
+                controller.cycleMode(reverse);
+                return;
+            }
+            event.accepted = false;
+            return;
         case Qt.Key_J:
             if (hasCtrl) {
                 controller.selectNext();
@@ -185,6 +213,13 @@ FocusScope {
             }
             event.accepted = false;
             return;
+        case Qt.Key_L:
+            if (hasCtrl) {
+                controller.cycleMode();
+                return;
+            }
+            event.accepted = false;
+            return;
         case Qt.Key_N:
             if (hasCtrl) {
                 controller.selectNextSection();
@@ -200,13 +235,19 @@ FocusScope {
             event.accepted = false;
             return;
         case Qt.Key_Tab:
-            if (actionPanel.hasActions) {
+            if (hasCtrl && actionPanel.hasActions) {
                 actionPanel.expanded ? actionPanel.cycleAction() : actionPanel.show();
+                return;
             }
+            controller.selectNext();
             return;
         case Qt.Key_Backtab:
-            if (actionPanel.expanded)
-                actionPanel.hide();
+            if (hasCtrl && actionPanel.expanded) {
+                const reverse = true;
+                actionPanel.expanded ? actionPanel.cycleAction(reverse) : actionPanel.show();
+                return;
+            }
+            controller.selectPrevious();
             return;
         case Qt.Key_Return:
         case Qt.Key_Enter:
@@ -388,7 +429,7 @@ FocusScope {
 
                 StyledText {
                     anchors.verticalCenter: parent.verticalCenter
-                    text: "Tab " + I18n.tr("actions")
+                    text: "Ctrl-Tab " + I18n.tr("actions")
                     font.pixelSize: Theme.fontSizeSmall - 1
                     color: Theme.surfaceVariantText
                     visible: actionPanel.hasActions
@@ -462,7 +503,7 @@ FocusScope {
                     showClearButton: true
                     textColor: Theme.surfaceText
                     font.pixelSize: Theme.fontSizeLarge
-                    enabled: root.parentModal ? (root.parentModal.spotlightOpen || root.parentModal.isClosing) : true
+                    enabled: root.parentModal ? root.parentModal.spotlightOpen : true
                     placeholderText: ""
                     ignoreUpDownKeys: true
                     ignoreTabKeys: true
@@ -696,13 +737,7 @@ FocusScope {
             Item {
                 width: parent.width
                 height: parent.height - searchField.height - categoryRow.height - fileFilterRow.height - actionPanel.height - Theme.spacingXS * ((categoryRow.visible ? 1 : 0) + (fileFilterRow.visible ? 1 : 0) + 2)
-                opacity: {
-                    if (!root.parentModal)
-                        return 1;
-                    if (Theme.isDirectionalEffect && root.parentModal.isClosing)
-                        return 1;
-                    return root.parentModal.isClosing ? 0 : 1;
-                }
+                opacity: root.parentModal?.isClosing ? 0 : 1
 
                 ResultsList {
                     id: resultsList
@@ -736,6 +771,7 @@ FocusScope {
         }
         function onSearchQueryRequested(query) {
             searchField.text = query;
+            searchField.cursorPosition = query.length;
         }
         function onModeChanged() {
             extFilterField.text = "";
@@ -946,6 +982,15 @@ FocusScope {
                             keyNavigationBacktab: editEnvVarsField
                         }
                     }
+
+                    DankToggle {
+                        id: editDgpuToggle
+                        width: parent.width
+                        text: I18n.tr("Launch on dGPU by default")
+                        visible: SessionService.nvidiaCommand.length > 0
+                        checked: false
+                        onToggled: checked => editDgpuToggle.checked = checked
+                    }
                 }
             }
 

quickshell/Modals/DankLauncherV2/ResultsList.qml

@@ -324,8 +324,6 @@ Item {
         height: 24
         z: 100
         visible: {
-            if (BlurService.enabled)
-                return false;
             if (mainListView.contentHeight <= mainListView.height)
                 return false;
             var atBottom = mainListView.contentY >= mainListView.contentHeight - mainListView.height + mainListView.originY - 5;
@@ -451,7 +449,7 @@ Item {
                     case "apps":
                         return "apps";
                     default:
-                        return "search_off";
+                        return root.controller?.searchQuery?.length > 0 ? "search_off" : "search";
                     }
                 }
             }
@@ -487,9 +485,9 @@ Item {
                     case "plugins":
                         return hasQuery ? I18n.tr("No plugin results") : I18n.tr("Browse or search plugins");
                     case "apps":
-                        return I18n.tr("No apps found");
+                        return hasQuery ? I18n.tr("No apps found") : I18n.tr("Type to search apps");
                     default:
-                        return I18n.tr("No results found");
+                        return hasQuery ? I18n.tr("No results found") : I18n.tr("Type to search");
                     }
                 }
             }

quickshell/Modals/Settings/SettingsContent.qml

@@ -518,20 +518,5 @@ FocusScope {
                     Qt.callLater(() => item.forceActiveFocus());
             }
         }
-
-        Loader {
-            id: frameLoader
-            anchors.fill: parent
-            active: root.currentIndex === 33
-            visible: active
-            focus: active
-
-            sourceComponent: FrameTab {}
-
-            onActiveChanged: {
-                if (active && item)
-                    Qt.callLater(() => item.forceActiveFocus());
-            }
-        }
     }
 }

quickshell/Modals/Settings/SettingsSidebar.qml

@@ -120,12 +120,6 @@ Rectangle {
                     "text": I18n.tr("Widgets"),
                     "icon": "widgets",
                     "tabIndex": 22
-                },
-                {
-                    "id": "frame",
-                    "text": I18n.tr("Frame"),
-                    "icon": "frame_source",
-                    "tabIndex": 33
                 }
             ]
         },

quickshell/Modules/AppDrawer/AppDrawerPopout.qml

@@ -8,6 +8,9 @@ DankPopout {
 
     layerNamespace: "dms:app-launcher"
 
+    readonly property real screenWidth: screen?.width ?? 1920
+    readonly property real screenHeight: screen?.height ?? 1080
+
     property string _pendingMode: ""
     property string _pendingQuery: ""
 
@@ -41,8 +44,35 @@ DankPopout {
         openWithQuery(query);
     }
 
-    popupWidth: 560
-    popupHeight: 640
+    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;
+        }
+    }
+
+    popupWidth: Math.min(_baseWidth, screenWidth - 100)
+    popupHeight: Math.min(_baseHeight, screenHeight - 100)
+
     triggerWidth: 40
     positioning: ""
     contentHandlesKeys: contentLoader.item?.launcherContent?.editMode ?? false
@@ -60,7 +90,7 @@ DankPopout {
         if (!lc)
             return;
 
-        const query = _pendingQuery;
+        const query = _pendingQuery || (SettingsData.rememberLastQuery ? SessionData.launcherLastQuery : "") || "";
         const mode = _pendingMode || SessionData.appDrawerLastMode || "apps";
         _pendingMode = "";
         _pendingQuery = "";
@@ -72,12 +102,9 @@ DankPopout {
         if (lc.controller) {
             lc.controller.searchMode = mode;
             lc.controller.pluginFilter = "";
-            lc.controller.searchQuery = "";
-            if (query) {
-                lc.controller.setSearchQuery(query);
-            } else {
-                lc.controller.performSearch();
-            }
+            lc.controller.searchQuery = query;
+
+            lc.controller.performSearch();
         }
         lc.resetScroll?.();
         lc.actionPanel?.hide();
@@ -106,7 +133,7 @@ DankPopout {
             QtObject {
                 id: modalAdapter
                 property bool spotlightOpen: appDrawerPopout.shouldBeVisible
-                property bool isClosing: appDrawerPopout.isClosing
+                property bool isClosing: false
 
                 function hide() {
                     appDrawerPopout.close();

quickshell/Modules/ControlCenter/BuiltinPlugins/CupsWidget.qml

@@ -34,7 +34,7 @@ PluginComponent {
             id: detailRoot
             implicitHeight: detailColumn.implicitHeight + Theme.spacingM * 2
             radius: Theme.cornerRadius
-            color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+            color: Theme.surfaceContainerHigh
 
             DankActionButton {
                 anchors.top: parent.top
@@ -252,7 +252,7 @@ PluginComponent {
                                 width: parent ? parent.width : 300
                                 height: 50
                                 radius: Theme.cornerRadius
-                                color: Theme.surfaceLight
+                                color: Theme.surfaceContainerHighest
                                 border.width: 1
                                 border.color: Theme.outlineLight
                                 opacity: 1.0

quickshell/Modules/ControlCenter/Components/EditControls.qml

@@ -33,7 +33,7 @@ Row {
         closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
 
         background: Rectangle {
-            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+            color: Theme.surfaceContainer
             border.color: Theme.primarySelected
             border.width: 0
             radius: Theme.cornerRadius

quickshell/Modules/ControlCenter/ControlCenterPopout.qml

@@ -136,11 +136,9 @@ DankPopout {
                 z: 5000
 
                 Behavior on opacity {
-                    enabled: !Theme.isDirectionalEffect
                     NumberAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Easing.BezierSpline
-                        easing.bezierCurve: root.shouldBeVisible ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+                        duration: 200
+                        easing.type: Easing.OutCubic
                     }
                 }
             }

quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml

@@ -207,9 +207,9 @@ Rectangle {
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
-                    color: deviceMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
-                    border.color: modelData === AudioService.source ? Theme.primary : Theme.outlineLight
-                    border.width: modelData === AudioService.source ? 2 : 1
+                    color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    border.color: modelData === AudioService.source ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                    border.width: 0
 
                     Row {
                         anchors.left: parent.left

quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml

@@ -218,9 +218,9 @@ Rectangle {
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
-                    color: deviceMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
-                    border.color: modelData === AudioService.sink ? Theme.primary : Theme.outlineLight
-                    border.width: modelData === AudioService.sink ? 2 : 1
+                    color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                    border.width: 0
 
                     DankRipple {
                         id: deviceRipple
@@ -397,9 +397,9 @@ Rectangle {
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
-                    color: Theme.surfaceLight
-                    border.color: modelData === AudioService.sink ? Theme.primary : Theme.outlineLight
-                    border.width: modelData === AudioService.sink ? 2 : 1
+                    color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                    border.width: 0
 
                     Row {
                         anchors.left: parent.left

quickshell/Modules/ControlCenter/Details/BatteryDetail.qml

@@ -129,9 +129,8 @@ Rectangle {
                 width: (parent.width - Theme.spacingM) / 2
                 height: 64
                 radius: Theme.cornerRadius
-                color: Theme.surfaceLight
-                border.color: Theme.outlineLight
-                border.width: 1
+                color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                border.width: 0
 
                 Column {
                     anchors.centerIn: parent
@@ -165,9 +164,8 @@ Rectangle {
                 width: (parent.width - Theme.spacingM) / 2
                 height: 64
                 radius: Theme.cornerRadius
-                color: Theme.surfaceLight
-                border.color: Theme.outlineLight
-                border.width: 1
+                color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                border.width: 0
 
                 Column {
                     anchors.centerIn: parent

quickshell/Modules/ControlCenter/Details/BluetoothCodecSelector.qml

@@ -153,7 +153,7 @@ Item {
         width: 320
         height: contentColumn.implicitHeight + Theme.spacingL * 2
         radius: Theme.cornerRadius
-        color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+        color: Theme.surfaceContainer
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
         border.width: 0
         opacity: modalVisible ? 1 : 0

quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml

@@ -229,6 +229,7 @@ Rectangle {
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
+                    border.width: 0
 
                     Component.onCompleted: {
                         if (!isConnected)
@@ -242,8 +243,8 @@ Rectangle {
                         if (isConnecting)
                             return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12);
                         if (deviceMouseArea.containsMouse)
-                            return Theme.primaryHoverLight;
-                        return Theme.surfaceLight;
+                            return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08);
+                        return Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency);
                     }
 
                     border.color: {
@@ -251,9 +252,8 @@ Rectangle {
                             return Theme.warning;
                         if (isConnected)
                             return Theme.primary;
-                        return Theme.outlineLight;
+                        return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12);
                     }
-                    border.width: (isConnecting || isConnected) ? 2 : 1
 
                     Row {
                         anchors.left: parent.left
@@ -490,9 +490,9 @@ Rectangle {
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
-                    color: availableMouseArea.containsMouse && isInteractive ? Theme.primaryHoverLight : Theme.surfaceLight
-                    border.color: Theme.outlineLight
-                    border.width: 1
+                    color: availableMouseArea.containsMouse && isInteractive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                    border.width: 0
                     opacity: isInteractive ? 1 : 0.6
 
                     Row {

quickshell/Modules/ControlCenter/Details/DiskUsageDetail.qml

@@ -79,9 +79,9 @@ Rectangle {
                     width: parent.width
                     height: 80
                     radius: Theme.cornerRadius
-                    color: Theme.surfaceLight
-                    border.color: modelData.mount === currentMountPath ? Theme.primary : Theme.outlineLight
-                    border.width: modelData.mount === currentMountPath ? 2 : 1
+                    color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    border.color: modelData.mount === currentMountPath ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+                    border.width: modelData.mount === currentMountPath ? 2 : 0
 
                     Row {
                         anchors.left: parent.left

quickshell/Modules/ControlCenter/Details/NetworkDetail.qml

@@ -308,9 +308,9 @@ Rectangle {
                     width: parent.width
                     height: wiredContentRow.implicitHeight + Theme.spacingM * 2
                     radius: Theme.cornerRadius
-                    color: wiredNetworkMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
-                    border.color: isActive ? Theme.primary : Theme.outlineLight
-                    border.width: isActive ? 2 : 1
+                    color: wiredNetworkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+                    border.color: Theme.primary
+                    border.width: 0
 
                     Row {
                         id: wiredContentRow
@@ -565,9 +565,9 @@ Rectangle {
             width: wifiContent.width
             height: wifiContentRow.implicitHeight + Theme.spacingM * 2
             radius: Theme.cornerRadius
-            color: networkMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
-            border.color: wifiDelegate.isConnected ? Theme.primary : Theme.outlineLight
-            border.width: wifiDelegate.isConnected ? 2 : 1
+            color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency)
+            border.color: wifiDelegate.isConnected ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
+            border.width: 0
 
             Row {
                 id: wifiContentRow

quickshell/Modules/DankBar/BarCanvas.qml

@@ -10,8 +10,6 @@ Item {
     required property var axis
     required property var barConfig
 
-    visible: !SettingsData.frameEnabled
-
     anchors.fill: parent
 
     anchors.left: parent.left
@@ -39,8 +37,6 @@ Item {
     }
 
     property real rt: {
-        if (SettingsData.frameEnabled)
-            return SettingsData.frameRounding;
         if (barConfig?.squareCorners ?? false)
             return 0;
         if (barWindow.hasMaximizedToplevel)
@@ -259,12 +255,11 @@ Item {
         h = h - wing;
         const r = wing;
         const cr = rt;
-        const crE = SettingsData.frameEnabled ? 0 : cr;
 
-        let d = `M ${crE} 0`;
-        d += ` L ${w - crE} 0`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 1 ${w} ${crE}`;
+        let d = `M ${cr} 0`;
+        d += ` L ${w - cr} 0`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 1 ${w} ${cr}`;
         if (r > 0) {
             d += ` L ${w} ${h + r}`;
             d += ` A ${r} ${r} 0 0 0 ${w - r} ${h}`;
@@ -278,9 +273,9 @@ Item {
             if (cr > 0)
                 d += ` A ${cr} ${cr} 0 0 1 0 ${h - cr}`;
         }
-        d += ` L 0 ${crE}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 1 ${crE} 0`;
+        d += ` L 0 ${cr}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 1 ${cr} 0`;
         d += " Z";
         return d;
     }
@@ -290,12 +285,11 @@ Item {
         h = h - wing;
         const r = wing;
         const cr = rt;
-        const crE = SettingsData.frameEnabled ? 0 : cr;
 
-        let d = `M ${crE} ${fullH}`;
-        d += ` L ${w - crE} ${fullH}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 0 ${w} ${fullH - crE}`;
+        let d = `M ${cr} ${fullH}`;
+        d += ` L ${w - cr} ${fullH}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 0 ${w} ${fullH - cr}`;
         if (r > 0) {
             d += ` L ${w} 0`;
             d += ` A ${r} ${r} 0 0 1 ${w - r} ${r}`;
@@ -309,9 +303,9 @@ Item {
             if (cr > 0)
                 d += ` A ${cr} ${cr} 0 0 0 0 ${cr}`;
         }
-        d += ` L 0 ${fullH - crE}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 0 ${crE} ${fullH}`;
+        d += ` L 0 ${fullH - cr}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 0 ${cr} ${fullH}`;
         d += " Z";
         return d;
     }
@@ -320,12 +314,11 @@ Item {
         w = w - wing;
         const r = wing;
         const cr = rt;
-        const crE = SettingsData.frameEnabled ? 0 : cr;
 
-        let d = `M 0 ${crE}`;
-        d += ` L 0 ${h - crE}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 0 ${crE} ${h}`;
+        let d = `M 0 ${cr}`;
+        d += ` L 0 ${h - cr}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 0 ${cr} ${h}`;
         if (r > 0) {
             d += ` L ${w + r} ${h}`;
             d += ` A ${r} ${r} 0 0 1 ${w} ${h - r}`;
@@ -339,9 +332,9 @@ Item {
             if (cr > 0)
                 d += ` A ${cr} ${cr} 0 0 0 ${w - cr} 0`;
         }
-        d += ` L ${crE} 0`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 0 0 ${crE}`;
+        d += ` L ${cr} 0`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 0 0 ${cr}`;
         d += " Z";
         return d;
     }
@@ -351,12 +344,11 @@ Item {
         w = w - wing;
         const r = wing;
         const cr = rt;
-        const crE = SettingsData.frameEnabled ? 0 : cr;
 
-        let d = `M ${fullW} ${crE}`;
-        d += ` L ${fullW} ${h - crE}`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 1 ${fullW - crE} ${h}`;
+        let d = `M ${fullW} ${cr}`;
+        d += ` L ${fullW} ${h - cr}`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 1 ${fullW - cr} ${h}`;
         if (r > 0) {
             d += ` L 0 ${h}`;
             d += ` A ${r} ${r} 0 0 0 ${r} ${h - r}`;
@@ -370,9 +362,9 @@ Item {
             if (cr > 0)
                 d += ` A ${cr} ${cr} 0 0 1 ${cr} 0`;
         }
-        d += ` L ${fullW - crE} 0`;
-        if (crE > 0)
-            d += ` A ${crE} ${crE} 0 0 1 ${fullW} ${crE}`;
+        d += ` L ${fullW - cr} 0`;
+        if (cr > 0)
+            d += ` A ${cr} ${cr} 0 0 1 ${fullW} ${cr}`;
         d += " Z";
         return d;
     }

quickshell/Modules/DankBar/DankBarContent.qml

@@ -23,31 +23,6 @@ Item {
     readonly property real innerPadding: barConfig?.innerPadding ?? 4
     readonly property real outlineThickness: (barConfig?.widgetOutlineEnabled ?? false) ? (barConfig?.widgetOutlineThickness ?? 1) : 0
 
-    readonly property real _frameLeftInset: {
-        if (!SettingsData.frameEnabled || barWindow.isVertical) return 0
-        return barWindow.hasAdjacentLeftBar
-            ? SettingsData.frameBarSize
-            : 0
-    }
-    readonly property real _frameRightInset: {
-        if (!SettingsData.frameEnabled || barWindow.isVertical) return 0
-        return barWindow.hasAdjacentRightBar
-            ? SettingsData.frameBarSize
-            : 0
-    }
-    readonly property real _frameTopInset: {
-        if (!SettingsData.frameEnabled || !barWindow.isVertical) return 0
-        return barWindow.hasAdjacentTopBar
-            ? SettingsData.frameThickness
-            : 0
-    }
-    readonly property real _frameBottomInset: {
-        if (!SettingsData.frameEnabled || !barWindow.isVertical) return 0
-        return barWindow.hasAdjacentBottomBar
-            ? SettingsData.frameThickness
-            : 0
-    }
-
     property alias hLeftSection: hLeftSection
     property alias hCenterSection: hCenterSection
     property alias hRightSection: hRightSection
@@ -56,14 +31,10 @@ Item {
     property alias vRightSection: vRightSection
 
     anchors.fill: parent
-    anchors.leftMargin:   Math.max(Theme.spacingXS, innerPadding * 0.8) + _frameLeftInset
-    anchors.rightMargin:  Math.max(Theme.spacingXS, innerPadding * 0.8) + _frameRightInset
-    anchors.topMargin:    (barWindow.isVertical
-        ? (barWindow.hasAdjacentTopBar ? outlineThickness : Theme.spacingXS)
-        : 0) + _frameTopInset
-    anchors.bottomMargin: (barWindow.isVertical
-        ? (barWindow.hasAdjacentBottomBar ? outlineThickness : Theme.spacingXS)
-        : 0) + _frameBottomInset
+    anchors.leftMargin: Math.max(Theme.spacingXS, innerPadding * 0.8)
+    anchors.rightMargin: Math.max(Theme.spacingXS, innerPadding * 0.8)
+    anchors.topMargin: barWindow.isVertical ? (barWindow.hasAdjacentTopBar ? outlineThickness : Theme.spacingXS) : 0
+    anchors.bottomMargin: barWindow.isVertical ? (barWindow.hasAdjacentBottomBar ? outlineThickness : Theme.spacingXS) : 0
     clip: false
 
     property int componentMapRevision: 0
@@ -998,7 +969,6 @@ Item {
             axis: barWindow.axis
             barSpacing: barConfig?.spacing ?? 4
             barConfig: topBarContent.barConfig
-            widgetData: parent.widgetData
             isAutoHideBar: topBarContent.barConfig?.autoHide ?? false
             isAtBottom: barWindow.axis?.edge === "bottom"
             visible: SettingsData.getFilteredScreens("systemTray").includes(barWindow.screen) && SystemTray.items.values.length > 0
@@ -1185,7 +1155,6 @@ Item {
                 if (!notificationCenterLoader.item) {
                     return;
                 }
-                notificationCenterLoader.item.triggerScreen = barWindow.screen;
                 const effectiveBarConfig = topBarContent.barConfig;
                 const barPosition = barWindow.axis?.edge === "left" ? 2 : (barWindow.axis?.edge === "right" ? 3 : (barWindow.axis?.edge === "top" ? 0 : 1));
                 if (notificationCenterLoader.item.setBarContext) {
@@ -1468,21 +1437,12 @@ Item {
             parentScreen: barWindow.screen
             onClicked: {
                 systemUpdateLoader.active = true;
-                if (!systemUpdateLoader.item)
-                    return;
-                const popout = systemUpdateLoader.item;
                 const effectiveBarConfig = topBarContent.barConfig;
                 const barPosition = barWindow.axis?.edge === "left" ? 2 : (barWindow.axis?.edge === "right" ? 3 : (barWindow.axis?.edge === "top" ? 0 : 1));
-                if (popout.setBarContext) {
-                    popout.setBarContext(barPosition, effectiveBarConfig?.bottomGap ?? 0);
+                if (systemUpdateLoader.item && systemUpdateLoader.item.setBarContext) {
+                    systemUpdateLoader.item.setBarContext(barPosition, effectiveBarConfig?.bottomGap ?? 0);
                 }
-                if (popout.setTriggerPosition) {
-                    const globalPos = visualContent.mapToItem(null, 0, 0);
-                    const currentScreen = parentScreen || Screen;
-                    const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barWindow.effectiveBarThickness, visualWidth, effectiveBarConfig?.spacing ?? 4, barPosition, effectiveBarConfig);
-                    popout.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen, barPosition, barWindow.effectiveBarThickness, effectiveBarConfig?.spacing ?? 4, effectiveBarConfig);
-                }
-                PopoutManager.requestPopout(popout, undefined, "systemUpdate");
+                systemUpdateLoader.item?.toggle();
             }
         }
     }

quickshell/Modules/DankBar/DankBarWindow.qml

@@ -133,11 +133,6 @@ PanelWindow {
             teardown();
             if (!BlurService.enabled || !BlurService.available)
                 return;
-            // In frame mode, FrameWindow owns the blur region for the entire screen edge
-            // (including the bar area). The bar must not set its own competing blur region
-            // so that frameBlurEnabled acts as the single control for all blur in frame mode.
-            if (SettingsData.frameEnabled)
-                return;
 
             const widgets = barWindow._blurWidgetItems.filter(w => w && w.visible && w.width > 0 && w.height > 0);
             const hasBar = barHasTransparency;
@@ -192,11 +187,6 @@ PanelWindow {
             }
         }
 
-        Connections {
-            target: SettingsData
-            function onFrameEnabledChanged() { barBlur.rebuild(); }
-        }
-
         Connections {
             target: topBarSlide
             function onXChanged() {
@@ -248,9 +238,7 @@ PanelWindow {
     readonly property color _surfaceContainer: Theme.surfaceContainer
     readonly property string _barId: barConfig?.id ?? "default"
     property real _backgroundAlpha: barConfig?.transparency ?? 1.0
-    readonly property color _bgColor: SettingsData.frameEnabled
-        ? Qt.rgba(SettingsData.effectiveFrameColor.r, SettingsData.effectiveFrameColor.g, SettingsData.effectiveFrameColor.b, SettingsData.frameOpacity)
-        : Theme.withAlpha(_surfaceContainer, _backgroundAlpha)
+    readonly property color _bgColor: Theme.withAlpha(_surfaceContainer, _backgroundAlpha)
 
     function _updateBackgroundAlpha() {
         const live = SettingsData.barConfigs.find(c => c.id === _barId);
@@ -396,7 +384,7 @@ PanelWindow {
         shouldHideForWindows = filtered.length > 0;
     }
 
-    property real effectiveSpacing: SettingsData.frameEnabled ? 0 : (hasMaximizedToplevel ? 0 : (barConfig?.spacing ?? 4))
+    property real effectiveSpacing: hasMaximizedToplevel ? 0 : (barConfig?.spacing ?? 4)
 
     Behavior on effectiveSpacing {
         enabled: barWindow.visible
@@ -407,12 +395,7 @@ PanelWindow {
     }
 
     readonly property int notificationCount: NotificationService.notifications.length
-    readonly property real effectiveBarThickness: SettingsData.frameEnabled
-        ? SettingsData.frameBarSize
-        : Theme.snap(Math.max(barWindow.widgetThickness + (barConfig?.innerPadding ?? 4) + 4, Theme.barHeight - 4 - (8 - (barConfig?.innerPadding ?? 4))), _dpr)
-    readonly property bool effectiveOpenOnOverview: SettingsData.frameEnabled
-        ? SettingsData.frameShowOnOverview
-        : (barConfig?.openOnOverview ?? false)
+    readonly property real effectiveBarThickness: Theme.snap(Math.max(barWindow.widgetThickness + (barConfig?.innerPadding ?? 4) + 4, Theme.barHeight - 4 - (8 - (barConfig?.innerPadding ?? 4))), _dpr)
     readonly property real widgetThickness: Theme.snap(Math.max(20, 26 + (barConfig?.innerPadding ?? 4) * 0.6), _dpr)
 
     readonly property bool hasAdjacentTopBar: {
@@ -661,14 +644,14 @@ PanelWindow {
     anchors.left: !isVertical ? true : (barPos === SettingsData.Position.Left)
     anchors.right: !isVertical ? true : (barPos === SettingsData.Position.Right)
 
-    exclusiveZone: (!(barConfig?.visible ?? true) || topBarCore.autoHide) ? -1 : (barWindow.effectiveBarThickness + effectiveSpacing + (Theme.isConnectedEffect ? 0 : (barConfig?.bottomGap ?? 0)))
+    exclusiveZone: (!(barConfig?.visible ?? true) || topBarCore.autoHide) ? -1 : (barWindow.effectiveBarThickness + effectiveSpacing + (barConfig?.bottomGap ?? 0))
 
     Item {
         id: inputMask
 
         readonly property int barThickness: Theme.px(barWindow.effectiveBarThickness + barWindow.effectiveSpacing, barWindow._dpr)
 
-        readonly property bool inOverviewWithShow: CompositorService.isNiri && NiriService.inOverview && barWindow.effectiveOpenOnOverview
+        readonly property bool inOverviewWithShow: CompositorService.isNiri && NiriService.inOverview && (barConfig?.openOnOverview ?? false)
         readonly property bool effectiveVisible: (barConfig?.visible ?? true) || inOverviewWithShow
         readonly property bool showing: effectiveVisible && (topBarCore.reveal || inOverviewWithShow || !topBarCore.autoHide)
 
@@ -809,7 +792,7 @@ PanelWindow {
         }
 
         property bool reveal: {
-            const inOverviewWithShow = CompositorService.isNiri && NiriService.inOverview && barWindow.effectiveOpenOnOverview;
+            const inOverviewWithShow = CompositorService.isNiri && NiriService.inOverview && (barConfig?.openOnOverview ?? false);
             if (inOverviewWithShow)
                 return true;
 
@@ -906,7 +889,7 @@ PanelWindow {
                 top: barWindow.isVertical ? parent.top : undefined
                 bottom: barWindow.isVertical ? parent.bottom : undefined
             }
-            readonly property bool inOverview: CompositorService.isNiri && NiriService.inOverview && barWindow.effectiveOpenOnOverview
+            readonly property bool inOverview: CompositorService.isNiri && NiriService.inOverview && (barConfig?.openOnOverview ?? false)
             hoverEnabled: (barConfig?.autoHide ?? false) && !inOverview && !topBarCore.hasActivePopout
             acceptedButtons: Qt.NoButton
             enabled: (barConfig?.autoHide ?? false) && !inOverview

quickshell/Modules/DankBar/Widgets/Battery.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import Quickshell.Services.UPower
 import qs.Common
 import qs.Modules.Plugins
 import qs.Services
@@ -11,8 +10,6 @@ BasePill {
     property bool batteryPopupVisible: false
     property var popoutTarget: null
 
-    property real touchpadAccumulator: 0
-
     readonly property int barPosition: {
         switch (axis?.edge) {
         case "top":
@@ -122,44 +119,5 @@ BasePill {
             battery.triggerRipple(this, mouse.x, mouse.y);
             toggleBatteryPopup();
         }
-        onWheel: wheel => {
-            var delta = wheel.angleDelta.y;
-            if (delta === 0)
-                return;
-
-            // Check if this is a touchpad
-            if (delta !== 120 && delta !== -120) {
-                touchpadAccumulator += delta;
-                console.info("Acc: "+touchpadAccumulator);
-                if (Math.abs(touchpadAccumulator) < 500)
-                    return;
-                delta = touchpadAccumulator;
-                touchpadAccumulator = 0;
-            }
-            console.info("Trigger! Delta: "+delta)
-
-            // This is after the other delta checks so it only shows on valid Y scroll
-            if (typeof PowerProfiles === "undefined") {
-                ToastService.showError("power-profiles-daemon not available");
-                return;
-            }
-
-            // Get list of profiles, and current index
-            const profiles = [PowerProfile.PowerSaver, PowerProfile.Balanced].concat(PowerProfiles.hasPerformanceProfile ? [PowerProfile.Performance] : []);
-            var index = profiles.findIndex(profile => PowerProfiles.profile === profile);
-
-            // Step once based on mouse wheel direction
-            if (delta > 0) index += 1;
-            else index -= 1;
-
-            // Already at end of list, can't go further
-            if (index < 0 || index >= profiles.length) return;
-
-            // Set new profile
-            PowerProfiles.profile = profiles[index];
-            if (PowerProfiles.profile !== profiles[index]) {
-                ToastService.showError("Failed to set power profile");
-            }
-        }
     }
 }

quickshell/Modules/DankBar/Widgets/CpuMonitor.qml

@@ -102,7 +102,7 @@ BasePill {
                     StyledTextMetrics {
                         id: cpuBaseline
                         font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
-                        text: "100%"
+                        text: "88%"
                     }
 
                     StyledTextMetrics {

quickshell/Modules/DankBar/Widgets/FocusedApp.qml

@@ -17,7 +17,7 @@ BasePill {
     property int availableWidth: 400
     readonly property int maxNormalWidth: 456
     readonly property int maxCompactWidth: 288
-    property Toplevel activeWindow: null
+    readonly property Toplevel activeWindow: ToplevelManager.activeToplevel
     property var activeDesktopEntry: null
     property bool isHovered: mouseArea.containsMouse
     property bool isAutoHideBar: false
@@ -38,44 +38,10 @@ BasePill {
         return 0;
     }
 
-    function updateActiveWindow() {
-        const active = ToplevelManager.activeToplevel;
-
-        if (!active) {
-            // Only clear if our tracked window is no longer alive
-            if (activeWindow) {
-                const alive = ToplevelManager.toplevels?.values;
-                if (alive && !Array.from(alive).some(t => t === activeWindow))
-                    activeWindow = null;
-            }
-            return;
-        }
-
-        if (!parentScreen || CompositorService.filterCurrentDisplay([active], parentScreen?.name)?.length > 0) {
-            activeWindow = active;
-        }
-        // else: active window is on a different screen so keep the previous value
-    }
-
     Component.onCompleted: {
-        updateActiveWindow();
         updateDesktopEntry();
     }
 
-    Connections {
-        target: ToplevelManager
-        function onActiveToplevelChanged() {
-            root.updateActiveWindow();
-        }
-    }
-
-    Connections {
-        target: CompositorService
-        function onToplevelsChanged() {
-            root.updateActiveWindow();
-        }
-    }
-
     Connections {
         target: DesktopEntries
         function onApplicationsChanged() {

quickshell/Modules/DankBar/Widgets/Media.qml

@@ -19,8 +19,7 @@ BasePill {
     readonly property bool usePlayerVolume: activePlayer && activePlayer.volumeSupported && !__isChromeBrowser
     property bool compactMode: false
     property var widgetData: null
-    readonly property bool adaptiveWidthEnabled: SettingsData.mediaAdaptiveWidthEnabled
-    readonly property int maxTextWidth: {
+    readonly property int textWidth: {
         const size = widgetData?.mediaSize !== undefined ? widgetData.mediaSize : SettingsData.mediaSize;
         switch (size) {
         case 0:
@@ -37,7 +36,10 @@ BasePill {
         if (isVerticalOrientation) {
             return widgetThickness - horizontalPadding * 2;
         }
-        return 0;
+        const controlsWidth = 20 + Theme.spacingXS + 24 + Theme.spacingXS + 20;
+        const audioVizWidth = 20;
+        const contentWidth = audioVizWidth + Theme.spacingXS + controlsWidth;
+        return contentWidth + (textWidth > 0 ? textWidth + Theme.spacingXS : 0);
     }
     readonly property int currentContentHeight: {
         if (!isVerticalOrientation) {
@@ -97,7 +99,7 @@ BasePill {
 
             if (isMouseWheelY) {
                 if (deltaY > 0) {
-                    MprisController.previousOrRewind();
+                    activePlayer.previous();
                 } else {
                     activePlayer.next();
                 }
@@ -105,7 +107,7 @@ BasePill {
                 scrollAccumulatorY += deltaY;
                 if (Math.abs(scrollAccumulatorY) >= touchpadThreshold) {
                     if (scrollAccumulatorY > 0) {
-                        MprisController.previousOrRewind();
+                        activePlayer.previous();
                     } else {
                         activePlayer.next();
                     }
@@ -117,28 +119,7 @@ BasePill {
 
     content: Component {
         Item {
-            id: contentRoot
-            readonly property real measuredTextWidth: {
-                if (!root.playerAvailable || root.maxTextWidth <= 0 || !textContainer.visible)
-                    return 0;
-                // Preserve the fixed-width text slot even if metadata is briefly empty.
-                if (!root.adaptiveWidthEnabled)
-                    return root.maxTextWidth;
-                if (textContainer.displayText.length === 0)
-                    return 0;
-                const rawWidth = mediaText.contentWidth;
-                if (!isFinite(rawWidth) || rawWidth <= 0)
-                    return 0;
-                return Math.min(root.maxTextWidth, Math.ceil(rawWidth));
-            }
-            readonly property int horizontalContentWidth: {
-                const controlsWidth = 20 + Theme.spacingXS + 24 + Theme.spacingXS + 20;
-                const audioVizWidth = 20;
-                const baseWidth = audioVizWidth + Theme.spacingXS + controlsWidth;
-                return baseWidth + (measuredTextWidth > 0 ? measuredTextWidth + Theme.spacingXS : 0);
-            }
-
-            implicitWidth: root.playerAvailable ? (root.isVerticalOrientation ? root.currentContentWidth : horizontalContentWidth) : 0
+            implicitWidth: root.playerAvailable ? root.currentContentWidth : 0
             implicitHeight: root.playerAvailable ? root.currentContentHeight : 0
             opacity: root.playerAvailable ? 1 : 0
 
@@ -151,9 +132,8 @@ BasePill {
 
             Behavior on implicitWidth {
                 NumberAnimation {
-                    duration: Theme.mediumDuration
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
+                    duration: Theme.shortDuration
+                    easing.type: Theme.standardEasing
                 }
             }
 
@@ -234,7 +214,7 @@ BasePill {
                             if (mouse.button === Qt.LeftButton) {
                                 activePlayer.togglePlaying();
                             } else if (mouse.button === Qt.MiddleButton) {
-                                MprisController.previousOrRewind();
+                                activePlayer.previous();
                             } else if (mouse.button === Qt.RightButton) {
                                 activePlayer.next();
                             }
@@ -289,7 +269,7 @@ BasePill {
                         }
 
                         anchors.verticalCenter: parent.verticalCenter
-                        width: contentRoot.measuredTextWidth
+                        width: textWidth
                         height: root.widgetThickness
                         visible: {
                             const size = widgetData?.mediaSize !== undefined ? widgetData.mediaSize : SettingsData.mediaSize;
@@ -298,95 +278,50 @@ BasePill {
                         clip: true
                         color: "transparent"
 
-                        Behavior on width {
-                            NumberAnimation {
-                                duration: Theme.mediumDuration
-                                easing.type: Easing.BezierSpline
-                                easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
+                        StyledText {
+                            id: mediaText
+                            property bool needsScrolling: implicitWidth > textContainer.width && SettingsData.scrollTitleEnabled
+                            property real scrollOffset: 0
+
+                            anchors.verticalCenter: parent.verticalCenter
+                            text: textContainer.displayText
+                            font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
+                            color: Theme.widgetTextColor
+                            wrapMode: Text.NoWrap
+                            x: needsScrolling ? -scrollOffset : 0
+                            onTextChanged: {
+                                scrollOffset = 0;
+                                scrollAnimation.restart();
                             }
-                        }
 
-                        Item {
-                            id: textClip
-                            anchors.fill: parent
-                            clip: true
+                            SequentialAnimation {
+                                id: scrollAnimation
+                                running: mediaText.needsScrolling && textContainer.visible
+                                loops: Animation.Infinite
 
-                            StyledText {
-                                id: mediaText
-                                property bool needsScrolling: implicitWidth > textContainer.width && SettingsData.scrollTitleEnabled
-                                property real scrollOffset: 0
-                                property real textShift: 0
-
-                                anchors.verticalCenter: parent.verticalCenter
-                                text: textContainer.displayText
-                                font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
-                                color: Theme.widgetTextColor
-                                wrapMode: Text.NoWrap
-                                x: (needsScrolling ? -scrollOffset : 0) + textShift
-                                opacity: 1
-
-                                onTextChanged: {
-                                    scrollOffset = 0;
-                                    textShift = 0;
-                                    scrollAnimation.restart();
-                                    textChangeAnimation.restart();
+                                PauseAnimation {
+                                    duration: 2000
                                 }
 
-                                SequentialAnimation {
-                                    id: scrollAnimation
-                                    running: mediaText.needsScrolling && textContainer.visible
-                                    loops: Animation.Infinite
-
-                                    PauseAnimation {
-                                        duration: 2000
-                                    }
-
-                                    NumberAnimation {
-                                        target: mediaText
-                                        property: "scrollOffset"
-                                        from: 0
-                                        to: mediaText.implicitWidth - textContainer.width + 5
-                                        duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
-                                        easing.type: Easing.Linear
-                                    }
-
-                                    PauseAnimation {
-                                        duration: 2000
-                                    }
-
-                                    NumberAnimation {
-                                        target: mediaText
-                                        property: "scrollOffset"
-                                        to: 0
-                                        duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
-                                        easing.type: Easing.Linear
-                                    }
+                                NumberAnimation {
+                                    target: mediaText
+                                    property: "scrollOffset"
+                                    from: 0
+                                    to: mediaText.implicitWidth - textContainer.width + 5
+                                    duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
+                                    easing.type: Easing.Linear
                                 }
 
-                                SequentialAnimation {
-                                    id: textChangeAnimation
+                                PauseAnimation {
+                                    duration: 2000
+                                }
 
-                                    ParallelAnimation {
-                                        NumberAnimation {
-                                            target: mediaText
-                                            property: "opacity"
-                                            from: 0.7
-                                            to: 1
-                                            duration: Theme.shortDuration
-                                            easing.type: Easing.BezierSpline
-                                            easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
-                                        }
-
-                                        NumberAnimation {
-                                            target: mediaText
-                                            property: "textShift"
-                                            from: 4
-                                            to: 0
-                                            duration: Theme.shortDuration
-                                            easing.type: Easing.BezierSpline
-                                            easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
-                                        }
-                                    }
+                                NumberAnimation {
+                                    target: mediaText
+                                    property: "scrollOffset"
+                                    to: 0
+                                    duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
+                                    easing.type: Easing.Linear
                                 }
                             }
                         }
@@ -435,7 +370,11 @@ BasePill {
                             anchors.fill: parent
                             enabled: root.playerAvailable
                             cursorShape: Qt.PointingHandCursor
-                            onClicked: MprisController.previousOrRewind()
+                            onClicked: {
+                                if (activePlayer) {
+                                    activePlayer.previous();
+                                }
+                            }
                         }
                     }
 

quickshell/Modules/DankBar/Widgets/RunningApps.qml

@@ -271,7 +271,7 @@ BasePill {
                         radius: Theme.cornerRadius
                         color: {
                             if (isFocused) {
-                                return mouseArea.containsMouse ? Theme.primarySelected : Theme.withAlpha(Theme.primary, 0.45);
+                                return mouseArea.containsMouse ? Theme.primarySelected : Theme.withAlpha(Theme.primary, 0.2);
                             }
                             return mouseArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : "transparent";
                         }
@@ -526,7 +526,7 @@ BasePill {
                         radius: Theme.cornerRadius
                         color: {
                             if (isFocused) {
-                                return mouseArea.containsMouse ? Theme.primarySelected : Theme.withAlpha(Theme.primary, 0.45);
+                                return mouseArea.containsMouse ? Theme.primarySelected : Theme.withAlpha(Theme.primary, 0.2);
                             }
                             return mouseArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : "transparent";
                         }

quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -16,11 +16,8 @@ BasePill {
     enableCursor: false
 
     property var parentWindow: null
-    property var widgetData: null
-    property string section: "right"
     property bool isAtBottom: false
     property bool isAutoHideBar: false
-    property bool useOverflowPopup: !widgetData?.trayUseInlineExpansion
     readonly property var hiddenTrayIds: {
         const envValue = Quickshell.env("DMS_HIDE_TRAYIDS") || "";
         return envValue ? envValue.split(",").map(id => id.trim().toLowerCase()) : [];
@@ -43,76 +40,6 @@ BasePill {
         return `${id}::${tooltipTitle}`;
     }
 
-    function trayIconSourceFor(trayItem) {
-        let icon = trayItem && trayItem.icon;
-        if (typeof icon === 'string' || icon instanceof String) {
-            if (icon === "")
-                return "";
-            if (icon.includes("?path=")) {
-                const split = icon.split("?path=");
-                if (split.length !== 2)
-                    return icon;
-                const name = split[0];
-                const path = split[1];
-                let fileName = name.substring(name.lastIndexOf("/") + 1);
-                if (fileName.startsWith("dropboxstatus")) {
-                    fileName = `hicolor/16x16/status/${fileName}`;
-                }
-                return `file://${path}/${fileName}`;
-            }
-            if (icon.startsWith("/") && !icon.startsWith("file://"))
-                return `file://${icon}`;
-            return icon;
-        }
-        return "";
-    }
-
-    function activateInlineTrayItem(trayItem, anchorItem) {
-        if (!trayItem)
-            return;
-        if (!trayItem.onlyMenu) {
-            trayItem.activate();
-            return;
-        }
-        if (!trayItem.hasMenu)
-            return;
-        root.showForTrayItem(trayItem, anchorItem, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
-    }
-
-    function openInlineTrayContextMenu(trayItem, areaItem, mouse, anchorItem) {
-        if (!trayItem) {
-            return;
-        }
-        if (!trayItem.hasMenu) {
-            const gp = areaItem.mapToGlobal(mouse.x, mouse.y);
-            root.callContextMenuFallback(trayItem.id, Math.round(gp.x), Math.round(gp.y));
-            return;
-        }
-        root.showForTrayItem(trayItem, anchorItem, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
-    }
-
-    function toggleIconName() {
-        const edge = root.axis?.edge;
-        if (root.useOverflowPopup) {
-            switch (edge) {
-            case "left":
-                return root.menuOpen ? "keyboard_arrow_left" : "keyboard_arrow_right";
-            case "right":
-                return root.menuOpen ? "keyboard_arrow_right" : "keyboard_arrow_left";
-            case "bottom":
-                return root.menuOpen ? "keyboard_arrow_down" : "keyboard_arrow_up";
-            case "top":
-                return root.menuOpen ? "keyboard_arrow_up" : "keyboard_arrow_down";
-            }
-        }
-
-        if (edge === "left" || edge === "right") {
-            return root.menuOpen == (root.section !== "right") ? "keyboard_arrow_up" : "keyboard_arrow_down";
-        }
-
-        return root.menuOpen != (root.section === "right") ? "keyboard_arrow_left" : "keyboard_arrow_right";
-    }
-
     // ! TODO - replace with either native dbus client (like plugins use) or just a DMS cli or something
     function callContextMenuFallback(trayItemId, globalX, globalY) {
         const script = ['ITEMS=$(dbus-send --session --print-reply --dest=org.kde.StatusNotifierWatcher /StatusNotifierWatcher org.freedesktop.DBus.Properties.Get string:org.kde.StatusNotifierWatcher string:RegisteredStatusNotifierItems 2>/dev/null)', 'while IFS= read -r line; do', '  line="${line#*\\\"}"', '  line="${line%\\\"*}"', '  [ -z "$line" ] && continue', '  BUS="${line%%/*}"', '  OBJ="/${line#*/}"', '  ID=$(dbus-send --session --print-reply --dest="$BUS" "$OBJ" org.freedesktop.DBus.Properties.Get string:org.kde.StatusNotifierItem string:Id 2>/dev/null | grep -oP "(?<=\\\")(.*?)(?=\\\")" | tail -1)', '  if [ "$ID" = "$1" ]; then', '    dbus-send --session --type=method_call --dest="$BUS" "$OBJ" org.kde.StatusNotifierItem.ContextMenu int32:"$2" int32:"$3"', '    exit 0', '  fi', 'done <<< "$ITEMS"',].join("\n");
@@ -151,13 +78,6 @@ BasePill {
                 item: item
             }))
     readonly property var hiddenBarItems: allSortedTrayItems.filter(item => SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
-    readonly property bool reverseInlineHorizontal: !useOverflowPopup && !isVerticalOrientation && section === "right"
-    readonly property bool reverseInlineVertical: !useOverflowPopup && isVerticalOrientation && section === "right"
-    readonly property var displayedMainBarItems: reverseInlineHorizontal ? [...mainBarItems].reverse() : mainBarItems
-    readonly property var displayedInlineExpandedItems: (reverseInlineHorizontal ? [...hiddenBarItems].reverse() : hiddenBarItems).map(item => ({
-                key: getTrayItemKey(item),
-                item: item
-            }))
 
     function moveTrayItemInFullOrder(visibleFromIndex, visibleToIndex) {
         if (visibleFromIndex === visibleToIndex || visibleFromIndex < 0 || visibleToIndex < 0)
@@ -183,7 +103,6 @@ BasePill {
     property int dropTargetIndex: -1
     property bool suppressShiftAnimation: false
     readonly property bool hasHiddenItems: allTrayItems.length > mainBarItems.length
-    readonly property bool inlineExpanded: hasHiddenItems && !useOverflowPopup && menuOpen
     visible: allTrayItems.length > 0
     opacity: allTrayItems.length > 0 ? 1 : 0
 
@@ -279,11 +198,10 @@ BasePill {
         id: rowComp
         Row {
             spacing: 0
-            layoutDirection: root.reverseInlineHorizontal ? Qt.RightToLeft : Qt.LeftToRight
 
             Repeater {
                 model: ScriptModel {
-                    values: root.displayedMainBarItems
+                    values: root.mainBarItems
                     objectProp: "key"
                 }
 
@@ -291,7 +209,29 @@ BasePill {
                     id: delegateRoot
                     property var trayItem: modelData.item
                     property string itemKey: modelData.key
-                    property string iconSource: root.trayIconSourceFor(trayItem)
+                    property string iconSource: {
+                        let icon = trayItem && trayItem.icon;
+                        if (typeof icon === 'string' || icon instanceof String) {
+                            if (icon === "")
+                                return "";
+                            if (icon.includes("?path=")) {
+                                const split = icon.split("?path=");
+                                if (split.length !== 2)
+                                    return icon;
+                                const name = split[0];
+                                const path = split[1];
+                                let fileName = name.substring(name.lastIndexOf("/") + 1);
+                                if (fileName.startsWith("dropboxstatus")) {
+                                    fileName = `hicolor/16x16/status/${fileName}`;
+                                }
+                                return `file://${path}/${fileName}`;
+                            }
+                            if (icon.startsWith("/") && !icon.startsWith("file://"))
+                                return `file://${icon}`;
+                            return icon;
+                        }
+                        return "";
+                    }
 
                     width: root.trayItemSize
                     height: root.barThickness
@@ -431,8 +371,7 @@ BasePill {
                             }
                             if (!delegateRoot.trayItem.hasMenu)
                                 return;
-                            if (root.useOverflowPopup)
-                                root.menuOpen = false;
+                            root.menuOpen = false;
                             root.showForTrayItem(delegateRoot.trayItem, visualContent, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
                         }
 
@@ -441,8 +380,8 @@ BasePill {
                                 const distance = Math.abs(mouse.x - dragHandler.dragStartPos.x);
                                 if (distance > 5) {
                                     dragHandler.dragging = true;
-                                    root.draggedIndex = root.reverseInlineHorizontal ? (root.mainBarItems.length - 1 - index) : index;
-                                    root.dropTargetIndex = root.draggedIndex;
+                                    root.draggedIndex = index;
+                                    root.dropTargetIndex = index;
                                 }
                             }
                             if (!dragHandler.dragging)
@@ -452,8 +391,7 @@ BasePill {
                             dragHandler.dragAxisOffset = axisOffset;
                             const itemSize = root.trayItemSize;
                             const slotOffset = Math.round(axisOffset / itemSize);
-                            const visualTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, index + slotOffset));
-                            const newTargetIndex = root.reverseInlineHorizontal ? (root.mainBarItems.length - 1 - visualTargetIndex) : visualTargetIndex;
+                            const newTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, index + slotOffset));
                             if (newTargetIndex !== root.dropTargetIndex) {
                                 root.dropTargetIndex = newTargetIndex;
                             }
@@ -469,8 +407,7 @@ BasePill {
                                 root.callContextMenuFallback(delegateRoot.trayItem.id, Math.round(gp.x), Math.round(gp.y));
                                 return;
                             }
-                            if (root.useOverflowPopup)
-                                root.menuOpen = false;
+                            root.menuOpen = false;
                             root.showForTrayItem(delegateRoot.trayItem, visualContent, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
                         }
                     }
@@ -492,7 +429,7 @@ BasePill {
 
                     DankIcon {
                         anchors.centerIn: parent
-                        name: root.toggleIconName()
+                        name: root.menuOpen ? "expand_less" : "expand_more"
                         size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
                         color: Theme.widgetTextColor
                     }
@@ -514,301 +451,6 @@ BasePill {
                     }
                 }
             }
-
-            Repeater {
-                model: ScriptModel {
-                    values: root.displayedInlineExpandedItems
-                    objectProp: "key"
-                }
-
-                delegate: inlineExpandedTrayItemDelegate
-            }
-        }
-    }
-
-    Component {
-        id: inlineExpandedTrayItemDelegate
-
-        Item {
-            property var trayItem: modelData.item
-            property string itemKey: modelData.key
-            property string iconSource: root.trayIconSourceFor(trayItem)
-
-            width: root.isVerticalOrientation ? root.barThickness : (root.inlineExpanded ? root.trayItemSize : 0)
-            height: root.isVerticalOrientation ? (root.inlineExpanded ? root.trayItemSize : 0) : root.barThickness
-            visible: width > 0 || height > 0
-
-            Behavior on width {
-                enabled: !root.isVerticalOrientation
-                NumberAnimation {
-                    duration: Theme.shortDuration
-                    easing.type: Theme.standardEasing
-                }
-            }
-
-            Behavior on height {
-                enabled: root.isVerticalOrientation
-                NumberAnimation {
-                    duration: Theme.shortDuration
-                    easing.type: Theme.standardEasing
-                }
-            }
-
-            Rectangle {
-                id: inlineVisualContent
-                width: root.trayItemSize
-                height: root.trayItemSize
-                x: root.isVerticalOrientation ? Math.round((parent.width - width) / 2) : (root.reverseInlineHorizontal ? parent.width - width : 0)
-                y: root.isVerticalOrientation ? (root.reverseInlineVertical ? parent.height - height : 0) : Math.round((parent.height - height) / 2)
-                radius: Theme.cornerRadius
-                color: inlineTrayItemArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : "transparent"
-                opacity: root.inlineExpanded ? 1 : 0
-
-                Behavior on opacity {
-                    NumberAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.standardEasing
-                    }
-                }
-
-                IconImage {
-                    id: inlineIconImg
-                    anchors.centerIn: parent
-                    width: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
-                    height: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
-                    source: iconSource
-                    asynchronous: true
-                    smooth: true
-                    mipmap: true
-                    visible: status === Image.Ready
-                }
-
-                Text {
-                    anchors.centerIn: parent
-                    visible: !inlineIconImg.visible
-                    text: {
-                        const itemId = trayItem?.id || "";
-                        if (!itemId)
-                            return "?";
-                        return itemId.charAt(0).toUpperCase();
-                    }
-                    font.pixelSize: 10
-                    color: Theme.widgetTextColor
-                }
-
-                DankRipple {
-                    id: inlineItemRipple
-                    cornerRadius: Theme.cornerRadius
-                }
-            }
-
-            MouseArea {
-                id: inlineTrayItemArea
-                anchors.fill: parent
-                hoverEnabled: true
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                cursorShape: Qt.PointingHandCursor
-                enabled: root.inlineExpanded
-
-                onPressed: mouse => {
-                    const pos = mapToItem(inlineVisualContent, mouse.x, mouse.y);
-                    inlineItemRipple.trigger(pos.x, pos.y);
-                }
-
-                onClicked: mouse => {
-                    if (mouse.button === Qt.LeftButton) {
-                        root.activateInlineTrayItem(trayItem, inlineVisualContent);
-                        return;
-                    }
-                    if (mouse.button !== Qt.RightButton)
-                        return;
-                    root.openInlineTrayContextMenu(trayItem, inlineTrayItemArea, mouse, inlineVisualContent);
-                }
-            }
-        }
-    }
-
-    Component {
-        id: verticalMainTrayItemDelegate
-
-        Item {
-            property var trayItem: modelData.item
-            property string itemKey: modelData.key
-            property string iconSource: root.trayIconSourceFor(trayItem)
-
-            width: root.barThickness
-            height: root.trayItemSize
-            z: dragHandler.dragging ? 100 : 0
-
-            property real shiftOffset: {
-                if (root.draggedIndex < 0)
-                    return 0;
-                if (index === root.draggedIndex)
-                    return 0;
-                const dragIdx = root.draggedIndex;
-                const dropIdx = root.dropTargetIndex;
-                const shiftAmount = root.trayItemSize;
-                if (dropIdx < 0)
-                    return 0;
-                if (dragIdx < dropIdx && index > dragIdx && index <= dropIdx)
-                    return -shiftAmount;
-                if (dragIdx > dropIdx && index >= dropIdx && index < dragIdx)
-                    return shiftAmount;
-                return 0;
-            }
-
-            transform: Translate {
-                y: shiftOffset
-                Behavior on y {
-                    enabled: !root.suppressShiftAnimation
-                    NumberAnimation {
-                        duration: 150
-                        easing.type: Easing.OutCubic
-                    }
-                }
-            }
-
-            Item {
-                id: dragHandler
-                anchors.fill: parent
-                property bool dragging: false
-                property point dragStartPos: Qt.point(0, 0)
-                property real dragAxisOffset: 0
-                property bool longPressing: false
-
-                Timer {
-                    id: longPressTimer
-                    interval: 400
-                    repeat: false
-                    onTriggered: dragHandler.longPressing = true
-                }
-            }
-
-            Rectangle {
-                id: visualContent
-                width: root.trayItemSize
-                height: root.trayItemSize
-                anchors.centerIn: parent
-                radius: Theme.cornerRadius
-                color: trayItemArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : "transparent"
-                border.width: dragHandler.dragging ? 2 : 0
-                border.color: Theme.primary
-                opacity: dragHandler.dragging ? 0.8 : 1.0
-
-                transform: Translate {
-                    y: dragHandler.dragging ? dragHandler.dragAxisOffset : 0
-                }
-
-                IconImage {
-                    id: iconImg
-                    anchors.centerIn: parent
-                    width: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
-                    height: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
-                    source: iconSource
-                    asynchronous: true
-                    smooth: true
-                    mipmap: true
-                    visible: status === Image.Ready
-                }
-
-                Text {
-                    anchors.centerIn: parent
-                    visible: !iconImg.visible
-                    text: {
-                        const itemId = trayItem?.id || "";
-                        if (!itemId)
-                            return "?";
-                        return itemId.charAt(0).toUpperCase();
-                    }
-                    font.pixelSize: 10
-                    color: Theme.widgetTextColor
-                }
-
-                DankRipple {
-                    id: itemRipple
-                    cornerRadius: Theme.cornerRadius
-                }
-            }
-
-            MouseArea {
-                id: trayItemArea
-                anchors.fill: parent
-                hoverEnabled: true
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                cursorShape: dragHandler.longPressing ? Qt.DragMoveCursor : Qt.PointingHandCursor
-
-                onPressed: mouse => {
-                    const pos = mapToItem(visualContent, mouse.x, mouse.y);
-                    itemRipple.trigger(pos.x, pos.y);
-                    if (mouse.button === Qt.LeftButton) {
-                        dragHandler.dragStartPos = Qt.point(mouse.x, mouse.y);
-                        longPressTimer.start();
-                    }
-                }
-
-                onReleased: mouse => {
-                    longPressTimer.stop();
-                    const wasDragging = dragHandler.dragging;
-                    const didReorder = wasDragging && root.dropTargetIndex >= 0 && root.dropTargetIndex !== root.draggedIndex;
-
-                    if (didReorder) {
-                        root.suppressShiftAnimation = true;
-                        root.moveTrayItemInFullOrder(root.draggedIndex, root.dropTargetIndex);
-                        Qt.callLater(() => root.suppressShiftAnimation = false);
-                    }
-
-                    dragHandler.longPressing = false;
-                    dragHandler.dragging = false;
-                    dragHandler.dragAxisOffset = 0;
-                    root.draggedIndex = -1;
-                    root.dropTargetIndex = -1;
-
-                    if (wasDragging || mouse.button !== Qt.LeftButton)
-                        return;
-
-                    if (!trayItem)
-                        return;
-                    if (!trayItem.onlyMenu) {
-                        trayItem.activate();
-                        return;
-                    }
-                    if (!trayItem.hasMenu)
-                        return;
-                    if (root.useOverflowPopup)
-                        root.menuOpen = false;
-                    root.showForTrayItem(trayItem, visualContent, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
-                }
-
-                onPositionChanged: mouse => {
-                    if (dragHandler.longPressing && !dragHandler.dragging) {
-                        const distance = Math.abs(mouse.y - dragHandler.dragStartPos.y);
-                        if (distance > 5) {
-                            dragHandler.dragging = true;
-                            root.draggedIndex = index;
-                            root.dropTargetIndex = root.draggedIndex;
-                        }
-                    }
-                    if (!dragHandler.dragging)
-                        return;
-
-                    const axisOffset = mouse.y - dragHandler.dragStartPos.y;
-                    dragHandler.dragAxisOffset = axisOffset;
-                    const itemSize = root.trayItemSize;
-                    const slotOffset = Math.round(axisOffset / itemSize);
-                    const newTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, index + slotOffset));
-                    if (newTargetIndex !== root.dropTargetIndex) {
-                        root.dropTargetIndex = newTargetIndex;
-                    }
-                }
-
-                onClicked: mouse => {
-                    if (dragHandler.dragging)
-                        return;
-                    if (mouse.button !== Qt.RightButton)
-                        return;
-                    root.openInlineTrayContextMenu(trayItem, trayItemArea, mouse, visualContent);
-                }
-            }
         }
     }
 
@@ -817,23 +459,219 @@ BasePill {
         Column {
             spacing: 0
 
-            // Column lacks layoutDirection, so we use four repeaters with mutually exclusive models to control whether main items or expanded items appear above/ below the toggle button.
-            // When reverseInlineVertical is true the first and third repeaters are empty and the second and fourth are active, and vice-versa.
-            // Because items are swapped between repeaters rather than reversed within a single list, vertical drag-and-drop indices don't need remapping (unlike the horizontal RightToLeft case).
             Repeater {
                 model: ScriptModel {
-                    values: root.reverseInlineVertical ? [] : root.displayedMainBarItems
+                    values: root.mainBarItems
                     objectProp: "key"
                 }
-                delegate: verticalMainTrayItemDelegate
-            }
 
-            Repeater {
-                model: ScriptModel {
-                    values: root.reverseInlineVertical ? root.displayedInlineExpandedItems : []
-                    objectProp: "key"
+                delegate: Item {
+                    id: delegateRoot
+                    property var trayItem: modelData.item
+                    property string itemKey: modelData.key
+                    property string iconSource: {
+                        let icon = trayItem && trayItem.icon;
+                        if (typeof icon === 'string' || icon instanceof String) {
+                            if (icon === "")
+                                return "";
+                            if (icon.includes("?path=")) {
+                                const split = icon.split("?path=");
+                                if (split.length !== 2)
+                                    return icon;
+                                const name = split[0];
+                                const path = split[1];
+                                let fileName = name.substring(name.lastIndexOf("/") + 1);
+                                if (fileName.startsWith("dropboxstatus")) {
+                                    fileName = `hicolor/16x16/status/${fileName}`;
+                                }
+                                return `file://${path}/${fileName}`;
+                            }
+                            if (icon.startsWith("/") && !icon.startsWith("file://"))
+                                return `file://${icon}`;
+                            return icon;
+                        }
+                        return "";
+                    }
+
+                    width: root.barThickness
+                    height: root.trayItemSize
+                    z: dragHandler.dragging ? 100 : 0
+
+                    property real shiftOffset: {
+                        if (root.draggedIndex < 0)
+                            return 0;
+                        if (index === root.draggedIndex)
+                            return 0;
+                        const dragIdx = root.draggedIndex;
+                        const dropIdx = root.dropTargetIndex;
+                        const shiftAmount = root.trayItemSize;
+                        if (dropIdx < 0)
+                            return 0;
+                        if (dragIdx < dropIdx && index > dragIdx && index <= dropIdx)
+                            return -shiftAmount;
+                        if (dragIdx > dropIdx && index >= dropIdx && index < dragIdx)
+                            return shiftAmount;
+                        return 0;
+                    }
+
+                    transform: Translate {
+                        y: delegateRoot.shiftOffset
+                        Behavior on y {
+                            enabled: !root.suppressShiftAnimation
+                            NumberAnimation {
+                                duration: 150
+                                easing.type: Easing.OutCubic
+                            }
+                        }
+                    }
+
+                    Item {
+                        id: dragHandler
+                        anchors.fill: parent
+                        property bool dragging: false
+                        property point dragStartPos: Qt.point(0, 0)
+                        property real dragAxisOffset: 0
+                        property bool longPressing: false
+
+                        Timer {
+                            id: longPressTimer
+                            interval: 400
+                            repeat: false
+                            onTriggered: dragHandler.longPressing = true
+                        }
+                    }
+
+                    Rectangle {
+                        id: visualContent
+                        width: root.trayItemSize
+                        height: root.trayItemSize
+                        anchors.centerIn: parent
+                        radius: Theme.cornerRadius
+                        color: trayItemArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : "transparent"
+                        border.width: dragHandler.dragging ? 2 : 0
+                        border.color: Theme.primary
+                        opacity: dragHandler.dragging ? 0.8 : 1.0
+
+                        transform: Translate {
+                            y: dragHandler.dragging ? dragHandler.dragAxisOffset : 0
+                        }
+
+                        IconImage {
+                            id: iconImg
+                            anchors.centerIn: parent
+                            width: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                            height: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                            source: delegateRoot.iconSource
+                            asynchronous: true
+                            smooth: true
+                            mipmap: true
+                            visible: status === Image.Ready
+                        }
+
+                        Text {
+                            anchors.centerIn: parent
+                            visible: !iconImg.visible
+                            text: {
+                                const itemId = trayItem?.id || "";
+                                if (!itemId)
+                                    return "?";
+                                return itemId.charAt(0).toUpperCase();
+                            }
+                            font.pixelSize: 10
+                            color: Theme.widgetTextColor
+                        }
+
+                        DankRipple {
+                            id: itemRipple
+                            cornerRadius: Theme.cornerRadius
+                        }
+                    }
+
+                    MouseArea {
+                        id: trayItemArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        acceptedButtons: Qt.LeftButton | Qt.RightButton
+                        cursorShape: dragHandler.longPressing ? Qt.DragMoveCursor : Qt.PointingHandCursor
+
+                        onPressed: mouse => {
+                            const pos = mapToItem(visualContent, mouse.x, mouse.y);
+                            itemRipple.trigger(pos.x, pos.y);
+                            if (mouse.button === Qt.LeftButton) {
+                                dragHandler.dragStartPos = Qt.point(mouse.x, mouse.y);
+                                longPressTimer.start();
+                            }
+                        }
+
+                        onReleased: mouse => {
+                            longPressTimer.stop();
+                            const wasDragging = dragHandler.dragging;
+                            const didReorder = wasDragging && root.dropTargetIndex >= 0 && root.dropTargetIndex !== root.draggedIndex;
+
+                            if (didReorder) {
+                                root.suppressShiftAnimation = true;
+                                root.moveTrayItemInFullOrder(root.draggedIndex, root.dropTargetIndex);
+                                Qt.callLater(() => root.suppressShiftAnimation = false);
+                            }
+
+                            dragHandler.longPressing = false;
+                            dragHandler.dragging = false;
+                            dragHandler.dragAxisOffset = 0;
+                            root.draggedIndex = -1;
+                            root.dropTargetIndex = -1;
+
+                            if (wasDragging || mouse.button !== Qt.LeftButton)
+                                return;
+
+                            if (!delegateRoot.trayItem)
+                                return;
+                            if (!delegateRoot.trayItem.onlyMenu) {
+                                delegateRoot.trayItem.activate();
+                                return;
+                            }
+                            if (!delegateRoot.trayItem.hasMenu)
+                                return;
+                            root.menuOpen = false;
+                            root.showForTrayItem(delegateRoot.trayItem, visualContent, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
+                        }
+
+                        onPositionChanged: mouse => {
+                            if (dragHandler.longPressing && !dragHandler.dragging) {
+                                const distance = Math.abs(mouse.y - dragHandler.dragStartPos.y);
+                                if (distance > 5) {
+                                    dragHandler.dragging = true;
+                                    root.draggedIndex = index;
+                                    root.dropTargetIndex = index;
+                                }
+                            }
+                            if (!dragHandler.dragging)
+                                return;
+
+                            const axisOffset = mouse.y - dragHandler.dragStartPos.y;
+                            dragHandler.dragAxisOffset = axisOffset;
+                            const itemSize = root.trayItemSize;
+                            const slotOffset = Math.round(axisOffset / itemSize);
+                            const newTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, index + slotOffset));
+                            if (newTargetIndex !== root.dropTargetIndex) {
+                                root.dropTargetIndex = newTargetIndex;
+                            }
+                        }
+
+                        onClicked: mouse => {
+                            if (dragHandler.dragging)
+                                return;
+                            if (mouse.button !== Qt.RightButton)
+                                return;
+                            if (!delegateRoot.trayItem?.hasMenu) {
+                                const gp = trayItemArea.mapToGlobal(mouse.x, mouse.y);
+                                root.callContextMenuFallback(delegateRoot.trayItem.id, Math.round(gp.x), Math.round(gp.y));
+                                return;
+                            }
+                            root.menuOpen = false;
+                            root.showForTrayItem(delegateRoot.trayItem, visualContent, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
+                        }
+                    }
                 }
-                delegate: inlineExpandedTrayItemDelegate
             }
 
             Item {
@@ -851,7 +689,14 @@ BasePill {
 
                     DankIcon {
                         anchors.centerIn: parent
-                        name: root.toggleIconName()
+                        name: {
+                            const edge = root.axis?.edge;
+                            if (edge === "left") {
+                                return root.menuOpen ? "chevron_left" : "chevron_right";
+                            } else {
+                                return root.menuOpen ? "chevron_right" : "chevron_left";
+                            }
+                        }
                         size: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
                         color: Theme.widgetTextColor
                     }
@@ -873,22 +718,6 @@ BasePill {
                     }
                 }
             }
-
-            Repeater {
-                model: ScriptModel {
-                    values: root.reverseInlineVertical ? [] : root.displayedInlineExpandedItems
-                    objectProp: "key"
-                }
-                delegate: inlineExpandedTrayItemDelegate
-            }
-
-            Repeater {
-                model: ScriptModel {
-                    values: root.reverseInlineVertical ? root.displayedMainBarItems : []
-                    objectProp: "key"
-                }
-                delegate: verticalMainTrayItemDelegate
-            }
         }
     }
 
@@ -904,7 +733,7 @@ BasePill {
             blurRadius: Theme.cornerRadius
         }
 
-        visible: root.useOverflowPopup && root.menuOpen
+        visible: root.menuOpen
         screen: root.parentScreen
         WlrLayershell.layer: WlrLayershell.Top
         WlrLayershell.exclusiveZone: -1
@@ -920,14 +749,13 @@ BasePill {
 
         HyprlandFocusGrab {
             windows: [overflowMenu]
-            active: CompositorService.useHyprlandFocusGrab && root.useOverflowPopup && root.menuOpen
+            active: CompositorService.useHyprlandFocusGrab && root.menuOpen
         }
 
         Connections {
             target: PopoutManager
             function onPopoutOpening() {
-                if (root.useOverflowPopup)
-                    root.menuOpen = false;
+                root.menuOpen = false;
             }
         }
 
@@ -1193,7 +1021,30 @@ BasePill {
 
                     delegate: Rectangle {
                         property var trayItem: modelData
-                        property string iconSource: root.trayIconSourceFor(trayItem)
+                        property string iconSource: {
+                            let icon = trayItem?.icon;
+                            if (typeof icon === 'string' || icon instanceof String) {
+                                if (icon === "")
+                                    return "";
+                                if (icon.includes("?path=")) {
+                                    const split = icon.split("?path=");
+                                    if (split.length !== 2)
+                                        return icon;
+                                    const name = split[0];
+                                    const path = split[1];
+                                    let fileName = name.substring(name.lastIndexOf("/") + 1);
+                                    if (fileName.startsWith("dropboxstatus")) {
+                                        fileName = `hicolor/16x16/status/${fileName}`;
+                                    }
+                                    return `file://${path}/${fileName}`;
+                                }
+                                if (icon.startsWith("/") && !icon.startsWith("file://")) {
+                                    return `file://${icon}`;
+                                }
+                                return icon;
+                            }
+                            return "";
+                        }
 
                         width: root.trayItemSize + 4
                         height: root.trayItemSize + 4
@@ -1462,8 +1313,7 @@ BasePill {
                 onVisibleChanged: {
                     if (visible) {
                         updatePosition();
-                        if (root.useOverflowPopup)
-                            root.menuOpen = false;
+                        root.menuOpen = false;
                         PopoutManager.closeAllPopouts();
                         ModalManager.closeAllModalsExcept(null);
                     }

quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml

@@ -20,46 +20,6 @@ Item {
     property var blurBarWindow: null
     property var hyprlandOverviewLoader: null
     property var parentScreen: null
-
-    readonly property real _leftMargin: {
-        if (isVertical)
-            return 0;
-        root.x;
-        if (!root.parent)
-            return 0;
-        const gap = root.mapToItem(null, 0, 0).x;
-        return (gap > 0 && gap < 30) ? gap + 5 : 0;
-    }
-    readonly property real _rightMargin: {
-        if (isVertical)
-            return 0;
-        root.x;
-        root.width;
-        if (!root.parent || !blurBarWindow)
-            return 0;
-        const gap = blurBarWindow.width - root.mapToItem(null, root.width, 0).x;
-        return (gap > 0 && gap < 30) ? gap + 5 : 0;
-    }
-    readonly property real _topMargin: {
-        if (!isVertical)
-            return 0;
-        root.y;
-        if (!root.parent)
-            return 0;
-        const gap = root.mapToItem(null, 0, 0).y;
-        return (gap > 0 && gap < 30) ? gap + 5 : 0;
-    }
-    readonly property real _bottomMargin: {
-        if (!isVertical)
-            return 0;
-        root.y;
-        root.height;
-        if (!root.parent || !blurBarWindow)
-            return 0;
-        const gap = blurBarWindow.height - root.mapToItem(null, 0, root.height).y;
-        return (gap > 0 && gap < 30) ? gap + 5 : 0;
-    }
-
     property int _desktopEntriesUpdateTrigger: 0
     readonly property var sortedToplevels: {
         return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, screenName);
@@ -579,60 +539,6 @@ Item {
         });
     }
 
-    function switchToWorkspaceByModelData(data) {
-        if (!data)
-            return;
-
-        if (root.useExtWorkspace && (data.id || data.name)) {
-            ExtWorkspaceService.activateWorkspace(data.id || data.name, data.groupID || "");
-            return;
-        }
-
-        switch (CompositorService.compositor) {
-        case "niri":
-            if (data.idx !== undefined)
-                NiriService.switchToWorkspace(data.idx);
-            break;
-        case "hyprland":
-            if (data.id)
-                Hyprland.dispatch(`workspace ${data.id}`);
-            break;
-        case "dwl":
-            if (data.tag !== undefined)
-                DwlService.switchToTag(root.screenName, data.tag);
-            break;
-        case "sway":
-        case "scroll":
-        case "miracle":
-            if (data.num)
-                try {
-                    I3.dispatch(`workspace number ${data.num}`);
-                } catch (_) {}
-            break;
-        }
-    }
-
-    function findClosestWorkspaceIndex(localX, localY) {
-        if (workspaceRepeater.count === 0)
-            return -1;
-
-        let closestIdx = -1;
-        let closestDist = Infinity;
-
-        for (let i = 0; i < workspaceRepeater.count; i++) {
-            const item = workspaceRepeater.itemAt(i);
-            if (!item)
-                continue;
-            const center = item.mapToItem(root, item.width / 2, item.height / 2);
-            const dist = isVertical ? Math.abs(localY - center.y) : Math.abs(localX - center.x);
-            if (dist < closestDist) {
-                closestDist = dist;
-                closestIdx = i;
-            }
-        }
-        return closestIdx;
-    }
-
     function switchWorkspace(direction) {
         if (useExtWorkspace) {
             const realWorkspaces = getRealWorkspaces();
@@ -846,15 +752,8 @@ Item {
     }
 
     MouseArea {
-        id: edgeMouseArea
-        z: -1
-        x: -root._leftMargin
-        y: -root._topMargin
-        width: root.width + root._leftMargin + root._rightMargin
-        height: root.height + root._topMargin + root._bottomMargin
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
 
         property real touchpadAccumulator: 0
         property real mouseAccumulator: 0
@@ -867,20 +766,12 @@ Item {
         }
 
         onClicked: mouse => {
-            const rootPos = edgeMouseArea.mapToItem(root, mouse.x, mouse.y);
-            switch (mouse.button) {
-            case Qt.RightButton:
+            if (mouse.button === Qt.RightButton) {
                 if (CompositorService.isNiri) {
                     NiriService.toggleOverview();
                 } else if (CompositorService.isHyprland && root.hyprlandOverviewLoader?.item) {
                     root.hyprlandOverviewLoader.item.overviewOpen = !root.hyprlandOverviewLoader.item.overviewOpen;
                 }
-                break;
-            case Qt.LeftButton:
-                const idx = root.findClosestWorkspaceIndex(rootPos.x, rootPos.y);
-                if (idx >= 0)
-                    root.switchToWorkspaceByModelData(root.workspaceList[idx]);
-                break;
             }
         }
 

quickshell/Modules/DankDash/DankDashPopout.qml

@@ -16,6 +16,7 @@ DankPopout {
     popupHeight: contentLoader.item ? contentLoader.item.implicitHeight : 500
     triggerWidth: 80
     screen: triggerScreen
+    shouldBeVisible: dashVisible
 
     property bool __focusArmed: false
     property bool __contentReady: false
@@ -99,7 +100,7 @@ DankPopout {
                 if (currentPlayer && currentPlayer !== player && currentPlayer.canPause) {
                     currentPlayer.pause();
                 }
-                MprisController.setActivePlayer(player);
+                MprisController.activePlayer = player;
                 root.__hideDropdowns();
             }
             onDeviceSelected: device => {

quickshell/Modules/DankDash/MediaDropdownOverlay.qml

@@ -44,43 +44,6 @@ Item {
 
     property int __volumeHoverCount: 0
 
-    readonly property bool directionalEffect: Theme.isDirectionalEffect
-    readonly property bool depthEffect: Theme.isDepthEffect
-
-    function panelMotionX(panelWidth, active) {
-        if (active)
-            return 0;
-        if (directionalEffect) {
-            const travel = Math.max(Theme.effectAnimOffset, panelWidth * 0.85);
-            return isRightEdge ? -travel : travel;
-        }
-        if (depthEffect) {
-            const travel = Math.max(Theme.effectAnimOffset * 0.7, panelWidth * 0.32);
-            return isRightEdge ? -travel : travel;
-        }
-        return 0;
-    }
-
-    function panelMotionY(panelType, panelHeight, active) {
-        if (active)
-            return 0;
-        if (directionalEffect) {
-            if (panelType === 2)
-                return panelHeight * 0.08;
-            if (panelType === 3)
-                return -panelHeight * 0.08;
-            return 0;
-        }
-        if (depthEffect) {
-            if (panelType === 2)
-                return panelHeight * 0.04;
-            if (panelType === 3)
-                return -panelHeight * 0.04;
-            return 0;
-        }
-        return 0;
-    }
-
     function volumeAreaEntered() {
         __volumeHoverCount++;
         panelEntered();
@@ -99,47 +62,30 @@ Item {
         visible: dropdownType === 1 && volumeAvailable
         width: 60
         height: 180
-        x: (isRightEdge ? anchorPos.x : anchorPos.x - width) + panelMotionX(width, dropdownType === 1)
-        y: anchorPos.y - height / 2 + panelMotionY(1, height, dropdownType === 1)
+        x: isRightEdge ? anchorPos.x : anchorPos.x - width
+        y: anchorPos.y - height / 2
         radius: Theme.cornerRadius * 2
         color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95)
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3)
         border.width: 1
 
-        opacity: Theme.isDirectionalEffect ? 1 : (dropdownType === 1 ? 1 : 0)
-        scale: Theme.isDirectionalEffect ? 1 : (dropdownType === 1 ? 1 : Theme.effectScaleCollapsed)
+        opacity: dropdownType === 1 ? 1 : 0
+        scale: dropdownType === 1 ? 1 : 0.96
         transformOrigin: isRightEdge ? Item.Left : Item.Right
 
         Behavior on opacity {
-            enabled: !Theme.isDirectionalEffect
-            DankAnim {
-                duration: Math.round(Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 1) * Theme.variantOpacityDurationScale)
-                easing.bezierCurve: dropdownType === 1 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+            NumberAnimation {
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
         Behavior on scale {
-            enabled: !Theme.isDirectionalEffect
             NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 1)
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
                 easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 1 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on x {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 1)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 1 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on y {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 1)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 1 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
@@ -251,50 +197,33 @@ Item {
 
     Rectangle {
         id: audioDevicesPanel
-        visible: dropdownType === 2 && activePlayer !== null
+        visible: dropdownType === 2
         width: 280
         height: Math.max(200, Math.min(280, availableDevices.length * 50 + 100))
-        x: (isRightEdge ? anchorPos.x : anchorPos.x - width) + panelMotionX(width, dropdownType === 2)
-        y: anchorPos.y - height / 2 + panelMotionY(2, height, dropdownType === 2)
+        x: isRightEdge ? anchorPos.x : anchorPos.x - width
+        y: anchorPos.y - height / 2
         radius: Theme.cornerRadius * 2
         color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.98)
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.6)
         border.width: 2
 
-        opacity: Theme.isDirectionalEffect ? 1 : (dropdownType === 2 ? 1 : 0)
-        scale: Theme.isDirectionalEffect ? 1 : (dropdownType === 2 ? 1 : Theme.effectScaleCollapsed)
+        opacity: dropdownType === 2 ? 1 : 0
+        scale: dropdownType === 2 ? 1 : 0.96
         transformOrigin: isRightEdge ? Item.Left : Item.Right
 
         Behavior on opacity {
-            enabled: !Theme.isDirectionalEffect
-            DankAnim {
-                duration: Math.round(Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 2) * Theme.variantOpacityDurationScale)
-                easing.bezierCurve: dropdownType === 2 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+            NumberAnimation {
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
         Behavior on scale {
-            enabled: !Theme.isDirectionalEffect
             NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 2)
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
                 easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 2 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on x {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 2)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 2 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on y {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 2)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 2 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
@@ -425,47 +354,30 @@ Item {
         visible: dropdownType === 3
         width: 240
         height: Math.max(180, Math.min(240, (allPlayers?.length || 0) * 50 + 80))
-        x: (isRightEdge ? anchorPos.x : anchorPos.x - width) + panelMotionX(width, dropdownType === 3)
-        y: anchorPos.y - height / 2 + panelMotionY(3, height, dropdownType === 3)
+        x: isRightEdge ? anchorPos.x : anchorPos.x - width
+        y: anchorPos.y - height / 2
         radius: Theme.cornerRadius * 2
         color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.98)
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.6)
         border.width: 2
 
-        opacity: Theme.isDirectionalEffect ? 1 : (dropdownType === 3 ? 1 : 0)
-        scale: Theme.isDirectionalEffect ? 1 : (dropdownType === 3 ? 1 : Theme.effectScaleCollapsed)
+        opacity: dropdownType === 3 ? 1 : 0
+        scale: dropdownType === 3 ? 1 : 0.96
         transformOrigin: isRightEdge ? Item.Left : Item.Right
 
         Behavior on opacity {
-            enabled: !Theme.isDirectionalEffect
-            DankAnim {
-                duration: Math.round(Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 3) * Theme.variantOpacityDurationScale)
-                easing.bezierCurve: dropdownType === 3 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+            NumberAnimation {
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
         Behavior on scale {
-            enabled: !Theme.isDirectionalEffect
             NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 3)
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
                 easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 3 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on x {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 3)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 3 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on y {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 3)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 3 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 

quickshell/Modules/DankDash/MediaPlayerTab.qml

@@ -487,7 +487,17 @@ Item {
                                     anchors.fill: parent
                                     hoverEnabled: true
                                     cursorShape: Qt.PointingHandCursor
-                                    onClicked: MprisController.previousOrRewind()
+                                    onClicked: {
+                                        if (!activePlayer) {
+                                            return;
+                                        }
+
+                                        if (activePlayer.position > 8 && activePlayer.canSeek) {
+                                            activePlayer.position = 0;
+                                        } else {
+                                            activePlayer.previous();
+                                        }
+                                    }
                                 }
                             }
                         }

quickshell/Modules/DankDash/Overview/MediaOverviewCard.qml

@@ -145,7 +145,14 @@ Card {
                     anchors.fill: parent
                     hoverEnabled: true
                     cursorShape: Qt.PointingHandCursor
-                    onClicked: MprisController.previousOrRewind()
+                    onClicked: {
+                        if (!activePlayer) return
+                        if (activePlayer.position > 8 && activePlayer.canSeek) {
+                            activePlayer.position = 0
+                        } else {
+                            activePlayer.previous()
+                        }
+                    }
                 }
             }
 

quickshell/Modules/Dock/Dock.qml

@@ -19,12 +19,11 @@ Variants {
 
         WindowBlur {
             targetWindow: dock
-            blurEnabled: dock.effectiveBlurEnabled && !SettingsData.connectedFrameModeActive
             blurX: dockBackground.x + dockContainer.x + dockMouseArea.x + dockCore.x + dockSlide.x
             blurY: dockBackground.y + dockContainer.y + dockMouseArea.y + dockCore.y + dockSlide.y
             blurWidth: dock.hasApps && dock.reveal ? dockBackground.width : 0
             blurHeight: dock.hasApps && dock.reveal ? dockBackground.height : 0
-            blurRadius: Theme.isConnectedEffect ? Theme.connectedCornerRadius : dock.surfaceRadius
+            blurRadius: Theme.cornerRadius
         }
 
         WlrLayershell.namespace: "dms:dock"
@@ -43,23 +42,6 @@ Variants {
         property real backgroundTransparency: SettingsData.dockTransparency
         property bool groupByApp: SettingsData.dockGroupByApp
         readonly property int borderThickness: SettingsData.dockBorderEnabled ? SettingsData.dockBorderThickness : 0
-        readonly property string connectedBarSide: SettingsData.dockPosition === SettingsData.Position.Top ? "top" : SettingsData.dockPosition === SettingsData.Position.Bottom ? "bottom" : SettingsData.dockPosition === SettingsData.Position.Left ? "left" : "right"
-        readonly property bool connectedBarActiveOnEdge: Theme.isConnectedEffect && !!(dock.screen || modelData) && SettingsData.getActiveBarEdgesForScreen(dock.screen || modelData).includes(connectedBarSide)
-        readonly property real connectedJoinInset: {
-            if (!Theme.isConnectedEffect)
-                return 0;
-            return connectedBarActiveOnEdge ? SettingsData.frameBarSize : SettingsData.frameThickness;
-        }
-        readonly property real surfaceRadius: Theme.connectedSurfaceRadius
-        readonly property color surfaceColor: Theme.isConnectedEffect ? Theme.connectedSurfaceColor : Theme.withAlpha(Theme.surfaceContainer, backgroundTransparency)
-        readonly property color surfaceBorderColor: Theme.isConnectedEffect ? "transparent" : BlurService.borderColor
-        readonly property real surfaceBorderWidth: Theme.isConnectedEffect ? 0 : BlurService.borderWidth
-        readonly property real surfaceTopLeftRadius: Theme.isConnectedEffect && (SettingsData.dockPosition === SettingsData.Position.Top || SettingsData.dockPosition === SettingsData.Position.Left) ? 0 : surfaceRadius
-        readonly property real surfaceTopRightRadius: Theme.isConnectedEffect && (SettingsData.dockPosition === SettingsData.Position.Top || SettingsData.dockPosition === SettingsData.Position.Right) ? 0 : surfaceRadius
-        readonly property real surfaceBottomLeftRadius: Theme.isConnectedEffect && (SettingsData.dockPosition === SettingsData.Position.Bottom || SettingsData.dockPosition === SettingsData.Position.Left) ? 0 : surfaceRadius
-        readonly property real surfaceBottomRightRadius: Theme.isConnectedEffect && (SettingsData.dockPosition === SettingsData.Position.Bottom || SettingsData.dockPosition === SettingsData.Position.Right) ? 0 : surfaceRadius
-        readonly property real horizontalConnectorExtent: Theme.isConnectedEffect && !isVertical ? Theme.connectedCornerRadius : 0
-        readonly property real verticalConnectorExtent: Theme.isConnectedEffect && isVertical ? Theme.connectedCornerRadius : 0
 
         readonly property int hasApps: dockApps.implicitWidth > 0 || dockApps.implicitHeight > 0
 
@@ -131,116 +113,13 @@ Variants {
             return getBarHeight(leftBar);
         }
 
-        readonly property real dockMargin: SettingsData.dockMargin
-        readonly property bool effectiveBlurEnabled: Theme.connectedSurfaceBlurEnabled
-        readonly property real effectiveDockBottomGap: Theme.isConnectedEffect ? 0 : SettingsData.dockBottomGap
-        readonly property real effectiveDockMargin: Theme.isConnectedEffect ? 0 : SettingsData.dockMargin
-        readonly property real positionSpacing: barSpacing + effectiveDockBottomGap + effectiveDockMargin
-        readonly property real joinedEdgeMargin: Theme.isConnectedEffect ? 0 : (barSpacing + effectiveDockMargin + 1 + dock.borderThickness)
+        readonly property real dockMargin: SettingsData.dockSpacing
+        readonly property real positionSpacing: barSpacing + SettingsData.dockBottomGap + SettingsData.dockMargin
         readonly property real _dpr: (dock.screen && dock.screen.devicePixelRatio) ? dock.screen.devicePixelRatio : 1
         function px(v) {
             return Math.round(v * _dpr) / _dpr;
         }
 
-        function connectorWidth(spacing) {
-            return dock.isVertical ? (spacing + Theme.connectedCornerRadius) : Theme.connectedCornerRadius;
-        }
-
-        function connectorHeight(spacing) {
-            return dock.isVertical ? Theme.connectedCornerRadius : (spacing + Theme.connectedCornerRadius);
-        }
-
-        function connectorSeamX(baseX, bodyWidth, placement) {
-            if (!dock.isVertical)
-                return placement === "left" ? baseX : baseX + bodyWidth;
-            return SettingsData.dockPosition === SettingsData.Position.Left ? baseX : baseX + bodyWidth;
-        }
-
-        function connectorSeamY(baseY, bodyHeight, placement) {
-            if (SettingsData.dockPosition === SettingsData.Position.Top)
-                return baseY;
-            if (SettingsData.dockPosition === SettingsData.Position.Bottom)
-                return baseY + bodyHeight;
-            return placement === "left" ? baseY : baseY + bodyHeight;
-        }
-
-        function connectorX(baseX, bodyWidth, placement, spacing) {
-            const seamX = connectorSeamX(baseX, bodyWidth, placement);
-            const width = connectorWidth(spacing);
-            if (!dock.isVertical)
-                return placement === "left" ? seamX - width : seamX;
-            return SettingsData.dockPosition === SettingsData.Position.Left ? seamX : seamX - width;
-        }
-
-        function connectorY(baseY, bodyHeight, placement, spacing) {
-            const seamY = connectorSeamY(baseY, bodyHeight, placement);
-            const height = connectorHeight(spacing);
-            if (SettingsData.dockPosition === SettingsData.Position.Top)
-                return seamY;
-            if (SettingsData.dockPosition === SettingsData.Position.Bottom)
-                return seamY - height;
-            return placement === "left" ? seamY - height : seamY;
-        }
-
-        // ─── ConnectedModeState sync ────────────────────────────────────────
-        // Dock window origin in screen-relative coordinates (FrameWindow space).
-        function _dockWindowOriginX() {
-            if (!dock.isVertical)
-                return 0;
-            if (SettingsData.dockPosition === SettingsData.Position.Right)
-                return (dock.screen ? dock.screen.width : 0) - dock.width;
-            return 0;
-        }
-        function _dockWindowOriginY() {
-            if (dock.isVertical)
-                return 0;
-            if (SettingsData.dockPosition === SettingsData.Position.Bottom)
-                return (dock.screen ? dock.screen.height : 0) - dock.height;
-            return 0;
-        }
-
-        readonly property string _dockScreenName: dock.modelData ? dock.modelData.name : (dock.screen ? dock.screen.name : "")
-
-        function _syncDockChromeState() {
-            if (!dock._dockScreenName)
-                return;
-            if (!SettingsData.connectedFrameModeActive) {
-                ConnectedModeState.clearDockState(dock._dockScreenName);
-                return;
-            }
-
-            ConnectedModeState.setDockState(dock._dockScreenName, {
-                "reveal": dock.visible && (dock.reveal || slideXAnimation.running || slideYAnimation.running) && dock.hasApps,
-                "barSide": dock.connectedBarSide,
-                "bodyX": dock._dockWindowOriginX() + dockBackground.x + dockContainer.x + dockMouseArea.x + dockCore.x,
-                "bodyY": dock._dockWindowOriginY() + dockBackground.y + dockContainer.y + dockMouseArea.y + dockCore.y,
-                "bodyW": dock.hasApps ? dockBackground.width : 0,
-                "bodyH": dock.hasApps ? dockBackground.height : 0,
-                "slideX": dockSlide.x,
-                "slideY": dockSlide.y
-            });
-        }
-
-        function _syncDockSlide() {
-            if (!dock._dockScreenName || !SettingsData.connectedFrameModeActive)
-                return;
-            ConnectedModeState.setDockSlide(dock._dockScreenName, dockSlide.x, dockSlide.y);
-        }
-
-        property bool _slideSyncPending: false
-        function _queueSlideSync() {
-            if (!SettingsData.connectedFrameModeActive)
-                return;
-            if (_slideSyncPending)
-                return;
-            _slideSyncPending = true;
-            Qt.callLater(dock._flushSlideSync);
-        }
-        function _flushSlideSync() {
-            _slideSyncPending = false;
-            dock._syncDockSlide();
-        }
-
         property bool contextMenuOpen: (dockVariants.contextMenu && dockVariants.contextMenu.visible && dockVariants.contextMenu.screen === modelData)
         property bool revealSticky: false
 
@@ -251,7 +130,7 @@ Variants {
                 return false;
 
             const screenName = dock.modelData?.name ?? "";
-            const dockThickness = dock.connectedJoinInset + effectiveBarHeight + SettingsData.dockSpacing + dock.effectiveDockBottomGap + dock.effectiveDockMargin;
+            const dockThickness = effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockBottomGap + SettingsData.dockMargin;
             const screenWidth = dock.screen?.width ?? 0;
             const screenHeight = dock.screen?.height ?? 0;
 
@@ -402,23 +281,6 @@ Variants {
             }
         }
 
-        Component.onCompleted: Qt.callLater(() => dock._syncDockChromeState())
-        Component.onDestruction: ConnectedModeState.clearDockState(dock._dockScreenName)
-
-        onRevealChanged: dock._syncDockChromeState()
-        onWidthChanged: dock._syncDockChromeState()
-        onHeightChanged: dock._syncDockChromeState()
-        onVisibleChanged: dock._syncDockChromeState()
-        onHasAppsChanged: dock._syncDockChromeState()
-        onConnectedBarSideChanged: dock._syncDockChromeState()
-
-        Connections {
-            target: SettingsData
-            function onConnectedFrameModeActiveChanged() {
-                dock._syncDockChromeState();
-            }
-        }
-
         Connections {
             target: SettingsData
             function onDockTransparencyChanged() {
@@ -440,13 +302,13 @@ Variants {
                 return -1;
             if (barSpacing > 0)
                 return -1;
-            return px(connectedJoinInset + effectiveBarHeight + SettingsData.dockSpacing + effectiveDockBottomGap + effectiveDockMargin);
+            return px(effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockBottomGap + SettingsData.dockMargin);
         }
 
         property real animationHeadroom: Math.ceil(SettingsData.dockIconSize * 0.35)
 
-        implicitWidth: isVertical ? (px(connectedJoinInset + effectiveBarHeight + SettingsData.dockSpacing + effectiveDockMargin + SettingsData.dockIconSize * 0.3) + animationHeadroom) : 0
-        implicitHeight: !isVertical ? (px(connectedJoinInset + effectiveBarHeight + SettingsData.dockSpacing + effectiveDockMargin + SettingsData.dockIconSize * 0.3) + animationHeadroom) : 0
+        implicitWidth: isVertical ? (px(effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockMargin + SettingsData.dockIconSize * 0.3) + animationHeadroom) : 0
+        implicitHeight: !isVertical ? (px(effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockMargin + SettingsData.dockIconSize * 0.3) + animationHeadroom) : 0
 
         Item {
             id: maskItem
@@ -456,17 +318,17 @@ Variants {
             x: {
                 const baseX = dockCore.x + dockMouseArea.x;
                 if (isVertical && SettingsData.dockPosition === SettingsData.Position.Right)
-                    return baseX - (expanded ? animationHeadroom + borderThickness + dock.horizontalConnectorExtent : 0);
-                return baseX - (expanded ? borderThickness + dock.horizontalConnectorExtent : 0);
+                    return baseX - (expanded ? animationHeadroom + borderThickness : 0);
+                return baseX - (expanded ? borderThickness : 0);
             }
             y: {
                 const baseY = dockCore.y + dockMouseArea.y;
                 if (!isVertical && SettingsData.dockPosition === SettingsData.Position.Bottom)
-                    return baseY - (expanded ? animationHeadroom + borderThickness + dock.verticalConnectorExtent : 0);
-                return baseY - (expanded ? borderThickness + dock.verticalConnectorExtent : 0);
+                    return baseY - (expanded ? animationHeadroom + borderThickness : 0);
+                return baseY - (expanded ? borderThickness : 0);
             }
-            width: dockMouseArea.width + (isVertical && expanded ? animationHeadroom : 0) + (expanded ? borderThickness * 2 + dock.horizontalConnectorExtent * 2 : 0)
-            height: dockMouseArea.height + (!isVertical && expanded ? animationHeadroom : 0) + (expanded ? borderThickness * 2 + dock.verticalConnectorExtent * 2 : 0)
+            width: dockMouseArea.width + (isVertical && expanded ? animationHeadroom : 0) + (expanded ? borderThickness * 2 : 0)
+            height: dockMouseArea.height + (!isVertical && expanded ? animationHeadroom : 0) + (expanded ? borderThickness * 2 : 0)
         }
 
         mask: Region {
@@ -526,7 +388,7 @@ Variants {
             const screenHeight = dock.screen ? dock.screen.height : 0;
 
             const gap = Theme.spacingS;
-            const bgMargin = dock.joinedEdgeMargin + dock.connectedJoinInset;
+            const bgMargin = barSpacing + SettingsData.dockMargin + 1 + dock.borderThickness;
             const btnW = dock.hoveredButton.width;
             const btnH = dock.hoveredButton.height;
 
@@ -597,11 +459,11 @@ Variants {
                         // Keep the taller hit area regardless of the reveal state to prevent shrinking loop
                         return Math.min(Math.max(dockBackground.height + 64, 200), maxDockHeight);
                     }
-                    return dock.reveal ? px(dock.connectedJoinInset + dock.effectiveBarHeight + SettingsData.dockSpacing + dock.effectiveDockBottomGap + dock.effectiveDockMargin) : 1;
+                    return dock.reveal ? px(dock.effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockBottomGap + SettingsData.dockMargin) : 1;
                 }
                 width: {
                     if (dock.isVertical) {
-                        return dock.reveal ? px(dock.connectedJoinInset + dock.effectiveBarHeight + SettingsData.dockSpacing + dock.effectiveDockBottomGap + dock.effectiveDockMargin) : 1;
+                        return dock.reveal ? px(dock.effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockBottomGap + SettingsData.dockMargin) : 1;
                     }
                     // Keep the wider hit area regardless of the reveal state to prevent shrinking loop
                     return Math.min(dockBackground.width + 8 + dock.borderThickness, maxDockWidth);
@@ -643,11 +505,7 @@ Variants {
                                 return 0;
                             if (dock.reveal)
                                 return 0;
-                            if (Theme.isConnectedEffect) {
-                                const retractDist = dockBackground.width + SettingsData.dockSpacing + 10;
-                                return SettingsData.dockPosition === SettingsData.Position.Right ? retractDist : -retractDist;
-                            }
-                            const hideDistance = dock.connectedJoinInset + dock.effectiveBarHeight + SettingsData.dockSpacing + dock.effectiveDockBottomGap + dock.effectiveDockMargin + 10;
+                            const hideDistance = dock.effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockBottomGap + SettingsData.dockMargin + 10;
                             if (SettingsData.dockPosition === SettingsData.Position.Right) {
                                 return hideDistance;
                             } else {
@@ -659,11 +517,7 @@ Variants {
                                 return 0;
                             if (dock.reveal)
                                 return 0;
-                            if (Theme.isConnectedEffect) {
-                                const retractDist = dockBackground.height + SettingsData.dockSpacing + 10;
-                                return SettingsData.dockPosition === SettingsData.Position.Bottom ? retractDist : -retractDist;
-                            }
-                            const hideDistance = dock.connectedJoinInset + dock.effectiveBarHeight + SettingsData.dockSpacing + dock.effectiveDockBottomGap + dock.effectiveDockMargin + 10;
+                            const hideDistance = dock.effectiveBarHeight + SettingsData.dockSpacing + SettingsData.dockBottomGap + SettingsData.dockMargin + 10;
                             if (SettingsData.dockPosition === SettingsData.Position.Bottom) {
                                 return hideDistance;
                             } else {
@@ -674,25 +528,18 @@ Variants {
                         Behavior on x {
                             NumberAnimation {
                                 id: slideXAnimation
-                                duration: Theme.isConnectedEffect ? Theme.variantDuration(Theme.popoutAnimationDuration, dock.reveal) : Theme.shortDuration
-                                easing.type: Theme.isConnectedEffect ? Easing.BezierSpline : Easing.OutCubic
-                                easing.bezierCurve: Theme.isConnectedEffect ? (dock.reveal ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve) : []
-                                onRunningChanged: if (!running) dock._syncDockChromeState()
+                                duration: Theme.shortDuration
+                                easing.type: Easing.OutCubic
                             }
                         }
 
                         Behavior on y {
                             NumberAnimation {
                                 id: slideYAnimation
-                                duration: Theme.isConnectedEffect ? Theme.variantDuration(Theme.popoutAnimationDuration, dock.reveal) : Theme.shortDuration
-                                easing.type: Theme.isConnectedEffect ? Easing.BezierSpline : Easing.OutCubic
-                                easing.bezierCurve: Theme.isConnectedEffect ? (dock.reveal ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve) : []
-                                onRunningChanged: if (!running) dock._syncDockChromeState()
+                                duration: Theme.shortDuration
+                                easing.type: Easing.OutCubic
                             }
                         }
-
-                        onXChanged: dock._queueSlideSync()
-                        onYChanged: dock._queueSlideSync()
                     }
 
                     Item {
@@ -706,60 +553,33 @@ Variants {
                             right: dock.isVertical ? (SettingsData.dockPosition === SettingsData.Position.Right ? parent.right : undefined) : undefined
                             verticalCenter: dock.isVertical ? parent.verticalCenter : undefined
                         }
-                        anchors.topMargin: !dock.isVertical && SettingsData.dockPosition === SettingsData.Position.Top ? (dock.connectedJoinInset + dock.joinedEdgeMargin) : 0
-                        anchors.bottomMargin: !dock.isVertical && SettingsData.dockPosition === SettingsData.Position.Bottom ? (dock.connectedJoinInset + dock.joinedEdgeMargin) : 0
-                        anchors.leftMargin: dock.isVertical && SettingsData.dockPosition === SettingsData.Position.Left ? (dock.connectedJoinInset + dock.joinedEdgeMargin) : 0
-                        anchors.rightMargin: dock.isVertical && SettingsData.dockPosition === SettingsData.Position.Right ? (dock.connectedJoinInset + dock.joinedEdgeMargin) : 0
+                        anchors.topMargin: !dock.isVertical && SettingsData.dockPosition === SettingsData.Position.Top ? barSpacing + SettingsData.dockMargin + 1 + dock.borderThickness : 0
+                        anchors.bottomMargin: !dock.isVertical && SettingsData.dockPosition === SettingsData.Position.Bottom ? barSpacing + SettingsData.dockMargin + 1 + dock.borderThickness : 0
+                        anchors.leftMargin: dock.isVertical && SettingsData.dockPosition === SettingsData.Position.Left ? barSpacing + SettingsData.dockMargin + 1 + dock.borderThickness : 0
+                        anchors.rightMargin: dock.isVertical && SettingsData.dockPosition === SettingsData.Position.Right ? barSpacing + SettingsData.dockMargin + 1 + dock.borderThickness : 0
 
                         implicitWidth: dock.isVertical ? (dockApps.implicitHeight + SettingsData.dockSpacing * 2) : (dockApps.implicitWidth + SettingsData.dockSpacing * 2)
                         implicitHeight: dock.isVertical ? (dockApps.implicitWidth + SettingsData.dockSpacing * 2) : (dockApps.implicitHeight + SettingsData.dockSpacing * 2)
                         width: implicitWidth
                         height: implicitHeight
 
-                        // Avoid an offscreen texture seam where the connected dock meets the frame.
-                        layer.enabled: !Theme.isConnectedEffect
+                        layer.enabled: true
                         clip: false
 
                         Rectangle {
                             anchors.fill: parent
-                            visible: !SettingsData.connectedFrameModeActive && !(Theme.isConnectedEffect && dock.reveal)
-                            color: dock.surfaceColor
-                            topLeftRadius: dock.surfaceTopLeftRadius
-                            topRightRadius: dock.surfaceTopRightRadius
-                            bottomLeftRadius: dock.surfaceBottomLeftRadius
-                            bottomRightRadius: dock.surfaceBottomRightRadius
+                            color: Theme.withAlpha(Theme.surfaceContainer, backgroundTransparency)
+                            radius: Theme.cornerRadius
                         }
 
                         Rectangle {
                             anchors.fill: parent
-                            visible: !SettingsData.connectedFrameModeActive && !(Theme.isConnectedEffect && dock.reveal)
                             color: "transparent"
-                            topLeftRadius: dock.surfaceTopLeftRadius
-                            topRightRadius: dock.surfaceTopRightRadius
-                            bottomLeftRadius: dock.surfaceBottomLeftRadius
-                            bottomRightRadius: dock.surfaceBottomRightRadius
-                            border.color: dock.surfaceBorderColor
-                            border.width: dock.surfaceBorderWidth
+                            radius: Theme.cornerRadius
+                            border.color: BlurService.borderColor
+                            border.width: BlurService.borderWidth
                             z: 100
                         }
-
-                        // Sync dockBackground geometry to ConnectedModeState
-                        onXChanged: dock._syncDockChromeState()
-                        onYChanged: dock._syncDockChromeState()
-                        onWidthChanged: dock._syncDockChromeState()
-                        onHeightChanged: dock._syncDockChromeState()
-                    }
-
-                    ConnectedShape {
-                        visible: Theme.isConnectedEffect && dock.reveal && !SettingsData.connectedFrameModeActive
-                        barSide: dock.connectedBarSide
-                        bodyWidth: dockBackground.width
-                        bodyHeight: dockBackground.height
-                        connectorRadius: Theme.connectedCornerRadius
-                        surfaceRadius: dock.surfaceRadius
-                        fillColor: dock.surfaceColor
-                        x: dockBackground.x - bodyX
-                        y: dockBackground.y - bodyY
                     }
 
                     Shape {
@@ -768,12 +588,12 @@ Variants {
                         y: dockBackground.y - borderThickness
                         width: dockBackground.width + borderThickness * 2
                         height: dockBackground.height + borderThickness * 2
-                        visible: SettingsData.dockBorderEnabled && dock.hasApps && !Theme.isConnectedEffect
+                        visible: SettingsData.dockBorderEnabled && dock.hasApps
                         preferredRendererType: Shape.CurveRenderer
 
                         readonly property real borderThickness: Math.max(1, dock.borderThickness)
                         readonly property real i: borderThickness / 2
-                        readonly property real cr: dock.surfaceRadius
+                        readonly property real cr: Theme.cornerRadius
                         readonly property real w: dockBackground.width
                         readonly property real h: dockBackground.height
 

quickshell/Modules/Frame/Frame.qml

@@ -1,17 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import qs.Common
-
-Variants {
-    id: root
-
-    model: Quickshell.screens
-
-    FrameInstance {
-        required property var modelData
-
-        screen: modelData
-    }
-}

quickshell/Modules/Frame/FrameBorder.qml

@@ -1,54 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Effects
-import qs.Common
-
-Item {
-    id: root
-
-    anchors.fill: parent
-
-    required property real cutoutTopInset
-    required property real cutoutBottomInset
-    required property real cutoutLeftInset
-    required property real cutoutRightInset
-    required property real cutoutRadius
-    property color borderColor: Qt.rgba(SettingsData.effectiveFrameColor.r, SettingsData.effectiveFrameColor.g, SettingsData.effectiveFrameColor.b, SettingsData.frameOpacity)
-
-    Rectangle {
-        id: borderRect
-
-        anchors.fill: parent
-        // Bake frameOpacity into the color alpha rather than using the `opacity` property
-        color: root.borderColor
-
-        layer.enabled: true
-        layer.effect: MultiEffect {
-            maskSource: cutoutMask
-            maskEnabled: true
-            maskInverted: true
-            maskThresholdMin: 0.5
-            maskSpreadAtMin: 1
-        }
-    }
-
-    Item {
-        id: cutoutMask
-
-        anchors.fill: parent
-        layer.enabled: true
-        visible: false
-
-        Rectangle {
-            anchors {
-                fill: parent
-                topMargin: root.cutoutTopInset
-                bottomMargin: root.cutoutBottomInset
-                leftMargin: root.cutoutLeftInset
-                rightMargin: root.cutoutRightInset
-            }
-            radius: root.cutoutRadius
-        }
-    }
-}

quickshell/Modules/Frame/FrameExclusions.qml

@@ -1,87 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-
-Scope {
-    id: root
-
-    required property var screen
-
-    readonly property var barEdges: {
-        SettingsData.barConfigs; // force re-eval when bar configs change
-        return SettingsData.getActiveBarEdgesForScreen(screen);
-    }
-
-    // One thin invisible PanelWindow per edge.
-    // Skips any edge where a bar already provides its own exclusiveZone.
-
-    readonly property bool screenEnabled: SettingsData.frameEnabled && SettingsData.isScreenInPreferences(root.screen, SettingsData.frameScreenPreferences)
-
-    Loader {
-        active: root.screenEnabled && !root.barEdges.includes("top")
-        sourceComponent: EdgeExclusion {
-            targetScreen:  root.screen
-            anchorTop:    true
-            anchorLeft:   true
-            anchorRight:  true
-        }
-    }
-
-    Loader {
-        active: root.screenEnabled && !root.barEdges.includes("bottom")
-        sourceComponent: EdgeExclusion {
-            targetScreen:  root.screen
-            anchorBottom:  true
-            anchorLeft:    true
-            anchorRight:   true
-        }
-    }
-
-    Loader {
-        active: root.screenEnabled && !root.barEdges.includes("left")
-        sourceComponent: EdgeExclusion {
-            targetScreen:  root.screen
-            anchorLeft:    true
-            anchorTop:     true
-            anchorBottom:  true
-        }
-    }
-
-    Loader {
-        active: root.screenEnabled && !root.barEdges.includes("right")
-        sourceComponent: EdgeExclusion {
-            targetScreen:  root.screen
-            anchorRight:   true
-            anchorTop:     true
-            anchorBottom:  true
-        }
-    }
-
-    component EdgeExclusion: PanelWindow {
-        required property var targetScreen
-
-        screen: targetScreen
-        property bool anchorTop:    false
-        property bool anchorBottom: false
-        property bool anchorLeft:   false
-        property bool anchorRight:  false
-
-        WlrLayershell.namespace: "dms:frame-exclusion"
-        WlrLayershell.layer: WlrLayer.Top
-        exclusiveZone: SettingsData.frameThickness
-        color: "transparent"
-        mask: Region {}
-        implicitWidth:  1
-        implicitHeight: 1
-
-        anchors {
-            top:    anchorTop
-            bottom: anchorBottom
-            left:   anchorLeft
-            right:  anchorRight
-        }
-    }
-}

quickshell/Modules/Frame/FrameInstance.qml

@@ -1,18 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-
-Item {
-    id: root
-
-    required property var screen
-
-    FrameWindow {
-        targetScreen: root.screen
-    }
-
-    FrameExclusions {
-        screen: root.screen
-    }
-}

quickshell/Modules/Frame/FrameWindow.qml

@@ -1,951 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Effects
-import Quickshell
-import Quickshell.Wayland
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-PanelWindow {
-    id: win
-
-    required property var targetScreen
-
-    screen: targetScreen
-    visible: true
-
-    WlrLayershell.namespace: "dms:frame"
-    WlrLayershell.layer: WlrLayer.Top
-    WlrLayershell.exclusionMode: ExclusionMode.Ignore
-
-    anchors {
-        top: true
-        bottom: true
-        left: true
-        right: true
-    }
-
-    color: "transparent"
-    mask: Region {}
-
-    readonly property var barEdges: {
-        SettingsData.barConfigs;
-        return SettingsData.getActiveBarEdgesForScreen(win.screen);
-    }
-
-    readonly property real _dpr: CompositorService.getScreenScale(win.screen)
-    readonly property bool _frameActive: SettingsData.frameEnabled && SettingsData.isScreenInPreferences(win.screen, SettingsData.frameScreenPreferences)
-    readonly property int _windowRegionWidth: win._regionInt(win.width)
-    readonly property int _windowRegionHeight: win._regionInt(win.height)
-    readonly property string _screenName: win.screen ? win.screen.name : ""
-    readonly property var _dockState: ConnectedModeState.dockStates[win._screenName] || ConnectedModeState.emptyDockState
-    readonly property var _dockSlide: ConnectedModeState.dockSlides[win._screenName] || ({
-            "x": 0,
-            "y": 0
-        })
-    readonly property var _notifState: ConnectedModeState.notificationStates[win._screenName] || ConnectedModeState.emptyNotificationState
-
-    // ─── Connected chrome convenience properties ──────────────────────────────
-    readonly property bool _connectedActive: win._frameActive && SettingsData.connectedFrameModeActive
-    readonly property string _barSide: {
-        const edges = win.barEdges;
-        if (edges.includes("top"))
-            return "top";
-        if (edges.includes("bottom"))
-            return "bottom";
-        if (edges.includes("left"))
-            return "left";
-        return "right";
-    }
-    readonly property real _ccr: Theme.connectedCornerRadius
-    readonly property real _effectivePopoutCcr: {
-        const extent = win._popoutArcExtent();
-        const isHoriz = ConnectedModeState.popoutBarSide === "top" || ConnectedModeState.popoutBarSide === "bottom";
-        const crossSize = isHoriz ? _popoutBodyBlurAnchor.width : _popoutBodyBlurAnchor.height;
-        return Math.max(0, Math.min(win._ccr, extent, crossSize / 2));
-    }
-    readonly property real _effectiveNotifCcr: {
-        const isHoriz = win._notifState.barSide === "top" || win._notifState.barSide === "bottom";
-        const crossSize = isHoriz ? _notifBodyBlurAnchor.width : _notifBodyBlurAnchor.height;
-        const extent = isHoriz ? _notifBodyBlurAnchor.height : _notifBodyBlurAnchor.width;
-        return Theme.snap(Math.max(0, Math.min(win._ccr, win._surfaceRadius, extent, crossSize / 2)), win._dpr);
-    }
-    readonly property color _surfaceColor: Theme.connectedSurfaceColor
-    readonly property real _surfaceOpacity: _surfaceColor.a
-    readonly property color _opaqueSurfaceColor: Qt.rgba(_surfaceColor.r, _surfaceColor.g, _surfaceColor.b, 1)
-    readonly property real _surfaceRadius: Theme.connectedSurfaceRadius
-    readonly property real _seamOverlap: Theme.hairline(win._dpr)
-    readonly property bool _disableLayer: Quickshell.env("DMS_DISABLE_LAYER") === "true" || Quickshell.env("DMS_DISABLE_LAYER") === "1"
-
-    function _regionInt(value) {
-        return Math.max(0, Math.round(Theme.px(value, win._dpr)));
-    }
-
-    readonly property int cutoutTopInset: win._regionInt(barEdges.includes("top") ? SettingsData.frameBarSize : SettingsData.frameThickness)
-    readonly property int cutoutBottomInset: win._regionInt(barEdges.includes("bottom") ? SettingsData.frameBarSize : SettingsData.frameThickness)
-    readonly property int cutoutLeftInset: win._regionInt(barEdges.includes("left") ? SettingsData.frameBarSize : SettingsData.frameThickness)
-    readonly property int cutoutRightInset: win._regionInt(barEdges.includes("right") ? SettingsData.frameBarSize : SettingsData.frameThickness)
-    readonly property int cutoutWidth: Math.max(0, win._windowRegionWidth - win.cutoutLeftInset - win.cutoutRightInset)
-    readonly property int cutoutHeight: Math.max(0, win._windowRegionHeight - win.cutoutTopInset - win.cutoutBottomInset)
-    readonly property int cutoutRadius: {
-        const requested = win._regionInt(SettingsData.frameRounding);
-        const maxRadius = Math.floor(Math.min(win.cutoutWidth, win.cutoutHeight) / 2);
-        return Math.max(0, Math.min(requested, maxRadius));
-    }
-
-    readonly property int _blurCutoutCompensation: SettingsData.frameOpacity <= 0.2 ? 1 : 0
-    readonly property int _blurCutoutLeft: Math.max(0, win.cutoutLeftInset - win._blurCutoutCompensation)
-    readonly property int _blurCutoutTop: Math.max(0, win.cutoutTopInset - win._blurCutoutCompensation)
-    readonly property int _blurCutoutRight: Math.min(win._windowRegionWidth, win._windowRegionWidth - win.cutoutRightInset + win._blurCutoutCompensation)
-    readonly property int _blurCutoutBottom: Math.min(win._windowRegionHeight, win._windowRegionHeight - win.cutoutBottomInset + win._blurCutoutCompensation)
-    readonly property int _blurCutoutRadius: {
-        const requested = win.cutoutRadius + win._blurCutoutCompensation;
-        const maxRadius = Math.floor(Math.min(_blurCutout.width, _blurCutout.height) / 2);
-        return Math.max(0, Math.min(requested, maxRadius));
-    }
-
-    // Invisible items providing scene coordinates for blur Region anchors
-    Item {
-        id: _blurCutout
-        x: win._blurCutoutLeft
-        y: win._blurCutoutTop
-        width: Math.max(0, win._blurCutoutRight - win._blurCutoutLeft)
-        height: Math.max(0, win._blurCutoutBottom - win._blurCutoutTop)
-    }
-
-    Item {
-        id: _popoutBodyBlurAnchor
-        visible: false
-
-        readonly property bool _active: ConnectedModeState.popoutVisible && ConnectedModeState.popoutScreen === win._screenName
-
-        readonly property real _dyClamp: (ConnectedModeState.popoutBarSide === "top" || ConnectedModeState.popoutBarSide === "bottom") ? Math.max(-ConnectedModeState.popoutBodyH, Math.min(ConnectedModeState.popoutAnimY * 1.02, ConnectedModeState.popoutBodyH)) : 0
-        readonly property real _dxClamp: (ConnectedModeState.popoutBarSide === "left" || ConnectedModeState.popoutBarSide === "right") ? Math.max(-ConnectedModeState.popoutBodyW, Math.min(ConnectedModeState.popoutAnimX * 1.02, ConnectedModeState.popoutBodyW)) : 0
-
-        x: _active ? ConnectedModeState.popoutBodyX + (ConnectedModeState.popoutBarSide === "right" ? _dxClamp : 0) : 0
-        y: _active ? ConnectedModeState.popoutBodyY + (ConnectedModeState.popoutBarSide === "bottom" ? _dyClamp : 0) : 0
-        width: _active ? Math.max(0, ConnectedModeState.popoutBodyW - Math.abs(_dxClamp)) : 0
-        height: _active ? Math.max(0, ConnectedModeState.popoutBodyH - Math.abs(_dyClamp)) : 0
-    }
-
-    Item {
-        id: _dockBodyBlurAnchor
-        visible: false
-
-        readonly property bool _active: win._dockState.reveal && win._dockState.bodyW > 0 && win._dockState.bodyH > 0
-
-        x: _active ? win._dockState.bodyX + (win._dockSlide.x || 0) : 0
-        y: _active ? win._dockState.bodyY + (win._dockSlide.y || 0) : 0
-        width: _active ? win._dockState.bodyW : 0
-        height: _active ? win._dockState.bodyH : 0
-    }
-
-    Item {
-        id: _popoutBodyBlurCap
-        opacity: 0
-
-        readonly property string _side: ConnectedModeState.popoutBarSide
-        readonly property real _capThickness: win._popoutBlurCapThickness()
-        readonly property bool _active: _popoutBodyBlurAnchor._active && _capThickness > 0 && _popoutBodyBlurAnchor.width > 0 && _popoutBodyBlurAnchor.height > 0
-        readonly property real _capWidth: (_side === "left" || _side === "right") ? Math.min(_capThickness, _popoutBodyBlurAnchor.width) : _popoutBodyBlurAnchor.width
-        readonly property real _capHeight: (_side === "top" || _side === "bottom") ? Math.min(_capThickness, _popoutBodyBlurAnchor.height) : _popoutBodyBlurAnchor.height
-
-        x: !_active ? 0 : (_side === "right" ? _popoutBodyBlurAnchor.x + _popoutBodyBlurAnchor.width - _capWidth : _popoutBodyBlurAnchor.x)
-        y: !_active ? 0 : (_side === "bottom" ? _popoutBodyBlurAnchor.y + _popoutBodyBlurAnchor.height - _capHeight : _popoutBodyBlurAnchor.y)
-        width: _active ? _capWidth : 0
-        height: _active ? _capHeight : 0
-    }
-
-    Item {
-        id: _dockBodyBlurCap
-        opacity: 0
-
-        readonly property string _side: win._dockState.barSide
-        readonly property bool _active: _dockBodyBlurAnchor._active && _dockBodyBlurAnchor.width > 0 && _dockBodyBlurAnchor.height > 0
-        readonly property real _capWidth: (_side === "left" || _side === "right") ? Math.min(win._dockConnectorRadius(), _dockBodyBlurAnchor.width) : _dockBodyBlurAnchor.width
-        readonly property real _capHeight: (_side === "top" || _side === "bottom") ? Math.min(win._dockConnectorRadius(), _dockBodyBlurAnchor.height) : _dockBodyBlurAnchor.height
-
-        x: !_active ? 0 : (_side === "right" ? _dockBodyBlurAnchor.x + _dockBodyBlurAnchor.width - _capWidth : _dockBodyBlurAnchor.x)
-        y: !_active ? 0 : (_side === "bottom" ? _dockBodyBlurAnchor.y + _dockBodyBlurAnchor.height - _capHeight : _dockBodyBlurAnchor.y)
-        width: _active ? _capWidth : 0
-        height: _active ? _capHeight : 0
-    }
-
-    Item {
-        id: _popoutLeftConnectorBlurAnchor
-        opacity: 0
-
-        readonly property bool _active: _popoutBodyBlurAnchor._active && win._effectivePopoutCcr > 0
-        readonly property real _w: win._popoutConnectorWidth(0)
-        readonly property real _h: win._popoutConnectorHeight(0)
-
-        x: _active ? Theme.snap(win._popoutConnectorX(_popoutBodyBlurAnchor.x, _popoutBodyBlurAnchor.width, "left", 0), win._dpr) : 0
-        y: _active ? Theme.snap(win._popoutConnectorY(_popoutBodyBlurAnchor.y, _popoutBodyBlurAnchor.height, "left", 0), win._dpr) : 0
-        width: _active ? _w : 0
-        height: _active ? _h : 0
-    }
-
-    Item {
-        id: _popoutRightConnectorBlurAnchor
-        opacity: 0
-
-        readonly property bool _active: _popoutBodyBlurAnchor._active && win._effectivePopoutCcr > 0
-        readonly property real _w: win._popoutConnectorWidth(0)
-        readonly property real _h: win._popoutConnectorHeight(0)
-
-        x: _active ? Theme.snap(win._popoutConnectorX(_popoutBodyBlurAnchor.x, _popoutBodyBlurAnchor.width, "right", 0), win._dpr) : 0
-        y: _active ? Theme.snap(win._popoutConnectorY(_popoutBodyBlurAnchor.y, _popoutBodyBlurAnchor.height, "right", 0), win._dpr) : 0
-        width: _active ? _w : 0
-        height: _active ? _h : 0
-    }
-
-    Item {
-        id: _popoutLeftConnectorCutout
-        opacity: 0
-
-        readonly property bool _active: _popoutLeftConnectorBlurAnchor.width > 0 && _popoutLeftConnectorBlurAnchor.height > 0
-        readonly property string _arcCorner: win._connectorArcCorner(ConnectedModeState.popoutBarSide, "left")
-
-        x: _active ? win._connectorCutoutX(_popoutLeftConnectorBlurAnchor.x, _popoutLeftConnectorBlurAnchor.width, _arcCorner, win._effectivePopoutCcr) : 0
-        y: _active ? win._connectorCutoutY(_popoutLeftConnectorBlurAnchor.y, _popoutLeftConnectorBlurAnchor.height, _arcCorner, win._effectivePopoutCcr) : 0
-        width: _active ? win._effectivePopoutCcr * 2 : 0
-        height: _active ? win._effectivePopoutCcr * 2 : 0
-    }
-
-    Item {
-        id: _popoutRightConnectorCutout
-        opacity: 0
-
-        readonly property bool _active: _popoutRightConnectorBlurAnchor.width > 0 && _popoutRightConnectorBlurAnchor.height > 0
-        readonly property string _arcCorner: win._connectorArcCorner(ConnectedModeState.popoutBarSide, "right")
-
-        x: _active ? win._connectorCutoutX(_popoutRightConnectorBlurAnchor.x, _popoutRightConnectorBlurAnchor.width, _arcCorner, win._effectivePopoutCcr) : 0
-        y: _active ? win._connectorCutoutY(_popoutRightConnectorBlurAnchor.y, _popoutRightConnectorBlurAnchor.height, _arcCorner, win._effectivePopoutCcr) : 0
-        width: _active ? win._effectivePopoutCcr * 2 : 0
-        height: _active ? win._effectivePopoutCcr * 2 : 0
-    }
-
-    Item {
-        id: _dockLeftConnectorBlurAnchor
-        opacity: 0
-
-        readonly property bool _active: _dockBodyBlurAnchor._active && win._dockConnectorRadius() > 0
-        readonly property real _w: win._dockConnectorWidth(0)
-        readonly property real _h: win._dockConnectorHeight(0)
-
-        x: _active ? Theme.snap(win._dockConnectorX(_dockBodyBlurAnchor.x, _dockBodyBlurAnchor.width, "left", 0), win._dpr) : 0
-        y: _active ? Theme.snap(win._dockConnectorY(_dockBodyBlurAnchor.y, _dockBodyBlurAnchor.height, "left", 0), win._dpr) : 0
-        width: _active ? _w : 0
-        height: _active ? _h : 0
-    }
-
-    Item {
-        id: _dockRightConnectorBlurAnchor
-        opacity: 0
-
-        readonly property bool _active: _dockBodyBlurAnchor._active && win._dockConnectorRadius() > 0
-        readonly property real _w: win._dockConnectorWidth(0)
-        readonly property real _h: win._dockConnectorHeight(0)
-
-        x: _active ? Theme.snap(win._dockConnectorX(_dockBodyBlurAnchor.x, _dockBodyBlurAnchor.width, "right", 0), win._dpr) : 0
-        y: _active ? Theme.snap(win._dockConnectorY(_dockBodyBlurAnchor.y, _dockBodyBlurAnchor.height, "right", 0), win._dpr) : 0
-        width: _active ? _w : 0
-        height: _active ? _h : 0
-    }
-
-    Item {
-        id: _dockLeftConnectorCutout
-        opacity: 0
-
-        readonly property bool _active: _dockLeftConnectorBlurAnchor.width > 0 && _dockLeftConnectorBlurAnchor.height > 0
-        readonly property string _arcCorner: win._connectorArcCorner(win._dockState.barSide, "left")
-
-        x: _active ? win._connectorCutoutX(_dockLeftConnectorBlurAnchor.x, _dockLeftConnectorBlurAnchor.width, _arcCorner, win._dockConnectorRadius()) : 0
-        y: _active ? win._connectorCutoutY(_dockLeftConnectorBlurAnchor.y, _dockLeftConnectorBlurAnchor.height, _arcCorner, win._dockConnectorRadius()) : 0
-        width: _active ? win._dockConnectorRadius() * 2 : 0
-        height: _active ? win._dockConnectorRadius() * 2 : 0
-    }
-
-    Item {
-        id: _dockRightConnectorCutout
-        opacity: 0
-
-        readonly property bool _active: _dockRightConnectorBlurAnchor.width > 0 && _dockRightConnectorBlurAnchor.height > 0
-        readonly property string _arcCorner: win._connectorArcCorner(win._dockState.barSide, "right")
-
-        x: _active ? win._connectorCutoutX(_dockRightConnectorBlurAnchor.x, _dockRightConnectorBlurAnchor.width, _arcCorner, win._dockConnectorRadius()) : 0
-        y: _active ? win._connectorCutoutY(_dockRightConnectorBlurAnchor.y, _dockRightConnectorBlurAnchor.height, _arcCorner, win._dockConnectorRadius()) : 0
-        width: _active ? win._dockConnectorRadius() * 2 : 0
-        height: _active ? win._dockConnectorRadius() * 2 : 0
-    }
-
-    Item {
-        id: _notifBodyBlurAnchor
-        visible: false
-
-        readonly property bool _active: win._frameActive && win._notifState.visible && win._notifState.bodyW > 0 && win._notifState.bodyH > 0
-
-        x: _active ? Theme.snap(win._notifState.bodyX, win._dpr) : 0
-        y: _active ? Theme.snap(win._notifState.bodyY, win._dpr) : 0
-        width: _active ? Theme.snap(win._notifState.bodyW, win._dpr) : 0
-        height: _active ? Theme.snap(win._notifState.bodyH, win._dpr) : 0
-    }
-
-    Item {
-        id: _notifBodyBlurCap
-        opacity: 0
-
-        readonly property string _side: win._notifState.barSide
-        readonly property bool _active: _notifBodyBlurAnchor._active && _notifBodyBlurAnchor.width > 0 && _notifBodyBlurAnchor.height > 0 && win._notifConnectorRadius() > 0
-        readonly property real _capWidth: (_side === "left" || _side === "right") ? Math.min(win._notifConnectorRadius(), _notifBodyBlurAnchor.width) : _notifBodyBlurAnchor.width
-        readonly property real _capHeight: (_side === "top" || _side === "bottom") ? Math.min(win._notifConnectorRadius(), _notifBodyBlurAnchor.height) : _notifBodyBlurAnchor.height
-
-        x: !_active ? 0 : (_side === "right" ? _notifBodyBlurAnchor.x + _notifBodyBlurAnchor.width - _capWidth : _notifBodyBlurAnchor.x)
-        y: !_active ? 0 : (_side === "bottom" ? _notifBodyBlurAnchor.y + _notifBodyBlurAnchor.height - _capHeight : _notifBodyBlurAnchor.y)
-        width: _active ? _capWidth : 0
-        height: _active ? _capHeight : 0
-    }
-
-    Item {
-        id: _notifLeftConnectorBlurAnchor
-        opacity: 0
-
-        readonly property bool _active: _notifBodyBlurAnchor._active && win._notifConnectorRadius() > 0
-        readonly property real _w: win._notifConnectorWidth(0)
-        readonly property real _h: win._notifConnectorHeight(0)
-
-        x: _active ? Theme.snap(win._notifConnectorX(_notifBodyBlurAnchor.x, _notifBodyBlurAnchor.width, "left", 0), win._dpr) : 0
-        y: _active ? Theme.snap(win._notifConnectorY(_notifBodyBlurAnchor.y, _notifBodyBlurAnchor.height, "left", 0), win._dpr) : 0
-        width: _active ? _w : 0
-        height: _active ? _h : 0
-    }
-
-    Item {
-        id: _notifRightConnectorBlurAnchor
-        opacity: 0
-
-        readonly property bool _active: _notifBodyBlurAnchor._active && win._notifConnectorRadius() > 0
-        readonly property real _w: win._notifConnectorWidth(0)
-        readonly property real _h: win._notifConnectorHeight(0)
-
-        x: _active ? Theme.snap(win._notifConnectorX(_notifBodyBlurAnchor.x, _notifBodyBlurAnchor.width, "right", 0), win._dpr) : 0
-        y: _active ? Theme.snap(win._notifConnectorY(_notifBodyBlurAnchor.y, _notifBodyBlurAnchor.height, "right", 0), win._dpr) : 0
-        width: _active ? _w : 0
-        height: _active ? _h : 0
-    }
-
-    Item {
-        id: _notifLeftConnectorCutout
-        opacity: 0
-
-        readonly property bool _active: _notifLeftConnectorBlurAnchor.width > 0 && _notifLeftConnectorBlurAnchor.height > 0
-        readonly property string _arcCorner: win._connectorArcCorner(win._notifState.barSide, "left")
-
-        x: _active ? win._connectorCutoutX(_notifLeftConnectorBlurAnchor.x, _notifLeftConnectorBlurAnchor.width, _arcCorner, win._notifConnectorRadius()) : 0
-        y: _active ? win._connectorCutoutY(_notifLeftConnectorBlurAnchor.y, _notifLeftConnectorBlurAnchor.height, _arcCorner, win._notifConnectorRadius()) : 0
-        width: _active ? win._notifConnectorRadius() * 2 : 0
-        height: _active ? win._notifConnectorRadius() * 2 : 0
-    }
-
-    Item {
-        id: _notifRightConnectorCutout
-        opacity: 0
-
-        readonly property bool _active: _notifRightConnectorBlurAnchor.width > 0 && _notifRightConnectorBlurAnchor.height > 0
-        readonly property string _arcCorner: win._connectorArcCorner(win._notifState.barSide, "right")
-
-        x: _active ? win._connectorCutoutX(_notifRightConnectorBlurAnchor.x, _notifRightConnectorBlurAnchor.width, _arcCorner, win._notifConnectorRadius()) : 0
-        y: _active ? win._connectorCutoutY(_notifRightConnectorBlurAnchor.y, _notifRightConnectorBlurAnchor.height, _arcCorner, win._notifConnectorRadius()) : 0
-        width: _active ? win._notifConnectorRadius() * 2 : 0
-        height: _active ? win._notifConnectorRadius() * 2 : 0
-    }
-
-    Region {
-        id: _staticBlurRegion
-        x: 0
-        y: 0
-        width: win._windowRegionWidth
-        height: win._windowRegionHeight
-
-        // Frame cutout (always active when frame is on)
-        Region {
-            item: _blurCutout
-            intersection: Intersection.Subtract
-            radius: win._blurCutoutRadius
-        }
-
-        // ── Connected popout blur regions ──
-        Region {
-            item: _popoutBodyBlurAnchor
-            radius: win._surfaceRadius
-        }
-        Region {
-            item: _popoutBodyBlurCap
-        }
-        Region {
-            item: _popoutLeftConnectorBlurAnchor
-            Region {
-                item: _popoutLeftConnectorCutout
-                intersection: Intersection.Subtract
-                radius: win._effectivePopoutCcr
-            }
-        }
-        Region {
-            item: _popoutRightConnectorBlurAnchor
-            Region {
-                item: _popoutRightConnectorCutout
-                intersection: Intersection.Subtract
-                radius: win._effectivePopoutCcr
-            }
-        }
-
-        // ── Connected dock blur regions ──
-        Region {
-            item: _dockBodyBlurAnchor
-            radius: win._dockBodyBlurRadius()
-        }
-        Region {
-            item: _dockBodyBlurCap
-        }
-        Region {
-            item: _dockLeftConnectorBlurAnchor
-            Region {
-                item: _dockLeftConnectorCutout
-                intersection: Intersection.Subtract
-                radius: win._dockConnectorRadius()
-            }
-        }
-        Region {
-            item: _dockRightConnectorBlurAnchor
-            Region {
-                item: _dockRightConnectorCutout
-                intersection: Intersection.Subtract
-                radius: win._dockConnectorRadius()
-            }
-        }
-
-        Region {
-            item: _notifBodyBlurAnchor
-            radius: win._surfaceRadius
-        }
-        Region {
-            item: _notifBodyBlurCap
-        }
-        Region {
-            item: _notifLeftConnectorBlurAnchor
-            Region {
-                item: _notifLeftConnectorCutout
-                intersection: Intersection.Subtract
-                radius: win._notifConnectorRadius()
-            }
-        }
-        Region {
-            item: _notifRightConnectorBlurAnchor
-            Region {
-                item: _notifRightConnectorCutout
-                intersection: Intersection.Subtract
-                radius: win._notifConnectorRadius()
-            }
-        }
-    }
-
-    // ─── Connector position helpers ────────────────────────────────────────
-
-    function _dockBodyBlurRadius() {
-        return _dockBodyBlurAnchor._active ? Math.max(0, Math.min(win._surfaceRadius, _dockBodyBlurAnchor.width / 2, _dockBodyBlurAnchor.height / 2)) : win._surfaceRadius;
-    }
-
-    function _dockConnectorRadius() {
-        if (!_dockBodyBlurAnchor._active)
-            return win._ccr;
-        const dockSide = win._dockState.barSide;
-        const thickness = (dockSide === "left" || dockSide === "right") ? _dockBodyBlurAnchor.width : _dockBodyBlurAnchor.height;
-        const bodyRadius = win._dockBodyBlurRadius();
-        const maxConnectorRadius = Math.max(0, thickness - bodyRadius - win._seamOverlap);
-        return Math.max(0, Math.min(win._ccr, bodyRadius, maxConnectorRadius));
-    }
-
-    function _dockConnectorWidth(spacing) {
-        const isVert = win._dockState.barSide === "left" || win._dockState.barSide === "right";
-        const radius = win._dockConnectorRadius();
-        return isVert ? (spacing + radius) : radius;
-    }
-
-    function _dockConnectorHeight(spacing) {
-        const isVert = win._dockState.barSide === "left" || win._dockState.barSide === "right";
-        const radius = win._dockConnectorRadius();
-        return isVert ? radius : (spacing + radius);
-    }
-
-    function _dockConnectorX(baseX, bodyWidth, placement, spacing) {
-        const dockSide = win._dockState.barSide;
-        const isVert = dockSide === "left" || dockSide === "right";
-        const seamX = !isVert ? (placement === "left" ? baseX : baseX + bodyWidth) : (dockSide === "left" ? baseX : baseX + bodyWidth);
-        const w = _dockConnectorWidth(spacing);
-        if (!isVert)
-            return placement === "left" ? seamX - w : seamX;
-        return dockSide === "left" ? seamX : seamX - w;
-    }
-
-    function _dockConnectorY(baseY, bodyHeight, placement, spacing) {
-        const dockSide = win._dockState.barSide;
-        const seamY = dockSide === "top" ? baseY : dockSide === "bottom" ? baseY + bodyHeight : (placement === "left" ? baseY : baseY + bodyHeight);
-        const h = _dockConnectorHeight(spacing);
-        if (dockSide === "top")
-            return seamY;
-        if (dockSide === "bottom")
-            return seamY - h;
-        return placement === "left" ? seamY - h : seamY;
-    }
-
-    function _notifConnectorRadius() {
-        return win._effectiveNotifCcr;
-    }
-
-    function _notifConnectorWidth(spacing) {
-        const isVert = win._notifState.barSide === "left" || win._notifState.barSide === "right";
-        const radius = win._notifConnectorRadius();
-        return isVert ? (spacing + radius) : radius;
-    }
-
-    function _notifConnectorHeight(spacing) {
-        const isVert = win._notifState.barSide === "left" || win._notifState.barSide === "right";
-        const radius = win._notifConnectorRadius();
-        return isVert ? radius : (spacing + radius);
-    }
-
-    function _notifConnectorX(baseX, bodyWidth, placement, spacing) {
-        const notifSide = win._notifState.barSide;
-        const isVert = notifSide === "left" || notifSide === "right";
-        const seamX = !isVert ? (placement === "left" ? baseX : baseX + bodyWidth) : (notifSide === "left" ? baseX : baseX + bodyWidth);
-        const w = _notifConnectorWidth(spacing);
-        if (!isVert)
-            return placement === "left" ? seamX - w : seamX;
-        return notifSide === "left" ? seamX : seamX - w;
-    }
-
-    function _notifConnectorY(baseY, bodyHeight, placement, spacing) {
-        const notifSide = win._notifState.barSide;
-        const seamY = notifSide === "top" ? baseY : notifSide === "bottom" ? baseY + bodyHeight : (placement === "left" ? baseY : baseY + bodyHeight);
-        const h = _notifConnectorHeight(spacing);
-        if (notifSide === "top")
-            return seamY;
-        if (notifSide === "bottom")
-            return seamY - h;
-        return placement === "left" ? seamY - h : seamY;
-    }
-
-    function _popoutConnectorWidth(spacing) {
-        const isVert = ConnectedModeState.popoutBarSide === "left" || ConnectedModeState.popoutBarSide === "right";
-        const radius = win._effectivePopoutCcr;
-        return isVert ? (spacing + radius) : radius;
-    }
-
-    function _popoutConnectorHeight(spacing) {
-        const isVert = ConnectedModeState.popoutBarSide === "left" || ConnectedModeState.popoutBarSide === "right";
-        const radius = win._effectivePopoutCcr;
-        return isVert ? radius : (spacing + radius);
-    }
-
-    function _popoutConnectorX(baseX, bodyWidth, placement, spacing) {
-        const popoutSide = ConnectedModeState.popoutBarSide;
-        const isVert = popoutSide === "left" || popoutSide === "right";
-        const seamX = !isVert ? (placement === "left" ? baseX : baseX + bodyWidth) : (popoutSide === "left" ? baseX : baseX + bodyWidth);
-        const w = _popoutConnectorWidth(spacing);
-        if (!isVert)
-            return placement === "left" ? seamX - w : seamX;
-        return popoutSide === "left" ? seamX : seamX - w;
-    }
-
-    function _popoutConnectorY(baseY, bodyHeight, placement, spacing) {
-        const popoutSide = ConnectedModeState.popoutBarSide;
-        const seamY = popoutSide === "top" ? baseY : popoutSide === "bottom" ? baseY + bodyHeight : (placement === "left" ? baseY : baseY + bodyHeight);
-        const h = _popoutConnectorHeight(spacing);
-        if (popoutSide === "top")
-            return seamY;
-        if (popoutSide === "bottom")
-            return seamY - h;
-        return placement === "left" ? seamY - h : seamY;
-    }
-
-    function _popoutFillOverlapX() {
-        return (ConnectedModeState.popoutBarSide === "top" || ConnectedModeState.popoutBarSide === "bottom") ? win._seamOverlap : 0;
-    }
-
-    function _popoutFillOverlapY() {
-        return (ConnectedModeState.popoutBarSide === "left" || ConnectedModeState.popoutBarSide === "right") ? win._seamOverlap : 0;
-    }
-
-    function _dockFillOverlapX() {
-        return (win._dockState.barSide === "top" || win._dockState.barSide === "bottom") ? win._seamOverlap : 0;
-    }
-
-    function _dockFillOverlapY() {
-        return (win._dockState.barSide === "left" || win._dockState.barSide === "right") ? win._seamOverlap : 0;
-    }
-
-    function _popoutArcExtent() {
-        return (ConnectedModeState.popoutBarSide === "top" || ConnectedModeState.popoutBarSide === "bottom") ? _popoutBodyBlurAnchor.height : _popoutBodyBlurAnchor.width;
-    }
-
-    function _popoutArcVisible() {
-        if (!_popoutBodyBlurAnchor._active || _popoutBodyBlurAnchor.width <= 0 || _popoutBodyBlurAnchor.height <= 0)
-            return false;
-        return win._popoutArcExtent() >= win._ccr * (1 + win._ccr * 0.02);
-    }
-
-    function _popoutBlurCapThickness() {
-        const extent = win._popoutArcExtent();
-        return Math.max(0, Math.min(win._effectivePopoutCcr, extent - win._surfaceRadius));
-    }
-
-    function _popoutChromeX() {
-        const barSide = ConnectedModeState.popoutBarSide;
-        return ConnectedModeState.popoutBodyX - ((barSide === "top" || barSide === "bottom") ? win._effectivePopoutCcr : 0);
-    }
-
-    function _popoutChromeY() {
-        const barSide = ConnectedModeState.popoutBarSide;
-        return ConnectedModeState.popoutBodyY - ((barSide === "left" || barSide === "right") ? win._effectivePopoutCcr : 0);
-    }
-
-    function _popoutChromeWidth() {
-        const barSide = ConnectedModeState.popoutBarSide;
-        return ConnectedModeState.popoutBodyW + ((barSide === "top" || barSide === "bottom") ? win._effectivePopoutCcr * 2 : 0);
-    }
-
-    function _popoutChromeHeight() {
-        const barSide = ConnectedModeState.popoutBarSide;
-        return ConnectedModeState.popoutBodyH + ((barSide === "left" || barSide === "right") ? win._effectivePopoutCcr * 2 : 0);
-    }
-
-    function _popoutClipX() {
-        return _popoutBodyBlurAnchor.x - win._popoutChromeX() - win._popoutFillOverlapX();
-    }
-
-    function _popoutClipY() {
-        return _popoutBodyBlurAnchor.y - win._popoutChromeY() - win._popoutFillOverlapY();
-    }
-
-    function _popoutClipWidth() {
-        return _popoutBodyBlurAnchor.width + win._popoutFillOverlapX() * 2;
-    }
-
-    function _popoutClipHeight() {
-        return _popoutBodyBlurAnchor.height + win._popoutFillOverlapY() * 2;
-    }
-
-    function _popoutBodyXInClip() {
-        return (ConnectedModeState.popoutBarSide === "left" ? _popoutBodyBlurAnchor._dxClamp : 0) - win._popoutFillOverlapX();
-    }
-
-    function _popoutBodyYInClip() {
-        return (ConnectedModeState.popoutBarSide === "top" ? _popoutBodyBlurAnchor._dyClamp : 0) - win._popoutFillOverlapY();
-    }
-
-    function _popoutBodyFullWidth() {
-        return ConnectedModeState.popoutBodyW + win._popoutFillOverlapX() * 2;
-    }
-
-    function _popoutBodyFullHeight() {
-        return ConnectedModeState.popoutBodyH + win._popoutFillOverlapY() * 2;
-    }
-
-    function _dockChromeX() {
-        const dockSide = win._dockState.barSide;
-        return _dockBodyBlurAnchor.x - ((dockSide === "top" || dockSide === "bottom") ? win._dockConnectorRadius() : 0);
-    }
-
-    function _dockChromeY() {
-        const dockSide = win._dockState.barSide;
-        return _dockBodyBlurAnchor.y - ((dockSide === "left" || dockSide === "right") ? win._dockConnectorRadius() : 0);
-    }
-
-    function _dockChromeWidth() {
-        const dockSide = win._dockState.barSide;
-        return _dockBodyBlurAnchor.width + ((dockSide === "top" || dockSide === "bottom") ? win._dockConnectorRadius() * 2 : 0);
-    }
-
-    function _dockChromeHeight() {
-        const dockSide = win._dockState.barSide;
-        return _dockBodyBlurAnchor.height + ((dockSide === "left" || dockSide === "right") ? win._dockConnectorRadius() * 2 : 0);
-    }
-
-    function _dockBodyXInChrome() {
-        return ((win._dockState.barSide === "top" || win._dockState.barSide === "bottom") ? win._dockConnectorRadius() : 0) - win._dockFillOverlapX();
-    }
-
-    function _dockBodyYInChrome() {
-        return ((win._dockState.barSide === "left" || win._dockState.barSide === "right") ? win._dockConnectorRadius() : 0) - win._dockFillOverlapY();
-    }
-
-    function _connectorArcCorner(barSide, placement) {
-        if (barSide === "top")
-            return placement === "left" ? "bottomLeft" : "bottomRight";
-        if (barSide === "bottom")
-            return placement === "left" ? "topLeft" : "topRight";
-        if (barSide === "left")
-            return placement === "left" ? "topRight" : "bottomRight";
-        return placement === "left" ? "topLeft" : "bottomLeft";
-    }
-
-    function _connectorCutoutX(connectorX, connectorWidth, arcCorner, radius) {
-        const r = radius === undefined ? win._effectivePopoutCcr : radius;
-        return (arcCorner === "topLeft" || arcCorner === "bottomLeft") ? connectorX - r : connectorX + connectorWidth - r;
-    }
-
-    function _connectorCutoutY(connectorY, connectorHeight, arcCorner, radius) {
-        const r = radius === undefined ? win._effectivePopoutCcr : radius;
-        return (arcCorner === "topLeft" || arcCorner === "topRight") ? connectorY - r : connectorY + connectorHeight - r;
-    }
-
-    // ─── Blur build / teardown ────────────────────────────────────────────────
-
-    function _buildBlur() {
-        try {
-            if (!BlurService.enabled || !SettingsData.frameBlurEnabled || !win._frameActive || !win.visible) {
-                win.BackgroundEffect.blurRegion = null;
-                return;
-            }
-            win.BackgroundEffect.blurRegion = _staticBlurRegion;
-        } catch (e) {
-            console.warn("FrameWindow: Failed to set blur region:", e);
-        }
-    }
-
-    function _teardownBlur() {
-        try {
-            win.BackgroundEffect.blurRegion = null;
-        } catch (e) {}
-    }
-
-    Timer {
-        id: _blurRebuildTimer
-        interval: 1
-        onTriggered: win._buildBlur()
-    }
-
-    Connections {
-        target: SettingsData
-        function onFrameBlurEnabledChanged() {
-            _blurRebuildTimer.restart();
-        }
-        function onFrameEnabledChanged() {
-            _blurRebuildTimer.restart();
-        }
-        function onFrameThicknessChanged() {
-            _blurRebuildTimer.restart();
-        }
-        function onFrameBarSizeChanged() {
-            _blurRebuildTimer.restart();
-        }
-        function onFrameOpacityChanged() {
-            _blurRebuildTimer.restart();
-        }
-        function onFrameRoundingChanged() {
-            _blurRebuildTimer.restart();
-        }
-        function onFrameScreenPreferencesChanged() {
-            _blurRebuildTimer.restart();
-        }
-        function onBarConfigsChanged() {
-            _blurRebuildTimer.restart();
-        }
-        function onConnectedFrameModeActiveChanged() {
-            _blurRebuildTimer.restart();
-        }
-    }
-
-    Connections {
-        target: BlurService
-        function onEnabledChanged() {
-            _blurRebuildTimer.restart();
-        }
-    }
-
-    onVisibleChanged: {
-        if (visible) {
-            _blurRebuildTimer.restart();
-        } else {
-            _teardownBlur();
-        }
-    }
-
-    Component.onCompleted: Qt.callLater(() => win._buildBlur())
-    Component.onDestruction: win._teardownBlur()
-
-    // ─── Frame border ─────────────────────────────────────────────────────────
-
-    FrameBorder {
-        anchors.fill: parent
-        visible: win._frameActive && !win._connectedActive
-        cutoutTopInset: win.cutoutTopInset
-        cutoutBottomInset: win.cutoutBottomInset
-        cutoutLeftInset: win.cutoutLeftInset
-        cutoutRightInset: win.cutoutRightInset
-        cutoutRadius: win.cutoutRadius
-    }
-
-    // ─── Connected chrome fills ───────────────────────────────────────────────
-
-    Item {
-        id: _connectedSurfaceLayer
-        anchors.fill: parent
-        visible: win._connectedActive
-        opacity: win._surfaceOpacity
-        // Skip FBO when disabled, or when neither elevation nor alpha blend is active
-        layer.enabled: !win._disableLayer && (Theme.elevationEnabled || win._surfaceOpacity < 1)
-        layer.smooth: false
-
-        layer.effect: MultiEffect {
-            readonly property var level: Theme.elevationLevel2
-            readonly property real _shadowBlur: Theme.elevationEnabled ? (level && level.blurPx !== undefined ? level.blurPx : 0) : 0
-            readonly property real _shadowSpread: Theme.elevationEnabled ? (level && level.spreadPx !== undefined ? level.spreadPx : 0) : 0
-
-            autoPaddingEnabled: true
-            blurEnabled: false
-            maskEnabled: false
-
-            shadowEnabled: !win._disableLayer && Theme.elevationEnabled
-            shadowBlur: Math.max(0, Math.min(1, _shadowBlur / Math.max(1, Theme.elevationBlurMax)))
-            shadowScale: 1 + (2 * _shadowSpread) / Math.max(1, Math.min(_connectedSurfaceLayer.width, _connectedSurfaceLayer.height))
-            shadowHorizontalOffset: Theme.elevationOffsetXFor(level, Theme.elevationLightDirection, 4)
-            shadowVerticalOffset: Theme.elevationOffsetYFor(level, Theme.elevationLightDirection, 4)
-            shadowColor: Theme.elevationShadowColor(level)
-            shadowOpacity: 1
-        }
-
-        FrameBorder {
-            anchors.fill: parent
-            borderColor: win._opaqueSurfaceColor
-            cutoutTopInset: win.cutoutTopInset
-            cutoutBottomInset: win.cutoutBottomInset
-            cutoutLeftInset: win.cutoutLeftInset
-            cutoutRightInset: win.cutoutRightInset
-            cutoutRadius: win.cutoutRadius
-        }
-
-        Item {
-            id: _connectedChrome
-            anchors.fill: parent
-            visible: true
-
-            Item {
-                id: _popoutChrome
-                visible: ConnectedModeState.popoutVisible && ConnectedModeState.popoutScreen === win._screenName
-                x: win._popoutChromeX()
-                y: win._popoutChromeY()
-                width: win._popoutChromeWidth()
-                height: win._popoutChromeHeight()
-
-                Item {
-                    id: _popoutClip
-                    readonly property bool _barHoriz: ConnectedModeState.popoutBarSide === "top" || ConnectedModeState.popoutBarSide === "bottom"
-                    // Expand clip by ccr on bar axis to include arc columns
-                    x: win._popoutClipX() - (_barHoriz ? win._effectivePopoutCcr : 0)
-                    y: win._popoutClipY() - (_barHoriz ? 0 : win._effectivePopoutCcr)
-                    width: win._popoutClipWidth() + (_barHoriz ? win._effectivePopoutCcr * 2 : 0)
-                    height: win._popoutClipHeight() + (_barHoriz ? 0 : win._effectivePopoutCcr * 2)
-                    clip: true
-
-                    ConnectedShape {
-                        id: _popoutShape
-                        visible: _popoutBodyBlurAnchor._active && _popoutBodyBlurAnchor.width > 0 && _popoutBodyBlurAnchor.height > 0
-                        barSide: ConnectedModeState.popoutBarSide
-                        bodyWidth: win._popoutClipWidth()
-                        bodyHeight: win._popoutClipHeight()
-                        connectorRadius: win._effectivePopoutCcr
-                        surfaceRadius: win._surfaceRadius
-                        fillColor: win._opaqueSurfaceColor
-                        x: 0
-                        y: 0
-                    }
-                }
-            }
-
-            Item {
-                id: _dockChrome
-                visible: _dockBodyBlurAnchor._active
-                x: win._dockChromeX()
-                y: win._dockChromeY()
-                width: win._dockChromeWidth()
-                height: win._dockChromeHeight()
-
-                Rectangle {
-                    id: _dockFill
-                    x: win._dockBodyXInChrome()
-                    y: win._dockBodyYInChrome()
-                    width: _dockBodyBlurAnchor.width + win._dockFillOverlapX() * 2
-                    height: _dockBodyBlurAnchor.height + win._dockFillOverlapY() * 2
-                    color: win._opaqueSurfaceColor
-                    z: 1
-
-                    readonly property string _dockSide: win._dockState.barSide
-                    readonly property real _dockRadius: win._dockBodyBlurRadius()
-                    topLeftRadius: (_dockSide === "top" || _dockSide === "left") ? 0 : _dockRadius
-                    topRightRadius: (_dockSide === "top" || _dockSide === "right") ? 0 : _dockRadius
-                    bottomLeftRadius: (_dockSide === "bottom" || _dockSide === "left") ? 0 : _dockRadius
-                    bottomRightRadius: (_dockSide === "bottom" || _dockSide === "right") ? 0 : _dockRadius
-                }
-
-                ConnectedCorner {
-                    id: _connDockLeft
-                    visible: _dockBodyBlurAnchor._active
-                    barSide: win._dockState.barSide
-                    placement: "left"
-                    spacing: 0
-                    connectorRadius: win._dockConnectorRadius()
-                    color: win._opaqueSurfaceColor
-                    dpr: win._dpr
-                    x: Theme.snap(win._dockConnectorX(_dockBodyBlurAnchor.x, _dockBodyBlurAnchor.width, "left", 0) - _dockChrome.x, win._dpr)
-                    y: Theme.snap(win._dockConnectorY(_dockBodyBlurAnchor.y, _dockBodyBlurAnchor.height, "left", 0) - _dockChrome.y, win._dpr)
-                }
-
-                ConnectedCorner {
-                    id: _connDockRight
-                    visible: _dockBodyBlurAnchor._active
-                    barSide: win._dockState.barSide
-                    placement: "right"
-                    spacing: 0
-                    connectorRadius: win._dockConnectorRadius()
-                    color: win._opaqueSurfaceColor
-                    dpr: win._dpr
-                    x: Theme.snap(win._dockConnectorX(_dockBodyBlurAnchor.x, _dockBodyBlurAnchor.width, "right", 0) - _dockChrome.x, win._dpr)
-                    y: Theme.snap(win._dockConnectorY(_dockBodyBlurAnchor.y, _dockBodyBlurAnchor.height, "right", 0) - _dockChrome.y, win._dpr)
-                }
-            }
-        }
-
-        Item {
-            id: _notifChrome
-            visible: _notifBodyBlurAnchor._active
-
-            readonly property string _notifSide: win._notifState.barSide
-            readonly property bool _isHoriz: _notifSide === "top" || _notifSide === "bottom"
-            readonly property real _notifCcr: win._effectiveNotifCcr
-            readonly property real _sideUnderlap: _isHoriz ? 0 : win._seamOverlap
-            readonly property real _bodyW: Theme.snap(_notifBodyBlurAnchor.width + _sideUnderlap, win._dpr)
-            readonly property real _bodyH: Theme.snap(_notifBodyBlurAnchor.height, win._dpr)
-
-            z: _isHoriz ? 0 : -1
-            x: Theme.snap(_notifBodyBlurAnchor.x - (_isHoriz ? _notifCcr : (_notifSide === "left" ? _sideUnderlap : 0)), win._dpr)
-            y: Theme.snap(_notifBodyBlurAnchor.y - (_isHoriz ? 0 : _notifCcr), win._dpr)
-            width: _isHoriz ? Theme.snap(_bodyW + _notifCcr * 2, win._dpr) : _bodyW
-            height: Theme.snap(_bodyH + (_isHoriz ? 0 : _notifCcr * 2), win._dpr)
-
-            ConnectedShape {
-                visible: _notifBodyBlurAnchor._active && _notifBodyBlurAnchor.width > 0 && _notifBodyBlurAnchor.height > 0
-                barSide: _notifChrome._notifSide
-                bodyWidth: _notifChrome._bodyW
-                bodyHeight: _notifChrome._bodyH
-                connectorRadius: _notifChrome._notifCcr
-                surfaceRadius: win._surfaceRadius
-                fillColor: win._opaqueSurfaceColor
-                x: 0
-                y: 0
-            }
-        }
-    }
-}

quickshell/Modules/Lock/LockScreenContent.qml

@@ -1338,7 +1338,7 @@ Item {
                             enabled: MprisController.activePlayer?.canGoPrevious ?? false
                             hoverEnabled: enabled
                             cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            onClicked: MprisController.previousOrRewind()
+                            onClicked: MprisController.activePlayer?.previous()
                         }
                     }
 

quickshell/Modules/Notifications/Center/NotificationCard.qml

@@ -34,12 +34,11 @@ Rectangle {
     readonly property real actionButtonHeight: compactMode ? 20 : 24
     readonly property real collapsedContentHeight: Math.max(iconSize, Theme.fontSizeSmall * 1.2 + Theme.fontSizeMedium * 1.2 + Theme.fontSizeSmall * 1.2 * (compactMode ? 1 : 2))
     readonly property real baseCardHeight: cardPadding * 2 + collapsedContentHeight + actionButtonHeight + contentSpacing
-    readonly property bool connectedFrameMode: SettingsData.connectedFrameModeActive
 
     width: parent ? parent.width : 400
     height: expanded ? (expandedContent.height + cardPadding * 2) : (baseCardHeight + collapsedContent.extraHeight)
     readonly property real targetHeight: expanded ? (expandedContent.height + cardPadding * 2) : (baseCardHeight + collapsedContent.extraHeight)
-    radius: connectedFrameMode ? Theme.connectedSurfaceRadius : Theme.cornerRadius
+    radius: Theme.cornerRadius
     scale: (cardHoverHandler.hovered ? 1.004 : 1.0) * listLevelAdjacentScaleInfluence
     readonly property bool shadowsAllowed: Theme.elevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
     readonly property var shadowElevation: Theme.elevationLevel1
@@ -101,8 +100,6 @@ Rectangle {
         if (keyboardNavigationActive && expanded && selectedNotificationIndex >= 0) {
             return Theme.primaryHoverLight;
         }
-        if (connectedFrameMode)
-            return Theme.popupLayerColor(Theme.surfaceContainerHigh);
         return Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency);
     }
     border.color: {
@@ -962,9 +959,9 @@ Rectangle {
     Behavior on height {
         enabled: root.__initialized && root.userInitiatedExpansion && root.animateExpansion
         NumberAnimation {
-            duration: root.connectedFrameMode ? Theme.variantDuration(Theme.popoutAnimationDuration, root.expanded) : (root.expanded ? Theme.notificationExpandDuration : Theme.notificationCollapseDuration)
+            duration: root.expanded ? Theme.notificationExpandDuration : Theme.notificationCollapseDuration
             easing.type: Easing.BezierSpline
-            easing.bezierCurve: root.connectedFrameMode ? (root.expanded ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve) : Theme.expressiveCurves.emphasized
+            easing.bezierCurve: Theme.expressiveCurves.emphasized
             onRunningChanged: {
                 if (running) {
                     root.isAnimating = true;

quickshell/Modules/Notifications/Center/NotificationCenterPopout.qml

@@ -39,9 +39,11 @@ DankPopout {
         }
     }
 
-    popupWidth: 400
+    popupWidth: triggerScreen ? Math.min(500, Math.max(380, triggerScreen.width - 48)) : 400
     popupHeight: stablePopupHeight
     positioning: ""
+    animationScaleCollapsed: 0.94
+    animationOffset: 0
     suspendShadowWhileResizing: false
 
     screen: triggerScreen

quickshell/Modules/Notifications/Popup/NotificationPopup.qml

@@ -10,29 +10,13 @@ import qs.Widgets
 PanelWindow {
     id: win
 
-    readonly property bool connectedFrameMode: SettingsData.frameEnabled
-        && Theme.isConnectedEffect
-        && SettingsData.isScreenInPreferences(win.screen, SettingsData.frameScreenPreferences)
-    readonly property string notifBarSide: {
-        const pos = SettingsData.notificationPopupPosition;
-        if (pos === -1) return "top";
-        switch (pos) {
-        case SettingsData.Position.Top: return "right";
-        case SettingsData.Position.Left: return "left";
-        case SettingsData.Position.BottomCenter: return "bottom";
-        case SettingsData.Position.Right: return "right";
-        case SettingsData.Position.Bottom: return "left";
-        default: return "top";
-        }
-    }
-
     WindowBlur {
         targetWindow: win
         blurX: content.x + content.cardInset + swipeTx.x + tx.x
         blurY: content.y + content.cardInset + swipeTx.y + tx.y
-        blurWidth: !win._finalized && !win.connectedFrameMode ? Math.max(0, content.width - content.cardInset * 2) : 0
-        blurHeight: !win._finalized && !win.connectedFrameMode ? Math.max(0, content.height - content.cardInset * 2) : 0
-        blurRadius: win.connectedFrameMode ? Theme.connectedSurfaceRadius : Theme.cornerRadius
+        blurWidth: !win._finalized ? Math.max(0, content.width - content.cardInset * 2) : 0
+        blurHeight: !win._finalized ? Math.max(0, content.height - content.cardInset * 2) : 0
+        blurRadius: Theme.cornerRadius
     }
 
     WlrLayershell.namespace: "dms:notification-popup"
@@ -41,15 +25,6 @@ PanelWindow {
     required property string notificationId
     readonly property bool hasValidData: notificationData && notificationData.notification
     readonly property alias hovered: cardHoverHandler.hovered
-    readonly property alias swipeActive: content.swipeActive
-    readonly property alias swipeDismissing: content.swipeDismissing
-    readonly property bool swipeDismissTowardEdge: {
-        if (content.swipeDismissing)
-            return _swipeDismissesTowardFrameEdge();
-        if (content.swipeActive)
-            return content.swipeOffset * _frameEdgeSwipeDirection() > 0;
-        return false;
-    }
     property int screenY: 0
     property bool exiting: false
     property bool _isDestroying: false
@@ -57,29 +32,6 @@ PanelWindow {
     property real _lastReportedAlignedHeight: -1
     property real _storedTopMargin: 0
     property real _storedBottomMargin: 0
-    readonly property bool directionalEffect: Theme.isDirectionalEffect
-    readonly property bool depthEffect: Theme.isDepthEffect
-    readonly property real entryTravel: {
-        const base = Math.abs(Theme.effectAnimOffset);
-        if (directionalEffect) {
-            if (isCenterPosition)
-                return Math.max(base, Math.round(content.height * 1.1));
-            return Math.max(base, Math.round(content.width * 0.95));
-        }
-        if (depthEffect)
-            return Math.max(base, 44);
-        return base;
-    }
-    readonly property real exitTravel: {
-        if (directionalEffect) {
-            if (isCenterPosition)
-                return Math.max(1, content.height);
-            return Math.max(1, content.width);
-        }
-        if (depthEffect)
-            return Math.round(entryTravel * 1.35);
-        return Anims.slidePx;
-    }
     readonly property string clearText: I18n.tr("Dismiss")
     property bool descriptionExpanded: false
     readonly property bool hasExpandableBody: (notificationData?.htmlBody || "").replace(/<[^>]*>/g, "").trim().length > 0
@@ -109,7 +61,6 @@ PanelWindow {
     signal exitStarted
     signal exitFinished
     signal popupHeightChanged
-    signal popupChromeGeometryChanged
 
     function startExit() {
         if (exiting || _isDestroying) {
@@ -117,7 +68,6 @@ PanelWindow {
         }
         exiting = true;
         exitStarted();
-        popupChromeGeometryChanged();
         exitAnim.restart();
         exitWatchdog.restart();
         if (NotificationService.removeFromVisibleNotifications)
@@ -197,8 +147,7 @@ PanelWindow {
             id: implicitHeightAnim
             duration: descriptionExpanded ? Theme.notificationExpandDuration : Theme.notificationCollapseDuration
             easing.type: Easing.BezierSpline
-            easing.bezierCurve: descriptionExpanded ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            onFinished: win.popupHeightChanged()
+            easing.bezierCurve: Theme.expressiveCurves.emphasized
         }
     }
 
@@ -246,8 +195,7 @@ PanelWindow {
     readonly property real maxPopupShadowBlurPx: Math.max((Theme.elevationLevel3 && Theme.elevationLevel3.blurPx !== undefined) ? Theme.elevationLevel3.blurPx : 12, (Theme.elevationLevel4 && Theme.elevationLevel4.blurPx !== undefined) ? Theme.elevationLevel4.blurPx : 16)
     readonly property real maxPopupShadowOffsetXPx: Math.max(Math.abs(Theme.elevationOffsetX(Theme.elevationLevel3)), Math.abs(Theme.elevationOffsetX(Theme.elevationLevel4)))
     readonly property real maxPopupShadowOffsetYPx: Math.max(Math.abs(Theme.elevationOffsetY(Theme.elevationLevel3, 6)), Math.abs(Theme.elevationOffsetY(Theme.elevationLevel4, 8)))
-    readonly property bool popupWindowShadowActive: Theme.elevationEnabled && SettingsData.notificationPopupShadowEnabled && !connectedFrameMode
-    readonly property real windowShadowPad: popupWindowShadowActive ? Theme.snap(Math.max(16, maxPopupShadowBlurPx + Math.max(maxPopupShadowOffsetXPx, maxPopupShadowOffsetYPx) + 8), dpr) : 0
+    readonly property real windowShadowPad: Theme.elevationEnabled && SettingsData.notificationPopupShadowEnabled ? Theme.snap(Math.max(16, maxPopupShadowBlurPx + Math.max(maxPopupShadowOffsetXPx, maxPopupShadowOffsetYPx) + 8), dpr) : 0
 
     anchors.top: true
     anchors.left: true
@@ -292,24 +240,12 @@ PanelWindow {
         });
     }
 
-    function _frameEdgeInset(side) {
-        if (!screen)
-            return 0;
-        const edges = SettingsData.getActiveBarEdgesForScreen(screen);
-        const raw = edges.includes(side) ? SettingsData.frameBarSize : SettingsData.frameThickness;
-        return Math.max(0, Math.round(Theme.px(raw, dpr)));
-    }
-
     function getTopMargin() {
         const popupPos = SettingsData.notificationPopupPosition;
         const isTop = isTopCenter || popupPos === SettingsData.Position.Top || popupPos === SettingsData.Position.Left;
         if (!isTop)
             return 0;
 
-        if (connectedFrameMode) {
-            const cornerClear = isCenterPosition ? 0 : (Theme.px(SettingsData.frameRounding, dpr) + Theme.px(Theme.connectedCornerRadius, dpr));
-            return _frameEdgeInset("top") + cornerClear + screenY;
-        }
         const barInfo = getBarInfo();
         const base = barInfo.topBar > 0 ? barInfo.topBar : Theme.popupDistance;
         return base + screenY;
@@ -321,10 +257,6 @@ PanelWindow {
         if (!isBottom)
             return 0;
 
-        if (connectedFrameMode) {
-            const cornerClear = isCenterPosition ? 0 : (Theme.px(SettingsData.frameRounding, dpr) + Theme.px(Theme.connectedCornerRadius, dpr));
-            return _frameEdgeInset("bottom") + cornerClear + screenY;
-        }
         const barInfo = getBarInfo();
         const base = barInfo.bottomBar > 0 ? barInfo.bottomBar : Theme.popupDistance;
         return base + screenY;
@@ -339,8 +271,6 @@ PanelWindow {
         if (!isLeft)
             return 0;
 
-        if (connectedFrameMode)
-            return _frameEdgeInset("left");
         const barInfo = getBarInfo();
         return barInfo.leftBar > 0 ? barInfo.leftBar : Theme.popupDistance;
     }
@@ -354,8 +284,6 @@ PanelWindow {
         if (!isRight)
             return 0;
 
-        if (connectedFrameMode)
-            return _frameEdgeInset("right");
         const barInfo = getBarInfo();
         return barInfo.rightBar > 0 ? barInfo.rightBar : Theme.popupDistance;
     }
@@ -400,89 +328,10 @@ PanelWindow {
         return Theme.snap(getContentY() - windowShadowPad, dpr);
     }
 
-    function _swipeDismissTarget() {
-        return (content.swipeDismissDirection < 0 ? -1 : 1) * content.width;
-    }
-
-    function _frameEdgeSwipeDirection() {
-        const popupPos = SettingsData.notificationPopupPosition;
-        return (popupPos === SettingsData.Position.Left || popupPos === SettingsData.Position.Bottom) ? -1 : 1;
-    }
-
-    function _swipeDismissesTowardFrameEdge() {
-        return content.swipeDismissDirection === _frameEdgeSwipeDirection();
-    }
-
-    function popupChromeMotionActive() {
-        return popupChromeOpenProgress() < 1 || exiting || content.swipeActive || content.swipeDismissing || Math.abs(content.swipeOffset) > 0.5;
-    }
-
-    function popupLayoutReservesSlot() {
-        return !content.swipeDismissing;
-    }
-
-    function popupChromeReservesSlot() {
-        return !content.swipeDismissing;
-    }
-
-    function _chromeMotionOffset() {
-        return isCenterPosition ? tx.y : tx.x;
-    }
-
-    function _chromeCardTravel() {
-        return Math.max(1, isCenterPosition ? alignedHeight : alignedWidth);
-    }
-
-    function popupChromeOpenProgress() {
-        if (exiting || content.swipeDismissing)
-            return 1;
-        return Math.max(0, Math.min(1, 1 - Math.abs(_chromeMotionOffset()) / _chromeCardTravel()));
-    }
-
-    function popupChromeReleaseProgress() {
-        if (exiting) {
-            const exitRel = Math.max(0, Math.min(1, Math.abs(_chromeMotionOffset()) / _chromeCardTravel()));
-            if (content.swipeDismissing) {
-                const swipeRel = Math.max(0, Math.min(1, Math.abs(content.swipeOffset) / Math.max(1, content.swipeTravelDistance)));
-                return Math.max(exitRel, swipeRel);
-            }
-            return exitRel;
-        }
-        if (content.swipeDismissing)
-            return Math.max(0, Math.min(1, Math.abs(content.swipeOffset) / Math.max(1, content.swipeTravelDistance)));
-        if (content.swipeActive && content.swipeOffset * _frameEdgeSwipeDirection() > 0)
-            return Math.max(0, Math.min(1, Math.abs(content.swipeOffset) / Math.max(1, content.swipeTravelDistance)));
-        return 0;
-    }
-
-    function popupChromeFollowsCardMotion() {
-        return false;
-    }
-
-    function popupChromeMotionX() {
-        if (!popupChromeMotionActive() || isCenterPosition)
-            return 0;
-        const motion = content.swipeOffset + tx.x;
-        if (content.swipeDismissing && !_swipeDismissesTowardFrameEdge())
-            return exiting ? Theme.snap(tx.x, dpr) : 0;
-        if (content.swipeActive && motion * _frameEdgeSwipeDirection() < 0)
-            return 0;
-        return Theme.snap(motion, dpr);
-    }
-
-    function popupChromeMotionY() {
-        return popupChromeMotionActive() ? Theme.snap(tx.y, dpr) : 0;
-    }
-
     readonly property bool screenValid: win.screen && !_isDestroying
     readonly property real dpr: screenValid ? CompositorService.getScreenScale(win.screen) : 1
     readonly property real alignedWidth: Theme.px(Math.max(0, implicitWidth - (windowShadowPad * 2)), dpr)
     readonly property real alignedHeight: Theme.px(Math.max(0, implicitHeight - (windowShadowPad * 2)), dpr)
-    onScreenYChanged: popupChromeGeometryChanged()
-    onScreenChanged: popupChromeGeometryChanged()
-    onConnectedFrameModeChanged: popupChromeGeometryChanged()
-    onAlignedWidthChanged: popupChromeGeometryChanged()
-    onAlignedHeightChanged: popupChromeGeometryChanged()
 
     Item {
         id: content
@@ -491,7 +340,7 @@ PanelWindow {
         y: Theme.snap(windowShadowPad, dpr)
         width: alignedWidth
         height: alignedHeight
-        visible: !win._finalized && !chromeOnlyExit
+        visible: !win._finalized
         scale: cardHoverHandler.hovered ? 1.01 : 1.0
         transformOrigin: Item.Center
 
@@ -503,27 +352,15 @@ PanelWindow {
         }
 
         property real swipeOffset: 0
-        property real swipeDismissDirection: 1
-        property bool chromeOnlyExit: false
-        readonly property real dismissThreshold: width * 0.35
+        readonly property real dismissThreshold: isCenterPosition ? height * 0.4 : width * 0.35
         readonly property real swipeFadeStartRatio: 0.75
-        readonly property real swipeTravelDistance: width
+        readonly property real swipeTravelDistance: isCenterPosition ? height : width
         readonly property real swipeFadeStartOffset: swipeTravelDistance * swipeFadeStartRatio
         readonly property real swipeFadeDistance: Math.max(1, swipeTravelDistance - swipeFadeStartOffset)
         readonly property bool swipeActive: swipeDragHandler.active
         property bool swipeDismissing: false
-        onSwipeDismissingChanged: {
-            if (!win.connectedFrameMode)
-                return;
-            win.popupHeightChanged();
-            win.popupChromeGeometryChanged();
-        }
-        onSwipeOffsetChanged: {
-            if (win.connectedFrameMode)
-                win.popupChromeGeometryChanged();
-        }
 
-        readonly property bool shadowsAllowed: win.popupWindowShadowActive
+        readonly property bool shadowsAllowed: Theme.elevationEnabled && SettingsData.notificationPopupShadowEnabled
         readonly property var elevLevel: cardHoverHandler.hovered ? Theme.elevationLevel4 : Theme.elevationLevel3
         readonly property real cardInset: Theme.snap(4, win.dpr)
         readonly property real shadowRenderPadding: shadowsAllowed ? Theme.snap(Math.max(16, shadowBlurPx + Math.max(Math.abs(shadowOffsetX), Math.abs(shadowOffsetY)) + 8), win.dpr) : 0
@@ -571,12 +408,8 @@ PanelWindow {
             sourceRect.y: content.shadowRenderPadding + content.cardInset
             sourceRect.width: Math.max(0, content.width - (content.cardInset * 2))
             sourceRect.height: Math.max(0, content.height - (content.cardInset * 2))
-            sourceRect.radius: win.connectedFrameMode ? Theme.connectedSurfaceRadius : Theme.cornerRadius
-            sourceRect.color: win.connectedFrameMode ? Theme.popupLayerColor(Theme.surfaceContainer) : Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-            sourceRect.antialiasing: true
-            sourceRect.layer.enabled: win.connectedFrameMode
-            sourceRect.layer.smooth: true
-            sourceRect.layer.textureSize: win.connectedFrameMode && win.dpr > 1 ? Qt.size(Math.ceil(sourceRect.width * win.dpr), Math.ceil(sourceRect.height * win.dpr)) : Qt.size(0, 0)
+            sourceRect.radius: Theme.cornerRadius
+            sourceRect.color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             sourceRect.border.color: notificationData && notificationData.urgency === NotificationUrgency.Critical ? Theme.withAlpha(Theme.primary, 0.3) : Theme.withAlpha(Theme.outline, 0.08)
             sourceRect.border.width: notificationData && notificationData.urgency === NotificationUrgency.Critical ? 2 : 0
 
@@ -614,10 +447,10 @@ PanelWindow {
         Rectangle {
             anchors.fill: parent
             anchors.margins: content.cardInset
-            radius: win.connectedFrameMode ? Theme.connectedSurfaceRadius : Theme.cornerRadius
+            radius: Theme.cornerRadius
             color: "transparent"
-            border.color: win.connectedFrameMode ? "transparent" : BlurService.borderColor
-            border.width: win.connectedFrameMode ? 0 : BlurService.borderWidth
+            border.color: BlurService.borderColor
+            border.width: BlurService.borderWidth
             z: 100
         }
 
@@ -1017,15 +850,14 @@ PanelWindow {
         DragHandler {
             id: swipeDragHandler
             target: null
-            xAxis.enabled: true
-            yAxis.enabled: false
+            xAxis.enabled: !isCenterPosition
+            yAxis.enabled: isCenterPosition
 
             onActiveChanged: {
                 if (active || win.exiting || content.swipeDismissing)
                     return;
 
                 if (Math.abs(content.swipeOffset) > content.dismissThreshold) {
-                    content.swipeDismissDirection = content.swipeOffset < 0 ? -1 : 1;
                     content.swipeDismissing = true;
                     swipeDismissAnim.start();
                 } else {
@@ -1037,7 +869,15 @@ PanelWindow {
                 if (win.exiting)
                     return;
 
-                content.swipeOffset = translation.x;
+                const raw = isCenterPosition ? translation.y : translation.x;
+                if (isTopCenter) {
+                    content.swipeOffset = Math.min(0, raw);
+                } else if (isBottomCenter) {
+                    content.swipeOffset = Math.max(0, raw);
+                } else {
+                    const isLeft = SettingsData.notificationPopupPosition === SettingsData.Position.Left || SettingsData.notificationPopupPosition === SettingsData.Position.Bottom;
+                    content.swipeOffset = isLeft ? Math.min(0, raw) : Math.max(0, raw);
+                }
             }
         }
 
@@ -1068,28 +908,20 @@ PanelWindow {
             id: swipeDismissAnim
             target: content
             property: "swipeOffset"
-            to: win._swipeDismissTarget()
+            to: isTopCenter ? -content.height : isBottomCenter ? content.height : (SettingsData.notificationPopupPosition === SettingsData.Position.Left || SettingsData.notificationPopupPosition === SettingsData.Position.Bottom ? -content.width : content.width)
             duration: Theme.notificationExitDuration
             easing.type: Easing.OutCubic
             onStopped: {
-                const inwardConnectedExit = win.connectedFrameMode && !win.isCenterPosition && !win._swipeDismissesTowardFrameEdge();
-                if (inwardConnectedExit)
-                    content.chromeOnlyExit = true;
-                if (win.connectedFrameMode) {
-                    win.startExit();
-                    NotificationService.dismissNotification(notificationData);
-                } else {
-                    NotificationService.dismissNotification(notificationData);
-                    win.forceExit();
-                }
+                NotificationService.dismissNotification(notificationData);
+                win.forceExit();
             }
         }
 
         transform: [
             Translate {
                 id: swipeTx
-                x: content.swipeOffset
-                y: 0
+                x: isCenterPosition ? 0 : content.swipeOffset
+                y: isCenterPosition ? content.swipeOffset : 0
             },
             Translate {
                 id: tx
@@ -1097,17 +929,9 @@ PanelWindow {
                     if (isCenterPosition)
                         return 0;
                     const isLeft = SettingsData.notificationPopupPosition === SettingsData.Position.Left || SettingsData.notificationPopupPosition === SettingsData.Position.Bottom;
-                    return isLeft ? -entryTravel : entryTravel;
-                }
-                y: isTopCenter ? -entryTravel : isBottomCenter ? entryTravel : 0
-                onXChanged: {
-                    if (win.connectedFrameMode)
-                        win.popupChromeGeometryChanged();
-                }
-                onYChanged: {
-                    if (win.connectedFrameMode)
-                        win.popupChromeGeometryChanged();
+                    return isLeft ? -Anims.slidePx : Anims.slidePx;
                 }
+                y: isTopCenter ? -Anims.slidePx : isBottomCenter ? Anims.slidePx : 0
             }
         ]
     }
@@ -1119,16 +943,16 @@ PanelWindow {
         property: isCenterPosition ? "y" : "x"
         from: {
             if (isTopCenter)
-                return -entryTravel;
+                return -Anims.slidePx;
             if (isBottomCenter)
-                return entryTravel;
+                return Anims.slidePx;
             const isLeft = SettingsData.notificationPopupPosition === SettingsData.Position.Left || SettingsData.notificationPopupPosition === SettingsData.Position.Bottom;
-            return isLeft ? -entryTravel : entryTravel;
+            return isLeft ? -Anims.slidePx : Anims.slidePx;
         }
         to: 0
         duration: Theme.notificationEnterDuration
         easing.type: Easing.BezierSpline
-        easing.bezierCurve: Theme.variantPopoutEnterCurve
+        easing.bezierCurve: isCenterPosition ? Theme.expressiveCurves.standardDecel : Theme.expressiveCurves.emphasizedDecel
         onStopped: {
             if (!win.exiting && !win._isDestroying) {
                 if (isCenterPosition) {
@@ -1153,35 +977,35 @@ PanelWindow {
             from: 0
             to: {
                 if (isTopCenter)
-                    return -exitTravel;
+                    return -Anims.slidePx;
                 if (isBottomCenter)
-                    return exitTravel;
+                    return Anims.slidePx;
                 const isLeft = SettingsData.notificationPopupPosition === SettingsData.Position.Left || SettingsData.notificationPopupPosition === SettingsData.Position.Bottom;
-                return isLeft ? -exitTravel : exitTravel;
+                return isLeft ? -Anims.slidePx : Anims.slidePx;
             }
             duration: Theme.notificationExitDuration
             easing.type: Easing.BezierSpline
-            easing.bezierCurve: Theme.variantPopoutExitCurve
+            easing.bezierCurve: Theme.expressiveCurves.emphasizedAccel
         }
 
         NumberAnimation {
             target: content
             property: "opacity"
             from: 1
-            to: Theme.isDirectionalEffect ? 1 : 0
+            to: 0
             duration: Theme.notificationExitDuration
             easing.type: Easing.BezierSpline
-            easing.bezierCurve: Theme.variantPopoutExitCurve
+            easing.bezierCurve: Theme.expressiveCurves.standardAccel
         }
 
         NumberAnimation {
             target: content
             property: "scale"
             from: 1
-            to: Theme.isDirectionalEffect ? 1 : Theme.effectScaleCollapsed
+            to: 0.98
             duration: Theme.notificationExitDuration
             easing.type: Easing.BezierSpline
-            easing.bezierCurve: Theme.variantPopoutExitCurve
+            easing.bezierCurve: Theme.expressiveCurves.emphasizedAccel
         }
     }
 

quickshell/Modules/Notifications/Popup/NotificationPopupManager.qml

@@ -8,44 +8,23 @@ QtObject {
     property var modelData
     property int topMargin: 0
     readonly property bool compactMode: SettingsData.notificationCompactMode
-    readonly property bool notificationConnectedMode: SettingsData.frameEnabled
-        && Theme.isConnectedEffect
-        && SettingsData.isScreenInPreferences(manager.modelData, SettingsData.frameScreenPreferences)
-    readonly property string notifBarSide: {
-        const pos = SettingsData.notificationPopupPosition;
-        if (pos === -1) return "top";
-        switch (pos) {
-        case SettingsData.Position.Top: return "right";
-        case SettingsData.Position.Left: return "left";
-        case SettingsData.Position.BottomCenter: return "bottom";
-        case SettingsData.Position.Right: return "right";
-        case SettingsData.Position.Bottom: return "left";
-        default: return "top";
-        }
-    }
     readonly property real cardPadding: compactMode ? Theme.notificationCardPaddingCompact : Theme.notificationCardPadding
     readonly property real popupIconSize: compactMode ? Theme.notificationIconSizeCompact : Theme.notificationIconSizeNormal
     readonly property real actionButtonHeight: compactMode ? 20 : 24
     readonly property real contentSpacing: compactMode ? Theme.spacingXS : Theme.spacingS
-    readonly property real popupSpacing: notificationConnectedMode ? 0 : (compactMode ? 0 : Theme.spacingXS)
+    readonly property real popupSpacing: compactMode ? 0 : Theme.spacingXS
     readonly property real collapsedContentHeight: Math.max(popupIconSize, Theme.fontSizeSmall * 1.2 + Theme.fontSizeMedium * 1.2 + Theme.fontSizeSmall * 1.2 * (compactMode ? 1 : 2))
     readonly property int baseNotificationHeight: cardPadding * 2 + collapsedContentHeight + actionButtonHeight + contentSpacing + popupSpacing
     property var popupWindows: []
     property var destroyingWindows: new Set()
     property var pendingDestroys: []
     property int destroyDelayMs: 100
-    property bool _chromeSyncPending: false
-    readonly property real chromeOpenProgressThreshold: 0.10
-    readonly property real chromeReleaseTailStart: 0.90
-    readonly property real chromeReleaseDropProgress: 0.995
     property Component popupComponent
 
     popupComponent: Component {
         NotificationPopup {
             onExitFinished: manager._onPopupExitFinished(this)
-            onExitStarted: manager._onPopupExitStarted(this)
             onPopupHeightChanged: manager._onPopupHeightChanged(this)
-            onPopupChromeGeometryChanged: manager._onPopupChromeGeometryChanged(this)
         }
     }
 
@@ -129,27 +108,6 @@ QtObject {
         return p && p.status !== Component.Null && !p._isDestroying && p.hasValidData;
     }
 
-    function _layoutWindows() {
-        return popupWindows.filter(p => _isValidWindow(p) && p.notificationData?.popup && !p.exiting && (!p.popupLayoutReservesSlot || p.popupLayoutReservesSlot()));
-    }
-
-    function _chromeWindows() {
-        return popupWindows.filter(p => {
-            if (!p || p.status === Component.Null || !p.visible || p._finalized || !p.hasValidData)
-                return false;
-            if (!p.notificationData?.popup && !p.exiting)
-                return false;
-            if (!p.exiting && p.popupChromeOpenProgress && p.popupChromeOpenProgress() < chromeOpenProgressThreshold)
-                return false;
-            // Keep the connected shell until the card is almost fully closed.
-            if (p.exiting && !p.swipeActive && p.popupChromeReleaseProgress) {
-                if (p.popupChromeReleaseProgress() > chromeReleaseDropProgress)
-                    return false;
-            }
-            return true;
-        });
-    }
-
     function _isFocusedScreen() {
         if (!SettingsData.notificationFocusedMonitor)
             return true;
@@ -158,24 +116,18 @@ QtObject {
     }
 
     function _sync(newWrappers) {
-        let needsReposition = false;
         for (const p of popupWindows.slice()) {
             if (!_isValidWindow(p) || p.exiting)
                 continue;
             if (p.notificationData && newWrappers.indexOf(p.notificationData) === -1) {
                 p.notificationData.removedByLimit = true;
                 p.notificationData.popup = false;
-                needsReposition = true;
             }
         }
         for (const w of newWrappers) {
-            if (w && !_hasWindowFor(w) && _isFocusedScreen()) {
+            if (w && !_hasWindowFor(w) && _isFocusedScreen())
                 _insertAtTop(w);
-                needsReposition = false;
-            }
         }
-        if (needsReposition)
-            _repositionAll();
     }
 
     function _popupHeight(p) {
@@ -205,7 +157,7 @@ QtObject {
     }
 
     function _repositionAll() {
-        const active = _layoutWindows();
+        const active = popupWindows.filter(p => _isValidWindow(p) && p.notificationData?.popup && !p.exiting);
 
         const pinnedSlots = [];
         for (const p of active) {
@@ -229,224 +181,6 @@ QtObject {
             win.screenY = currentY;
             currentY += _popupHeight(win);
         }
-        _scheduleNotificationChromeSync();
-    }
-
-    function _scheduleNotificationChromeSync() {
-        if (_chromeSyncPending)
-            return;
-        _chromeSyncPending = true;
-        Qt.callLater(() => {
-            _chromeSyncPending = false;
-            _syncNotificationChromeState();
-        });
-    }
-
-    function _clamp01(value) {
-        return Math.max(0, Math.min(1, value));
-    }
-
-    function _clipRectFromBarSide(rect, visibleFraction) {
-        const fraction = _clamp01(visibleFraction);
-        const w = Math.max(0, rect.right - rect.x);
-        const h = Math.max(0, rect.bottom - rect.y);
-
-        if (notifBarSide === "right") {
-            rect.x = rect.right - w * fraction;
-        } else if (notifBarSide === "left") {
-            rect.right = rect.x + w * fraction;
-        } else if (notifBarSide === "bottom") {
-            rect.y = rect.bottom - h * fraction;
-        } else {
-            rect.bottom = rect.y + h * fraction;
-        }
-        return rect;
-    }
-
-    function _popupChromeVisibleFraction(p) {
-        if (p.popupChromeReleaseProgress) {
-            const rel = p.popupChromeReleaseProgress();
-            if (p.exiting)
-                return Math.max(0, 1 - rel);
-            if (rel > 0)
-                return p.swipeDismissTowardEdge ? Math.max(0, 1 - rel) : 1 - _chromeReleaseTailProgress(rel);
-        }
-        if (p.popupChromeOpenProgress)
-            return _clamp01(p.popupChromeOpenProgress());
-        return 1;
-    }
-
-    function _popupChromeRect(p, useMotionOffset) {
-        if (!p || !p.screen)
-            return null;
-        const x = p.getContentX ? p.getContentX() : 0;
-        const y = p.getContentY ? p.getContentY() : 0;
-        const w = p.alignedWidth || 0;
-        const h = Math.max(p.alignedHeight || 0, baseNotificationHeight);
-        if (w <= 0 || h <= 0)
-            return null;
-        const rect = {
-            x: x,
-            y: y,
-            right: x + w,
-            bottom: y + h
-        };
-
-        if (!useMotionOffset)
-            return rect;
-
-        if (p.popupChromeFollowsCardMotion && p.popupChromeFollowsCardMotion()) {
-            const motionX = p.popupChromeMotionX ? p.popupChromeMotionX() : 0;
-            const motionY = p.popupChromeMotionY ? p.popupChromeMotionY() : 0;
-            rect.x += motionX;
-            rect.y += motionY;
-            rect.right += motionX;
-            rect.bottom += motionY;
-            return rect;
-        }
-
-        return _clipRectFromBarSide(rect, _popupChromeVisibleFraction(p));
-    }
-
-    function _chromeReleaseTailProgress(rawProgress) {
-        const progress = Math.max(0, Math.min(1, rawProgress));
-        if (progress <= chromeReleaseTailStart)
-            return 0;
-        return Math.max(0, Math.min(1, (progress - chromeReleaseTailStart) / Math.max(0.001, 1 - chromeReleaseTailStart)));
-    }
-
-    function _popupChromeBoundsRect(p, trailing, useMotionOffset) {
-        const rect = _popupChromeRect(p, useMotionOffset);
-        if (!rect || p !== trailing || !p.popupChromeReleaseProgress)
-            return rect;
-
-        const progress = _chromeReleaseTailProgress(p.popupChromeReleaseProgress());
-        if (progress <= 0)
-            return rect;
-
-        const anchorsTop = _stackAnchorsTop();
-        const h = Math.max(0, rect.bottom - rect.y);
-        const shrink = h * progress;
-        if (anchorsTop)
-            rect.bottom = Math.max(rect.y, rect.bottom - shrink);
-        else
-            rect.y = Math.min(rect.bottom, rect.y + shrink);
-        return rect;
-    }
-
-    function _stackAnchorsTop() {
-        const pos = SettingsData.notificationPopupPosition;
-        return pos === -1 || pos === SettingsData.Position.Top || pos === SettingsData.Position.Left;
-    }
-
-    function _trailingChromeWindow(candidates) {
-        const anchorsTop = _stackAnchorsTop();
-        let trailing = null;
-        let edge = anchorsTop ? -Infinity : Infinity;
-        for (const p of candidates) {
-            const rect = _popupChromeRect(p, false);
-            if (!rect)
-                continue;
-            const candidateEdge = anchorsTop ? rect.bottom : rect.y;
-            if ((anchorsTop && candidateEdge > edge) || (!anchorsTop && candidateEdge < edge)) {
-                edge = candidateEdge;
-                trailing = p;
-            }
-        }
-        return trailing;
-    }
-
-    function _chromeWindowReservesSlot(p, trailing) {
-        if (p === trailing)
-            return true;
-        return !p.popupChromeReservesSlot || p.popupChromeReservesSlot();
-    }
-
-    function _stackAnchoredChromeEdge(candidates) {
-        const anchorsTop = _stackAnchorsTop();
-        let edge = anchorsTop ? Infinity : -Infinity;
-        for (const p of candidates) {
-            const rect = _popupChromeRect(p, false);
-            if (!rect)
-                continue;
-            if (anchorsTop && rect.y < edge)
-                edge = rect.y;
-            if (!anchorsTop && rect.bottom > edge)
-                edge = rect.bottom;
-        }
-        if (edge === Infinity || edge === -Infinity)
-            return null;
-        return {
-            anchorsTop: anchorsTop,
-            edge: edge
-        };
-    }
-
-    function _syncNotificationChromeState() {
-        const screenName = manager.modelData?.name || "";
-        if (!screenName)
-            return;
-        if (!notificationConnectedMode) {
-            ConnectedModeState.clearNotificationState(screenName);
-            return;
-        }
-        const chromeCandidates = _chromeWindows();
-        if (chromeCandidates.length === 0) {
-            ConnectedModeState.clearNotificationState(screenName);
-            return;
-        }
-
-        const trailing = chromeCandidates.length > 1 ? _trailingChromeWindow(chromeCandidates) : null;
-        let active = chromeCandidates;
-        if (chromeCandidates.length > 1) {
-            const reserving = chromeCandidates.filter(p => _chromeWindowReservesSlot(p, trailing));
-            if (reserving.length > 0)
-                active = reserving;
-        }
-
-        let minX = Infinity;
-        let minY = Infinity;
-        let maxXEnd = -Infinity;
-        let maxYEnd = -Infinity;
-        const useMotionOffset = active.length === 1 && active[0].popupChromeMotionActive && active[0].popupChromeMotionActive();
-        for (const p of active) {
-            const rect = _popupChromeBoundsRect(p, trailing, useMotionOffset);
-            if (!rect)
-                continue;
-            if (rect.x < minX)
-                minX = rect.x;
-            if (rect.y < minY)
-                minY = rect.y;
-            if (rect.right > maxXEnd)
-                maxXEnd = rect.right;
-            if (rect.bottom > maxYEnd)
-                maxYEnd = rect.bottom;
-        }
-        const stackEdge = _stackAnchoredChromeEdge(chromeCandidates);
-        if (stackEdge !== null) {
-            if (stackEdge.anchorsTop && stackEdge.edge < minY)
-                minY = stackEdge.edge;
-            if (!stackEdge.anchorsTop && stackEdge.edge > maxYEnd)
-                maxYEnd = stackEdge.edge;
-        }
-        if (minX === Infinity || minY === Infinity || maxXEnd <= minX || maxYEnd <= minY) {
-            ConnectedModeState.clearNotificationState(screenName);
-            return;
-        }
-        ConnectedModeState.setNotificationState(screenName, {
-            visible: true,
-            barSide: notifBarSide,
-            bodyX: minX,
-            bodyY: minY,
-            bodyW: maxXEnd - minX,
-            bodyH: maxYEnd - minY
-        });
-    }
-
-    function _onPopupChromeGeometryChanged(p) {
-        if (!p || popupWindows.indexOf(p) === -1)
-            return;
-        _scheduleNotificationChromeSync();
     }
 
     function _onPopupHeightChanged(p) {
@@ -457,12 +191,6 @@ QtObject {
         _repositionAll();
     }
 
-    function _onPopupExitStarted(p) {
-        if (!p || popupWindows.indexOf(p) === -1)
-            return;
-        _repositionAll();
-    }
-
     function _onPopupExitFinished(p) {
         if (!p)
             return;
@@ -499,15 +227,8 @@ QtObject {
         }
         popupWindows = [];
         destroyingWindows.clear();
-        _chromeSyncPending = false;
-        _syncNotificationChromeState();
     }
 
-    onNotificationConnectedModeChanged: _scheduleNotificationChromeSync()
-    onNotifBarSideChanged: _scheduleNotificationChromeSync()
-    onModelDataChanged: _scheduleNotificationChromeSync()
-    onTopMarginChanged: _repositionAll()
-
     onPopupWindowsChanged: {
         if (popupWindows.length > 0 && !sweeper.running) {
             sweeper.start();

quickshell/Modules/Settings/DankBarTab.qml

@@ -27,7 +27,6 @@ Item {
         const pos = selectedBarConfig?.position ?? SettingsData.Position.Top;
         return pos === SettingsData.Position.Left || pos === SettingsData.Position.Right;
     }
-    readonly property bool connectedFrameModeActive: SettingsData.connectedFrameModeActive
 
     Timer {
         id: horizontalBarChangeDebounce
@@ -694,8 +693,6 @@ Item {
 
                 SettingsToggleRow {
                     visible: CompositorService.isNiri
-                    enabled: !SettingsData.frameEnabled
-                    opacity: SettingsData.frameEnabled ? 0.5 : 1.0
                     text: I18n.tr("Show on Overview")
                     checked: selectedBarConfig?.openOnOverview ?? false
                     onToggled: toggled => {
@@ -801,42 +798,11 @@ Item {
                 }
             }
 
-            Item {
-                visible: SettingsData.frameEnabled
-                width: parent.width
-                implicitHeight: frameNote.implicitHeight + Theme.spacingS * 2
-
-                Row {
-                    id: frameNote
-                    x: Theme.spacingM
-                    width: parent.width - Theme.spacingM * 2
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingS
-
-                    DankIcon {
-                        name: "frame_source"
-                        size: Theme.fontSizeMedium
-                        color: Theme.primary
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Spacing and size are managed by Frame mode")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        wrapMode: Text.WordWrap
-                        width: parent.width - Theme.fontSizeMedium - Theme.spacingS
-                    }
-                }
-            }
-
             SettingsCard {
                 iconName: "space_bar"
                 title: I18n.tr("Spacing")
                 settingKey: "barSpacing"
                 visible: selectedBarConfig?.enabled
-                enabled: !SettingsData.frameEnabled
-                opacity: SettingsData.frameEnabled ? 0.5 : 1.0
 
                 SettingsSliderRow {
                     id: edgeSpacingSlider
@@ -1037,8 +1003,6 @@ Item {
 
                 SettingsSliderRow {
                     id: barTransparencySlider
-                    enabled: !SettingsData.frameEnabled
-                    opacity: SettingsData.frameEnabled ? 0.5 : 1.0
                     text: I18n.tr("Bar Transparency")
                     value: (selectedBarConfig?.transparency ?? 1.0) * 100
                     minimum: 0
@@ -1080,64 +1044,6 @@ Item {
                         restoreMode: Binding.RestoreBinding
                     }
                 }
-
-                Item {
-                    visible: SettingsData.frameEnabled
-                    width: parent.width
-                    implicitHeight: transparencyFrameNote.implicitHeight + Theme.spacingS * 2
-
-                    Row {
-                        id: transparencyFrameNote
-                        x: Theme.spacingM
-                        width: parent.width - Theme.spacingM * 2
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "frame_source"
-                            size: Theme.fontSizeMedium
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Opacity is controlled by Frame Border Opacity in Frame settings")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                            wrapMode: Text.WordWrap
-                            width: parent.width - Theme.fontSizeMedium - Theme.spacingS
-                        }
-                    }
-                }
-            }
-
-            Item {
-                visible: dankBarTab.connectedFrameModeActive
-                width: parent.width
-                implicitHeight: connectedFrameStyleNote.implicitHeight + Theme.spacingS * 2
-
-                Row {
-                    id: connectedFrameStyleNote
-                    x: Theme.spacingM
-                    width: parent.width - Theme.spacingM * 2
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingS
-
-                    DankIcon {
-                        name: "frame_source"
-                        size: Theme.fontSizeMedium
-                        color: Theme.primary
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Connected Frame mode keeps bar shadow override, border, and corner overrides off while active")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        wrapMode: Text.WordWrap
-                        width: parent.width - Theme.fontSizeMedium - Theme.spacingS
-                    }
-                }
             }
 
             SettingsCard {
@@ -1148,8 +1054,6 @@ Item {
                 collapsible: true
                 expanded: true
                 visible: selectedBarConfig?.enabled
-                enabled: !dankBarTab.connectedFrameModeActive
-                opacity: dankBarTab.connectedFrameModeActive ? 0.5 : 1.0
 
                 readonly property bool shadowActive: (selectedBarConfig?.shadowIntensity ?? 0) > 0
                 readonly property bool isCustomColor: (selectedBarConfig?.shadowColorMode ?? "default") === "custom"
@@ -1383,8 +1287,6 @@ Item {
 
                 SettingsToggleRow {
                     text: I18n.tr("Square Corners")
-                    enabled: !SettingsData.frameEnabled
-                    opacity: SettingsData.frameEnabled ? 0.5 : 1.0
                     checked: selectedBarConfig?.squareCorners ?? false
                     onToggled: checked => SettingsData.updateBarConfig(selectedBarId, {
                             squareCorners: checked
@@ -1432,8 +1334,6 @@ Item {
 
                 SettingsToggleRow {
                     text: I18n.tr("Goth Corners")
-                    enabled: !SettingsData.frameEnabled
-                    opacity: SettingsData.frameEnabled ? 0.5 : 1.0
                     checked: selectedBarConfig?.gothCornersEnabled ?? false
                     onToggled: checked => SettingsData.updateBarConfig(selectedBarId, {
                             gothCornersEnabled: checked
@@ -1483,8 +1383,6 @@ Item {
                 iconName: "border_style"
                 title: I18n.tr("Border")
                 visible: selectedBarConfig?.enabled
-                enabled: !dankBarTab.connectedFrameModeActive
-                opacity: dankBarTab.connectedFrameModeActive ? 0.5 : 1.0
                 checked: selectedBarConfig?.borderEnabled ?? false
                 onToggled: checked => SettingsData.updateBarConfig(selectedBarId, {
                         borderEnabled: checked

quickshell/Modules/Settings/DockTab.qml

@@ -7,9 +7,6 @@ import qs.Modules.Settings.Widgets
 
 Item {
     id: root
-    readonly property bool connectedFrameModeActive: SettingsData.frameEnabled
-        && SettingsData.motionEffect === 1
-        && SettingsData.directionalAnimationMode === 3
 
     FileBrowserModal {
         id: dockLogoFileBrowser
@@ -547,8 +544,6 @@ Item {
 
                 SettingsSliderRow {
                     text: I18n.tr("Exclusive Zone Offset")
-                    enabled: !root.connectedFrameModeActive
-                    opacity: root.connectedFrameModeActive ? 0.5 : 1.0
                     value: SettingsData.dockBottomGap
                     minimum: -100
                     maximum: 100
@@ -558,8 +553,6 @@ Item {
 
                 SettingsSliderRow {
                     text: I18n.tr("Margin")
-                    enabled: !root.connectedFrameModeActive
-                    opacity: root.connectedFrameModeActive ? 0.5 : 1.0
                     value: SettingsData.dockMargin
                     minimum: 0
                     maximum: 100
@@ -568,42 +561,11 @@ Item {
                 }
             }
 
-            Item {
-                visible: root.connectedFrameModeActive
-                width: parent.width
-                implicitHeight: dockConnectedNote.implicitHeight + Theme.spacingS * 2
-
-                Row {
-                    id: dockConnectedNote
-                    x: Theme.spacingM
-                    width: parent.width - Theme.spacingM * 2
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingS
-
-                    DankIcon {
-                        name: "frame_source"
-                        size: Theme.fontSizeMedium
-                        color: Theme.primary
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Connected Frame mode manages dock edge offset, transparency, blur, and border styling")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        wrapMode: Text.WordWrap
-                        width: parent.width - Theme.fontSizeMedium - Theme.spacingS
-                    }
-                }
-            }
-
             SettingsCard {
                 width: parent.width
                 iconName: "opacity"
                 title: I18n.tr("Transparency")
                 settingKey: "dockTransparency"
-                enabled: !root.connectedFrameModeActive
-                opacity: root.connectedFrameModeActive ? 0.5 : 1.0
 
                 SettingsSliderRow {
                     text: I18n.tr("Dock Transparency")
@@ -623,8 +585,6 @@ Item {
                 settingKey: "dockBorder"
                 collapsible: true
                 expanded: false
-                enabled: !root.connectedFrameModeActive
-                opacity: root.connectedFrameModeActive ? 0.5 : 1.0
 
                 SettingsToggleRow {
                     text: I18n.tr("Border")

quickshell/Modules/Settings/FrameTab.qml

@@ -1,324 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.Settings.Widgets
-
-Item {
-    id: root
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    DankFlickable {
-        anchors.fill: parent
-        clip: true
-        contentHeight: mainColumn.height + Theme.spacingXL
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-            topPadding: 4
-            width: Math.min(550, parent.width - Theme.spacingL * 2)
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: Theme.spacingXL
-
-            // ── Enable Frame ──────────────────────────────────────────────────
-            SettingsCard {
-                width: parent.width
-                iconName: "frame_source"
-                title: I18n.tr("Frame")
-                settingKey: "frameEnabled"
-
-                SettingsToggleRow {
-                    settingKey: "frameEnable"
-                    tags: ["frame", "border", "outline", "display"]
-                    text: I18n.tr("Enable Frame")
-                    description: I18n.tr("Draw a connected picture-frame border around the entire display")
-                    checked: SettingsData.frameEnabled
-                    onToggled: checked => SettingsData.set("frameEnabled", checked)
-                }
-            }
-
-            // ── Border ────────────────────────────────────────────────────────
-            SettingsCard {
-                width: parent.width
-                iconName: "border_outer"
-                title: I18n.tr("Border")
-                settingKey: "frameBorder"
-                collapsible: true
-                visible: SettingsData.frameEnabled
-
-                SettingsSliderRow {
-                    id: roundingSlider
-                    settingKey: "frameRounding"
-                    tags: ["frame", "border", "rounding", "radius", "corner"]
-                    text: I18n.tr("Border Radius")
-                    description: SettingsData.connectedFrameModeActive
-                        ? I18n.tr("Controls the radius of the frame and all connected popout, dock, and modal surfaces while Connected Mode is active")
-                        : I18n.tr("Controls the frame border radius. This also becomes the connected surface radius whenever Connected Mode is active")
-                    unit: "px"
-                    minimum: 0
-                    maximum: 100
-                    step: 1
-                    defaultValue: 23
-                    value: SettingsData.frameRounding
-                    onSliderDragFinished: v => SettingsData.set("frameRounding", v)
-
-                    Binding {
-                        target: roundingSlider
-                        property: "value"
-                        value: SettingsData.frameRounding
-                    }
-                }
-
-                SettingsSliderRow {
-                    id: thicknessSlider
-                    settingKey: "frameThickness"
-                    tags: ["frame", "border", "thickness", "size", "width"]
-                    text: I18n.tr("Border Width")
-                    unit: "px"
-                    minimum: 2
-                    maximum: 100
-                    step: 1
-                    defaultValue: 16
-                    value: SettingsData.frameThickness
-                    onSliderDragFinished: v => SettingsData.set("frameThickness", v)
-
-                    Binding {
-                        target: thicknessSlider
-                        property: "value"
-                        value: SettingsData.frameThickness
-                    }
-                }
-
-                SettingsSliderRow {
-                    id: barThicknessSlider
-                    settingKey: "frameBarSize"
-                    tags: ["frame", "bar", "thickness", "size", "height", "width"]
-                    text: I18n.tr("Size")
-                    description: I18n.tr("Height of horizontal bars / width of vertical bars in frame mode")
-                    unit: "px"
-                    minimum: 24
-                    maximum: 100
-                    step: 1
-                    defaultValue: 40
-                    value: SettingsData.frameBarSize
-                    onSliderDragFinished: v => SettingsData.set("frameBarSize", v)
-
-                    Binding {
-                        target: barThicknessSlider
-                        property: "value"
-                        value: SettingsData.frameBarSize
-                    }
-                }
-
-                SettingsSliderRow {
-                    id: opacitySlider
-                    settingKey: "frameOpacity"
-                    tags: ["frame", "border", "surface", "popup", "opacity", "transparency"]
-                    text: I18n.tr("Surface Opacity")
-                    description: I18n.tr("Frame border opacity. Controls all surface opacity globally when Connected Mode is active")
-                    unit: "%"
-                    minimum: 0
-                    maximum: 100
-                    defaultValue: 100
-                    value: SettingsData.frameOpacity * 100
-                    onSliderDragFinished: v => SettingsData.set("frameOpacity", v / 100)
-
-                    Binding {
-                        target: opacitySlider
-                        property: "value"
-                        value: SettingsData.frameOpacity * 100
-                    }
-                }
-
-                SettingsToggleRow {
-                    id: frameBlurToggle
-                    settingKey: "frameBlurEnabled"
-                    tags: ["frame", "blur", "background", "glass", "transparency", "frosted"]
-                    text: I18n.tr("Frame Blur")
-                    description: !BlurService.available
-                        ? I18n.tr("Requires a newer version of Quickshell")
-                        : I18n.tr("Apply compositor blur behind the frame border")
-                    checked: SettingsData.frameBlurEnabled
-                    onToggled: checked => SettingsData.set("frameBlurEnabled", checked)
-                    enabled: BlurService.available && SettingsData.blurEnabled
-                    opacity: enabled ? 1.0 : 0.5
-                    visible: BlurService.available
-                }
-
-                Item {
-                    visible: BlurService.available && !SettingsData.blurEnabled
-                    width: parent.width
-                    height: blurToggleNote.height + Theme.spacingM * 2
-
-                    Row {
-                        id: blurToggleNote
-                        x: Theme.spacingM
-                        width: parent.width - Theme.spacingM * 2
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "blur_on"
-                            size: Theme.fontSizeMedium
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Frame Blur is controlled by Background Blur in Theme & Colors")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                            wrapMode: Text.WordWrap
-                            width: parent.width - Theme.fontSizeMedium - Theme.spacingS
-                        }
-                    }
-                }
-
-                // Color mode buttons
-                SettingsButtonGroupRow {
-                    settingKey: "frameColor"
-                    tags: ["frame", "border", "color", "theme", "primary", "surface", "default"]
-                    text: I18n.tr("Border color")
-                    model: [I18n.tr("Default"), I18n.tr("Primary"), I18n.tr("Surface"), I18n.tr("Custom")]
-                    currentIndex: {
-                        const fc = SettingsData.frameColor;
-                        if (!fc || fc === "default") return 0;
-                        if (fc === "primary") return 1;
-                        if (fc === "surface") return 2;
-                        return 3;
-                    }
-                    onSelectionChanged: (index, selected) => {
-                        if (!selected) return;
-                        switch (index) {
-                        case 0: SettingsData.set("frameColor", ""); break;
-                        case 1: SettingsData.set("frameColor", "primary"); break;
-                        case 2: SettingsData.set("frameColor", "surface"); break;
-                        case 3:
-                            const cur = SettingsData.frameColor;
-                            const isPreset = !cur || cur === "primary" || cur === "surface";
-                            if (isPreset) SettingsData.set("frameColor", "#2a2a2a");
-                            break;
-                        }
-                    }
-                }
-
-                // Custom color swatch — only visible when a hex color is stored (Custom mode)
-                Item {
-                    visible: {
-                        const fc = SettingsData.frameColor;
-                        return !!(fc && fc !== "primary" && fc !== "surface");
-                    }
-                    width: parent.width
-                    height: customColorRow.height + Theme.spacingM * 2
-
-                    Row {
-                        id: customColorRow
-                        width: parent.width - Theme.spacingM * 2
-                        x: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        StyledText {
-                            anchors.verticalCenter: parent.verticalCenter
-                            text: I18n.tr("Custom color")
-                            font.pixelSize: Theme.fontSizeMedium
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                        }
-
-                        Rectangle {
-                            id: colorSwatch
-                            anchors.verticalCenter: parent.verticalCenter
-                            width: 32
-                            height: 32
-                            radius: 16
-                            color: SettingsData.effectiveFrameColor
-                            border.color: Theme.outline
-                            border.width: 1
-
-                            MouseArea {
-                                anchors.fill: parent
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: {
-                                    PopoutService.colorPickerModal.selectedColor = SettingsData.effectiveFrameColor;
-                                    PopoutService.colorPickerModal.pickerTitle = I18n.tr("Frame Border Color");
-                                    PopoutService.colorPickerModal.onColorSelectedCallback = function (color) {
-                                        SettingsData.set("frameColor", color.toString());
-                                    };
-                                    PopoutService.colorPickerModal.show();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            // ── Bar Integration ───────────────────────────────────────────────
-            SettingsCard {
-                width: parent.width
-                iconName: "toolbar"
-                title: I18n.tr("Bar Integration")
-                settingKey: "frameBarIntegration"
-                collapsible: true
-                expanded: true
-                visible: SettingsData.frameEnabled
-
-                SettingsToggleRow {
-                    visible: CompositorService.isNiri
-                    settingKey: "frameShowOnOverview"
-                    tags: ["frame", "overview", "show", "hide", "niri"]
-                    text: I18n.tr("Show on Overview")
-                    description: I18n.tr("Show the bar and frame during Niri overview mode")
-                    checked: SettingsData.frameShowOnOverview
-                    onToggled: checked => SettingsData.set("frameShowOnOverview", checked)
-                }
-
-                SettingsToggleRow {
-                    visible: SettingsData.frameEnabled
-                    settingKey: "directionalAnimationMode"
-                    tags: ["frame", "connected", "popout", "corner", "animation"]
-                    text: I18n.tr("Connected Mode")
-                    description: I18n.tr("Popouts emerge flush from the bar edge as one continuous piece (based on Slide)")
-                    checked: SettingsData.connectedFrameModeActive
-                    onToggled: checked => {
-                        if (checked) {
-                            if (SettingsData.directionalAnimationMode !== 3)
-                                SettingsData.set("previousDirectionalMode", SettingsData.directionalAnimationMode);
-                            SettingsData.set("motionEffect", 1);
-                            SettingsData.set("directionalAnimationMode", 3);
-                        } else {
-                            SettingsData.set("directionalAnimationMode", SettingsData.previousDirectionalMode);
-                        }
-                    }
-
-                    Connections {
-                        target: SettingsData
-                        function onDirectionalAnimationModeChanged() {}
-                        function onMotionEffectChanged() {}
-                    }
-                }
-            }
-
-            // ── Display Assignment ────────────────────────────────────────────
-            SettingsCard {
-                width: parent.width
-                iconName: "monitor"
-                title: I18n.tr("Display Assignment")
-                settingKey: "frameDisplays"
-                collapsible: true
-                expanded: false
-                visible: SettingsData.frameEnabled
-
-                SettingsDisplayPicker {
-                    displayPreferences: SettingsData.frameScreenPreferences
-                    onPreferencesChanged: prefs => SettingsData.set("frameScreenPreferences", prefs)
-                }
-            }
-        }
-    }
-}

quickshell/Modules/Settings/LauncherTab.qml

@@ -606,8 +606,6 @@ Item {
                 property var allLauncherPlugins: {
                     SettingsData.launcherPluginVisibility;
                     SettingsData.launcherPluginOrder;
-                    SettingsData.dankLauncherV2IncludeFilesInAll;
-                    SettingsData.dankLauncherV2IncludeFoldersInAll;
                     var plugins = [];
                     var builtIn = AppSearchService.getBuiltInLauncherPlugins() || {};
                     for (var pluginId in builtIn) {
@@ -618,7 +616,6 @@ Item {
                             icon: plugin.cornerIcon || "extension",
                             iconType: "material",
                             isBuiltIn: true,
-                            isVirtual: false,
                             trigger: AppSearchService.getBuiltInPluginTrigger(pluginId) || ""
                         });
                     }
@@ -632,32 +629,9 @@ Item {
                             icon: rawIcon.startsWith("material:") ? rawIcon.substring(9) : rawIcon.startsWith("unicode:") ? rawIcon.substring(8) : rawIcon,
                             iconType: rawIcon.startsWith("unicode:") ? "unicode" : "material",
                             isBuiltIn: false,
-                            isVirtual: false,
                             trigger: PluginService.getPluginTrigger(pluginId) || ""
                         });
                     }
-                    if (SettingsData.dankLauncherV2IncludeFilesInAll) {
-                        plugins.push({
-                            id: "__files",
-                            name: I18n.tr("Files"),
-                            icon: "insert_drive_file",
-                            iconType: "material",
-                            isBuiltIn: false,
-                            isVirtual: true,
-                            trigger: "/"
-                        });
-                    }
-                    if (SettingsData.dankLauncherV2IncludeFoldersInAll) {
-                        plugins.push({
-                            id: "__folders",
-                            name: I18n.tr("Folders"),
-                            icon: "folder",
-                            iconType: "material",
-                            isBuiltIn: false,
-                            isVirtual: true,
-                            trigger: "/"
-                        });
-                    }
                     return SettingsData.getOrderedLauncherPlugins(plugins);
                 }
 
@@ -776,27 +750,9 @@ Item {
                                     anchors.right: parent.right
                                     anchors.rightMargin: Theme.spacingM
                                     anchors.verticalCenter: parent.verticalCenter
-                                    checked: {
-                                        switch (visibilityDelegateItem.modelData.id) {
-                                        case "__files":
-                                            return SettingsData.dankLauncherV2IncludeFilesInAll;
-                                        case "__folders":
-                                            return SettingsData.dankLauncherV2IncludeFoldersInAll;
-                                        default:
-                                            return SettingsData.getPluginAllowWithoutTrigger(visibilityDelegateItem.modelData.id);
-                                        }
-                                    }
+                                    checked: SettingsData.getPluginAllowWithoutTrigger(visibilityDelegateItem.modelData.id)
                                     onToggled: function (isChecked) {
-                                        switch (visibilityDelegateItem.modelData.id) {
-                                        case "__files":
-                                            SettingsData.set("dankLauncherV2IncludeFilesInAll", isChecked);
-                                            break;
-                                        case "__folders":
-                                            SettingsData.set("dankLauncherV2IncludeFoldersInAll", isChecked);
-                                            break;
-                                        default:
-                                            SettingsData.setPluginAllowWithoutTrigger(visibilityDelegateItem.modelData.id, isChecked);
-                                        }
+                                        SettingsData.setPluginAllowWithoutTrigger(visibilityDelegateItem.modelData.id, isChecked);
                                     }
                                 }
                             }
@@ -884,24 +840,6 @@ Item {
                     checked: SettingsData.rememberLastQuery
                     onToggled: checked => SettingsData.set("rememberLastQuery", checked)
                 }
-
-                SettingsToggleRow {
-                    settingKey: "dankLauncherV2IncludeFilesInAll"
-                    tags: ["launcher", "files", "dsearch", "all", "results", "indexed"]
-                    text: I18n.tr("Include Files in All Tab")
-                    description: I18n.tr("Merge indexed file results into the All tab (requires dsearch).")
-                    checked: SettingsData.dankLauncherV2IncludeFilesInAll
-                    onToggled: checked => SettingsData.set("dankLauncherV2IncludeFilesInAll", checked)
-                }
-
-                SettingsToggleRow {
-                    settingKey: "dankLauncherV2IncludeFoldersInAll"
-                    tags: ["launcher", "folders", "dirs", "dsearch", "all", "results", "indexed"]
-                    text: I18n.tr("Include Folders in All Tab")
-                    description: I18n.tr("Merge indexed folder results into the All tab (requires dsearch).")
-                    checked: SettingsData.dankLauncherV2IncludeFoldersInAll
-                    onToggled: checked => SettingsData.set("dankLauncherV2IncludeFoldersInAll", checked)
-                }
             }
 
             SettingsCard {

quickshell/Modules/Settings/MediaPlayerTab.qml

@@ -46,13 +46,6 @@ Item {
                     onToggled: checked => SettingsData.set("audioVisualizerEnabled", checked)
                 }
 
-                SettingsToggleRow {
-                    text: I18n.tr("Adaptive Media Width")
-                    description: I18n.tr("Shrink the media widget to fit shorter song titles while still respecting the configured maximum size")
-                    checked: SettingsData.mediaAdaptiveWidthEnabled
-                    onToggled: checked => SettingsData.set("mediaAdaptiveWidthEnabled", checked)
-                }
-
                 SettingsDropdownRow {
                     property var scrollOptsInternal: ["volume", "song", "nothing"]
                     property var scrollOptsDisplay: [I18n.tr("Change Volume", "media scroll wheel option"), I18n.tr("Change Song", "media scroll wheel option"), I18n.tr("Nothing", "media scroll wheel option")]