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

modals

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_common.go

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

core/cmd/dms/commands_doctor.go

@@ -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/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 {
@@ -536,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
@@ -617,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",
@@ -640,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),
@@ -727,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/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/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/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/Appearance.qml

@@ -7,8 +7,60 @@ import Quickshell
 Singleton {
     id: root
 
-    readonly property AppearanceRounding rounding: AppearanceRounding {}
-    readonly property AppearanceSpacing spacing: AppearanceSpacing {}
-    readonly property AppearanceFontSize fontSize: AppearanceFontSize {}
-    readonly property AppearanceAnim anim: AppearanceAnim {}
+    readonly property Rounding rounding: Rounding {}
+    readonly property Spacing spacing: Spacing {}
+    readonly property FontSize fontSize: FontSize {}
+    readonly property Anim anim: Anim {}
+
+    component Rounding: QtObject {
+        readonly property int small: 8
+        readonly property int normal: 12
+        readonly property int large: 16
+        readonly property int extraLarge: 24
+        readonly property int full: 1000
+    }
+
+    component Spacing: QtObject {
+        readonly property int small: 4
+        readonly property int normal: 8
+        readonly property int large: 12
+        readonly property int extraLarge: 16
+        readonly property int huge: 24
+    }
+
+    component FontSize: QtObject {
+        readonly property int small: 12
+        readonly property int normal: 14
+        readonly property int large: 16
+        readonly property int extraLarge: 20
+        readonly property int huge: 24
+    }
+
+    component AnimCurves: QtObject {
+        readonly property list<real> standard: [0.2, 0, 0, 1, 1, 1]
+        readonly property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
+        readonly property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
+        readonly property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1
+            / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
+        readonly property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
+        readonly property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
+        readonly property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
+        readonly property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
+        readonly property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+    }
+
+    component AnimDurations: QtObject {
+        readonly property int quick: 150
+        readonly property int normal: 300
+        readonly property int slow: 500
+        readonly property int extraSlow: 1000
+        readonly property int expressiveFastSpatial: 350
+        readonly property int expressiveDefaultSpatial: 500
+        readonly property int expressiveEffects: 200
+    }
+
+    component Anim: QtObject {
+        readonly property AnimCurves curves: AnimCurves {}
+        readonly property AnimDurations durations: AnimDurations {}
+    }
 }

quickshell/Common/AppearanceAnim.qml

@@ -1,6 +0,0 @@
-import QtQuick
-
-QtObject {
-    readonly property AppearanceAnimCurves curves: AppearanceAnimCurves {}
-    readonly property AppearanceAnimDurations durations: AppearanceAnimDurations {}
-}

quickshell/Common/AppearanceAnimCurves.qml

@@ -1,13 +0,0 @@
-import QtQuick
-
-QtObject {
-    readonly property list<real> standard: [0.2, 0, 0, 1, 1, 1]
-    readonly property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
-    readonly property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
-    readonly property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
-    readonly property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
-    readonly property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
-    readonly property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
-    readonly property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
-    readonly property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
-}

quickshell/Common/AppearanceAnimDurations.qml

@@ -1,11 +0,0 @@
-import QtQuick
-
-QtObject {
-    readonly property int quick: 150
-    readonly property int normal: 300
-    readonly property int slow: 500
-    readonly property int extraSlow: 1000
-    readonly property int expressiveFastSpatial: 350
-    readonly property int expressiveDefaultSpatial: 500
-    readonly property int expressiveEffects: 200
-}

quickshell/Common/AppearanceFontSize.qml

@@ -1,9 +0,0 @@
-import QtQuick
-
-QtObject {
-    readonly property int small: 12
-    readonly property int normal: 14
-    readonly property int large: 16
-    readonly property int extraLarge: 20
-    readonly property int huge: 24
-}

quickshell/Common/AppearanceRounding.qml

@@ -1,9 +0,0 @@
-import QtQuick
-
-QtObject {
-    readonly property int small: 8
-    readonly property int normal: 12
-    readonly property int large: 16
-    readonly property int extraLarge: 24
-    readonly property int full: 1000
-}

quickshell/Common/AppearanceSpacing.qml

@@ -1,9 +0,0 @@
-import QtQuick
-
-QtObject {
-    readonly property int small: 4
-    readonly property int normal: 8
-    readonly property int large: 12
-    readonly property int extraLarge: 16
-    readonly property int huge: 24
-}

quickshell/Common/SettingsData.qml

@@ -301,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
@@ -435,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

quickshell/Common/settings/SettingsSpec.js

@@ -140,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 },
@@ -243,7 +242,6 @@ var SPEC = {
 
     soundsEnabled: { def: true },
     useSystemSoundTheme: { def: false },
-    soundLogin: { def: false },
     soundNewNotification: { def: true },
     soundVolumeChanged: { def: true },
     soundPluggedIn: { def: true },

quickshell/DMSShell.qml

@@ -221,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,12 +60,15 @@ DankModal {
     }
 
     function show() {
+        if (!clipboardAvailable) {
+            ToastService.showError(I18n.tr("Clipboard service not available"));
+            return;
+        }
         open();
         activeImageLoads = 0;
         shouldHaveFocus = true;
         ClipboardService.reset();
-        if (clipboardAvailable)
-            ClipboardService.refresh();
+        ClipboardService.refresh();
         keyboardController.reset();
 
         Qt.callLater(function () {

quickshell/Modals/Clipboard/ClipboardHistoryPopout.qml

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

quickshell/Modals/Common/DankModal.qml

@@ -31,7 +31,7 @@ Item {
     property real animationOffset: Theme.spacingL
     property list<real> animationEnterCurve: Theme.expressiveCurves.expressiveDefaultSpatial
     property list<real> animationExitCurve: Theme.expressiveCurves.emphasized
-    property color backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+    property color backgroundColor: Theme.surfaceContainer
     property color borderColor: Theme.outlineMedium
     property real borderWidth: 0
     property real cornerRadius: Theme.cornerRadius

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/LauncherContent.qml

@@ -311,7 +311,7 @@ FocusScope {
 
     Item {
         anchors.fill: parent
-        visible: !editMode && !(root.parentModal?.isClosing ?? false)
+        visible: !editMode
 
         Item {
             id: footerBar
@@ -737,6 +737,8 @@ 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: root.parentModal?.isClosing ? 0 : 1
+
                 ResultsList {
                     id: resultsList
                     anchors.fill: parent

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/WindowRuleCheckboxRow.qml

@@ -1,54 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Row {
-    id: checkboxRow
-
-    property alias checked: checkbox.checked
-    property alias label: labelText.text
-    property bool indeterminate: false
-
-    spacing: Theme.spacingS
-    height: 24
-
-    Rectangle {
-        id: checkbox
-        property bool checked: false
-        width: 20
-        height: 20
-        radius: 4
-        color: checkboxRow.indeterminate ? Theme.surfaceVariant : (checked ? Theme.primary : "transparent")
-        border.color: checkboxRow.indeterminate ? Theme.outlineButton : (checked ? Theme.primary : Theme.outlineButton)
-        border.width: 2
-        anchors.verticalCenter: parent.verticalCenter
-
-        DankIcon {
-            anchors.centerIn: parent
-            name: checkboxRow.indeterminate ? "remove" : "check"
-            size: 12
-            color: checkboxRow.indeterminate ? Theme.surfaceVariantText : Theme.background
-            visible: parent.checked || checkboxRow.indeterminate
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            cursorShape: Qt.PointingHandCursor
-            onClicked: {
-                if (checkboxRow.indeterminate) {
-                    checkboxRow.indeterminate = false;
-                    checkbox.checked = true;
-                } else {
-                    checkbox.checked = !checkbox.checked;
-                }
-            }
-        }
-    }
-
-    StyledText {
-        id: labelText
-        font.pixelSize: Theme.fontSizeSmall
-        color: Theme.surfaceText
-        anchors.verticalCenter: parent.verticalCenter
-    }
-}

quickshell/Modals/WindowRuleInputField.qml

@@ -1,17 +0,0 @@
-import QtQuick
-import qs.Common
-
-Rectangle {
-    id: inputFieldRect
-
-    default property alias contentData: inputFieldRect.data
-    property bool hasFocus: false
-    property int fieldHeight: Theme.fontSizeMedium + Theme.spacingL * 2
-
-    width: parent.width
-    height: fieldHeight
-    radius: Theme.cornerRadius
-    color: Theme.surfaceHover
-    border.color: hasFocus ? Theme.primary : Theme.outlineStrong
-    border.width: hasFocus ? 2 : 1
-}

quickshell/Modals/WindowRuleModal.qml

@@ -297,6 +297,78 @@ FloatingWindow {
         }
     }
 
+    component SectionHeader: StyledText {
+        property string title
+        text: title
+        font.pixelSize: Theme.fontSizeMedium
+        font.weight: Font.Medium
+        color: Theme.primary
+        topPadding: Theme.spacingM
+        bottomPadding: Theme.spacingXS
+        width: parent.width
+        horizontalAlignment: Text.AlignLeft
+    }
+
+    component CheckboxRow: Row {
+        property alias checked: checkbox.checked
+        property alias label: labelText.text
+        property bool indeterminate: false
+        spacing: Theme.spacingS
+        height: 24
+
+        Rectangle {
+            id: checkbox
+            property bool checked: false
+            width: 20
+            height: 20
+            radius: 4
+            color: parent.indeterminate ? Theme.surfaceVariant : (checked ? Theme.primary : "transparent")
+            border.color: parent.indeterminate ? Theme.outlineButton : (checked ? Theme.primary : Theme.outlineButton)
+            border.width: 2
+            anchors.verticalCenter: parent.verticalCenter
+
+            DankIcon {
+                anchors.centerIn: parent
+                name: parent.parent.indeterminate ? "remove" : "check"
+                size: 12
+                color: parent.parent.indeterminate ? Theme.surfaceVariantText : Theme.background
+                visible: parent.checked || parent.parent.indeterminate
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    if (parent.parent.indeterminate) {
+                        parent.parent.indeterminate = false;
+                        parent.checked = true;
+                    } else {
+                        parent.checked = !parent.checked;
+                    }
+                }
+            }
+        }
+
+        StyledText {
+            id: labelText
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceText
+            anchors.verticalCenter: parent.verticalCenter
+        }
+    }
+
+    component InputField: Rectangle {
+        id: inputFieldRect
+        default property alias contentData: inputFieldRect.data
+        property bool hasFocus: false
+        width: parent.width
+        height: root.inputFieldHeight
+        radius: Theme.cornerRadius
+        color: Theme.surfaceHover
+        border.color: hasFocus ? Theme.primary : Theme.outlineStrong
+        border.width: hasFocus ? 2 : 1
+    }
+
     FocusScope {
         anchors.fill: parent
         focus: true
@@ -375,7 +447,7 @@ FloatingWindow {
                 width: flickable.width - Theme.spacingM
                 spacing: Theme.spacingXS
 
-                WindowRuleInputField {
+                InputField {
                     hasFocus: nameInput.activeFocus
                     DankTextField {
                         id: nameInput
@@ -388,11 +460,11 @@ FloatingWindow {
                     }
                 }
 
-                WindowRuleSectionHeader {
+                SectionHeader {
                     title: I18n.tr("Match Criteria")
                 }
 
-                WindowRuleInputField {
+                InputField {
                     hasFocus: appIdInput.activeFocus
                     DankTextField {
                         id: appIdInput
@@ -409,7 +481,7 @@ FloatingWindow {
                     width: parent.width
                     spacing: Theme.spacingS
 
-                    WindowRuleInputField {
+                    InputField {
                         width: addTitleBtn.visible ? parent.width - addTitleBtn.width - Theme.spacingS : parent.width
                         hasFocus: titleInput.activeFocus
                         DankTextField {
@@ -442,7 +514,7 @@ FloatingWindow {
                     }
                 }
 
-                WindowRuleSectionHeader {
+                SectionHeader {
                     title: I18n.tr("Window Opening")
                 }
 
@@ -450,24 +522,24 @@ FloatingWindow {
                     width: parent.width
                     spacing: Theme.spacingL
 
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: floatingToggle
                         label: I18n.tr("Float")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: maximizedToggle
                         label: I18n.tr("Maximize")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: fullscreenToggle
                         label: I18n.tr("Fullscreen")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: maximizedToEdgesToggle
                         label: I18n.tr("Max to Edges")
                         visible: isNiri
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: openFocusedToggle
                         label: I18n.tr("Focus")
                         visible: isNiri
@@ -491,7 +563,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: outputInput.activeFocus
                             DankTextField {
@@ -518,7 +590,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: workspaceInput.activeFocus
                             DankTextField {
@@ -551,7 +623,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: columnWidthInput.activeFocus
                             DankTextField {
@@ -578,7 +650,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: windowHeightInput.activeFocus
                             DankTextField {
@@ -594,7 +666,7 @@ FloatingWindow {
                     }
                 }
 
-                WindowRuleSectionHeader {
+                SectionHeader {
                     title: I18n.tr("Dynamic Properties")
                 }
 
@@ -602,7 +674,7 @@ FloatingWindow {
                     width: parent.width
                     spacing: Theme.spacingM
 
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: opacityEnabled
                         label: I18n.tr("Opacity")
                         anchors.verticalCenter: parent.verticalCenter
@@ -624,19 +696,19 @@ FloatingWindow {
                     spacing: Theme.spacingL
                     visible: isNiri
 
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: vrrToggle
                         label: I18n.tr("VRR On-Demand")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: clipToGeometryToggle
                         label: I18n.tr("Clip to Geometry")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: tiledStateToggle
                         label: I18n.tr("Tiled State")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: drawBorderBgToggle
                         label: I18n.tr("Border with BG")
                     }
@@ -697,7 +769,7 @@ FloatingWindow {
                     spacing: Theme.spacingM
                     visible: isNiri
 
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: scrollFactorEnabled
                         label: I18n.tr("Scroll Factor")
                         anchors.verticalCenter: parent.verticalCenter
@@ -718,7 +790,7 @@ FloatingWindow {
                     width: parent.width
                     spacing: Theme.spacingM
 
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: cornerRadiusEnabled
                         label: I18n.tr("Corner Radius")
                         anchors.verticalCenter: parent.verticalCenter
@@ -735,7 +807,7 @@ FloatingWindow {
                     }
                 }
 
-                WindowRuleSectionHeader {
+                SectionHeader {
                     title: I18n.tr("Size Constraints")
                 }
 
@@ -755,7 +827,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: minWidthInput.activeFocus
                             DankTextField {
@@ -782,7 +854,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: maxWidthInput.activeFocus
                             DankTextField {
@@ -809,7 +881,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: minHeightInput.activeFocus
                             DankTextField {
@@ -836,7 +908,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: maxHeightInput.activeFocus
                             DankTextField {
@@ -852,7 +924,7 @@ FloatingWindow {
                     }
                 }
 
-                WindowRuleSectionHeader {
+                SectionHeader {
                     title: I18n.tr("Hyprland Options")
                     visible: isHyprland
                 }
@@ -862,43 +934,43 @@ FloatingWindow {
                     spacing: Theme.spacingL
                     visible: isHyprland
 
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: tileToggle
                         label: I18n.tr("Tile")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: noFocusToggle
                         label: I18n.tr("No Focus")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: noBorderToggle
                         label: I18n.tr("No Border")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: noShadowToggle
                         label: I18n.tr("No Shadow")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: noDimToggle
                         label: I18n.tr("No Dim")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: noBlurToggle
                         label: I18n.tr("No Blur")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: noAnimToggle
                         label: I18n.tr("No Anim")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: noRoundingToggle
                         label: I18n.tr("No Rounding")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: pinToggle
                         label: I18n.tr("Pin")
                     }
-                    WindowRuleCheckboxRow {
+                    CheckboxRow {
                         id: opaqueToggle
                         label: I18n.tr("Opaque")
                     }
@@ -921,7 +993,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: sizeInput.activeFocus
                             DankTextField {
@@ -948,7 +1020,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: moveInput.activeFocus
                             DankTextField {
@@ -981,7 +1053,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: monitorInput.activeFocus
                             DankTextField {
@@ -1008,7 +1080,7 @@ FloatingWindow {
                             horizontalAlignment: Text.AlignLeft
                         }
 
-                        WindowRuleInputField {
+                        InputField {
                             width: parent.width
                             hasFocus: hyprWorkspaceInput.activeFocus
                             DankTextField {

quickshell/Modals/WindowRuleSectionHeader.qml

@@ -1,15 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-StyledText {
-    property string title
-    text: title
-    font.pixelSize: Theme.fontSizeMedium
-    font.weight: Font.Medium
-    color: Theme.primary
-    topPadding: Theme.spacingM
-    bottomPadding: Theme.spacingXS
-    width: parent.width
-    horizontalAlignment: Text.AlignLeft
-}

quickshell/Modules/AppDrawer/AppDrawerPopout.qml

@@ -133,7 +133,7 @@ DankPopout {
             QtObject {
                 id: modalAdapter
                 property bool spotlightOpen: appDrawerPopout.shouldBeVisible
-                readonly property bool isClosing: !appDrawerPopout.shouldBeVisible
+                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/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/DankBarContent.qml

@@ -969,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

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/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/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/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/ProcessList/CircleGauge.qml

@@ -1,161 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: gaugeRoot
-
-    property real value: 0
-    property string label: ""
-    property string sublabel: ""
-    property string detail: ""
-    property color accentColor: Theme.primary
-    property color detailColor: Theme.surfaceVariantText
-
-    readonly property real thickness: Math.max(4, Math.min(width, height) / 15)
-    readonly property real glowExtra: thickness * 1.4
-    readonly property real arcPadding: (thickness + glowExtra) / 2
-
-    readonly property real innerDiameter: width - (arcPadding + thickness + glowExtra) * 2
-    readonly property real maxTextWidth: innerDiameter * 0.9
-    readonly property real baseLabelSize: Math.round(width * 0.18)
-    readonly property real labelSize: Math.round(Math.min(baseLabelSize, maxTextWidth / Math.max(1, label.length * 0.65)))
-    readonly property real sublabelSize: Math.round(Math.min(width * 0.13, maxTextWidth / Math.max(1, sublabel.length * 0.7)))
-    readonly property real detailSize: Math.round(Math.min(width * 0.12, maxTextWidth / Math.max(1, detail.length * 0.65)))
-
-    property real animValue: 0
-
-    onValueChanged: animValue = Math.min(1, Math.max(0, value))
-
-    Behavior on animValue {
-        NumberAnimation {
-            duration: Theme.mediumDuration
-            easing.type: Easing.OutCubic
-        }
-    }
-
-    Component.onCompleted: animValue = Math.min(1, Math.max(0, value))
-
-    Canvas {
-        id: glowCanvas
-        anchors.fill: parent
-        onPaint: {
-            const ctx = getContext("2d");
-            ctx.reset();
-            const cx = width / 2;
-            const cy = height / 2;
-            const radius = (Math.min(width, height) / 2) - gaugeRoot.arcPadding;
-            const startAngle = -Math.PI * 0.5;
-            const endAngle = Math.PI * 1.5;
-
-            ctx.lineCap = "round";
-
-            if (gaugeRoot.animValue > 0) {
-                const prog = startAngle + (endAngle - startAngle) * gaugeRoot.animValue;
-                ctx.beginPath();
-                ctx.arc(cx, cy, radius, startAngle, prog);
-                ctx.strokeStyle = Qt.rgba(gaugeRoot.accentColor.r, gaugeRoot.accentColor.g, gaugeRoot.accentColor.b, 0.2);
-                ctx.lineWidth = gaugeRoot.thickness + gaugeRoot.glowExtra;
-                ctx.stroke();
-            }
-        }
-
-        Connections {
-            target: gaugeRoot
-            function onAnimValueChanged() {
-                glowCanvas.requestPaint();
-            }
-            function onAccentColorChanged() {
-                glowCanvas.requestPaint();
-            }
-            function onWidthChanged() {
-                glowCanvas.requestPaint();
-            }
-            function onHeightChanged() {
-                glowCanvas.requestPaint();
-            }
-        }
-
-        Component.onCompleted: requestPaint()
-    }
-
-    Canvas {
-        id: arcCanvas
-        anchors.fill: parent
-        onPaint: {
-            const ctx = getContext("2d");
-            ctx.reset();
-            const cx = width / 2;
-            const cy = height / 2;
-            const radius = (Math.min(width, height) / 2) - gaugeRoot.arcPadding;
-            const startAngle = -Math.PI * 0.5;
-            const endAngle = Math.PI * 1.5;
-
-            ctx.lineCap = "round";
-
-            ctx.beginPath();
-            ctx.arc(cx, cy, radius, startAngle, endAngle);
-            ctx.strokeStyle = Qt.rgba(gaugeRoot.accentColor.r, gaugeRoot.accentColor.g, gaugeRoot.accentColor.b, 0.1);
-            ctx.lineWidth = gaugeRoot.thickness;
-            ctx.stroke();
-
-            if (gaugeRoot.animValue > 0) {
-                const prog = startAngle + (endAngle - startAngle) * gaugeRoot.animValue;
-                ctx.beginPath();
-                ctx.arc(cx, cy, radius, startAngle, prog);
-                ctx.strokeStyle = gaugeRoot.accentColor;
-                ctx.lineWidth = gaugeRoot.thickness;
-                ctx.stroke();
-            }
-        }
-
-        Connections {
-            target: gaugeRoot
-            function onAnimValueChanged() {
-                arcCanvas.requestPaint();
-            }
-            function onAccentColorChanged() {
-                arcCanvas.requestPaint();
-            }
-            function onWidthChanged() {
-                arcCanvas.requestPaint();
-            }
-            function onHeightChanged() {
-                arcCanvas.requestPaint();
-            }
-        }
-
-        Component.onCompleted: requestPaint()
-    }
-
-    Column {
-        anchors.centerIn: parent
-        spacing: 1
-
-        StyledText {
-            text: gaugeRoot.label
-            font.pixelSize: gaugeRoot.labelSize
-            font.family: SettingsData.monoFontFamily
-            font.weight: Font.Bold
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: gaugeRoot.sublabel
-            font.pixelSize: gaugeRoot.sublabelSize
-            font.weight: Font.Medium
-            color: gaugeRoot.accentColor
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: gaugeRoot.detail
-            font.pixelSize: gaugeRoot.detailSize
-            font.family: SettingsData.monoFontFamily
-            color: gaugeRoot.detailColor
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: gaugeRoot.detail.length > 0
-        }
-    }
-}

quickshell/Modules/ProcessList/InfoRow.qml

@@ -1,29 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import qs.Common
-import qs.Widgets
-
-RowLayout {
-    property string label: ""
-    property string value: ""
-
-    Layout.fillWidth: true
-    spacing: Theme.spacingS
-
-    StyledText {
-        text: label + ":"
-        font.pixelSize: Theme.fontSizeSmall
-        font.weight: Font.Medium
-        color: Theme.surfaceVariantText
-        Layout.preferredWidth: 100
-    }
-
-    StyledText {
-        text: value
-        font.pixelSize: Theme.fontSizeSmall
-        font.family: SettingsData.monoFontFamily
-        color: Theme.surfaceText
-        Layout.fillWidth: true
-        elide: Text.ElideRight
-    }
-}

quickshell/Modules/ProcessList/PerformanceCard.qml

@@ -1,160 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import qs.Common
-import qs.Widgets
-
-Rectangle {
-    id: card
-
-    property string title: ""
-    property string icon: ""
-    property string value: ""
-    property string subtitle: ""
-    property color accentColor: Theme.primary
-    property var history: []
-    property var history2: null
-    property real maxValue: 100
-    property bool showSecondary: false
-    property string extraInfo: ""
-    property color extraInfoColor: Theme.surfaceVariantText
-    property int historySize: 60
-
-    radius: Theme.cornerRadius
-    color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-    border.color: Theme.outlineLight
-    border.width: 1
-
-    Canvas {
-        id: graphCanvas
-        anchors.fill: parent
-        anchors.margins: 4
-        renderStrategy: Canvas.Cooperative
-
-        property var hist: card.history
-        property var hist2: card.history2
-
-        onHistChanged: requestPaint()
-        onHist2Changed: requestPaint()
-        onWidthChanged: requestPaint()
-        onHeightChanged: requestPaint()
-
-        onPaint: {
-            const ctx = getContext("2d");
-            ctx.reset();
-            ctx.clearRect(0, 0, width, height);
-
-            if (!hist || hist.length < 2)
-                return;
-
-            let max = card.maxValue;
-            if (max <= 0) {
-                max = 1;
-                for (let k = 0; k < hist.length; k++)
-                    max = Math.max(max, hist[k]);
-                if (hist2) {
-                    for (let l = 0; l < hist2.length; l++)
-                        max = Math.max(max, hist2[l]);
-                }
-                max *= 1.1;
-            }
-
-            const c = card.accentColor;
-            const grad = ctx.createLinearGradient(0, 0, 0, height);
-            grad.addColorStop(0, Qt.rgba(c.r, c.g, c.b, 0.25));
-            grad.addColorStop(1, Qt.rgba(c.r, c.g, c.b, 0.02));
-
-            ctx.fillStyle = grad;
-            ctx.beginPath();
-            ctx.moveTo(0, height);
-            for (let i = 0; i < hist.length; i++) {
-                const x = (width / (card.historySize - 1)) * i;
-                const y = height - (hist[i] / max) * height * 0.8;
-                ctx.lineTo(x, y);
-            }
-            ctx.lineTo((width / (card.historySize - 1)) * (hist.length - 1), height);
-            ctx.closePath();
-            ctx.fill();
-
-            ctx.strokeStyle = Qt.rgba(c.r, c.g, c.b, 0.8);
-            ctx.lineWidth = 2;
-            ctx.beginPath();
-            for (let j = 0; j < hist.length; j++) {
-                const px = (width / (card.historySize - 1)) * j;
-                const py = height - (hist[j] / max) * height * 0.8;
-                j === 0 ? ctx.moveTo(px, py) : ctx.lineTo(px, py);
-            }
-            ctx.stroke();
-
-            if (hist2 && hist2.length >= 2 && card.showSecondary) {
-                ctx.strokeStyle = Qt.rgba(c.r, c.g, c.b, 0.4);
-                ctx.lineWidth = 1.5;
-                ctx.setLineDash([4, 4]);
-                ctx.beginPath();
-                for (let m = 0; m < hist2.length; m++) {
-                    const sx = (width / (card.historySize - 1)) * m;
-                    const sy = height - (hist2[m] / max) * height * 0.8;
-                    m === 0 ? ctx.moveTo(sx, sy) : ctx.lineTo(sx, sy);
-                }
-                ctx.stroke();
-                ctx.setLineDash([]);
-            }
-        }
-    }
-
-    ColumnLayout {
-        anchors.fill: parent
-        anchors.margins: Theme.spacingM
-        spacing: Theme.spacingXS
-
-        RowLayout {
-            Layout.fillWidth: true
-            spacing: Theme.spacingS
-
-            DankIcon {
-                name: card.icon
-                size: Theme.iconSize
-                color: card.accentColor
-            }
-
-            StyledText {
-                text: card.title
-                font.pixelSize: Theme.fontSizeLarge
-                font.weight: Font.Bold
-                color: Theme.surfaceText
-            }
-
-            Item {
-                Layout.fillWidth: true
-            }
-
-            StyledText {
-                text: card.extraInfo
-                font.pixelSize: Theme.fontSizeSmall
-                font.family: SettingsData.monoFontFamily
-                color: card.extraInfoColor
-                visible: card.extraInfo.length > 0
-            }
-        }
-
-        Item {
-            Layout.fillHeight: true
-        }
-
-        StyledText {
-            text: card.value
-            font.pixelSize: Theme.fontSizeXLarge
-            font.family: SettingsData.monoFontFamily
-            font.weight: Font.Bold
-            color: Theme.surfaceText
-        }
-
-        StyledText {
-            text: card.subtitle
-            font.pixelSize: Theme.fontSizeSmall
-            font.family: SettingsData.monoFontFamily
-            color: Theme.surfaceVariantText
-            elide: Text.ElideRight
-            Layout.fillWidth: true
-        }
-    }
-}

quickshell/Modules/ProcessList/PerformanceView.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import Quickshell
 import qs.Common
 import qs.Services
+import qs.Widgets
 
 Item {
     id: root
@@ -72,7 +73,6 @@ Item {
             PerformanceCard {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                historySize: root.historySize
                 title: "CPU"
                 icon: "memory"
                 value: DgopService.cpuUsage.toFixed(1) + "%"
@@ -88,7 +88,6 @@ Item {
             PerformanceCard {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                historySize: root.historySize
                 title: I18n.tr("Memory")
                 icon: "sd_card"
                 value: DgopService.memoryUsage.toFixed(1) + "%"
@@ -110,7 +109,6 @@ Item {
             PerformanceCard {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                historySize: root.historySize
                 title: I18n.tr("Network")
                 icon: "swap_horiz"
                 value: "↓ " + root.formatBytes(DgopService.networkRxRate)
@@ -127,7 +125,6 @@ Item {
             PerformanceCard {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                historySize: root.historySize
                 title: I18n.tr("Disk")
                 icon: "storage"
                 value: "R: " + root.formatBytes(DgopService.diskReadRate)
@@ -149,4 +146,159 @@ Item {
             }
         }
     }
+
+    component PerformanceCard: Rectangle {
+        id: card
+
+        property string title: ""
+        property string icon: ""
+        property string value: ""
+        property string subtitle: ""
+        property color accentColor: Theme.primary
+        property var history: []
+        property var history2: null
+        property real maxValue: 100
+        property bool showSecondary: false
+        property string extraInfo: ""
+        property color extraInfoColor: Theme.surfaceVariantText
+
+        radius: Theme.cornerRadius
+        color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+        border.color: Theme.outlineLight
+        border.width: 1
+
+        Canvas {
+            id: graphCanvas
+            anchors.fill: parent
+            anchors.margins: 4
+            renderStrategy: Canvas.Cooperative
+
+            property var hist: card.history
+            property var hist2: card.history2
+
+            onHistChanged: requestPaint()
+            onHist2Changed: requestPaint()
+            onWidthChanged: requestPaint()
+            onHeightChanged: requestPaint()
+
+            onPaint: {
+                const ctx = getContext("2d");
+                ctx.reset();
+                ctx.clearRect(0, 0, width, height);
+
+                if (!hist || hist.length < 2)
+                    return;
+
+                let max = card.maxValue;
+                if (max <= 0) {
+                    max = 1;
+                    for (let k = 0; k < hist.length; k++)
+                        max = Math.max(max, hist[k]);
+                    if (hist2) {
+                        for (let l = 0; l < hist2.length; l++)
+                            max = Math.max(max, hist2[l]);
+                    }
+                    max *= 1.1;
+                }
+
+                const c = card.accentColor;
+                const grad = ctx.createLinearGradient(0, 0, 0, height);
+                grad.addColorStop(0, Qt.rgba(c.r, c.g, c.b, 0.25));
+                grad.addColorStop(1, Qt.rgba(c.r, c.g, c.b, 0.02));
+
+                ctx.fillStyle = grad;
+                ctx.beginPath();
+                ctx.moveTo(0, height);
+                for (let i = 0; i < hist.length; i++) {
+                    const x = (width / (root.historySize - 1)) * i;
+                    const y = height - (hist[i] / max) * height * 0.8;
+                    ctx.lineTo(x, y);
+                }
+                ctx.lineTo((width / (root.historySize - 1)) * (hist.length - 1), height);
+                ctx.closePath();
+                ctx.fill();
+
+                ctx.strokeStyle = Qt.rgba(c.r, c.g, c.b, 0.8);
+                ctx.lineWidth = 2;
+                ctx.beginPath();
+                for (let j = 0; j < hist.length; j++) {
+                    const px = (width / (root.historySize - 1)) * j;
+                    const py = height - (hist[j] / max) * height * 0.8;
+                    j === 0 ? ctx.moveTo(px, py) : ctx.lineTo(px, py);
+                }
+                ctx.stroke();
+
+                if (hist2 && hist2.length >= 2 && card.showSecondary) {
+                    ctx.strokeStyle = Qt.rgba(c.r, c.g, c.b, 0.4);
+                    ctx.lineWidth = 1.5;
+                    ctx.setLineDash([4, 4]);
+                    ctx.beginPath();
+                    for (let m = 0; m < hist2.length; m++) {
+                        const sx = (width / (root.historySize - 1)) * m;
+                        const sy = height - (hist2[m] / max) * height * 0.8;
+                        m === 0 ? ctx.moveTo(sx, sy) : ctx.lineTo(sx, sy);
+                    }
+                    ctx.stroke();
+                    ctx.setLineDash([]);
+                }
+            }
+        }
+
+        ColumnLayout {
+            anchors.fill: parent
+            anchors.margins: Theme.spacingM
+            spacing: Theme.spacingXS
+
+            RowLayout {
+                Layout.fillWidth: true
+                spacing: Theme.spacingS
+
+                DankIcon {
+                    name: card.icon
+                    size: Theme.iconSize
+                    color: card.accentColor
+                }
+
+                StyledText {
+                    text: card.title
+                    font.pixelSize: Theme.fontSizeLarge
+                    font.weight: Font.Bold
+                    color: Theme.surfaceText
+                }
+
+                Item {
+                    Layout.fillWidth: true
+                }
+
+                StyledText {
+                    text: card.extraInfo
+                    font.pixelSize: Theme.fontSizeSmall
+                    font.family: SettingsData.monoFontFamily
+                    color: card.extraInfoColor
+                    visible: card.extraInfo.length > 0
+                }
+            }
+
+            Item {
+                Layout.fillHeight: true
+            }
+
+            StyledText {
+                text: card.value
+                font.pixelSize: Theme.fontSizeXLarge
+                font.family: SettingsData.monoFontFamily
+                font.weight: Font.Bold
+                color: Theme.surfaceText
+            }
+
+            StyledText {
+                text: card.subtitle
+                font.pixelSize: Theme.fontSizeSmall
+                font.family: SettingsData.monoFontFamily
+                color: Theme.surfaceVariantText
+                elide: Text.ElideRight
+                Layout.fillWidth: true
+            }
+        }
+    }
 }

quickshell/Modules/ProcessList/ProcessItem.qml

@@ -1,334 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Rectangle {
-    id: processItemRoot
-
-    property var process: null
-    property bool isExpanded: false
-    property bool isSelected: false
-    property var contextMenu: null
-
-    signal toggleExpand
-    signal clicked
-    signal contextMenuRequested(real mouseX, real mouseY)
-
-    readonly property int processPid: process?.pid ?? 0
-    readonly property real processCpu: process?.cpu ?? 0
-    readonly property int processMemKB: process?.memoryKB ?? 0
-    readonly property string processCmd: process?.command ?? ""
-    readonly property string processFullCmd: process?.fullCommand ?? processCmd
-
-    height: isExpanded ? (44 + expandedRect.height + Theme.spacingXS) : 44
-    radius: Theme.cornerRadius
-    color: {
-        if (isSelected)
-            return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15);
-        return processMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : "transparent";
-    }
-    border.color: {
-        if (isSelected)
-            return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3);
-        return processMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent";
-    }
-    border.width: 1
-    clip: true
-
-    Behavior on height {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-    }
-
-    Behavior on color {
-        ColorAnimation {
-            duration: Theme.shortDuration
-        }
-    }
-
-    MouseArea {
-        id: processMouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onClicked: mouse => {
-            if (mouse.button === Qt.RightButton) {
-                processItemRoot.contextMenuRequested(mouse.x, mouse.y);
-                return;
-            }
-            processItemRoot.clicked();
-            processItemRoot.toggleExpand();
-        }
-    }
-
-    Column {
-        anchors.fill: parent
-        spacing: 0
-
-        Item {
-            width: parent.width
-            height: 44
-
-            RowLayout {
-                anchors.fill: parent
-                anchors.leftMargin: Theme.spacingS
-                anchors.rightMargin: Theme.spacingS
-                spacing: 0
-
-                Item {
-                    Layout.fillWidth: true
-                    Layout.minimumWidth: 200
-                    height: parent.height
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: DgopService.getProcessIcon(processItemRoot.processCmd)
-                            size: Theme.iconSize - 4
-                            color: {
-                                if (processItemRoot.processCpu > 80)
-                                    return Theme.error;
-                                if (processItemRoot.processCpu > 50)
-                                    return Theme.warning;
-                                return Theme.surfaceText;
-                            }
-                            opacity: 0.8
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: processItemRoot.processCmd
-                            font.pixelSize: Theme.fontSizeSmall
-                            font.family: SettingsData.monoFontFamily
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            elide: Text.ElideRight
-                            width: Math.min(implicitWidth, 280)
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-                }
-
-                Item {
-                    Layout.preferredWidth: 100
-                    height: parent.height
-
-                    Rectangle {
-                        anchors.centerIn: parent
-                        width: 70
-                        height: 24
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (processItemRoot.processCpu > 80)
-                                return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.15);
-                            if (processItemRoot.processCpu > 50)
-                                return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12);
-                            return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06);
-                        }
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: DgopService.formatCpuUsage(processItemRoot.processCpu)
-                            font.pixelSize: Theme.fontSizeSmall
-                            font.family: SettingsData.monoFontFamily
-                            font.weight: Font.Bold
-                            color: {
-                                if (processItemRoot.processCpu > 80)
-                                    return Theme.error;
-                                if (processItemRoot.processCpu > 50)
-                                    return Theme.warning;
-                                return Theme.surfaceText;
-                            }
-                        }
-                    }
-                }
-
-                Item {
-                    Layout.preferredWidth: 100
-                    height: parent.height
-
-                    Rectangle {
-                        anchors.centerIn: parent
-                        width: 70
-                        height: 24
-                        radius: Theme.cornerRadius
-                        color: {
-                            if (processItemRoot.processMemKB > 2 * 1024 * 1024)
-                                return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.15);
-                            if (processItemRoot.processMemKB > 1024 * 1024)
-                                return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12);
-                            return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06);
-                        }
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: DgopService.formatMemoryUsage(processItemRoot.processMemKB)
-                            font.pixelSize: Theme.fontSizeSmall
-                            font.family: SettingsData.monoFontFamily
-                            font.weight: Font.Bold
-                            color: {
-                                if (processItemRoot.processMemKB > 2 * 1024 * 1024)
-                                    return Theme.error;
-                                if (processItemRoot.processMemKB > 1024 * 1024)
-                                    return Theme.warning;
-                                return Theme.surfaceText;
-                            }
-                        }
-                    }
-                }
-
-                Item {
-                    Layout.preferredWidth: 80
-                    height: parent.height
-
-                    StyledText {
-                        anchors.centerIn: parent
-                        text: processItemRoot.processPid > 0 ? processItemRoot.processPid.toString() : ""
-                        font.pixelSize: Theme.fontSizeSmall
-                        font.family: SettingsData.monoFontFamily
-                        color: Theme.surfaceVariantText
-                    }
-                }
-
-                Item {
-                    Layout.preferredWidth: 40
-                    height: parent.height
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: processItemRoot.isExpanded ? "expand_less" : "expand_more"
-                        size: Theme.iconSize - 4
-                        color: Theme.surfaceVariantText
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            id: expandedRect
-            width: parent.width - Theme.spacingM * 2
-            height: processItemRoot.isExpanded ? (expandedContent.implicitHeight + Theme.spacingS * 2) : 0
-            anchors.horizontalCenter: parent.horizontalCenter
-            radius: Theme.cornerRadius - 2
-            color: Qt.rgba(Theme.surfaceContainerHigh.r, Theme.surfaceContainerHigh.g, Theme.surfaceContainerHigh.b, 0.6)
-            clip: true
-            visible: processItemRoot.isExpanded
-
-            Behavior on height {
-                NumberAnimation {
-                    duration: Theme.shortDuration
-                    easing.type: Theme.standardEasing
-                }
-            }
-
-            Column {
-                id: expandedContent
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.margins: Theme.spacingS
-                spacing: Theme.spacingXS
-
-                RowLayout {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    StyledText {
-                        id: cmdLabel
-                        text: I18n.tr("Full Command:", "process detail label")
-                        font.pixelSize: Theme.fontSizeSmall - 2
-                        font.weight: Font.Bold
-                        color: Theme.surfaceVariantText
-                        Layout.alignment: Qt.AlignVCenter
-                    }
-
-                    StyledText {
-                        id: cmdText
-                        text: processItemRoot.processFullCmd
-                        font.pixelSize: Theme.fontSizeSmall - 2
-                        font.family: SettingsData.monoFontFamily
-                        color: Theme.surfaceText
-                        Layout.fillWidth: true
-                        Layout.alignment: Qt.AlignVCenter
-                        elide: Text.ElideMiddle
-                    }
-
-                    Rectangle {
-                        id: copyBtn
-                        Layout.preferredWidth: 24
-                        Layout.preferredHeight: 24
-                        Layout.alignment: Qt.AlignVCenter
-                        radius: Theme.cornerRadius - 2
-                        color: copyMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : "transparent"
-
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: "content_copy"
-                            size: 14
-                            color: copyMouseArea.containsMouse ? Theme.primary : Theme.surfaceVariantText
-                        }
-
-                        MouseArea {
-                            id: copyMouseArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                Quickshell.execDetached(["dms", "cl", "copy", processItemRoot.processFullCmd]);
-                            }
-                        }
-                    }
-                }
-
-                Row {
-                    spacing: Theme.spacingL
-
-                    Row {
-                        spacing: Theme.spacingXS
-
-                        StyledText {
-                            text: "PPID:"
-                            font.pixelSize: Theme.fontSizeSmall - 2
-                            font.weight: Font.Bold
-                            color: Theme.surfaceVariantText
-                        }
-
-                        StyledText {
-                            text: (processItemRoot.process?.ppid ?? 0) > 0 ? processItemRoot.process.ppid.toString() : "--"
-                            font.pixelSize: Theme.fontSizeSmall - 2
-                            font.family: SettingsData.monoFontFamily
-                            color: Theme.surfaceText
-                        }
-                    }
-
-                    Row {
-                        spacing: Theme.spacingXS
-
-                        StyledText {
-                            text: "Mem:"
-                            font.pixelSize: Theme.fontSizeSmall - 2
-                            font.weight: Font.Bold
-                            color: Theme.surfaceVariantText
-                        }
-
-                        StyledText {
-                            text: (processItemRoot.process?.memoryPercent ?? 0).toFixed(1) + "%"
-                            font.pixelSize: Theme.fontSizeSmall - 2
-                            font.family: SettingsData.monoFontFamily
-                            color: Theme.surfaceText
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/ProcessList/ProcessListPopout.qml

@@ -374,4 +374,162 @@ DankPopout {
             }
         }
     }
+
+    component CircleGauge: Item {
+        id: gaugeRoot
+
+        property real value: 0
+        property string label: ""
+        property string sublabel: ""
+        property string detail: ""
+        property color accentColor: Theme.primary
+        property color detailColor: Theme.surfaceVariantText
+
+        readonly property real thickness: Math.max(4, Math.min(width, height) / 15)
+        readonly property real glowExtra: thickness * 1.4
+        readonly property real arcPadding: (thickness + glowExtra) / 2
+
+        readonly property real innerDiameter: width - (arcPadding + thickness + glowExtra) * 2
+        readonly property real maxTextWidth: innerDiameter * 0.9
+        readonly property real baseLabelSize: Math.round(width * 0.18)
+        readonly property real labelSize: Math.round(Math.min(baseLabelSize, maxTextWidth / Math.max(1, label.length * 0.65)))
+        readonly property real sublabelSize: Math.round(Math.min(width * 0.13, maxTextWidth / Math.max(1, sublabel.length * 0.7)))
+        readonly property real detailSize: Math.round(Math.min(width * 0.12, maxTextWidth / Math.max(1, detail.length * 0.65)))
+
+        property real animValue: 0
+
+        onValueChanged: animValue = Math.min(1, Math.max(0, value))
+
+        Behavior on animValue {
+            NumberAnimation {
+                duration: Theme.mediumDuration
+                easing.type: Easing.OutCubic
+            }
+        }
+
+        Component.onCompleted: animValue = Math.min(1, Math.max(0, value))
+
+        Canvas {
+            id: glowCanvas
+            anchors.fill: parent
+            onPaint: {
+                const ctx = getContext("2d");
+                ctx.reset();
+                const cx = width / 2;
+                const cy = height / 2;
+                const radius = (Math.min(width, height) / 2) - gaugeRoot.arcPadding;
+                const startAngle = -Math.PI * 0.5;
+                const endAngle = Math.PI * 1.5;
+
+                ctx.lineCap = "round";
+
+                if (gaugeRoot.animValue > 0) {
+                    const prog = startAngle + (endAngle - startAngle) * gaugeRoot.animValue;
+                    ctx.beginPath();
+                    ctx.arc(cx, cy, radius, startAngle, prog);
+                    ctx.strokeStyle = Qt.rgba(gaugeRoot.accentColor.r, gaugeRoot.accentColor.g, gaugeRoot.accentColor.b, 0.2);
+                    ctx.lineWidth = gaugeRoot.thickness + gaugeRoot.glowExtra;
+                    ctx.stroke();
+                }
+            }
+
+            Connections {
+                target: gaugeRoot
+                function onAnimValueChanged() {
+                    glowCanvas.requestPaint();
+                }
+                function onAccentColorChanged() {
+                    glowCanvas.requestPaint();
+                }
+                function onWidthChanged() {
+                    glowCanvas.requestPaint();
+                }
+                function onHeightChanged() {
+                    glowCanvas.requestPaint();
+                }
+            }
+
+            Component.onCompleted: requestPaint()
+        }
+
+        Canvas {
+            id: arcCanvas
+            anchors.fill: parent
+            onPaint: {
+                const ctx = getContext("2d");
+                ctx.reset();
+                const cx = width / 2;
+                const cy = height / 2;
+                const radius = (Math.min(width, height) / 2) - gaugeRoot.arcPadding;
+                const startAngle = -Math.PI * 0.5;
+                const endAngle = Math.PI * 1.5;
+
+                ctx.lineCap = "round";
+
+                ctx.beginPath();
+                ctx.arc(cx, cy, radius, startAngle, endAngle);
+                ctx.strokeStyle = Qt.rgba(gaugeRoot.accentColor.r, gaugeRoot.accentColor.g, gaugeRoot.accentColor.b, 0.1);
+                ctx.lineWidth = gaugeRoot.thickness;
+                ctx.stroke();
+
+                if (gaugeRoot.animValue > 0) {
+                    const prog = startAngle + (endAngle - startAngle) * gaugeRoot.animValue;
+                    ctx.beginPath();
+                    ctx.arc(cx, cy, radius, startAngle, prog);
+                    ctx.strokeStyle = gaugeRoot.accentColor;
+                    ctx.lineWidth = gaugeRoot.thickness;
+                    ctx.stroke();
+                }
+            }
+
+            Connections {
+                target: gaugeRoot
+                function onAnimValueChanged() {
+                    arcCanvas.requestPaint();
+                }
+                function onAccentColorChanged() {
+                    arcCanvas.requestPaint();
+                }
+                function onWidthChanged() {
+                    arcCanvas.requestPaint();
+                }
+                function onHeightChanged() {
+                    arcCanvas.requestPaint();
+                }
+            }
+
+            Component.onCompleted: requestPaint()
+        }
+
+        Column {
+            anchors.centerIn: parent
+            spacing: 1
+
+            StyledText {
+                text: gaugeRoot.label
+                font.pixelSize: gaugeRoot.labelSize
+                font.family: SettingsData.monoFontFamily
+                font.weight: Font.Bold
+                color: Theme.surfaceText
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
+            StyledText {
+                text: gaugeRoot.sublabel
+                font.pixelSize: gaugeRoot.sublabelSize
+                font.weight: Font.Medium
+                color: gaugeRoot.accentColor
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
+            StyledText {
+                text: gaugeRoot.detail
+                font.pixelSize: gaugeRoot.detailSize
+                font.family: SettingsData.monoFontFamily
+                color: gaugeRoot.detailColor
+                anchors.horizontalCenter: parent.horizontalCenter
+                visible: gaugeRoot.detail.length > 0
+            }
+        }
+    }
 }

quickshell/Modules/ProcessList/ProcessesView.qml

@@ -368,4 +368,402 @@ Item {
             }
         }
     }
+
+    component SortableHeader: Item {
+        id: headerItem
+
+        property string text: ""
+        property string sortKey: ""
+        property string currentSort: ""
+        property bool sortAscending: false
+        property int alignment: Text.AlignHCenter
+
+        signal clicked
+
+        readonly property bool isActive: sortKey === currentSort
+
+        height: 36
+
+        Rectangle {
+            anchors.fill: parent
+            anchors.margins: 2
+            radius: Theme.cornerRadius
+            color: headerItem.isActive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : (headerMouseArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06) : "transparent")
+
+            Behavior on color {
+                ColorAnimation {
+                    duration: Theme.shortDuration
+                }
+            }
+        }
+
+        RowLayout {
+            anchors.fill: parent
+            anchors.leftMargin: Theme.spacingS
+            anchors.rightMargin: Theme.spacingS
+            spacing: 4
+
+            Item {
+                Layout.fillWidth: headerItem.alignment === Text.AlignLeft
+                visible: headerItem.alignment !== Text.AlignLeft
+            }
+
+            StyledText {
+                text: headerItem.text
+                font.pixelSize: Theme.fontSizeSmall
+                font.family: SettingsData.monoFontFamily
+                font.weight: headerItem.isActive ? Font.Bold : Font.Medium
+                color: headerItem.isActive ? Theme.primary : Theme.surfaceText
+                opacity: headerItem.isActive ? 1 : 0.8
+            }
+
+            DankIcon {
+                name: headerItem.sortAscending ? "arrow_upward" : "arrow_downward"
+                size: Theme.fontSizeSmall
+                color: Theme.primary
+                visible: headerItem.isActive
+            }
+
+            Item {
+                Layout.fillWidth: headerItem.alignment !== Text.AlignLeft
+                visible: headerItem.alignment === Text.AlignLeft
+            }
+        }
+
+        MouseArea {
+            id: headerMouseArea
+            anchors.fill: parent
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            onClicked: headerItem.clicked()
+        }
+    }
+
+    component ProcessItem: Rectangle {
+        id: processItemRoot
+
+        property var process: null
+        property bool isExpanded: false
+        property bool isSelected: false
+        property var contextMenu: null
+
+        signal toggleExpand
+        signal clicked
+        signal contextMenuRequested(real mouseX, real mouseY)
+
+        readonly property int processPid: process?.pid ?? 0
+        readonly property real processCpu: process?.cpu ?? 0
+        readonly property int processMemKB: process?.memoryKB ?? 0
+        readonly property string processCmd: process?.command ?? ""
+        readonly property string processFullCmd: process?.fullCommand ?? processCmd
+
+        height: isExpanded ? (44 + expandedRect.height + Theme.spacingXS) : 44
+        radius: Theme.cornerRadius
+        color: {
+            if (isSelected)
+                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15);
+            return processMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : "transparent";
+        }
+        border.color: {
+            if (isSelected)
+                return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3);
+            return processMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent";
+        }
+        border.width: 1
+        clip: true
+
+        Behavior on height {
+            NumberAnimation {
+                duration: Theme.shortDuration
+                easing.type: Theme.standardEasing
+            }
+        }
+
+        Behavior on color {
+            ColorAnimation {
+                duration: Theme.shortDuration
+            }
+        }
+
+        MouseArea {
+            id: processMouseArea
+            anchors.fill: parent
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+            onClicked: mouse => {
+                if (mouse.button === Qt.RightButton) {
+                    processItemRoot.contextMenuRequested(mouse.x, mouse.y);
+                    return;
+                }
+                processItemRoot.clicked();
+                processItemRoot.toggleExpand();
+            }
+        }
+
+        Column {
+            anchors.fill: parent
+            spacing: 0
+
+            Item {
+                width: parent.width
+                height: 44
+
+                RowLayout {
+                    anchors.fill: parent
+                    anchors.leftMargin: Theme.spacingS
+                    anchors.rightMargin: Theme.spacingS
+                    spacing: 0
+
+                    Item {
+                        Layout.fillWidth: true
+                        Layout.minimumWidth: 200
+                        height: parent.height
+
+                        Row {
+                            anchors.left: parent.left
+                            anchors.verticalCenter: parent.verticalCenter
+                            spacing: Theme.spacingS
+
+                            DankIcon {
+                                name: DgopService.getProcessIcon(processItemRoot.processCmd)
+                                size: Theme.iconSize - 4
+                                color: {
+                                    if (processItemRoot.processCpu > 80)
+                                        return Theme.error;
+                                    if (processItemRoot.processCpu > 50)
+                                        return Theme.warning;
+                                    return Theme.surfaceText;
+                                }
+                                opacity: 0.8
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            StyledText {
+                                text: processItemRoot.processCmd
+                                font.pixelSize: Theme.fontSizeSmall
+                                font.family: SettingsData.monoFontFamily
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                                elide: Text.ElideRight
+                                width: Math.min(implicitWidth, 280)
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+                        }
+                    }
+
+                    Item {
+                        Layout.preferredWidth: 100
+                        height: parent.height
+
+                        Rectangle {
+                            anchors.centerIn: parent
+                            width: 70
+                            height: 24
+                            radius: Theme.cornerRadius
+                            color: {
+                                if (processItemRoot.processCpu > 80)
+                                    return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.15);
+                                if (processItemRoot.processCpu > 50)
+                                    return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12);
+                                return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06);
+                            }
+
+                            StyledText {
+                                anchors.centerIn: parent
+                                text: DgopService.formatCpuUsage(processItemRoot.processCpu)
+                                font.pixelSize: Theme.fontSizeSmall
+                                font.family: SettingsData.monoFontFamily
+                                font.weight: Font.Bold
+                                color: {
+                                    if (processItemRoot.processCpu > 80)
+                                        return Theme.error;
+                                    if (processItemRoot.processCpu > 50)
+                                        return Theme.warning;
+                                    return Theme.surfaceText;
+                                }
+                            }
+                        }
+                    }
+
+                    Item {
+                        Layout.preferredWidth: 100
+                        height: parent.height
+
+                        Rectangle {
+                            anchors.centerIn: parent
+                            width: 70
+                            height: 24
+                            radius: Theme.cornerRadius
+                            color: {
+                                if (processItemRoot.processMemKB > 2 * 1024 * 1024)
+                                    return Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.15);
+                                if (processItemRoot.processMemKB > 1024 * 1024)
+                                    return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12);
+                                return Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06);
+                            }
+
+                            StyledText {
+                                anchors.centerIn: parent
+                                text: DgopService.formatMemoryUsage(processItemRoot.processMemKB)
+                                font.pixelSize: Theme.fontSizeSmall
+                                font.family: SettingsData.monoFontFamily
+                                font.weight: Font.Bold
+                                color: {
+                                    if (processItemRoot.processMemKB > 2 * 1024 * 1024)
+                                        return Theme.error;
+                                    if (processItemRoot.processMemKB > 1024 * 1024)
+                                        return Theme.warning;
+                                    return Theme.surfaceText;
+                                }
+                            }
+                        }
+                    }
+
+                    Item {
+                        Layout.preferredWidth: 80
+                        height: parent.height
+
+                        StyledText {
+                            anchors.centerIn: parent
+                            text: processItemRoot.processPid > 0 ? processItemRoot.processPid.toString() : ""
+                            font.pixelSize: Theme.fontSizeSmall
+                            font.family: SettingsData.monoFontFamily
+                            color: Theme.surfaceVariantText
+                        }
+                    }
+
+                    Item {
+                        Layout.preferredWidth: 40
+                        height: parent.height
+
+                        DankIcon {
+                            anchors.centerIn: parent
+                            name: processItemRoot.isExpanded ? "expand_less" : "expand_more"
+                            size: Theme.iconSize - 4
+                            color: Theme.surfaceVariantText
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                id: expandedRect
+                width: parent.width - Theme.spacingM * 2
+                height: processItemRoot.isExpanded ? (expandedContent.implicitHeight + Theme.spacingS * 2) : 0
+                anchors.horizontalCenter: parent.horizontalCenter
+                radius: Theme.cornerRadius - 2
+                color: Qt.rgba(Theme.surfaceContainerHigh.r, Theme.surfaceContainerHigh.g, Theme.surfaceContainerHigh.b, 0.6)
+                clip: true
+                visible: processItemRoot.isExpanded
+
+                Behavior on height {
+                    NumberAnimation {
+                        duration: Theme.shortDuration
+                        easing.type: Theme.standardEasing
+                    }
+                }
+
+                Column {
+                    id: expandedContent
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    anchors.margins: Theme.spacingS
+                    spacing: Theme.spacingXS
+
+                    RowLayout {
+                        width: parent.width
+                        spacing: Theme.spacingS
+
+                        StyledText {
+                            id: cmdLabel
+                            text: I18n.tr("Full Command:", "process detail label")
+                            font.pixelSize: Theme.fontSizeSmall - 2
+                            font.weight: Font.Bold
+                            color: Theme.surfaceVariantText
+                            Layout.alignment: Qt.AlignVCenter
+                        }
+
+                        StyledText {
+                            id: cmdText
+                            text: processItemRoot.processFullCmd
+                            font.pixelSize: Theme.fontSizeSmall - 2
+                            font.family: SettingsData.monoFontFamily
+                            color: Theme.surfaceText
+                            Layout.fillWidth: true
+                            Layout.alignment: Qt.AlignVCenter
+                            elide: Text.ElideMiddle
+                        }
+
+                        Rectangle {
+                            id: copyBtn
+                            Layout.preferredWidth: 24
+                            Layout.preferredHeight: 24
+                            Layout.alignment: Qt.AlignVCenter
+                            radius: Theme.cornerRadius - 2
+                            color: copyMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : "transparent"
+
+                            DankIcon {
+                                anchors.centerIn: parent
+                                name: "content_copy"
+                                size: 14
+                                color: copyMouseArea.containsMouse ? Theme.primary : Theme.surfaceVariantText
+                            }
+
+                            MouseArea {
+                                id: copyMouseArea
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                cursorShape: Qt.PointingHandCursor
+                                onClicked: {
+                                    Quickshell.execDetached(["dms", "cl", "copy", processItemRoot.processFullCmd]);
+                                }
+                            }
+                        }
+                    }
+
+                    Row {
+                        spacing: Theme.spacingL
+
+                        Row {
+                            spacing: Theme.spacingXS
+
+                            StyledText {
+                                text: "PPID:"
+                                font.pixelSize: Theme.fontSizeSmall - 2
+                                font.weight: Font.Bold
+                                color: Theme.surfaceVariantText
+                            }
+
+                            StyledText {
+                                text: (processItemRoot.process?.ppid ?? 0) > 0 ? processItemRoot.process.ppid.toString() : "--"
+                                font.pixelSize: Theme.fontSizeSmall - 2
+                                font.family: SettingsData.monoFontFamily
+                                color: Theme.surfaceText
+                            }
+                        }
+
+                        Row {
+                            spacing: Theme.spacingXS
+
+                            StyledText {
+                                text: "Mem:"
+                                font.pixelSize: Theme.fontSizeSmall - 2
+                                font.weight: Font.Bold
+                                color: Theme.surfaceVariantText
+                            }
+
+                            StyledText {
+                                text: (processItemRoot.process?.memoryPercent ?? 0).toFixed(1) + "%"
+                                font.pixelSize: Theme.fontSizeSmall - 2
+                                font.family: SettingsData.monoFontFamily
+                                color: Theme.surfaceText
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

quickshell/Modules/ProcessList/SortableHeader.qml

@@ -1,74 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import qs.Common
-import qs.Widgets
-
-Item {
-    id: headerItem
-
-    property string text: ""
-    property string sortKey: ""
-    property string currentSort: ""
-    property bool sortAscending: false
-    property int alignment: Text.AlignHCenter
-
-    signal clicked
-
-    readonly property bool isActive: sortKey === currentSort
-
-    height: 36
-
-    Rectangle {
-        anchors.fill: parent
-        anchors.margins: 2
-        radius: Theme.cornerRadius
-        color: headerItem.isActive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : (headerMouseArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.06) : "transparent")
-
-        Behavior on color {
-            ColorAnimation {
-                duration: Theme.shortDuration
-            }
-        }
-    }
-
-    RowLayout {
-        anchors.fill: parent
-        anchors.leftMargin: Theme.spacingS
-        anchors.rightMargin: Theme.spacingS
-        spacing: 4
-
-        Item {
-            Layout.fillWidth: headerItem.alignment === Text.AlignLeft
-            visible: headerItem.alignment !== Text.AlignLeft
-        }
-
-        StyledText {
-            text: headerItem.text
-            font.pixelSize: Theme.fontSizeSmall
-            font.family: SettingsData.monoFontFamily
-            font.weight: headerItem.isActive ? Font.Bold : Font.Medium
-            color: headerItem.isActive ? Theme.primary : Theme.surfaceText
-            opacity: headerItem.isActive ? 1 : 0.8
-        }
-
-        DankIcon {
-            name: headerItem.sortAscending ? "arrow_upward" : "arrow_downward"
-            size: Theme.fontSizeSmall
-            color: Theme.primary
-            visible: headerItem.isActive
-        }
-
-        Item {
-            Layout.fillWidth: headerItem.alignment !== Text.AlignLeft
-            visible: headerItem.alignment === Text.AlignLeft
-        }
-    }
-
-    MouseArea {
-        id: headerMouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: headerItem.clicked()
-    }
-}

quickshell/Modules/ProcessList/SystemView.qml

@@ -358,4 +358,29 @@ Item {
             }
         }
     }
+
+    component InfoRow: RowLayout {
+        property string label: ""
+        property string value: ""
+
+        Layout.fillWidth: true
+        spacing: Theme.spacingS
+
+        StyledText {
+            text: label + ":"
+            font.pixelSize: Theme.fontSizeSmall
+            font.weight: Font.Medium
+            color: Theme.surfaceVariantText
+            Layout.preferredWidth: 100
+        }
+
+        StyledText {
+            text: value
+            font.pixelSize: Theme.fontSizeSmall
+            font.family: SettingsData.monoFontFamily
+            color: Theme.surfaceText
+            Layout.fillWidth: true
+            elide: Text.ElideRight
+        }
+    }
 }

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")]

quickshell/Modules/Settings/SoundsTab.qml

@@ -91,16 +91,6 @@ Item {
                         visible: AudioService.gsettingsAvailable
                     }
 
-                    SettingsToggleRow {
-                        tab: "sounds"
-                        tags: ["sound", "login", "startup", "boot"]
-                        settingKey: "soundLogin"
-                        text: I18n.tr("Login")
-                        description: I18n.tr("Play sound after logging in")
-                        checked: SettingsData.soundLogin
-                        onToggled: checked => SettingsData.set("soundLogin", checked)
-                    }
-
                     SettingsToggleRow {
                         tab: "sounds"
                         tags: ["sound", "notification", "new"]

quickshell/Modules/Settings/WidgetsTab.qml

@@ -430,7 +430,7 @@ Item {
             "id": widget.id,
             "enabled": widget.enabled
         };
-        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "diskUsageMode", "minimumWidth", "showSwap", "showInGb", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "controlCenterGroupOrder", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge", "trayUseInlineExpansion"];
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "diskUsageMode", "minimumWidth", "showSwap", "showInGb", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "controlCenterGroupOrder", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge"];
         for (var i = 0; i < keys.length; i++) {
             if (widget[keys[i]] !== undefined)
                 result[keys[i]] = widget[keys[i]];
@@ -712,8 +712,6 @@ Item {
                     item.barMaxVisibleRunningApps = widget.barMaxVisibleRunningApps;
                 if (widget.barShowOverflowBadge !== undefined)
                     item.barShowOverflowBadge = widget.barShowOverflowBadge;
-                if (widget.trayUseInlineExpansion !== undefined)
-                    item.trayUseInlineExpansion = widget.trayUseInlineExpansion;
             }
             widgets.push(item);
         });

quickshell/Modules/Settings/WidgetsTabSection.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Layouts
 import qs.Common
 import qs.Widgets
 import qs.Services
@@ -39,7 +40,7 @@ Column {
             "id": widget.id,
             "enabled": widget.enabled
         };
-        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "diskUsageMode", "minimumWidth", "showSwap", "showInGb", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "controlCenterGroupOrder", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge", "trayUseInlineExpansion"];
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "diskUsageMode", "minimumWidth", "showSwap", "showInGb", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "controlCenterGroupOrder", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge"];
         for (var i = 0; i < keys.length; i++) {
             if (widget[keys[i]] !== undefined)
                 result[keys[i]] = widget[keys[i]];
@@ -51,14 +52,15 @@ Column {
     height: implicitHeight
     spacing: Theme.spacingM
 
-    Row {
+    RowLayout {
+        width: parent.width
         spacing: Theme.spacingM
 
         DankIcon {
             name: root.titleIcon
             size: Theme.iconSize
             color: Theme.primary
-            anchors.verticalCenter: parent.verticalCenter
+            Layout.alignment: Qt.AlignVCenter
         }
 
         StyledText {
@@ -66,7 +68,7 @@ Column {
             font.pixelSize: Theme.fontSizeLarge
             font.weight: Font.Medium
             color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
+            Layout.alignment: Qt.AlignVCenter
         }
     }
 
@@ -437,7 +439,7 @@ Column {
 
                         Row {
                             spacing: Theme.spacingXS
-                            visible: modelData.id === "clock" || modelData.id === "focusedWindow" || modelData.id === "keyboard_layout_name" || modelData.id === "appsDock" || modelData.id === "systemTray"
+                            visible: modelData.id === "clock" || modelData.id === "focusedWindow" || modelData.id === "keyboard_layout_name" || modelData.id === "appsDock"
 
                             DankActionButton {
                                 id: compactModeButton
@@ -543,39 +545,6 @@ Column {
                                 }
                             }
 
-                            DankActionButton {
-                                id: trayMenuButton
-                                buttonSize: 32
-                                visible: modelData.id === "systemTray"
-                                iconName: "more_vert"
-                                iconSize: 18
-                                iconColor: Theme.outline
-                                onClicked: {
-                                    trayContextMenu.widgetData = modelData;
-                                    trayContextMenu.sectionId = root.sectionId;
-                                    trayContextMenu.widgetIndex = index;
-
-                                    var buttonPos = trayMenuButton.mapToItem(root, 0, 0);
-                                    var popupWidth = trayContextMenu.width;
-                                    var popupHeight = trayContextMenu.height;
-
-                                    var xPos = buttonPos.x - popupWidth - Theme.spacingS;
-                                    if (xPos < 0)
-                                        xPos = buttonPos.x + trayMenuButton.width + Theme.spacingS;
-
-                                    var yPos = buttonPos.y - popupHeight / 2 + trayMenuButton.height / 2;
-                                    if (yPos < 0) {
-                                        yPos = Theme.spacingS;
-                                    } else if (yPos + popupHeight > root.height) {
-                                        yPos = root.height - popupHeight - Theme.spacingS;
-                                    }
-
-                                    trayContextMenu.x = xPos;
-                                    trayContextMenu.y = yPos;
-                                    trayContextMenu.open();
-                                }
-                            }
-
                             Rectangle {
                                 id: compactModeTooltip
                                 width: tooltipText.contentWidth + Theme.spacingM * 2
@@ -964,88 +933,6 @@ Column {
         }
     }
 
-    Popup {
-        id: trayContextMenu
-
-        property var widgetData: null
-        property string sectionId: ""
-        property int widgetIndex: -1
-        readonly property var currentWidgetData: (widgetIndex >= 0 && widgetIndex < root.items.length) ? root.items[widgetIndex] : widgetData
-
-        width: 220
-        height: contentColumn.implicitHeight + Theme.spacingS * 2
-        padding: 0
-        modal: true
-        focus: true
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-        background: Rectangle {
-            color: Theme.surfaceContainer
-            radius: Theme.cornerRadius
-            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-            border.width: 0
-        }
-
-        contentItem: Item {
-            Column {
-                id: contentColumn
-                anchors.fill: parent
-                anchors.margins: Theme.spacingS
-                spacing: 2
-
-                Rectangle {
-                    width: parent.width
-                    height: 32
-                    radius: Theme.cornerRadius
-                    color: trayOverflowArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "arrow_selector_tool"
-                            size: 16
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Use Inline Expansion")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Normal
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        id: trayOverflowToggle
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: 40
-                        height: 20
-                        checked: trayContextMenu.currentWidgetData?.trayUseInlineExpansion ?? false
-                    }
-
-                    MouseArea {
-                        id: trayOverflowArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            const newValue = !(trayContextMenu.currentWidgetData?.trayUseInlineExpansion ?? false);
-                            root.overflowSettingChanged(trayContextMenu.sectionId, trayContextMenu.widgetIndex, "trayUseInlineExpansion", newValue);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     Popup {
         id: diskUsageContextMenu
 
@@ -1094,26 +981,10 @@ Column {
 
                 Repeater {
                     model: [
-                        {
-                            label: I18n.tr("Percentage"),
-                            mode: 0,
-                            icon: "percent"
-                        },
-                        {
-                            label: I18n.tr("Total"),
-                            mode: 1,
-                            icon: "storage"
-                        },
-                        {
-                            label: I18n.tr("Remaining"),
-                            mode: 2,
-                            icon: "hourglass_empty"
-                        },
-                        {
-                            label: I18n.tr("Remaining / Total"),
-                            mode: 3,
-                            icon: "pie_chart"
-                        }
+                        { label: I18n.tr("Percentage"), mode: 0, icon: "percent" },
+                        { label: I18n.tr("Total"), mode: 1, icon: "storage" },
+                        { label: I18n.tr("Remaining"), mode: 2, icon: "hourglass_empty" },
+                        { label: I18n.tr("Remaining / Total"), mode: 3, icon: "pie_chart" }
                     ]
 
                     delegate: Rectangle {
@@ -1445,7 +1316,20 @@ Column {
                     id: longestControlCenterLabelMetrics
                     font.pixelSize: Theme.fontSizeSmall
                     text: {
-                        const labels = [I18n.tr("Network"), I18n.tr("VPN"), I18n.tr("Bluetooth"), I18n.tr("Audio"), I18n.tr("Volume"), I18n.tr("Microphone"), I18n.tr("Microphone Volume"), I18n.tr("Brightness"), I18n.tr("Brightness Value"), I18n.tr("Battery"), I18n.tr("Printer"), I18n.tr("Screen Sharing")];
+                        const labels = [
+                            I18n.tr("Network"),
+                            I18n.tr("VPN"),
+                            I18n.tr("Bluetooth"),
+                            I18n.tr("Audio"),
+                            I18n.tr("Volume"),
+                            I18n.tr("Microphone"),
+                            I18n.tr("Microphone Volume"),
+                            I18n.tr("Brightness"),
+                            I18n.tr("Brightness Value"),
+                            I18n.tr("Battery"),
+                            I18n.tr("Printer"),
+                            I18n.tr("Screen Sharing")
+                        ];
                         let longest = "";
                         for (let i = 0; i < labels.length; i++) {
                             if (labels[i].length > longest.length)
@@ -1456,7 +1340,6 @@ Column {
                 }
 
                 Repeater {
-                    id: groupRepeater
                     model: controlCenterContextMenu.controlCenterGroups
 
                     delegate: Item {
@@ -1686,6 +1569,8 @@ Column {
                             }
                         }
                     }
+
+                    id: groupRepeater
                 }
             }
         }

quickshell/Services/AudioService.qml

@@ -26,7 +26,6 @@ Singleton {
     property var powerUnplugSound: null
     property var normalNotificationSound: null
     property var criticalNotificationSound: null
-    property var loginSound: null
     property real notificationsVolume: 1.0
     property bool notificationsAudioMuted: false
 
@@ -68,16 +67,6 @@ Singleton {
         }
     }
 
-    // Used in playLoginSoundIfApplicable()
-    Process {
-        id: loginSoundChecker
-        onExited: (exitCode) => {
-            if (exitCode === 0) {
-                playLoginSound();
-            }
-    }
-}
-
     function getAvailableSinks() {
         const hidden = SessionData.hiddenOutputDeviceNames ?? [];
         return Pipewire.nodes.values.filter(node => node.audio && node.isSink && !node.isStream && !hidden.includes(node.name));
@@ -406,7 +395,7 @@ EOFCONFIG
         const themesToSearch = themeName !== "freedesktop" ? `${themeName} freedesktop` : themeName;
 
         const script = `
-            for event_key in audio-volume-change power-plug power-unplug message message-new-instant desktop-login; do
+            for event_key in audio-volume-change power-plug power-unplug message message-new-instant; do
                 found=0
 
                 case "$event_key" in
@@ -468,8 +457,7 @@ EOFCONFIG
             "power-plug": "../assets/sounds/plasma/power-plug.wav",
             "power-unplug": "../assets/sounds/plasma/power-unplug.wav",
             "message": "../assets/sounds/freedesktop/message.wav",
-            "message-new-instant": "../assets/sounds/freedesktop/message-new-instant.wav",
-            "desktop-login": "../assets/sounds/freedesktop/desktop-login.wav"
+            "message-new-instant": "../assets/sounds/freedesktop/message-new-instant.wav"
         };
 
         const specialConditions = {
@@ -563,10 +551,6 @@ EOFCONFIG
             criticalNotificationSound.destroy();
             criticalNotificationSound = null;
         }
-        if (loginSound) {
-            loginSound.destroy();
-            loginSound = null;
-        }
     }
 
     function createSoundPlayers() {
@@ -638,19 +622,6 @@ EOFCONFIG
                     }
                 }
             `, root, "AudioService.CriticalNotificationSound");
-
-            const loginPath = getSoundPath("desktop-login");
-            loginSound = Qt.createQmlObject(`
-                import QtQuick
-                import QtMultimedia
-                MediaPlayer {
-                    source: "${loginPath}"
-                    audioOutput: AudioOutput {
-                        ${deviceProperty}volume: notificationsVolume
-                    }
-                }
-            `, root, "AudioService.LoginSound");
-
         } catch (e) {
             console.warn("AudioService: Error creating sound players:", e);
         }
@@ -690,31 +661,6 @@ EOFCONFIG
         criticalNotificationSound.play();
     }
 
-    function playLoginSound() {
-        if (!soundsAvailable || !loginSound || notificationsAudioMuted || isMediaPlaying()) {
-            return;
-        }
-        loginSound.play();
-    }
-
-    function playLoginSoundIfApplicable() {
-        if (SettingsData.soundsEnabled && SettingsData.soundLogin && !notificationsAudioMuted) {
-            // plays login sound on session start, but only if a specific file doesn't exist,
-            // to prevent it from playing on every DMS restart during the session
-            const runtimeDir = Quickshell.env("XDG_RUNTIME_DIR");
-            const sessionId = Quickshell.env("XDG_SESSION_ID") || "0";
-
-            if (!runtimeDir) return;
-
-            const loginFile = `${runtimeDir}/danklinux.login-${sessionId}`;
-
-            // if file doesn't exist, touch it (0)
-            // If it exists, do nothing (1)
-            loginSoundChecker.command = ["sh", "-c", `[ ! -f ${loginFile} ] && touch ${loginFile}`];
-            loginSoundChecker.running = true;
-        }
-    }
-
     function playVolumeChangeSoundIfEnabled() {
         if (SettingsData.soundsEnabled && SettingsData.soundVolumeChanged && !notificationsAudioMuted) {
             playVolumeChangeSound();

quickshell/Services/BlurService.qml

@@ -3,16 +3,13 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
-import Quickshell.Io
 import Quickshell.Wayland // ! Import is needed despite what qmlls says
 import qs.Common
 
 Singleton {
     id: root
 
-    property bool quickshellSupported: false
-    property bool compositorSupported: false
-    property bool available: quickshellSupported && compositorSupported
+    property bool available: false
     readonly property bool enabled: available && (SettingsData.blurEnabled ?? false)
 
     readonly property color borderColor: {
@@ -75,27 +72,6 @@ Singleton {
         region.destroy();
     }
 
-    Process {
-        id: blurProbe
-        running: false
-        command: ["dms", "blur", "check"]
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                root.compositorSupported = text.trim() === "supported";
-                if (root.compositorSupported)
-                    console.info("BlurService: Compositor supports ext-background-effect-v1");
-                else
-                    console.info("BlurService: Compositor does not support ext-background-effect-v1");
-            }
-        }
-
-        onExited: exitCode => {
-            if (exitCode !== 0)
-                console.warn("BlurService: blur probe failed with code:", exitCode);
-        }
-    }
-
     Component.onCompleted: {
         try {
             const test = Qt.createQmlObject(`
@@ -103,9 +79,8 @@ Singleton {
                 Region { radius: 0 }
             `, root, "BlurAvailabilityTest");
             test.destroy();
-            quickshellSupported = true;
-            console.info("BlurService: Quickshell blur support available");
-            blurProbe.running = true;
+            available = true;
+            console.info("BlurService: Initialized with blur support");
         } catch (e) {
             console.info("BlurService: BackgroundEffect not available - blur disabled. Requires a newer version of Quickshell.");
         }

quickshell/Services/ClipboardService.qml

@@ -255,12 +255,6 @@ Singleton {
         return pinnedEntries.some(pinnedEntry => pinnedEntry.hash === entryHash);
     }
 
-    onClipboardAvailableChanged: {
-        if (!clipboardAvailable || refCount <= 0)
-            return;
-        refresh();
-    }
-
     Connections {
         target: DMSService
         enabled: root.refCount > 0

quickshell/Services/MprisController.qml

@@ -10,20 +10,4 @@ Singleton {
 
     readonly property list<MprisPlayer> availablePlayers: Mpris.players.values
     property MprisPlayer activePlayer: availablePlayers.find(p => p.isPlaying) ?? availablePlayers.find(p => p.canControl && p.canPlay) ?? null
-
-    Timer {
-        interval: 1000
-        running: root.activePlayer?.playbackState === MprisPlaybackState.Playing
-        repeat: true
-        onTriggered: root.activePlayer?.positionChanged()
-    }
-
-    function previousOrRewind(): void {
-        if (!activePlayer)
-            return;
-        if (activePlayer.position > 8 && activePlayer.canSeek)
-            activePlayer.position = 0;
-        else if (activePlayer.canGoPrevious)
-            activePlayer.previous();
-    }
 }

quickshell/Services/NotifWrapper.qml

@@ -1,147 +0,0 @@
-import QtQuick
-import Quickshell.Services.Notifications
-import qs.Common
-
-QtObject {
-    id: wrapper
-
-    property bool popup: false
-    property bool removedByLimit: false
-    property bool isPersistent: true
-    property int seq: 0
-    property string persistedImagePath: ""
-
-    onPopupChanged: {
-        if (!popup) {
-            NotificationService.removeFromVisibleNotifications(wrapper);
-        }
-    }
-
-    readonly property Timer timer: Timer {
-        interval: {
-            if (!wrapper.notification)
-                return 5000;
-            switch (wrapper.urgency) {
-            case NotificationUrgency.Low:
-                return SettingsData.notificationTimeoutLow;
-            case NotificationUrgency.Critical:
-                return SettingsData.notificationTimeoutCritical;
-            default:
-                return SettingsData.notificationTimeoutNormal;
-            }
-        }
-        repeat: false
-        running: false
-        onTriggered: {
-            if (interval > 0) {
-                wrapper.popup = false;
-            }
-        }
-    }
-
-    readonly property date time: new Date()
-    readonly property string timeStr: {
-        NotificationService.timeUpdateTick;
-        NotificationService.clockFormatChanged;
-
-        const now = new Date();
-        const diff = now.getTime() - time.getTime();
-        const minutes = Math.floor(diff / 60000);
-        const hours = Math.floor(minutes / 60);
-
-        if (hours < 1) {
-            if (minutes < 1) {
-                return "now";
-            }
-            return `${minutes}m ago`;
-        }
-
-        const nowDate = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-        const timeDate = new Date(time.getFullYear(), time.getMonth(), time.getDate());
-        const daysDiff = Math.floor((nowDate - timeDate) / (1000 * 60 * 60 * 24));
-
-        if (daysDiff === 0) {
-            return formatTime(time);
-        }
-
-        try {
-            const localeName = (typeof I18n !== "undefined" && I18n.locale) ? I18n.locale().name : "en-US";
-            const weekday = time.toLocaleDateString(localeName, {
-                weekday: "long"
-            });
-            return `${weekday}, ${formatTime(time)}`;
-        } catch (e) {
-            return formatTime(time);
-        }
-    }
-
-    function formatTime(date) {
-        let use24Hour = true;
-        try {
-            if (typeof SettingsData !== "undefined" && SettingsData.use24HourClock !== undefined) {
-                use24Hour = SettingsData.use24HourClock;
-            }
-        } catch (e) {
-            use24Hour = true;
-        }
-
-        if (use24Hour) {
-            return date.toLocaleTimeString(Qt.locale(), "HH:mm");
-        } else {
-            return date.toLocaleTimeString(Qt.locale(), "h:mm AP");
-        }
-    }
-
-    required property Notification notification
-    readonly property string summary: (notification?.summary ?? "").replace(/<img\b[^>]*>/gi, "")
-    readonly property string body: (notification?.body ?? "").replace(/<img\b[^>]*>/gi, "")
-    readonly property string htmlBody: NotificationService._resolveHtmlBody(body)
-    readonly property string appIcon: notification?.appIcon ?? ""
-    readonly property string appName: {
-        if (!notification)
-            return "app";
-        if (notification.appName == "") {
-            const entry = DesktopEntries.heuristicLookup(notification.desktopEntry);
-            if (entry && entry.name)
-                return entry.name.toLowerCase();
-        }
-        return notification.appName || "app";
-    }
-    readonly property string desktopEntry: notification?.desktopEntry ?? ""
-    readonly property string image: notification?.image ?? ""
-    readonly property string cleanImage: {
-        if (!image)
-            return "";
-        return Paths.strip(image);
-    }
-    property int urgencyOverride: notification?.urgency ?? NotificationUrgency.Normal
-    readonly property int urgency: urgencyOverride
-    readonly property list<NotificationAction> actions: notification?.actions ?? []
-
-    readonly property Connections conn: Connections {
-        target: wrapper.notification?.Retainable ?? null
-
-        function onDropped(): void {
-            NotificationService.allWrappers = NotificationService.allWrappers.filter(w => w !== wrapper);
-            NotificationService.notifications = NotificationService.notifications.filter(w => w !== wrapper);
-
-            if (NotificationService.bulkDismissing) {
-                return;
-            }
-
-            const groupKey = NotificationService.getGroupKey(wrapper);
-            const remainingInGroup = NotificationService.notifications.filter(n => NotificationService.getGroupKey(n) === groupKey);
-
-            if (remainingInGroup.length <= 1) {
-                NotificationService.clearGroupExpansionState(groupKey);
-            }
-
-            NotificationService.cleanupExpansionStates();
-            NotificationService._recomputeGroupsLater();
-        }
-
-        function onAboutToDestroy(): void {
-            wrapper.destroy();
-        }
-    }
-}

quickshell/Services/NotificationService.qml

@@ -655,6 +655,150 @@ Singleton {
         }
     }
 
+    component NotifWrapper: QtObject {
+        id: wrapper
+
+        property bool popup: false
+        property bool removedByLimit: false
+        property bool isPersistent: true
+        property int seq: 0
+        property string persistedImagePath: ""
+
+        onPopupChanged: {
+            if (!popup) {
+                removeFromVisibleNotifications(wrapper);
+            }
+        }
+
+        readonly property Timer timer: Timer {
+            interval: {
+                if (!wrapper.notification)
+                    return 5000;
+                switch (wrapper.urgency) {
+                case NotificationUrgency.Low:
+                    return SettingsData.notificationTimeoutLow;
+                case NotificationUrgency.Critical:
+                    return SettingsData.notificationTimeoutCritical;
+                default:
+                    return SettingsData.notificationTimeoutNormal;
+                }
+            }
+            repeat: false
+            running: false
+            onTriggered: {
+                if (interval > 0) {
+                    wrapper.popup = false;
+                }
+            }
+        }
+
+        readonly property date time: new Date()
+        readonly property string timeStr: {
+            root.timeUpdateTick;
+            root.clockFormatChanged;
+
+            const now = new Date();
+            const diff = now.getTime() - time.getTime();
+            const minutes = Math.floor(diff / 60000);
+            const hours = Math.floor(minutes / 60);
+
+            if (hours < 1) {
+                if (minutes < 1) {
+                    return "now";
+                }
+                return `${minutes}m ago`;
+            }
+
+            const nowDate = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+            const timeDate = new Date(time.getFullYear(), time.getMonth(), time.getDate());
+            const daysDiff = Math.floor((nowDate - timeDate) / (1000 * 60 * 60 * 24));
+
+            if (daysDiff === 0) {
+                return formatTime(time);
+            }
+
+            try {
+                const localeName = (typeof I18n !== "undefined" && I18n.locale) ? I18n.locale().name : "en-US";
+                const weekday = time.toLocaleDateString(localeName, {
+                    weekday: "long"
+                });
+                return `${weekday}, ${formatTime(time)}`;
+            } catch (e) {
+                return formatTime(time);
+            }
+        }
+
+        function formatTime(date) {
+            let use24Hour = true;
+            try {
+                if (typeof SettingsData !== "undefined" && SettingsData.use24HourClock !== undefined) {
+                    use24Hour = SettingsData.use24HourClock;
+                }
+            } catch (e) {
+                use24Hour = true;
+            }
+
+            if (use24Hour) {
+                return date.toLocaleTimeString(Qt.locale(), "HH:mm");
+            } else {
+                return date.toLocaleTimeString(Qt.locale(), "h:mm AP");
+            }
+        }
+
+        required property Notification notification
+        readonly property string summary: (notification?.summary ?? "").replace(/<img\b[^>]*>/gi, "")
+        readonly property string body: (notification?.body ?? "").replace(/<img\b[^>]*>/gi, "")
+        readonly property string htmlBody: root._resolveHtmlBody(body)
+        readonly property string appIcon: notification?.appIcon ?? ""
+        readonly property string appName: {
+            if (!notification)
+                return "app";
+            if (notification.appName == "") {
+                const entry = DesktopEntries.heuristicLookup(notification.desktopEntry);
+                if (entry && entry.name)
+                    return entry.name.toLowerCase();
+            }
+            return notification.appName || "app";
+        }
+        readonly property string desktopEntry: notification?.desktopEntry ?? ""
+        readonly property string image: notification?.image ?? ""
+        readonly property string cleanImage: {
+            if (!image)
+                return "";
+            return Paths.strip(image);
+        }
+        property int urgencyOverride: notification?.urgency ?? NotificationUrgency.Normal
+        readonly property int urgency: urgencyOverride
+        readonly property list<NotificationAction> actions: notification?.actions ?? []
+
+        readonly property Connections conn: Connections {
+            target: wrapper.notification?.Retainable ?? null
+
+            function onDropped(): void {
+                root.allWrappers = root.allWrappers.filter(w => w !== wrapper);
+                root.notifications = root.notifications.filter(w => w !== wrapper);
+
+                if (root.bulkDismissing) {
+                    return;
+                }
+
+                const groupKey = getGroupKey(wrapper);
+                const remainingInGroup = root.notifications.filter(n => getGroupKey(n) === groupKey);
+
+                if (remainingInGroup.length <= 1) {
+                    clearGroupExpansionState(groupKey);
+                }
+
+                cleanupExpansionStates();
+                root._recomputeGroupsLater();
+            }
+
+            function onAboutToDestroy(): void {
+                wrapper.destroy();
+            }
+        }
+    }
+
     Component {
         id: notifComponent
         NotifWrapper {}

quickshell/Widgets/DankButtonGroup.qml

@@ -89,7 +89,7 @@ Row {
             width: Math.max(contentItem.implicitWidth + root.buttonPadding * 2, root.minButtonWidth) + (selected ? 4 : 0)
             height: root.buttonHeight
 
-            color: selected ? Theme.buttonBg : Theme.withAlpha(Theme.surfaceVariant, Theme.popupTransparency)
+            color: selected ? Theme.buttonBg : Theme.surfaceVariant
             border.color: "transparent"
             border.width: 0
 

quickshell/Widgets/DankOSD.qml

@@ -266,7 +266,7 @@ PanelWindow {
         scale: shouldBeVisible ? 1 : 0.9
 
         property bool childHovered: false
-        readonly property real popupSurfaceAlpha: Theme.popupTransparency
+        readonly property real popupSurfaceAlpha: SettingsData.popupTransparency
 
         Rectangle {
             id: background
@@ -286,7 +286,7 @@ PanelWindow {
             level: Theme.elevationLevel3
             fallbackOffset: 6
             targetRadius: Theme.cornerRadius
-            targetColor: Theme.withAlpha(Theme.surfaceContainer, osdContainer.popupSurfaceAlpha)
+            targetColor: Theme.surfaceContainer
             borderColor: Theme.outlineMedium
             borderWidth: 1
             shadowEnabled: Theme.elevationEnabled && SettingsData.popoutElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"

quickshell/Widgets/DankPopout.qml

@@ -576,6 +576,14 @@ Item {
                     }
                 }
 
+                Rectangle {
+                    anchors.fill: parent
+                    radius: Theme.cornerRadius
+                    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+                    border.color: BlurService.enabled ? BlurService.borderColor : Theme.outlineMedium
+                    border.width: BlurService.borderWidth
+                }
+
                 Loader {
                     id: contentLoader
                     anchors.fill: parent
@@ -583,21 +591,6 @@ Item {
                     asynchronous: false
                 }
             }
-
-            Rectangle {
-                width: parent.width
-                height: parent.height
-                x: contentWrapper.x
-                y: contentWrapper.y
-                opacity: contentWrapper.opacity
-                scale: contentWrapper.scale
-                visible: contentWrapper.visible
-                radius: Theme.cornerRadius
-                color: "transparent"
-                border.color: BlurService.enabled ? BlurService.borderColor : Theme.outlineMedium
-                border.width: BlurService.borderWidth
-                z: 100
-            }
         }
 
         Item {

quickshell/Widgets/VpnProfileDelegate.qml

@@ -238,7 +238,7 @@ Rectangle {
                         width: fieldContent.width + Theme.spacingM * 2
                         height: 32
                         radius: Theme.cornerRadius - 2
-                        color: Theme.surfaceLight
+                        color: Theme.surfaceContainerHigh
                         border.width: 1
                         border.color: Theme.outlineLight
 
@@ -272,9 +272,7 @@ Rectangle {
                 checked: configData ? (configData.autoconnect || false) : false
                 visible: !VPNService.configLoading && configData !== null
                 onToggled: checked => {
-                    VPNService.updateConfig(profile.uuid, {
-                        autoconnect: checked
-                    });
+                    VPNService.updateConfig(profile.uuid, {autoconnect: checked});
                 }
             }
 

quickshell/translations/extract_translations.py

@@ -86,13 +86,13 @@ def create_poeditor_json(translations):
             references.append(ref)
 
         contexts = sorted(data['contexts']) if data['contexts'] else []
-        comment = " | ".join(contexts) if contexts else ""
+        context_str = " | ".join(contexts) if contexts else term
 
         entry = {
             "term": term,
-            "context": term,
+            "context": context_str,
             "reference": ", ".join(references),
-            "comment": comment
+            "comment": ""
         }
         poeditor_data.append(entry)