fix(launcher): select first file search result by default fixes #1967

* Issue:(Settings)Switched Neovim Mutagen Theme To Default False

* also set to false in settingsData
- this is the case when file fails to parse

---------

Co-authored-by: bbedward <bbedward@gmail.com>

.github/workflows/run-obs.yml

@@ -9,8 +9,8 @@ on:
         type: choice
         options:
           - dms
-          - dms-greeter
           - dms-git
+          - dms-greeter
           - all
         default: "dms"
       rebuild_release:
@@ -119,8 +119,9 @@ jobs:
               echo "🔄 Manual rebuild requested: $PKG (db$REBUILD)"
 
             elif [[ "$PKG" == "all" ]]; then
-              # Check each stable package and build list of those needing updates
+              # Check each package and build list of those needing updates
               PACKAGES_TO_UPDATE=()
+              check_dms_git && PACKAGES_TO_UPDATE+=("dms-git")
               if check_dms_stable; then
                 PACKAGES_TO_UPDATE+=("dms")
                 if [[ -n "$LATEST_TAG" ]]; then
@@ -139,7 +140,7 @@ jobs:
               else
                 echo "packages=" >> $GITHUB_OUTPUT
                 echo "has_updates=false" >> $GITHUB_OUTPUT
-                echo "✓ Both packages up to date"
+                echo "✓ All packages up to date"
               fi
 
             elif [[ "$PKG" == "dms-git" ]]; then
@@ -244,7 +245,7 @@ jobs:
           fi
 
       - name: Update dms-git spec version
-        if: contains(steps.packages.outputs.packages, 'dms-git')
+        if: contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all'
         run: |
           COMMIT_HASH=$(git rev-parse --short=8 HEAD)
           COMMIT_COUNT=$(git rev-list --count HEAD)
@@ -265,7 +266,7 @@ jobs:
           } > distro/opensuse/dms-git.spec
 
       - name: Update Debian dms-git changelog version
-        if: contains(steps.packages.outputs.packages, 'dms-git')
+        if: contains(steps.packages.outputs.packages, 'dms-git') || steps.packages.outputs.packages == 'all'
         run: |
           COMMIT_HASH=$(git rev-parse --short=8 HEAD)
           COMMIT_COUNT=$(git rev-list --count HEAD)
@@ -388,7 +389,7 @@ jobs:
           UPLOADED_PACKAGES=()
           SKIPPED_PACKAGES=()
 
-          # PACKAGES can be space-separated list (e.g., "dms dms-greeter" from "all" check)
+          # PACKAGES can be space-separated list (e.g., "dms-git dms" from "all" check)
           # Loop through each package and upload
           for PKG in $PACKAGES; do
             echo ""

.github/workflows/run-ppa.yml

@@ -4,15 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       package:
-        description: "Package to upload"
-        required: true
-        type: choice
-        options:
-          - dms
-          - dms-greeter
-          - dms-git
-          - all
-        default: "dms"
+        description: "Package to upload (dms, dms-git, dms-greeter, or all)"
+        required: false
+        default: "dms-git"
       rebuild_release:
         description: "Release number for rebuilds (e.g., 2, 3, 4 for ppa2, ppa3, ppa4)"
         required: false
@@ -145,7 +139,7 @@ jobs:
             fi
           else
             # Fallback
-            echo "packages=dms" >> $GITHUB_OUTPUT
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
             echo "has_updates=true" >> $GITHUB_OUTPUT
           fi
 
@@ -215,7 +209,7 @@ jobs:
             echo "✓ Using rebuild release number: ppa$REBUILD_RELEASE"
           fi
 
-          # PACKAGES can be space-separated list (e.g., "dms-git dms dms-greeter" from "all" check)
+          # PACKAGES can be space-separated list (e.g., "dms-git dms" from "all" check)
           # Loop through each package and upload
           for PKG in $PACKAGES; do
             # Map package to PPA name

core/.mockery.yml

@@ -28,12 +28,6 @@ packages:
       outpkg: mocks_brightness
     interfaces:
       DBusConn:
-  github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation:
-    config:
-      dir: "internal/mocks/geolocation"
-      outpkg: mocks_geolocation
-    interfaces:
-      Client:
   github.com/AvengeMedia/DankMaterialShell/core/internal/server/network:
     config:
       dir: "internal/mocks/network"

core/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.10.1
+    rev: v2.9.0
     hooks:
       - id: golangci-lint-fmt
         require_serial: true

core/cmd/dms/commands_clipboard.go

@@ -222,16 +222,19 @@ func init() {
 
 func runClipCopy(cmd *cobra.Command, args []string) {
 	var data []byte
+	copyFromStdin := false
 
 	switch {
 	case len(args) > 0:
 		data = []byte(args[0])
-	default:
+	case clipCopyDownload || clipCopyType == "__multi__":
 		var err error
 		data, err = io.ReadAll(os.Stdin)
 		if err != nil {
 			log.Fatalf("read stdin: %v", err)
 		}
+	default:
+		copyFromStdin = true
 	}
 
 	if clipCopyDownload {
@@ -257,6 +260,13 @@ func runClipCopy(cmd *cobra.Command, args []string) {
 		return
 	}
 
+	if copyFromStdin {
+		if err := clipboard.CopyReader(os.Stdin, clipCopyType, clipCopyForeground, clipCopyPasteOnce); err != nil {
+			log.Fatalf("copy: %v", err)
+		}
+		return
+	}
+
 	if err := clipboard.CopyOpts(data, clipCopyType, clipCopyForeground, clipCopyPasteOnce); err != nil {
 		log.Fatalf("copy: %v", err)
 	}

core/go.mod

@@ -16,8 +16,6 @@ require (
 	github.com/sblinch/kdl-go v0.0.0-20260121213736-8b7053306ca6
 	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.11.1
-	github.com/yeqown/go-qrcode/v2 v2.2.5
-	github.com/yeqown/go-qrcode/writer/standard v1.3.0
 	github.com/yuin/goldmark v1.7.16
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	go.etcd.io/bbolt v1.4.3
@@ -34,19 +32,15 @@ require (
 	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fogleman/gg v1.3.0 // indirect
 	github.com/go-git/gcfg/v2 v2.0.2 // indirect
 	github.com/go-git/go-billy/v6 v6.0.0-20260209124918-37866f83c2d3 // indirect
 	github.com/go-logfmt/logfmt v0.6.1 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/kevinburke/ssh_config v1.6.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/pjbgf/sha1cd v0.5.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
 	github.com/stretchr/objx v0.5.3 // indirect
-	github.com/yeqown/reedsolomon v1.0.0 // indirect
 	golang.org/x/crypto v0.48.0 // indirect
 	golang.org/x/net v0.50.0 // indirect
 )

core/go.sum

@@ -58,8 +58,6 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
-github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
-github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
@@ -77,8 +75,6 @@ github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
 github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
@@ -119,8 +115,6 @@ github.com/pilebones/go-udev v0.9.1 h1:uN72M1C1fgzhsVmBGEM8w9RD1JY4iVsPZpr+Z6rb3
 github.com/pilebones/go-udev v0.9.1/go.mod h1:Bgcl07crebF3JSeS4+nuaRvhWFdCeFoBhXXeAp93XNo=
 github.com/pjbgf/sha1cd v0.5.0 h1:a+UkboSi1znleCDUNT3M5YxjOnN1fz2FhN48FlwCxs0=
 github.com/pjbgf/sha1cd v0.5.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
@@ -148,12 +142,6 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-github.com/yeqown/go-qrcode/v2 v2.2.5 h1:HCOe2bSjkhZyYoyyNaXNzh4DJZll6inVJQQw+8228Zk=
-github.com/yeqown/go-qrcode/v2 v2.2.5/go.mod h1:uHpt9CM0V1HeXLz+Wg5MN50/sI/fQhfkZlOM+cOTHxw=
-github.com/yeqown/go-qrcode/writer/standard v1.3.0 h1:chdyhEfRtUPgQtuPeaWVGQ/TQx4rE1PqeoW3U+53t34=
-github.com/yeqown/go-qrcode/writer/standard v1.3.0/go.mod h1:O4MbzsotGCvy8upYPCR91j81dr5XLT7heuljcNXW+oQ=
-github.com/yeqown/reedsolomon v1.0.0 h1:x1h/Ej/uJnNu8jaX7GLHBWmZKCAWjEJTetkqaabr4B0=
-github.com/yeqown/reedsolomon v1.0.0/go.mod h1:P76zpcn2TCuL0ul1Fso373qHRc69LKwAw/Iy6g1WiiM=
 github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.7.16 h1:n+CJdUxaFMiDUNnWC3dMWCIQJSkxH4uz3ZwQBkAlVNE=
 github.com/yuin/goldmark v1.7.16/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=

core/internal/clipboard/clipboard.go

@@ -1,10 +1,12 @@
 package clipboard
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"syscall"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/ext_data_control"
@@ -12,17 +14,37 @@ import (
 )
 
 func Copy(data []byte, mimeType string) error {
-	return CopyOpts(data, mimeType, false, false)
+	return CopyReader(bytes.NewReader(data), mimeType, false, false)
 }
 
 func CopyOpts(data []byte, mimeType string, foreground, pasteOnce bool) error {
+	if foreground {
+		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 CopyReader(bytes.NewReader(data), mimeType, foreground, pasteOnce)
+}
+
+func CopyReader(data io.Reader, mimeType string, foreground, pasteOnce bool) error {
 	if !foreground {
 		return copyFork(data, mimeType, pasteOnce)
 	}
-	return copyServe(data, mimeType, pasteOnce)
+	return copyServeReader(data, mimeType, pasteOnce)
 }
 
-func copyFork(data []byte, mimeType string, pasteOnce bool) error {
+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")
@@ -30,11 +52,15 @@ func copyFork(data []byte, mimeType string, pasteOnce bool) error {
 	args = append(args, "--type", mimeType)
 
 	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Stdin = nil
 	cmd.Stdout = nil
 	cmd.Stderr = nil
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
 
+	if stdinSource, ok := data.(*os.File); ok {
+		cmd.Stdin = stdinSource
+		return cmd.Start()
+	}
+
 	stdin, err := cmd.StdinPipe()
 	if err != nil {
 		return fmt.Errorf("stdin pipe: %w", err)
@@ -44,16 +70,66 @@ func copyFork(data []byte, mimeType string, pasteOnce bool) error {
 		return fmt.Errorf("start: %w", err)
 	}
 
-	if _, err := stdin.Write(data); err != nil {
+	if _, err := io.Copy(stdin, data); err != nil {
 		stdin.Close()
 		return fmt.Errorf("write stdin: %w", err)
 	}
-	stdin.Close()
+	if err := stdin.Close(); err != nil {
+		return fmt.Errorf("close stdin: %w", err)
+	}
 
 	return nil
 }
 
-func copyServe(data []byte, mimeType string, pasteOnce bool) error {
+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{}
+
+	if cacheDir, err := os.UserCacheDir(); err == nil {
+		preferredDirs = append(preferredDirs, filepath.Join(cacheDir, "dms", "clipboard"))
+	}
+	preferredDirs = append(preferredDirs, "/var/tmp/dms/clipboard")
+
+	for _, dir := range preferredDirs {
+		if err := os.MkdirAll(dir, 0o700); err != nil {
+			continue
+		}
+		cachedData, err := os.CreateTemp(dir, "dms-clipboard-*")
+		if err == nil {
+			return cachedData, nil
+		}
+	}
+	return os.CreateTemp("", "dms-clipboard-*")
+}
+
+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)
@@ -139,12 +215,18 @@ func copyServe(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) {
 		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:
@@ -165,6 +247,8 @@ func copyServe(data []byte, mimeType string, pasteOnce bool) error {
 		select {
 		case <-cancelled:
 			return nil
+		case err := <-sendErr:
+			return err
 		case <-pasted:
 			if pasteOnce {
 				return nil

core/internal/distros/arch.go

@@ -440,29 +440,10 @@ func (a *ArchDistribution) installAURPackages(ctx context.Context, packages []st
 	a.log(fmt.Sprintf("Installing AUR packages manually: %s", strings.Join(packages, ", ")))
 
 	hasNiri := false
-	hasQuickshell := false
 	for _, pkg := range packages {
 		if pkg == "niri-git" {
 			hasNiri = true
 		}
-		if pkg == "quickshell" || pkg == "quickshell-git" {
-			hasQuickshell = true
-		}
-	}
-
-	// If quickshell is in the list, always reinstall google-breakpad first
-	if hasQuickshell {
-		progressChan <- InstallProgressMsg{
-			Phase:       PhaseAURPackages,
-			Progress:    0.63,
-			Step:        "Reinstalling google-breakpad for quickshell...",
-			IsComplete:  false,
-			CommandInfo: "Reinstalling prerequisite AUR package for quickshell",
-		}
-
-		if err := a.installSingleAURPackage(ctx, "google-breakpad", sudoPassword, progressChan, 0.63, 0.65); err != nil {
-			return fmt.Errorf("failed to reinstall google-breakpad prerequisite for quickshell: %w", err)
-		}
 	}
 
 	// If niri is in the list, install makepkg-git-lfs-proto first if not already installed
@@ -616,10 +597,16 @@ func (a *ArchDistribution) installSingleAURPackage(ctx context.Context, pkg, sud
 		return fmt.Errorf("failed to remove optdepends from .SRCINFO for %s: %w", pkg, err)
 	}
 
-	// Skip dependency installation for dms-shell-git and dms-shell-bin
-	// since we manually manage those dependencies
-	if pkg != "dms-shell-git" && pkg != "dms-shell-bin" {
-		// Pre-install dependencies from .SRCINFO
+	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),
@@ -628,19 +615,19 @@ func (a *ArchDistribution) installSingleAURPackage(ctx context.Context, pkg, sud
 			CommandInfo: "Installing package dependencies and makedepends",
 		}
 
-		// Install dependencies and makedepends explicitly
-		srcinfoPath = filepath.Join(packageDir, ".SRCINFO")
+		// Install dependencies from .SRCINFO
+		depFilter := ""
+		if pkg == "dms-shell-git" {
+			depFilter = ` | sed -E 's/[[:space:]]*(quickshell|dgop)[[:space:]]*/ /g' | tr -s ' '`
+		}
 
 		depsCmd := exec.CommandContext(ctx, "bash", "-c",
 			fmt.Sprintf(`
-				deps=$(grep "depends = " "%s" | grep -v "makedepends" | sed 's/.*depends = //' | tr '\n' ' ' | sed 's/[[:space:]]*$//')
-				if [[ "%s" == *"quickshell"* ]]; then
-					deps=$(echo "$deps" | sed 's/google-breakpad//g' | sed 's/  / /g' | sed 's/^ *//g' | sed 's/ *$//g')
-				fi
+				deps=$(grep "depends = " "%s" | grep -v "makedepends" | sed 's/.*depends = //' | tr '\n' ' ' %s | sed 's/[[:space:]]*$//')
 				if [ ! -z "$deps" ] && [ "$deps" != " " ]; then
 					echo '%s' | sudo -S pacman -S --needed --noconfirm $deps
 				fi
-			`, srcinfoPath, pkg, sudoPassword))
+				`, srcinfoPath, depFilter, sudoPassword))
 
 		if err := a.runWithProgress(depsCmd, progressChan, PhaseAURPackages, startProgress+0.3*(endProgress-startProgress), startProgress+0.35*(endProgress-startProgress)); err != nil {
 			return fmt.Errorf("FAILED to install runtime dependencies for %s: %w", pkg, err)
@@ -657,14 +644,6 @@ func (a *ArchDistribution) installSingleAURPackage(ctx context.Context, pkg, sud
 		if err := a.runWithProgress(makedepsCmd, progressChan, PhaseAURPackages, startProgress+0.35*(endProgress-startProgress), startProgress+0.4*(endProgress-startProgress)); err != nil {
 			return fmt.Errorf("FAILED to install make dependencies for %s: %w", pkg, err)
 		}
-	} else {
-		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),
-		}
 	}
 
 	progressChan <- InstallProgressMsg{
@@ -677,7 +656,7 @@ func (a *ArchDistribution) installSingleAURPackage(ctx context.Context, pkg, sud
 
 	buildCmd := exec.CommandContext(ctx, "makepkg", "--noconfirm")
 	buildCmd.Dir = packageDir
-	buildCmd.Env = append(os.Environ(), "PKGEXT=.pkg.tar") // Disable compression for speed
+	buildCmd.Env = append(os.Environ(), "PKGEXT=.pkg.tar")
 
 	if err := a.runWithProgress(buildCmd, progressChan, PhaseAURPackages, startProgress+0.4*(endProgress-startProgress), startProgress+0.7*(endProgress-startProgress)); err != nil {
 		return fmt.Errorf("failed to build %s: %w", pkg, err)

core/internal/geolocation/client.go

@@ -1,42 +0,0 @@
-package geolocation
-
-import "github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-
-func NewClient() Client {
-	geoclueClient, err := newGeoClueClient()
-	if err != nil {
-		log.Warnf("GeoClue2 unavailable: %v", err)
-		return newSeededIpClient()
-	}
-
-	loc, _ := geoclueClient.GetLocation()
-	if loc.Latitude != 0 || loc.Longitude != 0 {
-		log.Info("Using GeoClue2 location")
-		return geoclueClient
-	}
-
-	log.Info("GeoClue2 has no fix yet, seeding with IP location")
-	ipLoc, err := fetchIPLocation()
-	if err != nil {
-		log.Warnf("IP location seed failed: %v", err)
-		return geoclueClient
-	}
-
-	log.Info("Seeded GeoClue2 with IP location")
-	geoclueClient.SeedLocation(Location{Latitude: ipLoc.Latitude, Longitude: ipLoc.Longitude})
-	return geoclueClient
-}
-
-func newSeededIpClient() *IpClient {
-	client := newIpClient()
-	ipLoc, err := fetchIPLocation()
-	if err != nil {
-		log.Warnf("IP location also failed: %v", err)
-		return client
-	}
-
-	log.Info("Using IP location")
-	client.currLocation.Latitude = ipLoc.Latitude
-	client.currLocation.Longitude = ipLoc.Longitude
-	return client
-}

core/internal/geolocation/client_geoclue.go

@@ -1,243 +0,0 @@
-package geolocation
-
-import (
-	"fmt"
-	"sync"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/pkg/dbusutil"
-	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
-	"github.com/godbus/dbus/v5"
-)
-
-const (
-	dbusGeoClueService   = "org.freedesktop.GeoClue2"
-	dbusGeoCluePath      = "/org/freedesktop/GeoClue2"
-	dbusGeoClueInterface = dbusGeoClueService
-
-	dbusGeoClueManagerPath      = dbusGeoCluePath + "/Manager"
-	dbusGeoClueManagerInterface = dbusGeoClueInterface + ".Manager"
-	dbusGeoClueManagerGetClient = dbusGeoClueManagerInterface + ".GetClient"
-
-	dbusGeoClueClientInterface       = dbusGeoClueInterface + ".Client"
-	dbusGeoClueClientDesktopId       = dbusGeoClueClientInterface + ".DesktopId"
-	dbusGeoClueClientTimeThreshold   = dbusGeoClueClientInterface + ".TimeThreshold"
-	dbusGeoClueClientTimeStart       = dbusGeoClueClientInterface + ".Start"
-	dbusGeoClueClientTimeStop        = dbusGeoClueClientInterface + ".Stop"
-	dbusGeoClueClientLocationUpdated = dbusGeoClueClientInterface + ".LocationUpdated"
-
-	dbusGeoClueLocationInterface = dbusGeoClueInterface + ".Location"
-	dbusGeoClueLocationLatitude  = dbusGeoClueLocationInterface + ".Latitude"
-	dbusGeoClueLocationLongitude = dbusGeoClueLocationInterface + ".Longitude"
-)
-
-type GeoClueClient struct {
-	currLocation  *Location
-	locationMutex sync.RWMutex
-
-	dbusConn   *dbus.Conn
-	clientPath dbus.ObjectPath
-	signals    chan *dbus.Signal
-
-	stopChan chan struct{}
-	sigWG    sync.WaitGroup
-
-	subscribers syncmap.Map[string, chan Location]
-}
-
-func newGeoClueClient() (*GeoClueClient, error) {
-	dbusConn, err := dbus.ConnectSystemBus()
-	if err != nil {
-		return nil, fmt.Errorf("system bus connection failed: %w", err)
-	}
-
-	c := &GeoClueClient{
-		dbusConn: dbusConn,
-		stopChan: make(chan struct{}),
-		signals:  make(chan *dbus.Signal, 256),
-
-		currLocation: &Location{
-			Latitude:  0.0,
-			Longitude: 0.0,
-		},
-	}
-
-	if err := c.setupClient(); err != nil {
-		dbusConn.Close()
-		return nil, err
-	}
-
-	if err := c.startSignalPump(); err != nil {
-		return nil, err
-	}
-
-	return c, nil
-}
-
-func (c *GeoClueClient) Close() {
-	close(c.stopChan)
-
-	c.sigWG.Wait()
-
-	if c.signals != nil {
-		c.dbusConn.RemoveSignal(c.signals)
-		close(c.signals)
-	}
-
-	c.subscribers.Range(func(key string, ch chan Location) bool {
-		close(ch)
-		c.subscribers.Delete(key)
-		return true
-	})
-
-	if c.dbusConn != nil {
-		c.dbusConn.Close()
-	}
-}
-
-func (c *GeoClueClient) Subscribe(id string) chan Location {
-	ch := make(chan Location, 64)
-	c.subscribers.Store(id, ch)
-	return ch
-}
-
-func (c *GeoClueClient) Unsubscribe(id string) {
-	if ch, ok := c.subscribers.LoadAndDelete(id); ok {
-		close(ch)
-	}
-}
-
-func (c *GeoClueClient) setupClient() error {
-	managerObj := c.dbusConn.Object(dbusGeoClueService, dbusGeoClueManagerPath)
-
-	if err := managerObj.Call(dbusGeoClueManagerGetClient, 0).Store(&c.clientPath); err != nil {
-		return fmt.Errorf("failed to create GeoClue2 client: %w", err)
-	}
-
-	clientObj := c.dbusConn.Object(dbusGeoClueService, c.clientPath)
-	if err := clientObj.SetProperty(dbusGeoClueClientDesktopId, "dms"); err != nil {
-		return fmt.Errorf("failed to set desktop ID: %w", err)
-	}
-
-	if err := clientObj.SetProperty(dbusGeoClueClientTimeThreshold, uint(10)); err != nil {
-		return fmt.Errorf("failed to set time threshold: %w", err)
-	}
-
-	return nil
-}
-
-func (c *GeoClueClient) startSignalPump() error {
-	c.dbusConn.Signal(c.signals)
-
-	if err := c.dbusConn.AddMatchSignal(
-		dbus.WithMatchObjectPath(c.clientPath),
-		dbus.WithMatchInterface(dbusGeoClueClientInterface),
-		dbus.WithMatchSender(dbusGeoClueClientLocationUpdated),
-	); err != nil {
-		return err
-	}
-
-	c.sigWG.Add(1)
-	go func() {
-		defer c.sigWG.Done()
-
-		clientObj := c.dbusConn.Object(dbusGeoClueService, c.clientPath)
-		clientObj.Call(dbusGeoClueClientTimeStart, 0)
-		defer clientObj.Call(dbusGeoClueClientTimeStop, 0)
-
-		for {
-			select {
-			case <-c.stopChan:
-				return
-			case sig, ok := <-c.signals:
-				if !ok {
-					return
-				}
-				if sig == nil {
-					continue
-				}
-
-				c.handleSignal(sig)
-			}
-		}
-	}()
-
-	return nil
-}
-
-func (c *GeoClueClient) handleSignal(sig *dbus.Signal) {
-	switch sig.Name {
-	case dbusGeoClueClientLocationUpdated:
-		if len(sig.Body) != 2 {
-			return
-		}
-
-		newLocationPath, ok := sig.Body[1].(dbus.ObjectPath)
-		if !ok {
-			return
-		}
-
-		if err := c.handleLocationUpdated(newLocationPath); err != nil {
-			log.Warn("GeoClue: Failed to handle location update: %v", err)
-			return
-		}
-	}
-}
-
-func (c *GeoClueClient) handleLocationUpdated(path dbus.ObjectPath) error {
-	locationObj := c.dbusConn.Object(dbusGeoClueService, path)
-
-	lat, err := locationObj.GetProperty(dbusGeoClueLocationLatitude)
-	if err != nil {
-		return err
-	}
-
-	long, err := locationObj.GetProperty(dbusGeoClueLocationLongitude)
-	if err != nil {
-		return err
-	}
-
-	c.locationMutex.Lock()
-	c.currLocation.Latitude = dbusutil.AsOr(lat, 0.0)
-	c.currLocation.Longitude = dbusutil.AsOr(long, 0.0)
-	c.locationMutex.Unlock()
-
-	c.notifySubscribers()
-	return nil
-}
-
-func (c *GeoClueClient) notifySubscribers() {
-	currentLocation, err := c.GetLocation()
-	if err != nil {
-		return
-	}
-
-	c.subscribers.Range(func(key string, ch chan Location) bool {
-		select {
-		case ch <- currentLocation:
-		default:
-			log.Warn("GeoClue: subscriber channel full, dropping update")
-		}
-		return true
-	})
-}
-
-func (c *GeoClueClient) SeedLocation(loc Location) {
-	c.locationMutex.Lock()
-	defer c.locationMutex.Unlock()
-	c.currLocation.Latitude = loc.Latitude
-	c.currLocation.Longitude = loc.Longitude
-}
-
-func (c *GeoClueClient) GetLocation() (Location, error) {
-	c.locationMutex.RLock()
-	defer c.locationMutex.RUnlock()
-	if c.currLocation == nil {
-		return Location{
-			Latitude:  0.0,
-			Longitude: 0.0,
-		}, nil
-	}
-	stateCopy := *c.currLocation
-	return stateCopy, nil
-}

core/internal/geolocation/client_ip.go

@@ -1,91 +0,0 @@
-package geolocation
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-)
-
-type IpClient struct {
-	currLocation *Location
-}
-
-type ipLocationResult struct {
-	Location
-	City string
-}
-
-type ipAPIResponse struct {
-	Status string  `json:"status"`
-	Lat    float64 `json:"lat"`
-	Lon    float64 `json:"lon"`
-	City   string  `json:"city"`
-}
-
-func newIpClient() *IpClient {
-	return &IpClient{
-		currLocation: &Location{},
-	}
-}
-
-func (c *IpClient) Subscribe(id string) chan Location {
-	ch := make(chan Location, 1)
-	if location, err := c.GetLocation(); err == nil {
-		ch <- location
-	}
-	return ch
-}
-
-func (c *IpClient) Unsubscribe(id string) {}
-
-func (c *IpClient) Close() {}
-
-func (c *IpClient) GetLocation() (Location, error) {
-	if c.currLocation.Latitude != 0 || c.currLocation.Longitude != 0 {
-		return *c.currLocation, nil
-	}
-
-	result, err := fetchIPLocation()
-	if err != nil {
-		return Location{}, err
-	}
-
-	c.currLocation.Latitude = result.Latitude
-	c.currLocation.Longitude = result.Longitude
-	return *c.currLocation, nil
-}
-
-func fetchIPLocation() (ipLocationResult, error) {
-	client := &http.Client{Timeout: 10 * time.Second}
-
-	resp, err := client.Get("http://ip-api.com/json/")
-	if err != nil {
-		return ipLocationResult{}, fmt.Errorf("failed to fetch IP location: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return ipLocationResult{}, fmt.Errorf("ip-api.com returned status %d", resp.StatusCode)
-	}
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return ipLocationResult{}, fmt.Errorf("failed to read response: %w", err)
-	}
-
-	var data ipAPIResponse
-	if err := json.Unmarshal(body, &data); err != nil {
-		return ipLocationResult{}, fmt.Errorf("failed to parse response: %w", err)
-	}
-
-	if data.Status == "fail" || (data.Lat == 0 && data.Lon == 0) {
-		return ipLocationResult{}, fmt.Errorf("ip-api.com returned no location data")
-	}
-
-	return ipLocationResult{
-		Location: Location{Latitude: data.Lat, Longitude: data.Lon},
-		City:     data.City,
-	}, nil
-}

core/internal/geolocation/types.go

@@ -1,15 +0,0 @@
-package geolocation
-
-type Location struct {
-	Latitude  float64
-	Longitude float64
-}
-
-type Client interface {
-	GetLocation() (Location, error)
-
-	Subscribe(id string) chan Location
-	Unsubscribe(id string)
-
-	Close()
-}

core/internal/mocks/geolocation/mock_Client.go

@@ -1,203 +0,0 @@
-// Code generated by mockery v2.53.5. DO NOT EDIT.
-
-package mocks_geolocation
-
-import (
-	geolocation "github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// MockClient is an autogenerated mock type for the Client type
-type MockClient struct {
-	mock.Mock
-}
-
-type MockClient_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *MockClient) EXPECT() *MockClient_Expecter {
-	return &MockClient_Expecter{mock: &_m.Mock}
-}
-
-// Close provides a mock function with no fields
-func (_m *MockClient) Close() {
-	_m.Called()
-}
-
-// MockClient_Close_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Close'
-type MockClient_Close_Call struct {
-	*mock.Call
-}
-
-// Close is a helper method to define mock.On call
-func (_e *MockClient_Expecter) Close() *MockClient_Close_Call {
-	return &MockClient_Close_Call{Call: _e.mock.On("Close")}
-}
-
-func (_c *MockClient_Close_Call) Run(run func()) *MockClient_Close_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockClient_Close_Call) Return() *MockClient_Close_Call {
-	_c.Call.Return()
-	return _c
-}
-
-func (_c *MockClient_Close_Call) RunAndReturn(run func()) *MockClient_Close_Call {
-	_c.Run(run)
-	return _c
-}
-
-// GetLocation provides a mock function with no fields
-func (_m *MockClient) GetLocation() (geolocation.Location, error) {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetLocation")
-	}
-
-	var r0 geolocation.Location
-	var r1 error
-	if rf, ok := ret.Get(0).(func() (geolocation.Location, error)); ok {
-		return rf()
-	}
-	if rf, ok := ret.Get(0).(func() geolocation.Location); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(geolocation.Location)
-	}
-
-	if rf, ok := ret.Get(1).(func() error); ok {
-		r1 = rf()
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// MockClient_GetLocation_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetLocation'
-type MockClient_GetLocation_Call struct {
-	*mock.Call
-}
-
-// GetLocation is a helper method to define mock.On call
-func (_e *MockClient_Expecter) GetLocation() *MockClient_GetLocation_Call {
-	return &MockClient_GetLocation_Call{Call: _e.mock.On("GetLocation")}
-}
-
-func (_c *MockClient_GetLocation_Call) Run(run func()) *MockClient_GetLocation_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *MockClient_GetLocation_Call) Return(_a0 geolocation.Location, _a1 error) *MockClient_GetLocation_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *MockClient_GetLocation_Call) RunAndReturn(run func() (geolocation.Location, error)) *MockClient_GetLocation_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Subscribe provides a mock function with given fields: id
-func (_m *MockClient) Subscribe(id string) chan geolocation.Location {
-	ret := _m.Called(id)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Subscribe")
-	}
-
-	var r0 chan geolocation.Location
-	if rf, ok := ret.Get(0).(func(string) chan geolocation.Location); ok {
-		r0 = rf(id)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(chan geolocation.Location)
-		}
-	}
-
-	return r0
-}
-
-// MockClient_Subscribe_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Subscribe'
-type MockClient_Subscribe_Call struct {
-	*mock.Call
-}
-
-// Subscribe is a helper method to define mock.On call
-//   - id string
-func (_e *MockClient_Expecter) Subscribe(id interface{}) *MockClient_Subscribe_Call {
-	return &MockClient_Subscribe_Call{Call: _e.mock.On("Subscribe", id)}
-}
-
-func (_c *MockClient_Subscribe_Call) Run(run func(id string)) *MockClient_Subscribe_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(string))
-	})
-	return _c
-}
-
-func (_c *MockClient_Subscribe_Call) Return(_a0 chan geolocation.Location) *MockClient_Subscribe_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *MockClient_Subscribe_Call) RunAndReturn(run func(string) chan geolocation.Location) *MockClient_Subscribe_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Unsubscribe provides a mock function with given fields: id
-func (_m *MockClient) Unsubscribe(id string) {
-	_m.Called(id)
-}
-
-// MockClient_Unsubscribe_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Unsubscribe'
-type MockClient_Unsubscribe_Call struct {
-	*mock.Call
-}
-
-// Unsubscribe is a helper method to define mock.On call
-//   - id string
-func (_e *MockClient_Expecter) Unsubscribe(id interface{}) *MockClient_Unsubscribe_Call {
-	return &MockClient_Unsubscribe_Call{Call: _e.mock.On("Unsubscribe", id)}
-}
-
-func (_c *MockClient_Unsubscribe_Call) Run(run func(id string)) *MockClient_Unsubscribe_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(string))
-	})
-	return _c
-}
-
-func (_c *MockClient_Unsubscribe_Call) Return() *MockClient_Unsubscribe_Call {
-	_c.Call.Return()
-	return _c
-}
-
-func (_c *MockClient_Unsubscribe_Call) RunAndReturn(run func(string)) *MockClient_Unsubscribe_Call {
-	_c.Run(run)
-	return _c
-}
-
-// NewMockClient creates a new instance of MockClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewMockClient(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *MockClient {
-	mock := &MockClient{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}

core/internal/mocks/network/mock_Backend.go

@@ -1062,62 +1062,6 @@ func (_c *MockBackend_GetWiFiNetworkDetails_Call) RunAndReturn(run func(string)
 	return _c
 }
 
-// GetWiFiQRCodeContent provides a mock function with given fields: ssid
-func (_m *MockBackend) GetWiFiQRCodeContent(ssid string) (string, error) {
-	ret := _m.Called(ssid)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetWiFiQRCodeContent")
-	}
-
-	var r0 string
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string) (string, error)); ok {
-		return rf(ssid)
-	}
-	if rf, ok := ret.Get(0).(func(string) string); ok {
-		r0 = rf(ssid)
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(ssid)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// MockBackend_GetWiFiQRCodeContent_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetWiFiQRCodeContent'
-type MockBackend_GetWiFiQRCodeContent_Call struct {
-	*mock.Call
-}
-
-// GetWiFiQRCodeContent is a helper method to define mock.On call
-//   - ssid string
-func (_e *MockBackend_Expecter) GetWiFiQRCodeContent(ssid interface{}) *MockBackend_GetWiFiQRCodeContent_Call {
-	return &MockBackend_GetWiFiQRCodeContent_Call{Call: _e.mock.On("GetWiFiQRCodeContent", ssid)}
-}
-
-func (_c *MockBackend_GetWiFiQRCodeContent_Call) Run(run func(ssid string)) *MockBackend_GetWiFiQRCodeContent_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(string))
-	})
-	return _c
-}
-
-func (_c *MockBackend_GetWiFiQRCodeContent_Call) Return(_a0 string, _a1 error) *MockBackend_GetWiFiQRCodeContent_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *MockBackend_GetWiFiQRCodeContent_Call) RunAndReturn(run func(string) (string, error)) *MockBackend_GetWiFiQRCodeContent_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // GetWiredConnections provides a mock function with no fields
 func (_m *MockBackend) GetWiredConnections() ([]network.WiredConnection, error) {
 	ret := _m.Called()

core/internal/server/cups/actions.go

@@ -2,10 +2,8 @@ package cups
 
 import (
 	"errors"
-	"fmt"
 	"net"
 	"net/url"
-	"os/exec"
 	"strings"
 	"time"
 
@@ -277,42 +275,13 @@ func (m *Manager) GetClasses() ([]PrinterClass, error) {
 	return classes, nil
 }
 
-func createPrinterViaLpadmin(name, deviceURI, ppd, information, location string) error {
-	args := []string{"-p", name, "-E", "-v", deviceURI, "-m", ppd}
-	if information != "" {
-		args = append(args, "-D", information)
-	}
-	if location != "" {
-		args = append(args, "-L", location)
-	}
-	out, err := exec.Command("lpadmin", args...).CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("lpadmin failed: %s: %w", strings.TrimSpace(string(out)), err)
-	}
-	return nil
-}
-
-func deletePrinterViaLpadmin(name string) error {
-	out, err := exec.Command("lpadmin", "-x", name).CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("lpadmin failed: %s: %w", strings.TrimSpace(string(out)), err)
-	}
-	return nil
-}
-
 func (m *Manager) CreatePrinter(name, deviceURI, ppd string, shared bool, errorPolicy, information, location string) error {
 	usedPkHelper := false
 
 	err := m.client.CreatePrinter(name, deviceURI, ppd, shared, errorPolicy, information, location)
 	if isAuthError(err) && m.pkHelper != nil {
 		if err = m.pkHelper.PrinterAdd(name, deviceURI, ppd, information, location); err != nil {
-			// pkHelper failed (e.g., no polkit agent), try lpadmin as last resort.
-			// lpadmin -E enables the printer, so no further setup needed.
-			if lpadminErr := createPrinterViaLpadmin(name, deviceURI, ppd, information, location); lpadminErr != nil {
-				return err
-			}
-			m.RefreshState()
-			return nil
+			return err
 		}
 		usedPkHelper = true
 	} else if err != nil {
@@ -339,12 +308,6 @@ func (m *Manager) DeletePrinter(printerName string) error {
 	err := m.client.DeletePrinter(printerName)
 	if isAuthError(err) && m.pkHelper != nil {
 		err = m.pkHelper.PrinterDelete(printerName)
-		if err != nil {
-			// pkHelper failed, try lpadmin as last resort
-			if lpadminErr := deletePrinterViaLpadmin(printerName); lpadminErr == nil {
-				err = nil
-			}
-		}
 	}
 	if err == nil {
 		m.RefreshState()

core/internal/server/cups/handlers.go

@@ -70,8 +70,6 @@ func HandleRequest(conn net.Conn, req models.Request, manager *Manager) {
 		handleRestartJob(conn, req, manager)
 	case "cups.holdJob":
 		handleHoldJob(conn, req, manager)
-	case "cups.testConnection":
-		handleTestConnection(conn, req, manager)
 	default:
 		models.RespondError(conn, req.ID, fmt.Sprintf("unknown method: %s", req.Method))
 	}
@@ -466,22 +464,3 @@ func handleHoldJob(conn net.Conn, req models.Request, manager *Manager) {
 	}
 	models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "job held"})
 }
-
-func handleTestConnection(conn net.Conn, req models.Request, manager *Manager) {
-	host, err := params.StringNonEmpty(req.Params, "host")
-	if err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	port := params.IntOpt(req.Params, "port", 631)
-	protocol := params.StringOpt(req.Params, "protocol", "ipp")
-
-	result, err := manager.TestRemotePrinter(host, port, protocol)
-	if err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	models.Respond(conn, req.ID, result)
-}

core/internal/server/cups/test_connection.go

@@ -1,176 +0,0 @@
-package cups
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"strings"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp"
-)
-
-var validProtocols = map[string]bool{
-	"ipp":    true,
-	"ipps":   true,
-	"lpd":    true,
-	"socket": true,
-}
-
-func validateTestConnectionParams(host string, port int, protocol string) error {
-	if host == "" {
-		return errors.New("host is required")
-	}
-	if strings.ContainsAny(host, " \t\n\r/\\") {
-		return errors.New("host contains invalid characters")
-	}
-	if port < 1 || port > 65535 {
-		return errors.New("port must be between 1 and 65535")
-	}
-	if protocol != "" && !validProtocols[protocol] {
-		return errors.New("protocol must be one of: ipp, ipps, lpd, socket")
-	}
-	return nil
-}
-
-const probeTimeout = 10 * time.Second
-
-func probeRemotePrinter(host string, port int, useTLS bool) (*RemotePrinterInfo, error) {
-	addr := net.JoinHostPort(host, fmt.Sprintf("%d", port))
-
-	// Fast fail: TCP reachability check
-	conn, err := net.DialTimeout("tcp", addr, probeTimeout)
-	if err != nil {
-		return &RemotePrinterInfo{
-			Reachable: false,
-			Error:     fmt.Sprintf("cannot reach %s: %s", addr, err.Error()),
-		}, nil
-	}
-	conn.Close()
-
-	// Create a temporary IPP client pointing at the remote host.
-	// The TCP dial above provides fast-fail for unreachable hosts.
-	// The IPP adapter's ResponseHeaderTimeout (90s) bounds stalling servers.
-	client := ipp.NewIPPClient(host, port, "", "", useTLS)
-
-	// Try /ipp/print first (modern driverless printers), then / (legacy)
-	info, err := probeIPPEndpoint(client, host, port, useTLS, "/ipp/print")
-	if err != nil {
-		// If we got an auth error, the printer exists but requires credentials.
-		// Report it as reachable with the URI that triggered the auth challenge.
-		if isAuthError(err) {
-			proto := "ipp"
-			if useTLS {
-				proto = "ipps"
-			}
-			return &RemotePrinterInfo{
-				Reachable: true,
-				URI:       fmt.Sprintf("%s://%s:%d/ipp/print", proto, host, port),
-				Info:      "authentication required",
-			}, nil
-		}
-		info, err = probeIPPEndpoint(client, host, port, useTLS, "/")
-	}
-	if err != nil {
-		if isAuthError(err) {
-			proto := "ipp"
-			if useTLS {
-				proto = "ipps"
-			}
-			return &RemotePrinterInfo{
-				Reachable: true,
-				URI:       fmt.Sprintf("%s://%s:%d/", proto, host, port),
-				Info:      "authentication required",
-			}, nil
-		}
-		// TCP reachable but not an IPP printer
-		return &RemotePrinterInfo{
-			Reachable: true,
-			Error:     fmt.Sprintf("host is reachable but does not appear to be an IPP printer: %s", err.Error()),
-		}, nil
-	}
-
-	return info, nil
-}
-
-func probeIPPEndpoint(client *ipp.IPPClient, host string, port int, useTLS bool, resourcePath string) (*RemotePrinterInfo, error) {
-	proto := "ipp"
-	if useTLS {
-		proto = "ipps"
-	}
-	printerURI := fmt.Sprintf("%s://%s:%d%s", proto, host, port, resourcePath)
-
-	httpProto := "http"
-	if useTLS {
-		httpProto = "https"
-	}
-	httpURL := fmt.Sprintf("%s://%s:%d%s", httpProto, host, port, resourcePath)
-
-	req := ipp.NewRequest(ipp.OperationGetPrinterAttributes, 1)
-	req.OperationAttributes[ipp.AttributePrinterURI] = printerURI
-	req.OperationAttributes[ipp.AttributeRequestedAttributes] = []string{
-		ipp.AttributePrinterName,
-		ipp.AttributePrinterMakeAndModel,
-		ipp.AttributePrinterState,
-		ipp.AttributePrinterInfo,
-		ipp.AttributePrinterUriSupported,
-	}
-
-	resp, err := client.SendRequest(httpURL, req, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(resp.PrinterAttributes) == 0 {
-		return nil, errors.New("no printer attributes returned")
-	}
-
-	attrs := resp.PrinterAttributes[0]
-
-	return &RemotePrinterInfo{
-		Reachable: true,
-		MakeModel: getStringAttr(attrs, ipp.AttributePrinterMakeAndModel),
-		Name:      getStringAttr(attrs, ipp.AttributePrinterName),
-		Info:      getStringAttr(attrs, ipp.AttributePrinterInfo),
-		State:     parsePrinterState(attrs),
-		URI:       printerURI,
-	}, nil
-}
-
-// TestRemotePrinter validates inputs and probes a remote printer via IPP.
-// For lpd/socket protocols, only TCP reachability is tested.
-func (m *Manager) TestRemotePrinter(host string, port int, protocol string) (*RemotePrinterInfo, error) {
-	if protocol == "" {
-		protocol = "ipp"
-	}
-
-	if err := validateTestConnectionParams(host, port, protocol); err != nil {
-		return nil, err
-	}
-
-	// For non-IPP protocols, only check TCP reachability
-	if protocol == "lpd" || protocol == "socket" {
-		addr := net.JoinHostPort(host, fmt.Sprintf("%d", port))
-		conn, err := net.DialTimeout("tcp", addr, probeTimeout)
-		if err != nil {
-			return &RemotePrinterInfo{
-				Reachable: false,
-				Error:     fmt.Sprintf("cannot reach %s: %s", addr, err.Error()),
-			}, nil
-		}
-		conn.Close()
-		return &RemotePrinterInfo{
-			Reachable: true,
-			URI:       fmt.Sprintf("%s://%s:%d", protocol, host, port),
-		}, nil
-	}
-
-	useTLS := protocol == "ipps"
-
-	probeFn := m.probeRemoteFn
-	if probeFn == nil {
-		probeFn = probeRemotePrinter
-	}
-
-	return probeFn(host, port, useTLS)
-}

core/internal/server/cups/test_connection_test.go

@@ -1,397 +0,0 @@
-package cups
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"testing"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/pkg/ipp"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestValidateTestConnectionParams(t *testing.T) {
-	tests := []struct {
-		name     string
-		host     string
-		port     int
-		protocol string
-		wantErr  string
-	}{
-		{
-			name:     "valid ipp",
-			host:     "192.168.0.5",
-			port:     631,
-			protocol: "ipp",
-			wantErr:  "",
-		},
-		{
-			name:     "valid ipps",
-			host:     "printer.local",
-			port:     443,
-			protocol: "ipps",
-			wantErr:  "",
-		},
-		{
-			name:     "valid lpd",
-			host:     "10.0.0.1",
-			port:     515,
-			protocol: "lpd",
-			wantErr:  "",
-		},
-		{
-			name:     "valid socket",
-			host:     "10.0.0.1",
-			port:     9100,
-			protocol: "socket",
-			wantErr:  "",
-		},
-		{
-			name:     "empty host",
-			host:     "",
-			port:     631,
-			protocol: "ipp",
-			wantErr:  "host is required",
-		},
-		{
-			name:     "port too low",
-			host:     "192.168.0.5",
-			port:     0,
-			protocol: "ipp",
-			wantErr:  "port must be between 1 and 65535",
-		},
-		{
-			name:     "port too high",
-			host:     "192.168.0.5",
-			port:     70000,
-			protocol: "ipp",
-			wantErr:  "port must be between 1 and 65535",
-		},
-		{
-			name:     "invalid protocol",
-			host:     "192.168.0.5",
-			port:     631,
-			protocol: "ftp",
-			wantErr:  "protocol must be one of: ipp, ipps, lpd, socket",
-		},
-		{
-			name:     "empty protocol treated as ipp",
-			host:     "192.168.0.5",
-			port:     631,
-			protocol: "",
-			wantErr:  "",
-		},
-		{
-			name:     "host with slash",
-			host:     "192.168.0.5/admin",
-			port:     631,
-			protocol: "ipp",
-			wantErr:  "host contains invalid characters",
-		},
-		{
-			name:     "host with space",
-			host:     "192.168.0.5 ",
-			port:     631,
-			protocol: "ipp",
-			wantErr:  "host contains invalid characters",
-		},
-		{
-			name:     "host with newline",
-			host:     "192.168.0.5\n",
-			port:     631,
-			protocol: "ipp",
-			wantErr:  "host contains invalid characters",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := validateTestConnectionParams(tt.host, tt.port, tt.protocol)
-			if tt.wantErr == "" {
-				assert.NoError(t, err)
-			} else {
-				assert.EqualError(t, err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestManager_TestRemotePrinter_Validation(t *testing.T) {
-	m := NewTestManager(nil, nil)
-
-	tests := []struct {
-		name     string
-		host     string
-		port     int
-		protocol string
-		wantErr  string
-	}{
-		{
-			name:     "empty host returns error",
-			host:     "",
-			port:     631,
-			protocol: "ipp",
-			wantErr:  "host is required",
-		},
-		{
-			name:     "invalid port returns error",
-			host:     "192.168.0.5",
-			port:     0,
-			protocol: "ipp",
-			wantErr:  "port must be between 1 and 65535",
-		},
-		{
-			name:     "invalid protocol returns error",
-			host:     "192.168.0.5",
-			port:     631,
-			protocol: "ftp",
-			wantErr:  "protocol must be one of: ipp, ipps, lpd, socket",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			_, err := m.TestRemotePrinter(tt.host, tt.port, tt.protocol)
-			assert.EqualError(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestManager_TestRemotePrinter_IPP(t *testing.T) {
-	tests := []struct {
-		name      string
-		protocol  string
-		probeRet  *RemotePrinterInfo
-		probeErr  error
-		wantTLS   bool
-		wantReach bool
-		wantModel string
-	}{
-		{
-			name:     "successful ipp probe",
-			protocol: "ipp",
-			probeRet: &RemotePrinterInfo{
-				Reachable: true,
-				MakeModel: "HP OfficeJet 8010",
-				Name:      "OfficeJet",
-				State:     "idle",
-				URI:       "ipp://192.168.0.5:631/ipp/print",
-			},
-			wantTLS:   false,
-			wantReach: true,
-			wantModel: "HP OfficeJet 8010",
-		},
-		{
-			name:     "successful ipps probe",
-			protocol: "ipps",
-			probeRet: &RemotePrinterInfo{
-				Reachable: true,
-				MakeModel: "HP OfficeJet 8010",
-				URI:       "ipps://192.168.0.5:631/ipp/print",
-			},
-			wantTLS:   true,
-			wantReach: true,
-			wantModel: "HP OfficeJet 8010",
-		},
-		{
-			name:     "unreachable host",
-			protocol: "ipp",
-			probeRet: &RemotePrinterInfo{
-				Reachable: false,
-				Error:     "cannot reach 192.168.0.5:631: connection refused",
-			},
-			wantReach: false,
-		},
-		{
-			name:     "empty protocol defaults to ipp",
-			protocol: "",
-			probeRet: &RemotePrinterInfo{
-				Reachable: true,
-				MakeModel: "Test Printer",
-			},
-			wantTLS:   false,
-			wantReach: true,
-			wantModel: "Test Printer",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var capturedTLS bool
-			m := NewTestManager(nil, nil)
-			m.probeRemoteFn = func(host string, port int, useTLS bool) (*RemotePrinterInfo, error) {
-				capturedTLS = useTLS
-				return tt.probeRet, tt.probeErr
-			}
-
-			result, err := m.TestRemotePrinter("192.168.0.5", 631, tt.protocol)
-			if tt.probeErr != nil {
-				assert.Error(t, err)
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, tt.wantReach, result.Reachable)
-			assert.Equal(t, tt.wantModel, result.MakeModel)
-			assert.Equal(t, tt.wantTLS, capturedTLS)
-		})
-	}
-}
-
-func TestManager_TestRemotePrinter_AuthRequired(t *testing.T) {
-	m := NewTestManager(nil, nil)
-	m.probeRemoteFn = func(host string, port int, useTLS bool) (*RemotePrinterInfo, error) {
-		// Simulate what happens when the printer returns HTTP 401
-		return probeRemotePrinterWithAuthError(host, port, useTLS)
-	}
-
-	result, err := m.TestRemotePrinter("192.168.0.107", 631, "ipp")
-	assert.NoError(t, err)
-	assert.True(t, result.Reachable)
-	assert.Equal(t, "authentication required", result.Info)
-	assert.Contains(t, result.URI, "ipp://192.168.0.107:631")
-}
-
-// probeRemotePrinterWithAuthError simulates a probe where the printer
-// returns HTTP 401 on both endpoints.
-func probeRemotePrinterWithAuthError(host string, port int, useTLS bool) (*RemotePrinterInfo, error) {
-	// This simulates what probeRemotePrinter does when both endpoints
-	// return auth errors. We test the auth detection logic directly.
-	err := ipp.HTTPError{Code: 401}
-	if isAuthError(err) {
-		proto := "ipp"
-		if useTLS {
-			proto = "ipps"
-		}
-		return &RemotePrinterInfo{
-			Reachable: true,
-			URI:       fmt.Sprintf("%s://%s:%d/ipp/print", proto, host, port),
-			Info:      "authentication required",
-		}, nil
-	}
-	return nil, err
-}
-
-func TestManager_TestRemotePrinter_NonIPPProtocol(t *testing.T) {
-	m := NewTestManager(nil, nil)
-	probeCalled := false
-	m.probeRemoteFn = func(host string, port int, useTLS bool) (*RemotePrinterInfo, error) {
-		probeCalled = true
-		return nil, nil
-	}
-
-	// These will fail at TCP dial (no real server), but the important
-	// thing is that probeRemoteFn is NOT called for lpd/socket.
-	m.TestRemotePrinter("192.168.0.5", 9100, "socket")
-	assert.False(t, probeCalled, "probe function should not be called for socket protocol")
-
-	m.TestRemotePrinter("192.168.0.5", 515, "lpd")
-	assert.False(t, probeCalled, "probe function should not be called for lpd protocol")
-}
-
-func TestHandleTestConnection_Success(t *testing.T) {
-	m := NewTestManager(nil, nil)
-	m.probeRemoteFn = func(host string, port int, useTLS bool) (*RemotePrinterInfo, error) {
-		return &RemotePrinterInfo{
-			Reachable: true,
-			MakeModel: "HP OfficeJet 8010",
-			Name:      "OfficeJet",
-			State:     "idle",
-			URI:       "ipp://192.168.0.5:631/ipp/print",
-		}, nil
-	}
-
-	buf := &bytes.Buffer{}
-	conn := &mockConn{Buffer: buf}
-
-	req := models.Request{
-		ID:     1,
-		Method: "cups.testConnection",
-		Params: map[string]any{
-			"host": "192.168.0.5",
-		},
-	}
-
-	handleTestConnection(conn, req, m)
-
-	var resp models.Response[RemotePrinterInfo]
-	err := json.NewDecoder(buf).Decode(&resp)
-	assert.NoError(t, err)
-	assert.NotNil(t, resp.Result)
-	assert.True(t, resp.Result.Reachable)
-	assert.Equal(t, "HP OfficeJet 8010", resp.Result.MakeModel)
-}
-
-func TestHandleTestConnection_MissingHost(t *testing.T) {
-	m := NewTestManager(nil, nil)
-	buf := &bytes.Buffer{}
-	conn := &mockConn{Buffer: buf}
-
-	req := models.Request{
-		ID:     1,
-		Method: "cups.testConnection",
-		Params: map[string]any{},
-	}
-
-	handleTestConnection(conn, req, m)
-
-	var resp models.Response[any]
-	err := json.NewDecoder(buf).Decode(&resp)
-	assert.NoError(t, err)
-	assert.Nil(t, resp.Result)
-	assert.NotNil(t, resp.Error)
-}
-
-func TestHandleTestConnection_CustomPortAndProtocol(t *testing.T) {
-	m := NewTestManager(nil, nil)
-	m.probeRemoteFn = func(host string, port int, useTLS bool) (*RemotePrinterInfo, error) {
-		assert.Equal(t, 9631, port)
-		assert.True(t, useTLS)
-		return &RemotePrinterInfo{Reachable: true, URI: "ipps://192.168.0.5:9631/ipp/print"}, nil
-	}
-
-	buf := &bytes.Buffer{}
-	conn := &mockConn{Buffer: buf}
-
-	req := models.Request{
-		ID:     1,
-		Method: "cups.testConnection",
-		Params: map[string]any{
-			"host":     "192.168.0.5",
-			"port":     float64(9631),
-			"protocol": "ipps",
-		},
-	}
-
-	handleTestConnection(conn, req, m)
-
-	var resp models.Response[RemotePrinterInfo]
-	err := json.NewDecoder(buf).Decode(&resp)
-	assert.NoError(t, err)
-	assert.NotNil(t, resp.Result)
-	assert.True(t, resp.Result.Reachable)
-}
-
-func TestHandleRequest_TestConnection(t *testing.T) {
-	m := NewTestManager(nil, nil)
-	m.probeRemoteFn = func(host string, port int, useTLS bool) (*RemotePrinterInfo, error) {
-		return &RemotePrinterInfo{Reachable: true}, nil
-	}
-
-	buf := &bytes.Buffer{}
-	conn := &mockConn{Buffer: buf}
-
-	req := models.Request{
-		ID:     1,
-		Method: "cups.testConnection",
-		Params: map[string]any{"host": "192.168.0.5"},
-	}
-
-	HandleRequest(conn, req, m)
-
-	var resp models.Response[RemotePrinterInfo]
-	err := json.NewDecoder(buf).Decode(&resp)
-	assert.NoError(t, err)
-	assert.NotNil(t, resp.Result)
-	assert.True(t, resp.Result.Reachable)
-}

core/internal/server/cups/types.go

@@ -55,16 +55,6 @@ type PPD struct {
 	Type            string `json:"type"`
 }
 
-type RemotePrinterInfo struct {
-	Reachable bool   `json:"reachable"`
-	MakeModel string `json:"makeModel"`
-	Name      string `json:"name"`
-	Info      string `json:"info"`
-	State     string `json:"state"`
-	URI       string `json:"uri"`
-	Error     string `json:"error,omitempty"`
-}
-
 type PrinterClass struct {
 	Name     string   `json:"name"`
 	URI      string   `json:"uri"`
@@ -87,7 +77,6 @@ type Manager struct {
 	notifierWg        sync.WaitGroup
 	lastNotifiedState *CUPSState
 	baseURL           string
-	probeRemoteFn     func(host string, port int, useTLS bool) (*RemotePrinterInfo, error)
 }
 
 type SubscriptionManagerInterface interface {

core/internal/server/location/handlers.go

@@ -1,61 +0,0 @@
-package location
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-)
-
-type LocationEvent struct {
-	Type string `json:"type"`
-	Data State  `json:"data"`
-}
-
-func HandleRequest(conn net.Conn, req models.Request, manager *Manager) {
-	switch req.Method {
-	case "location.getState":
-		handleGetState(conn, req, manager)
-	case "location.subscribe":
-		handleSubscribe(conn, req, manager)
-
-	default:
-		models.RespondError(conn, req.ID, fmt.Sprintf("unknown method: %s", req.Method))
-	}
-}
-
-func handleGetState(conn net.Conn, req models.Request, manager *Manager) {
-	models.Respond(conn, req.ID, manager.GetState())
-}
-
-func handleSubscribe(conn net.Conn, req models.Request, manager *Manager) {
-	clientID := fmt.Sprintf("client-%p", conn)
-	stateChan := manager.Subscribe(clientID)
-	defer manager.Unsubscribe(clientID)
-
-	initialState := manager.GetState()
-	event := LocationEvent{
-		Type: "state_changed",
-		Data: initialState,
-	}
-
-	if err := json.NewEncoder(conn).Encode(models.Response[LocationEvent]{
-		ID:     req.ID,
-		Result: &event,
-	}); err != nil {
-		return
-	}
-
-	for state := range stateChan {
-		event := LocationEvent{
-			Type: "state_changed",
-			Data: state,
-		}
-		if err := json.NewEncoder(conn).Encode(models.Response[LocationEvent]{
-			Result: &event,
-		}); err != nil {
-			return
-		}
-	}
-}

core/internal/server/location/manager.go

@@ -1,175 +0,0 @@
-package location
-
-import (
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-)
-
-func NewManager(client geolocation.Client) (*Manager, error) {
-	currLocation, err := client.GetLocation()
-	if err != nil {
-		log.Warnf("Failed to get initial location: %v", err)
-	}
-
-	m := &Manager{
-		client:   client,
-		dirty:    make(chan struct{}),
-		stopChan: make(chan struct{}),
-
-		state: &State{
-			Latitude:  currLocation.Latitude,
-			Longitude: currLocation.Longitude,
-		},
-	}
-
-	if err := m.startSignalPump(); err != nil {
-		return nil, err
-	}
-
-	m.notifierWg.Add(1)
-	go m.notifier()
-
-	return m, nil
-}
-
-func (m *Manager) Close() {
-	close(m.stopChan)
-	m.notifierWg.Wait()
-
-	m.sigWG.Wait()
-
-	m.subscribers.Range(func(key string, ch chan State) bool {
-		close(ch)
-		m.subscribers.Delete(key)
-		return true
-	})
-}
-
-func (m *Manager) Subscribe(id string) chan State {
-	ch := make(chan State, 64)
-	m.subscribers.Store(id, ch)
-	return ch
-}
-
-func (m *Manager) Unsubscribe(id string) {
-	if ch, ok := m.subscribers.LoadAndDelete(id); ok {
-		close(ch)
-	}
-}
-
-func (m *Manager) startSignalPump() error {
-	m.sigWG.Add(1)
-	go func() {
-		defer m.sigWG.Done()
-
-		subscription := m.client.Subscribe("locationManager")
-		defer m.client.Unsubscribe("locationManager")
-
-		for {
-			select {
-			case <-m.stopChan:
-				return
-			case location, ok := <-subscription:
-				if !ok {
-					return
-				}
-
-				m.handleLocationChange(location)
-			}
-		}
-	}()
-
-	return nil
-}
-
-func (m *Manager) handleLocationChange(location geolocation.Location) {
-	m.stateMutex.Lock()
-	defer m.stateMutex.Unlock()
-
-	m.state.Latitude = location.Latitude
-	m.state.Longitude = location.Longitude
-
-	m.notifySubscribers()
-}
-
-func (m *Manager) notifySubscribers() {
-	select {
-	case m.dirty <- struct{}{}:
-	default:
-	}
-}
-
-func (m *Manager) GetState() State {
-	m.stateMutex.RLock()
-	defer m.stateMutex.RUnlock()
-	if m.state == nil {
-		return State{
-			Latitude:  0.0,
-			Longitude: 0.0,
-		}
-	}
-	stateCopy := *m.state
-	return stateCopy
-}
-
-func (m *Manager) notifier() {
-	defer m.notifierWg.Done()
-	const minGap = 200 * time.Millisecond
-	timer := time.NewTimer(minGap)
-	timer.Stop()
-	var pending bool
-
-	for {
-		select {
-		case <-m.stopChan:
-			timer.Stop()
-			return
-		case <-m.dirty:
-			if pending {
-				continue
-			}
-			pending = true
-			timer.Reset(minGap)
-		case <-timer.C:
-			if !pending {
-				continue
-			}
-
-			currentState := m.GetState()
-
-			if m.lastNotified != nil && !stateChanged(m.lastNotified, &currentState) {
-				pending = false
-				continue
-			}
-
-			m.subscribers.Range(func(key string, ch chan State) bool {
-				select {
-				case ch <- currentState:
-				default:
-					log.Warn("Location: subscriber channel full, dropping update")
-				}
-				return true
-			})
-
-			stateCopy := currentState
-			m.lastNotified = &stateCopy
-			pending = false
-		}
-	}
-}
-
-func stateChanged(old, new *State) bool {
-	if old == nil || new == nil {
-		return true
-	}
-	if old.Latitude != new.Latitude {
-		return true
-	}
-	if old.Longitude != new.Longitude {
-		return true
-	}
-
-	return false
-}

core/internal/server/location/types.go

@@ -1,28 +0,0 @@
-package location
-
-import (
-	"sync"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation"
-	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
-)
-
-type State struct {
-	Latitude  float64 `json:"latitude"`
-	Longitude float64 `json:"longitude"`
-}
-
-type Manager struct {
-	state      *State
-	stateMutex sync.RWMutex
-
-	client geolocation.Client
-
-	stopChan chan struct{}
-	sigWG    sync.WaitGroup
-
-	subscribers  syncmap.Map[string, chan State]
-	dirty        chan struct{}
-	notifierWg   sync.WaitGroup
-	lastNotified *State
-}

core/internal/server/network/backend.go

@@ -10,7 +10,6 @@ type Backend interface {
 	ScanWiFi() error
 	ScanWiFiDevice(device string) error
 	GetWiFiNetworkDetails(ssid string) (*NetworkInfoResponse, error)
-	GetWiFiQRCodeContent(ssid string) (string, error)
 	GetWiFiDevices() []WiFiDevice
 
 	ConnectWiFi(req ConnectionRequest) error

core/internal/server/network/backend_hybrid_iwd_networkd.go

@@ -111,10 +111,6 @@ func (b *HybridIwdNetworkdBackend) GetWiFiNetworkDetails(ssid string) (*NetworkI
 	return b.wifi.GetWiFiNetworkDetails(ssid)
 }
 
-func (b *HybridIwdNetworkdBackend) GetWiFiQRCodeContent(ssid string) (string, error) {
-	return b.wifi.GetWiFiQRCodeContent(ssid)
-}
-
 func (b *HybridIwdNetworkdBackend) ConnectWiFi(req ConnectionRequest) error {
 	if err := b.wifi.ConnectWiFi(req); err != nil {
 		return err

core/internal/server/network/backend_iwd_unimplemented.go

@@ -1,9 +1,6 @@
 package network
 
-import (
-	"fmt"
-	"os"
-)
+import "fmt"
 
 func (b *IWDBackend) GetWiredConnections() ([]WiredConnection, error) {
 	return nil, fmt.Errorf("wired connections not supported by iwd")
@@ -115,19 +112,3 @@ func (b *IWDBackend) getWiFiDevicesLocked() []WiFiDevice {
 		Networks:  b.state.WiFiNetworks,
 	}}
 }
-
-func (b *IWDBackend) GetWiFiQRCodeContent(ssid string) (string, error) {
-	path := iwdConfigPath(ssid)
-
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return "", fmt.Errorf("no saved iwd config for `%s`: %w", ssid, err)
-	}
-
-	passphrase, err := parseIWDPassphrase(string(data))
-	if err != nil {
-		return "", fmt.Errorf("failed to read passphrase for `%s`: %w", ssid, err)
-	}
-
-	return FormatWiFiQRString("WPA", ssid, passphrase), nil
-}

core/internal/server/network/backend_networkd_unimplemented.go

@@ -18,10 +18,6 @@ func (b *SystemdNetworkdBackend) GetWiFiNetworkDetails(ssid string) (*NetworkInf
 	return nil, fmt.Errorf("WiFi details not supported by networkd backend")
 }
 
-func (b *SystemdNetworkdBackend) GetWiFiQRCodeContent(ssid string) (string, error) {
-	return "", fmt.Errorf("WiFi QR Code not supported by networkd backend")
-}
-
 func (b *SystemdNetworkdBackend) ConnectWiFi(req ConnectionRequest) error {
 	return fmt.Errorf("WiFi connect not supported by networkd backend")
 }

core/internal/server/network/backend_networkmanager_wifi.go

@@ -196,65 +196,6 @@ func (b *NetworkManagerBackend) GetWiFiNetworkDetails(ssid string) (*NetworkInfo
 	}, nil
 }
 
-func (b *NetworkManagerBackend) GetWiFiQRCodeContent(ssid string) (string, error) {
-	conn, err := b.findConnection(ssid)
-	if err != nil {
-		return "", fmt.Errorf("no saved connection for `%s`: %w", ssid, err)
-	}
-
-	connSettings, err := conn.GetSettings()
-	if err != nil {
-		return "", fmt.Errorf("failed to get settings for `%s`: %w", ssid, err)
-	}
-
-	secSettings, ok := connSettings["802-11-wireless-security"]
-	if !ok {
-		return "", fmt.Errorf("network `%s` has no security settings", ssid)
-	}
-
-	keyMgmt, ok := secSettings["key-mgmt"].(string)
-	if !ok {
-		return "", fmt.Errorf("failed to identify security type of network `%s`", ssid)
-	}
-
-	var securityType string
-	switch keyMgmt {
-	case "none":
-		authAlg, _ := secSettings["auth-alg"].(string)
-		switch authAlg {
-		case "open":
-			securityType = "nopass"
-		default:
-			securityType = "WEP"
-		}
-	case "ieee8021x":
-		securityType = "WEP"
-	default:
-		securityType = "WPA"
-	}
-
-	if securityType != "WPA" {
-		return "", fmt.Errorf("QR code generation only supports WPA connections, `%s` uses %s", ssid, securityType)
-	}
-
-	secrets, err := conn.GetSecrets("802-11-wireless-security")
-	if err != nil {
-		return "", fmt.Errorf("failed to retrieve connection secrets for `%s`: %w", ssid, err)
-	}
-
-	secSecrets, ok := secrets["802-11-wireless-security"]
-	if !ok {
-		return "", fmt.Errorf("failed to retrieve password for `%s`", ssid)
-	}
-
-	psk, ok := secSecrets["psk"].(string)
-	if !ok {
-		return "", fmt.Errorf("failed to retrieve password for `%s`", ssid)
-	}
-
-	return FormatWiFiQRString(securityType, ssid, psk), nil
-}
-
 func (b *NetworkManagerBackend) ConnectWiFi(req ConnectionRequest) error {
 	devInfo, err := b.getWifiDeviceForConnection(req.Device)
 	if err != nil {

core/internal/server/network/handlers.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
@@ -41,10 +40,6 @@ func HandleRequest(conn net.Conn, req models.Request, manager *Manager) {
 		handleSetPreference(conn, req, manager)
 	case "network.info":
 		handleGetNetworkInfo(conn, req, manager)
-	case "network.qrcode":
-		handleGetNetworkQRCode(conn, req, manager)
-	case "network.delete-qrcode":
-		handleDeleteQRCode(conn, req, manager)
 	case "network.ethernet.info":
 		handleGetWiredNetworkInfo(conn, req, manager)
 	case "network.subscribe":
@@ -325,42 +320,6 @@ func handleGetNetworkInfo(conn net.Conn, req models.Request, manager *Manager) {
 	models.Respond(conn, req.ID, network)
 }
 
-func handleGetNetworkQRCode(conn net.Conn, req models.Request, manager *Manager) {
-	ssid, err := params.String(req.Params, "ssid")
-	if err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	content, err := manager.GetNetworkQRCode(ssid)
-	if err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	models.Respond(conn, req.ID, content)
-}
-
-func handleDeleteQRCode(conn net.Conn, req models.Request, _ *Manager) {
-	path, err := params.String(req.Params, "path")
-	if err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	if !isValidQRCodePath(path) {
-		models.RespondError(conn, req.ID, "invalid QR code path")
-		return
-	}
-
-	if err := os.Remove(path); err != nil {
-		models.RespondError(conn, req.ID, err.Error())
-		return
-	}
-
-	models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "QR code file deleted"})
-}
-
 func handleGetWiredNetworkInfo(conn net.Conn, req models.Request, manager *Manager) {
 	uuid, err := params.String(req.Params, "uuid")
 	if err != nil {

core/internal/server/network/manager.go

@@ -6,8 +6,6 @@ import (
 	"time"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/yeqown/go-qrcode/v2"
-	"github.com/yeqown/go-qrcode/writer/standard"
 )
 
 func NewManager() (*Manager, error) {
@@ -440,43 +438,6 @@ func (m *Manager) GetNetworkInfoDetailed(ssid string) (*NetworkInfoResponse, err
 	return m.backend.GetWiFiNetworkDetails(ssid)
 }
 
-func (m *Manager) GetNetworkQRCode(ssid string) ([2]string, error) {
-	content, err := m.backend.GetWiFiQRCodeContent(ssid)
-	if err != nil {
-		return [2]string{}, err
-	}
-
-	qrc, err := qrcode.New(content)
-	if err != nil {
-		return [2]string{}, fmt.Errorf("failed to create QR code for `%s`: %w", ssid, err)
-	}
-
-	pathThemed, pathNormal := qrCodePaths(ssid)
-
-	wThemed, err := standard.New(
-		pathThemed,
-		standard.WithBuiltinImageEncoder(standard.PNG_FORMAT),
-		standard.WithBgTransparent(),
-		standard.WithFgColorRGBHex("#ffffff"),
-	)
-	if err != nil {
-		return [2]string{}, fmt.Errorf("failed to create QR code writer: %w", err)
-	}
-	if err := qrc.Save(wThemed); err != nil {
-		return [2]string{}, fmt.Errorf("failed to save QR code for `%s`: %w", ssid, err)
-	}
-
-	wNormal, err := standard.New(pathNormal, standard.WithBuiltinImageEncoder(standard.PNG_FORMAT))
-	if err != nil {
-		return [2]string{}, fmt.Errorf("failed to create QR code writer: %w", err)
-	}
-	if err := qrc.Save(wNormal); err != nil {
-		return [2]string{}, fmt.Errorf("failed to save QR code for `%s`: %w", ssid, err)
-	}
-
-	return [2]string{pathThemed, pathNormal}, nil
-}
-
 func (m *Manager) ToggleWiFi() error {
 	enabled, err := m.backend.GetWiFiEnabled()
 	if err != nil {

core/internal/server/network/wifi_qrcode.go

@@ -1,59 +0,0 @@
-package network
-
-import (
-	"fmt"
-	"path/filepath"
-	"regexp"
-	"strings"
-)
-
-const qrCodeTmpPrefix = "/tmp/dank-wifi-qrcode-"
-
-func FormatWiFiQRString(securityType, ssid, password string) string {
-	return fmt.Sprintf("WIFI:T:%s;S:%s;P:%s;;", securityType, ssid, password)
-}
-
-func qrCodePaths(ssid string) (themed, normal string) {
-	safe := sanitizeSSIDForPath(ssid)
-	themed = fmt.Sprintf("%s%s-themed.png", qrCodeTmpPrefix, safe)
-	normal = fmt.Sprintf("%s%s-normal.png", qrCodeTmpPrefix, safe)
-	return
-}
-
-func isValidQRCodePath(path string) bool {
-	clean := filepath.Clean(path)
-	return strings.HasPrefix(clean, qrCodeTmpPrefix) && strings.HasSuffix(clean, ".png")
-}
-
-var safePathChar = regexp.MustCompile(`[^a-zA-Z0-9_-]`)
-
-func sanitizeSSIDForPath(ssid string) string {
-	return safePathChar.ReplaceAllString(ssid, "_")
-}
-
-var iwdVerbatimSSID = regexp.MustCompile(`^[a-zA-Z0-9 _-]+$`)
-
-func iwdConfigPath(ssid string) string {
-	switch {
-	case iwdVerbatimSSID.MatchString(ssid):
-		return fmt.Sprintf("/var/lib/iwd/%s.psk", ssid)
-	default:
-		return fmt.Sprintf("/var/lib/iwd/=%x.psk", []byte(ssid))
-	}
-}
-
-func parseIWDPassphrase(data string) (string, error) {
-	inSecurity := false
-	for _, line := range strings.Split(data, "\n") {
-		line = strings.TrimSpace(line)
-		switch {
-		case line == "[Security]":
-			inSecurity = true
-		case strings.HasPrefix(line, "["):
-			inSecurity = false
-		case inSecurity && strings.HasPrefix(line, "Passphrase="):
-			return strings.TrimPrefix(line, "Passphrase="), nil
-		}
-	}
-	return "", fmt.Errorf("no passphrase found in iwd config")
-}

core/internal/server/router.go

@@ -15,7 +15,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/freedesktop"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/location"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/network"
@@ -193,15 +192,6 @@ func RouteRequest(conn net.Conn, req models.Request) {
 		return
 	}
 
-	if strings.HasPrefix(req.Method, "location.") {
-		if locationManager == nil {
-			models.RespondError(conn, req.ID, "location manager not initialized")
-			return
-		}
-		location.HandleRequest(conn, req, locationManager)
-		return
-	}
-
 	switch req.Method {
 	case "ping":
 		models.Respond(conn, req.ID, "pong")

core/internal/server/server.go

@@ -14,7 +14,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/apppicker"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/bluez"
@@ -26,7 +25,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/extworkspace"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/freedesktop"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/location"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/network"
@@ -72,7 +70,6 @@ var clipboardManager *clipboard.Manager
 var dbusManager *serverDbus.Manager
 var wlContext *wlcontext.SharedContext
 var themeModeManager *thememode.Manager
-var locationManager *location.Manager
 
 const dbusClientID = "dms-dbus-client"
 
@@ -191,7 +188,7 @@ func InitializeFreedeskManager() error {
 	return nil
 }
 
-func InitializeWaylandManager(geoClient geolocation.Client) error {
+func InitializeWaylandManager() error {
 	log.Info("Attempting to initialize Wayland gamma control...")
 
 	if wlContext == nil {
@@ -204,7 +201,7 @@ func InitializeWaylandManager(geoClient geolocation.Client) error {
 	}
 
 	config := wayland.DefaultConfig()
-	manager, err := wayland.NewManager(wlContext.Display(), geoClient, config)
+	manager, err := wayland.NewManager(wlContext.Display(), config)
 	if err != nil {
 		log.Errorf("Failed to initialize wayland manager: %v", err)
 		return err
@@ -385,27 +382,14 @@ func InitializeDbusManager() error {
 	return nil
 }
 
-func InitializeThemeModeManager(geoClient geolocation.Client) error {
-	manager := thememode.NewManager(geoClient)
+func InitializeThemeModeManager() error {
+	manager := thememode.NewManager()
 	themeModeManager = manager
 
 	log.Info("Theme mode automation manager initialized")
 	return nil
 }
 
-func InitializeLocationManager(geoClient geolocation.Client) error {
-	manager, err := location.NewManager(geoClient)
-	if err != nil {
-		log.Warnf("Failed to initialize location manager: %v", err)
-		return err
-	}
-
-	locationManager = manager
-
-	log.Info("Location manager initialized")
-	return nil
-}
-
 func handleConnection(conn net.Conn) {
 	defer conn.Close()
 
@@ -553,10 +537,6 @@ func getServerInfo() ServerInfo {
 		caps = append(caps, "theme.auto")
 	}
 
-	if locationManager != nil {
-		caps = append(caps, "location")
-	}
-
 	if dbusManager != nil {
 		caps = append(caps, "dbus")
 	}
@@ -1327,9 +1307,6 @@ func cleanupManagers() {
 	if wlContext != nil {
 		wlContext.Close()
 	}
-	if locationManager != nil {
-		locationManager.Close()
-	}
 }
 
 func Start(printDocs bool) error {
@@ -1511,9 +1488,6 @@ func Start(printDocs bool) error {
 		log.Info(" clipboard.getConfig                   - Get clipboard configuration")
 		log.Info(" clipboard.setConfig                   - Set configuration (params: maxHistory?, maxEntrySize?, autoClearDays?, clearAtStartup?)")
 		log.Info(" clipboard.subscribe                   - Subscribe to clipboard state changes (streaming)")
-		log.Info("Location:")
-		log.Info(" location.getState                      - Get current location state")
-		log.Info(" location.subscribe                     - Subscribe to location changes (streaming)")
 		log.Info("")
 	}
 	log.Info("Initializing managers...")
@@ -1545,9 +1519,6 @@ func Start(printDocs bool) error {
 	loginctlReady := make(chan struct{})
 	freedesktopReady := make(chan struct{})
 
-	geoClient := geolocation.NewClient()
-	defer geoClient.Close()
-
 	go func() {
 		defer close(loginctlReady)
 		if err := InitializeLoginctlManager(); err != nil {
@@ -1592,7 +1563,7 @@ func Start(printDocs bool) error {
 		}
 	}()
 
-	if err := InitializeWaylandManager(geoClient); err != nil {
+	if err := InitializeWaylandManager(); err != nil {
 		log.Warnf("Wayland manager unavailable: %v", err)
 	}
 
@@ -1624,7 +1595,7 @@ func Start(printDocs bool) error {
 		log.Debugf("WlrOutput manager unavailable: %v", err)
 	}
 
-	if err := InitializeThemeModeManager(geoClient); err != nil {
+	if err := InitializeThemeModeManager(); err != nil {
 		log.Warnf("Theme mode manager unavailable: %v", err)
 	} else {
 		notifyCapabilityChange()
@@ -1637,12 +1608,6 @@ func Start(printDocs bool) error {
 		}()
 	}
 
-	if err := InitializeLocationManager(geoClient); err != nil {
-		log.Warnf("Location manager unavailable: %v", err)
-	} else {
-		notifyCapabilityChange()
-	}
-
 	fatalErrChan := make(chan error, 1)
 	if wlrOutputManager != nil {
 		go func() {

core/internal/server/thememode/manager.go

@@ -5,7 +5,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/loginctl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wayland"
 	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
@@ -33,14 +32,12 @@ type Manager struct {
 	cachedIPLat   *float64
 	cachedIPLon   *float64
 
-	geoClient geolocation.Client
-
 	stopChan      chan struct{}
 	updateTrigger chan struct{}
 	wg            sync.WaitGroup
 }
 
-func NewManager(geoClient geolocation.Client) *Manager {
+func NewManager() *Manager {
 	m := &Manager{
 		config: Config{
 			Enabled:           false,
@@ -54,7 +51,6 @@ func NewManager(geoClient geolocation.Client) *Manager {
 		},
 		stopChan:      make(chan struct{}),
 		updateTrigger: make(chan struct{}, 1),
-		geoClient:     geoClient,
 	}
 
 	m.updateState(time.Now())
@@ -331,17 +327,17 @@ func (m *Manager) getLocation(config Config) (*float64, *float64) {
 	}
 	m.locationMutex.RUnlock()
 
-	location, err := m.geoClient.GetLocation()
+	lat, lon, err := wayland.FetchIPLocation()
 	if err != nil {
 		return nil, nil
 	}
 
 	m.locationMutex.Lock()
-	m.cachedIPLat = &location.Latitude
-	m.cachedIPLon = &location.Longitude
+	m.cachedIPLat = lat
+	m.cachedIPLon = lon
 	m.locationMutex.Unlock()
 
-	return m.cachedIPLat, m.cachedIPLon
+	return lat, lon
 }
 
 func statesEqual(a, b *State) bool {

core/internal/server/wayland/manager.go

@@ -13,14 +13,13 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_gamma_control"
 )
 
 const animKelvinStep = 25
 
-func NewManager(display wlclient.WaylandDisplay, geoClient geolocation.Client, config Config) (*Manager, error) {
+func NewManager(display wlclient.WaylandDisplay, config Config) (*Manager, error) {
 	if err := config.Validate(); err != nil {
 		return nil, err
 	}
@@ -41,7 +40,6 @@ func NewManager(display wlclient.WaylandDisplay, geoClient geolocation.Client, c
 		updateTrigger: make(chan struct{}, 1),
 		dirty:         make(chan struct{}, 1),
 		dbusSignal:    make(chan *dbus.Signal, 16),
-		geoClient:     geoClient,
 	}
 
 	if err := m.setupRegistry(); err != nil {
@@ -439,16 +437,15 @@ func (m *Manager) getLocation() (*float64, *float64) {
 		}
 		m.locationMutex.RUnlock()
 
-		location, err := m.geoClient.GetLocation()
+		lat, lon, err := FetchIPLocation()
 		if err != nil {
 			return nil, nil
 		}
-
 		m.locationMutex.Lock()
-		m.cachedIPLat = &location.Latitude
-		m.cachedIPLon = &location.Longitude
+		m.cachedIPLat = lat
+		m.cachedIPLon = lon
 		m.locationMutex.Unlock()
-		return m.cachedIPLat, m.cachedIPLon
+		return lat, lon
 	}
 	return nil, nil
 }

core/internal/server/wayland/manager_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	mocks_geolocation "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/geolocation"
 	mocks_wlclient "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/wlclient"
 )
 
@@ -391,20 +390,18 @@ func TestNotifySubscribers_NonBlocking(t *testing.T) {
 
 func TestNewManager_GetRegistryError(t *testing.T) {
 	mockDisplay := mocks_wlclient.NewMockWaylandDisplay(t)
-	mockGeoclient := mocks_geolocation.NewMockClient(t)
 
 	mockDisplay.EXPECT().Context().Return(nil)
 	mockDisplay.EXPECT().GetRegistry().Return(nil, errors.New("failed to get registry"))
 
 	config := DefaultConfig()
-	_, err := NewManager(mockDisplay, mockGeoclient, config)
+	_, err := NewManager(mockDisplay, config)
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "get registry")
 }
 
 func TestNewManager_InvalidConfig(t *testing.T) {
 	mockDisplay := mocks_wlclient.NewMockWaylandDisplay(t)
-	mockGeoclient := mocks_geolocation.NewMockClient(t)
 
 	config := Config{
 		LowTemp:  500,
@@ -412,6 +409,6 @@ func TestNewManager_InvalidConfig(t *testing.T) {
 		Gamma:    1.0,
 	}
 
-	_, err := NewManager(mockDisplay, mockGeoclient, config)
+	_, err := NewManager(mockDisplay, config)
 	assert.Error(t, err)
 }

core/internal/server/wayland/types.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/geolocation"
 	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
 	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
 	"github.com/godbus/dbus/v5"
@@ -98,8 +97,6 @@ type Manager struct {
 	dbusConn   *dbus.Conn
 	dbusSignal chan *dbus.Signal
 
-	geoClient geolocation.Client
-
 	lastAppliedTemp  int
 	lastAppliedGamma float64
 }

distro/debian/dms-git/debian/rules

@@ -27,12 +27,12 @@ override_dh_auto_build:
 	# Verify core directory exists (native package format has source at root)
 	test -d core || (echo "ERROR: core directory not found!" && exit 1)
 
-	# Pin go.mod and vendor/modules.txt to the installed Go toolchain version
-	GO_INSTALLED=$$(go version | grep -oP 'go\K[0-9]+\.[0-9]+'); \
-	sed -i "s/^go [0-9]\+\.[0-9]\+\(\.[0-9]*\)\?$$/go $${GO_INSTALLED}/" core/go.mod; \
-	sed -i "s/^\(## explicit; go \)[0-9]\+\.[0-9]\+\(\.[0-9]*\)\?$$/\1$${GO_INSTALLED}/" core/vendor/modules.txt
+	# Patch go.mod to use Go 1.24 base version (Debian 13 has 1.23.x, may vary)
+	sed -i 's/^go 1\.24\.[0-9]*/go 1.24/' core/go.mod
 
-	# Build dms-cli (single shell to preserve variables; arch: Debian amd64/arm64 -> Makefile amd64/arm64)
+	# Build dms-cli from source using vendored dependencies
+	# Extract version info and build in single shell to preserve variables
+	# Architecture mapping: Debian amd64/arm64 -> Makefile amd64/arm64
 	VERSION="$(UPSTREAM_VERSION)"; \
 	COMMIT=$$(echo "$(UPSTREAM_VERSION)" | grep -oP '(?<=git)[0-9]+\.[a-f0-9]+' | cut -d. -f2 | head -c8 || echo "unknown"); \
 	if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \

distro/debian/dms-greeter/_service

@@ -3,7 +3,7 @@
   <service name="download_url">
     <param name="protocol">https</param>
     <param name="host">github.com</param>
-    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.4.3/dms-qml.tar.gz</param>
+    <param name="path">/AvengeMedia/DankMaterialShell/releases/download/v1.4.2/dms-qml.tar.gz</param>
     <param name="filename">dms-qml.tar.gz</param>
   </service>
 </services>

distro/debian/dms-greeter/debian/changelog

@@ -1,5 +1,6 @@
-dms-greeter (1.4.3db1) unstable; urgency=medium
+dms-greeter (1.4.2db8) unstable; urgency=medium
 
-  * Update to v1.4.3 stable release
+  * Initial Debian OBS package
+  * Port from Ubuntu/Fedora packaging
 
- -- Avenge Media <AvengeMedia.US@gmail.com>  Tue, 25 Feb 2026 02:40:00 +0000
+ -- Avenge Media <AvengeMedia.US@gmail.com>  Sat, 21 Feb 2026 00:00:00 +0000

distro/fedora/dms-git.spec

@@ -3,7 +3,6 @@
 %global debug_package %{nil}
 %global version {{{ git_repo_version }}}
 %global pkg_summary DankMaterialShell - Material 3 inspired shell for Wayland compositors
-%global go_toolchain_version 1.25.7
 
 Name:           dms
 Epoch:          2
@@ -15,12 +14,12 @@ License:        MIT
 URL:            https://github.com/AvengeMedia/DankMaterialShell
 VCS:            {{{ git_repo_vcs }}}
 Source0:        {{{ git_repo_pack }}}
-Source1:        https://go.dev/dl/go%{go_toolchain_version}.linux-amd64.tar.gz
-Source2:        https://go.dev/dl/go%{go_toolchain_version}.linux-arm64.tar.gz
 
 BuildRequires:  git-core
 BuildRequires:  gzip
+BuildRequires:  golang >= 1.24
 BuildRequires:  make
+BuildRequires:  wget
 BuildRequires:  systemd-rpm-macros
 
 # Core requirements
@@ -29,7 +28,7 @@ Requires:       accountsservice
 Requires:       dms-cli = %{epoch}:%{version}-%{release}
 Requires:       dgop
 
-# Core utilities (Recommended for DMS functionality)
+# Core utilities (Highly recommended for DMS functionality)
 Recommends:     cava
 Recommends:     danksearch
 Recommends:     matugen
@@ -67,28 +66,6 @@ Provides native DBus bindings, NetworkManager integration, and system utilities.
 VERSION="%{version}"
 COMMIT=$(echo "%{version}" | grep -oP '[a-f0-9]{7,}' | head -n1 || echo "unknown")
 
-# Use pinned bundled Go toolchain (deterministic across chroots)
-case "%{_arch}" in
-  x86_64)
-    GO_TARBALL="%{_sourcedir}/go%{go_toolchain_version}.linux-amd64.tar.gz"
-    ;;
-  aarch64)
-    GO_TARBALL="%{_sourcedir}/go%{go_toolchain_version}.linux-arm64.tar.gz"
-    ;;
-  *)
-    echo "Unsupported architecture for bundled Go: %{_arch}"
-    exit 1
-    ;;
-esac
-
-rm -rf .go
-tar -xzf "$GO_TARBALL"
-mv go .go
-export GOROOT="$PWD/.go"
-export PATH="$GOROOT/bin:$PATH"
-export GOTOOLCHAIN=local
-go version
-
 cd core
 make dist VERSION="$VERSION" COMMIT="$COMMIT"
 

distro/nix/common.nix

@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  dmsPkgs,
   ...
 }:
 let
@@ -9,7 +10,7 @@ let
 in
 {
   packages = [
-    cfg.package
+    dmsPkgs.dms-shell
   ]
   ++ lib.optional cfg.enableSystemMonitoring cfg.dgop.package
   ++ lib.optionals cfg.enableVPN [

distro/nix/greeter.nix

@@ -8,7 +8,6 @@
 let
   inherit (lib) types;
   cfg = config.programs.dank-material-shell.greeter;
-  cfgDms = config.programs.dank-material-shell;
 
   inherit (config.services.greetd.settings.default_session) user;
 
@@ -30,13 +29,13 @@ let
       lib.escapeShellArgs (
         [
           "sh"
-          "${cfg.package}/share/quickshell/dms/Modules/Greetd/assets/dms-greeter"
+          "${../../quickshell/Modules/Greetd/assets/dms-greeter}"
           "--cache-dir"
           cacheDir
           "--command"
           cfg.compositor.name
           "-p"
-          "${cfg.package}/share/quickshell/dms"
+          "${dmsPkgs.dms-shell}/share/quickshell/dms"
         ]
         ++ lib.optionals (cfg.compositor.customConfig != "") [
           "-C"
@@ -66,21 +65,6 @@ in
 
   options.programs.dank-material-shell.greeter = {
     enable = lib.mkEnableOption "DankMaterialShell greeter";
-    package = lib.mkOption {
-      type = types.package;
-      default = if cfgDms.enable or false then cfgDms.package else dmsPkgs.dms-shell;
-      defaultText = lib.literalExpression ''
-        if config.programs.dank-material-shell.enable
-        then config.programs.dank-material-shell.package
-        else built from source;
-      '';
-      description = ''
-        The DankMaterialShell package to use for the greeter.
-
-        Defaults to the package from `programs.dank-material-shell` if it is enabled,
-        otherwise defaults to building from source.
-      '';
-    };
     compositor.name = lib.mkOption {
       type = types.enum [
         "niri"

distro/nix/home.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  dmsPkgs,
   ...
 }@args:
 let
@@ -12,6 +13,7 @@ let
       config
       pkgs
       lib
+      dmsPkgs
       ;
   };
   hasPluginSettings = lib.any (plugin: plugin.settings != { }) (
@@ -94,7 +96,7 @@ in
       };
 
       Service = {
-        ExecStart = lib.getExe cfg.package + " run --session";
+        ExecStart = lib.getExe dmsPkgs.dms-shell + " run --session";
         Restart = "on-failure";
       };
 

distro/nix/nixos.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  dmsPkgs,
   ...
 }@args:
 let
@@ -11,6 +12,7 @@ let
       config
       pkgs
       lib
+      dmsPkgs
       ;
   };
 in
@@ -34,7 +36,7 @@ in
       restartIfChanged = cfg.systemd.restartIfChanged;
 
       serviceConfig = {
-        ExecStart = lib.getExe cfg.package + " run --session";
+        ExecStart = lib.getExe dmsPkgs.dms-shell + " run --session";
         Restart = "on-failure";
       };
     };
@@ -48,7 +50,6 @@ in
 
     services.power-profiles-daemon.enable = lib.mkDefault true;
     services.accounts-daemon.enable = lib.mkDefault true;
-    services.geoclue2.enable = lib.mkDefault true;
     security.polkit.enable = lib.mkDefault true;
   };
 }

distro/nix/options.nix

@@ -26,9 +26,6 @@ in
 
   options.programs.dank-material-shell = {
     enable = lib.mkEnableOption "DankMaterialShell";
-    package = lib.mkPackageOption dmsPkgs "dms-shell" {
-      extraDescription = "The DankMaterialShell package to use (defaults to be built from source)";
-    };
 
     systemd = {
       enable = lib.mkEnableOption "DankMaterialShell systemd startup";

distro/opensuse/dms-git.spec

@@ -56,10 +56,8 @@ mkdir -p $HOME $GOCACHE $GOMODCACHE
 # OBS has no network access, so use local toolchain only
 export GOTOOLCHAIN=local
 
-# Pin go.mod and vendor/modules.txt to the installed Go toolchain version
-GO_INSTALLED=$(go version | grep -oP 'go\K[0-9]+\.[0-9]+')
-sed -i "s/^go [0-9]\+\.[0-9]\+\(\.[0-9]*\)\?$/go ${GO_INSTALLED}/" core/go.mod
-sed -i "s/^\(## explicit; go \)[0-9]\+\.[0-9]\+\(\.[0-9]*\)\?$/\1${GO_INSTALLED}/" core/vendor/modules.txt
+# Patch go.mod to use base Go version (e.g., go 1.24 instead of go 1.24.6)
+sed -i 's/^go 1\.24\.[0-9]*/go 1.24/' core/go.mod
 
 # Extract version info for embedding in binary
 VERSION="%{version}"

distro/scripts/obs-upload.sh

@@ -419,9 +419,6 @@ if [[ "$UPLOAD_OPENSUSE" == true ]] && [[ -f "distro/opensuse/$PACKAGE.spec" ]];
         sed -i "s/VERSION_PLACEHOLDER/${DMS_GREETER_BASE_VERSION}/g" "$WORK_DIR/$PACKAGE.spec"
         sed -i "s/RELEASE_PLACEHOLDER/${DMS_GREETER_RELEASE}/g" "$WORK_DIR/$PACKAGE.spec"
         sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" "$WORK_DIR/$PACKAGE.spec"
-        # Explicitly set Version:/Release: in case the spec uses %{version} macro
-        sed -i "s/^Version:.*/Version:        ${DMS_GREETER_BASE_VERSION}/" "$WORK_DIR/$PACKAGE.spec"
-        sed -i "s/^Release:.*/Release:        ${DMS_GREETER_RELEASE}%{?dist}/" "$WORK_DIR/$PACKAGE.spec"
     fi
 
     if [[ -f "$WORK_DIR/.osc/$PACKAGE.spec" ]]; then
@@ -816,9 +813,6 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ -d "distro/debian/$PACKAGE/debian" ]]; t
                 sed -i "s/VERSION_PLACEHOLDER/${DMS_GREETER_BASE_VERSION}/g" "$WORK_DIR/$PACKAGE.spec"
                 sed -i "s/RELEASE_PLACEHOLDER/${DMS_GREETER_RELEASE}/g" "$WORK_DIR/$PACKAGE.spec"
                 sed -i "s/CHANGELOG_DATE_PLACEHOLDER/${CHANGELOG_DATE}/g" "$WORK_DIR/$PACKAGE.spec"
-                # Explicitly set Version:/Release: in case the spec uses %{version} macro
-                sed -i "s/^Version:.*/Version:        ${DMS_GREETER_BASE_VERSION}/" "$WORK_DIR/$PACKAGE.spec"
-                sed -i "s/^Release:.*/Release:        ${DMS_GREETER_RELEASE}%{?dist}/" "$WORK_DIR/$PACKAGE.spec"
             fi
         fi
 

flake.nix

@@ -72,76 +72,82 @@
             "${cleanVersion}${dateSuffix}${revSuffix}";
         in
         {
-          dms-shell = pkgs.buildGoModule (
-            let
-              rootSrc = ./.;
-            in
+          dms-shell = pkgs.lib.makeOverridable (
             {
-              inherit version;
-              pname = "dms-shell";
-              src = ./core;
-              vendorHash = "sha256-dEk7IOd6aQwaxZruxQclN7TGMyb8EJOl6NBWRsoZ9HQ=";
+              extraQtPackages ? [ ],
+            }:
+            pkgs.buildGoModule (
+              let
+                rootSrc = ./.;
+                qtPackages = (qmlPkgs pkgs) ++ extraQtPackages;
+              in
+              {
+                inherit version;
+                pname = "dms-shell";
+                src = ./core;
+                vendorHash = "sha256-dEk7IOd6aQwaxZruxQclN7TGMyb8EJOl6NBWRsoZ9HQ=";
 
-              subPackages = [ "cmd/dms" ];
+                subPackages = [ "cmd/dms" ];
 
-              ldflags = [
-                "-s"
-                "-w"
-                "-X 'main.Version=${version}'"
-              ];
+                ldflags = [
+                  "-s"
+                  "-w"
+                  "-X 'main.Version=${version}'"
+                ];
 
-              nativeBuildInputs = with pkgs; [
-                installShellFiles
-                makeWrapper
-              ];
+                nativeBuildInputs = with pkgs; [
+                  installShellFiles
+                  makeWrapper
+                ];
 
-              postInstall = ''
-                mkdir -p $out/share/quickshell/dms
-                cp -r ${rootSrc}/quickshell/. $out/share/quickshell/dms/
+                postInstall = ''
+                  mkdir -p $out/share/quickshell/dms
+                  cp -r ${rootSrc}/quickshell/. $out/share/quickshell/dms/
 
-                chmod u+w $out/share/quickshell/dms/VERSION
-                echo "${version}" > $out/share/quickshell/dms/VERSION
+                  chmod u+w $out/share/quickshell/dms/VERSION
+                  echo "${version}" > $out/share/quickshell/dms/VERSION
 
-                # Install desktop file and icon
-                install -D ${rootSrc}/assets/dms-open.desktop \
-                  $out/share/applications/dms-open.desktop
-                install -D ${rootSrc}/core/assets/danklogo.svg \
-                  $out/share/hicolor/scalable/apps/danklogo.svg
+                  # Install desktop file and icon
+                  install -D ${rootSrc}/assets/dms-open.desktop \
+                    $out/share/applications/dms-open.desktop
+                  install -D ${rootSrc}/core/assets/danklogo.svg \
+                    $out/share/hicolor/scalable/apps/danklogo.svg
 
-                wrapProgram $out/bin/dms \
-                  --add-flags "-c $out/share/quickshell/dms" \
-                  --prefix "NIXPKGS_QT6_QML_IMPORT_PATH" ":" "${mkQmlImportPath pkgs (qmlPkgs pkgs)}" \
-                  --prefix "QT_PLUGIN_PATH" ":" "${mkQtPluginPath pkgs (qmlPkgs pkgs)}"
+                  wrapProgram $out/bin/dms \
+                    --add-flags "-c $out/share/quickshell/dms" \
+                    --prefix "NIXPKGS_QT6_QML_IMPORT_PATH" ":" "${mkQmlImportPath pkgs qtPackages}" \
+                    --prefix "QT_PLUGIN_PATH" ":" "${mkQtPluginPath pkgs qtPackages}"
 
-                install -Dm644 ${rootSrc}/assets/systemd/dms.service \
-                  $out/lib/systemd/user/dms.service
+                  install -Dm644 ${rootSrc}/assets/systemd/dms.service \
+                    $out/lib/systemd/user/dms.service
 
-                substituteInPlace $out/lib/systemd/user/dms.service \
-                  --replace-fail /usr/bin/dms $out/bin/dms \
-                  --replace-fail /usr/bin/pkill ${pkgs.procps}/bin/pkill
+                  substituteInPlace $out/lib/systemd/user/dms.service \
+                    --replace-fail /usr/bin/dms $out/bin/dms \
+                    --replace-fail /usr/bin/pkill ${pkgs.procps}/bin/pkill
 
-                substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \
-                  --replace-fail /bin/bash ${pkgs.bashInteractive}/bin/bash
+                  substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \
+                    --replace-fail /bin/bash ${pkgs.bashInteractive}/bin/bash
 
-                substituteInPlace $out/share/quickshell/dms/assets/pam/fprint \
-                  --replace-fail pam_fprintd.so ${pkgs.fprintd}/lib/security/pam_fprintd.so
+                  substituteInPlace $out/share/quickshell/dms/assets/pam/fprint \
+                    --replace-fail pam_fprintd.so ${pkgs.fprintd}/lib/security/pam_fprintd.so
 
-                installShellCompletion --cmd dms \
-                  --bash <($out/bin/dms completion bash) \
-                  --fish <($out/bin/dms completion fish) \
-                  --zsh <($out/bin/dms completion zsh)
-              '';
+                  installShellCompletion --cmd dms \
+                    --bash <($out/bin/dms completion bash) \
+                    --fish <($out/bin/dms completion fish) \
+                    --zsh <($out/bin/dms completion zsh)
+                '';
 
-              meta = {
-                description = "Desktop shell for wayland compositors built with Quickshell & GO";
-                homepage = "https://danklinux.com";
-                changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${version}";
-                license = pkgs.lib.licenses.mit;
-                mainProgram = "dms";
-                platforms = pkgs.lib.platforms.linux;
-              };
-            }
-          );
+                meta = {
+                  description = "Desktop shell for wayland compositors built with Quickshell & GO";
+                  homepage = "https://danklinux.com";
+                  changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${version}";
+                  license = pkgs.lib.licenses.mit;
+                  mainProgram = "dms";
+                  platforms = pkgs.lib.platforms.linux;
+                };
+              }
+            )
+          ) { };
 
           quickshell = quickshell.packages.${system}.default;
 
@@ -182,7 +188,6 @@
               with pkgs;
               [
                 go_1_25
-                go-mockery_2
                 gopls
                 delve
                 go-tools

quickshell/CODENAME

@@ -1 +1 @@
-The Wolverine
+Saffron Bloom

quickshell/Common/AnimVariants.qml

@@ -1,174 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import qs.Common
-
-// AnimVariants — Central tuning for animation and Motion Effects variants
-// (Material/Fluent/Dynamic) (Standard/Directional/Depth)
-
-Singleton {
-    id: root
-
-    readonly property list<real> variantEnterCurve: {
-        if (typeof SettingsData === "undefined")
-            return Anims.expressiveDefaultSpatial;
-        switch (SettingsData.animationVariant) {
-        case 1:
-            return Anims.standardDecel;
-        case 2:
-            return Anims.expressiveFastSpatial;
-        default:
-            return Anims.expressiveDefaultSpatial;
-        }
-    }
-
-    readonly property list<real> variantExitCurve: {
-        if (typeof SettingsData === "undefined")
-            return Anims.emphasized;
-        switch (SettingsData.animationVariant) {
-        case 1:
-            return Anims.standard;
-        case 2:
-            return Anims.emphasized;
-        default:
-            return Anims.emphasized;
-        }
-    }
-
-    // Modal-specific entry curve
-    readonly property list<real> variantModalEnterCurve: {
-        if (typeof SettingsData === "undefined")
-            return Anims.expressiveDefaultSpatial;
-        if (isDirectionalEffect) {
-            if (SettingsData.animationVariant === 1)
-                return Anims.standardDecel;
-            if (SettingsData.animationVariant === 2)
-                return Anims.expressiveFastSpatial;
-        }
-        return variantEnterCurve;
-    }
-
-    readonly property list<real> variantModalExitCurve: {
-        if (typeof SettingsData === "undefined")
-            return Anims.emphasized;
-        if (isDirectionalEffect) {
-            if (SettingsData.animationVariant === 1)
-                return Anims.emphasizedAccel;
-            if (SettingsData.animationVariant === 2)
-                return Anims.emphasizedAccel;
-        }
-        return variantExitCurve;
-    }
-
-    // Popout-specific entry curve
-    readonly property list<real> variantPopoutEnterCurve: {
-        if (typeof SettingsData === "undefined")
-            return Anims.expressiveDefaultSpatial;
-        if (isDirectionalEffect) {
-            if (SettingsData.animationVariant === 1)
-                return Anims.standardDecel;
-            if (SettingsData.animationVariant === 2)
-                return Anims.expressiveFastSpatial;
-            return Anims.standardDecel;
-        }
-        return variantEnterCurve;
-    }
-
-    readonly property list<real> variantPopoutExitCurve: {
-        if (typeof SettingsData === "undefined")
-            return Anims.emphasized;
-        if (isDirectionalEffect) {
-            if (SettingsData.animationVariant === 1)
-                return Anims.emphasizedAccel;
-            if (SettingsData.animationVariant === 2)
-                return Anims.emphasizedAccel;
-        }
-        return variantExitCurve;
-    }
-
-    readonly property real variantEnterDurationFactor: {
-        if (typeof SettingsData === "undefined")
-            return 1.0;
-        switch (SettingsData.animationVariant) {
-        case 1:
-            return 0.9;
-        case 2:
-            return 1.08;
-        default:
-            return 1.0;
-        }
-    }
-
-    readonly property real variantExitDurationFactor: {
-        if (typeof SettingsData === "undefined")
-            return 1.0;
-        switch (SettingsData.animationVariant) {
-        case 1:
-            return 0.85;
-        case 2:
-            return 0.92;
-        default:
-            return 1.0;
-        }
-    }
-
-    // Fluent: opacity at ~55% of duration; Material/Dynamic: 1:1 with position
-    readonly property real variantOpacityDurationScale: {
-        if (typeof SettingsData === "undefined")
-            return 1.0;
-        return SettingsData.animationVariant === 1 ? 0.55 : 1.0;
-    }
-
-    function variantDuration(baseDuration, entering) {
-        const factor = entering ? variantEnterDurationFactor : variantExitDurationFactor;
-        return Math.max(0, Math.round(baseDuration * factor));
-    }
-
-    function variantExitCleanupPadding() {
-        if (typeof SettingsData === "undefined")
-            return 50;
-        switch (SettingsData.motionEffect) {
-        case 1:
-            return 8;
-        case 2:
-            return 24;
-        default:
-            return 50;
-        }
-    }
-
-    function variantCloseInterval(baseDuration) {
-        return variantDuration(baseDuration, false) + variantExitCleanupPadding();
-    }
-
-    readonly property bool isDirectionalEffect: typeof SettingsData !== "undefined" && SettingsData.motionEffect === 1
-    readonly property bool isDepthEffect: typeof SettingsData !== "undefined" && SettingsData.motionEffect === 2
-
-    readonly property real effectScaleCollapsed: {
-        if (typeof SettingsData === "undefined")
-            return 0.96;
-        switch (SettingsData.motionEffect) {
-        case 1:
-            return 1.0;
-        case 2:
-            return 0.88;
-        default:
-            return 0.96;
-        }
-    }
-
-    readonly property real effectAnimOffset: {
-        if (typeof SettingsData === "undefined")
-            return 16;
-        switch (SettingsData.motionEffect) {
-        case 1:
-            return 144;
-        case 2:
-            return 56;
-        default:
-            return 16;
-        }
-    }
-}

quickshell/Common/Anims.qml

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

quickshell/Common/ElevationShadow.qml

@@ -1,54 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Effects
-import qs.Common
-
-Item {
-    id: root
-
-    property var level: Theme.elevationLevel2
-    property string direction: Theme.elevationLightDirection
-    property real fallbackOffset: 4
-
-    property color targetColor: "white"
-    property real targetRadius: Theme.cornerRadius
-    property color borderColor: "transparent"
-    property real borderWidth: 0
-
-    property bool shadowEnabled: Theme.elevationEnabled
-    property real shadowBlurPx: level && level.blurPx !== undefined ? level.blurPx : 0
-    property real shadowSpreadPx: level && level.spreadPx !== undefined ? level.spreadPx : 0
-    property real shadowOffsetX: Theme.elevationOffsetXFor(level, direction, fallbackOffset)
-    property real shadowOffsetY: Theme.elevationOffsetYFor(level, direction, fallbackOffset)
-    property color shadowColor: Theme.elevationShadowColor(level)
-    property real shadowOpacity: 1
-    property real blurMax: Theme.elevationBlurMax
-
-    property alias sourceRect: sourceRect
-
-    layer.enabled: shadowEnabled
-
-    layer.effect: MultiEffect {
-        autoPaddingEnabled: true
-        shadowEnabled: true
-        blurEnabled: false
-        maskEnabled: false
-        shadowBlur: Math.max(0, Math.min(1, root.shadowBlurPx / Math.max(1, root.blurMax)))
-        shadowScale: 1 + (2 * root.shadowSpreadPx) / Math.max(1, Math.min(root.width, root.height))
-        shadowHorizontalOffset: root.shadowOffsetX
-        shadowVerticalOffset: root.shadowOffsetY
-        blurMax: root.blurMax
-        shadowColor: root.shadowColor
-        shadowOpacity: root.shadowOpacity
-    }
-
-    Rectangle {
-        id: sourceRect
-        anchors.fill: parent
-        radius: root.targetRadius
-        color: root.targetColor
-        border.color: root.borderColor
-        border.width: root.borderWidth
-    }
-}

quickshell/Common/I18n.qml

@@ -1,6 +1,5 @@
 pragma Singleton
 pragma ComponentBehavior: Bound
-
 import QtQuick
 import Qt.labs.folderlistmodel
 import Quickshell
@@ -9,9 +8,7 @@ import Quickshell.Io
 Singleton {
     id: root
 
-    property string _resolvedLocale: "en"
-
-    readonly property string _rawLocale: SessionData.locale === "" ? Qt.locale().name : SessionData.locale
+    readonly property string _rawLocale: Qt.locale().name
     readonly property string _lang: _rawLocale.split(/[_-]/)[0]
     readonly property var _candidates: {
         const fullUnderscore = _rawLocale;
@@ -24,10 +21,7 @@ Singleton {
 
     readonly property url translationsFolder: Qt.resolvedUrl("../translations/poexports")
 
-    readonly property alias folder: dir.folder
-    property var presentLocales: ({
-            "en": Qt.locale("en")
-        })
+    property string currentLocale: "en"
     property var translations: ({})
     property bool translationsLoaded: false
 
@@ -40,10 +34,8 @@ Singleton {
         showDirs: false
         showDotAndDotDot: false
 
-        onStatusChanged: if (status === FolderListModel.Ready) {
-            root._loadPresentLocales();
-            root._pickTranslation();
-        }
+        onStatusChanged: if (status === FolderListModel.Ready)
+            root._pickTranslation()
     }
 
     FileView {
@@ -54,54 +46,41 @@ Singleton {
             try {
                 root.translations = JSON.parse(text());
                 root.translationsLoaded = true;
-                console.info(`I18n: Loaded translations for '${root._resolvedLocale}' (${Object.keys(root.translations).length} contexts)`);
+                console.info(`I18n: Loaded translations for '${root.currentLocale}' ` + `(${Object.keys(root.translations).length} contexts)`);
             } catch (e) {
-                console.warn(`I18n: Error parsing '${root._resolvedLocale}':`, e, "- falling back to English");
+                console.warn(`I18n: Error parsing '${root.currentLocale}':`, e, "- falling back to English");
                 root._fallbackToEnglish();
             }
         }
 
         onLoadFailed: error => {
-            console.warn(`I18n: Failed to load '${root._resolvedLocale}' (${error}), ` + "falling back to English");
+            console.warn(`I18n: Failed to load '${root.currentLocale}' (${error}), ` + "falling back to English");
             root._fallbackToEnglish();
         }
     }
 
-    function locale() {
-        if (SessionData.timeLocale)
-            return Qt.locale(SessionData.timeLocale);
-        return Qt.locale();
-    }
-
-    function _loadPresentLocales() {
-        if (Object.keys(presentLocales).length > 1) {
-            return; // already loaded
-        }
+    function _pickTranslation() {
+        const present = new Set();
         for (let i = 0; i < dir.count; i++) {
             const name = dir.get(i, "fileName"); // e.g. "zh_CN.json"
             if (name && name.endsWith(".json")) {
-                const shortName = name.slice(0, -5);
-                presentLocales[shortName] = Qt.locale(shortName);
+                present.add(name.slice(0, -5));
             }
         }
-    }
 
-    function _pickTranslation() {
         for (let i = 0; i < _candidates.length; i++) {
             const cand = _candidates[i];
-            if (presentLocales[cand] === undefined)
-                continue;
-            _resolvedLocale = cand;
-            useLocale(cand, cand.startsWith("en") ? "" : translationsFolder + "/" + cand + ".json");
-            return;
+            if (present.has(cand)) {
+                _useLocale(cand, dir.folder + "/" + cand + ".json");
+                return;
+            }
         }
 
-        _resolvedLocale = "en";
         _fallbackToEnglish();
     }
 
-    function useLocale(localeTag, fileUrl) {
-        _resolvedLocale = localeTag || "en";
+    function _useLocale(localeTag, fileUrl) {
+        currentLocale = localeTag;
         _selectedPath = fileUrl;
         translationsLoaded = false;
         translations = ({});
@@ -109,6 +88,7 @@ Singleton {
     }
 
     function _fallbackToEnglish() {
+        currentLocale = "en";
         _selectedPath = "";
         translationsLoaded = false;
         translations = ({});

quickshell/Common/SessionData.qml

@@ -21,9 +21,7 @@ Singleton {
     property bool _isReadOnly: false
     property bool _hasUnsavedChanges: false
     property var _loadedSessionSnapshot: null
-    readonly property var _hooks: ({
-        "updateLocale": updateLocale
-    })
+    readonly property var _hooks: ({})
     readonly property string _stateUrl: StandardPaths.writableLocation(StandardPaths.GenericStateLocation)
     readonly property string _stateDir: Paths.strip(_stateUrl)
 
@@ -128,9 +126,6 @@ Singleton {
     property var hiddenOutputDeviceNames: []
     property var hiddenInputDeviceNames: []
 
-    property string locale: ""
-    property string timeLocale: ""
-
     property string launcherLastMode: "all"
     property string appDrawerLastMode: "apps"
     property string niriOverviewLastMode: "apps"
@@ -1109,14 +1104,6 @@ Singleton {
         saveSettings();
     }
 
-    function updateLocale() {
-        if (!locale) {
-            I18n._pickTranslation();
-            return;
-        }
-        I18n.useLocale(locale, locale.startsWith("en") ? "" : I18n.folder + "/" + locale + ".json");
-    }
-
     function setLauncherLastMode(mode) {
         launcherLastMode = mode;
         saveSettings();

quickshell/Common/SettingsData.qml

@@ -14,7 +14,7 @@ import "settings/SettingsStore.js" as Store
 Singleton {
     id: root
 
-    readonly property int settingsConfigVersion: 6
+    readonly property int settingsConfigVersion: 5
 
     readonly property bool isGreeterMode: Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true"
 
@@ -37,18 +37,6 @@ Singleton {
         Custom
     }
 
-    enum AnimationVariant {
-        Material,
-        Fluent,
-        Dynamic
-    }
-
-    enum AnimationEffect {
-        Standard,     // 0 — M3: scale-in, rises from below
-        Directional,  // 1 — pure large slide, no scale
-        Depth         // 2 — medium slide with deep depth scale pop
-    }
-
     enum SuspendBehavior {
         Suspend,
         Hibernate,
@@ -161,7 +149,6 @@ Singleton {
     property int mangoLayoutRadiusOverride: -1
     property int mangoLayoutBorderSize: -1
 
-    property int firstDayOfWeek: -1
     property bool use24HourClock: true
     property bool showSeconds: false
     property bool padHours12Hour: false
@@ -178,30 +165,6 @@ Singleton {
     property int modalCustomAnimationDuration: 150
     property bool enableRippleEffects: true
     onEnableRippleEffectsChanged: saveSettings()
-    property int animationVariant: SettingsData.AnimationVariant.Material
-    onAnimationVariantChanged: saveSettings()
-    property int motionEffect: SettingsData.AnimationEffect.Standard
-    onMotionEffectChanged: saveSettings()
-    property int directionalAnimationMode: 0
-    onDirectionalAnimationModeChanged: saveSettings()
-    property bool m3ElevationEnabled: true
-    onM3ElevationEnabledChanged: saveSettings()
-    property int m3ElevationIntensity: 12
-    onM3ElevationIntensityChanged: saveSettings()
-    property int m3ElevationOpacity: 30
-    onM3ElevationOpacityChanged: saveSettings()
-    property string m3ElevationColorMode: "default"
-    onM3ElevationColorModeChanged: saveSettings()
-    property string m3ElevationLightDirection: "top"
-    onM3ElevationLightDirectionChanged: saveSettings()
-    property string m3ElevationCustomColor: "#000000"
-    onM3ElevationCustomColorChanged: saveSettings()
-    property bool modalElevationEnabled: true
-    onModalElevationEnabledChanged: saveSettings()
-    property bool popoutElevationEnabled: true
-    onPopoutElevationEnabledChanged: saveSettings()
-    property bool barElevationEnabled: true
-    onBarElevationEnabledChanged: saveSettings()
     property string wallpaperFillMode: "Fill"
     property bool blurredWallpaperLayer: false
     property bool blurWallpaperOnOverview: false
@@ -474,7 +437,7 @@ Singleton {
     property bool matugenTemplateGhostty: true
     property bool matugenTemplateKitty: true
     property bool matugenTemplateFoot: true
-    property bool matugenTemplateNeovim: true
+    property bool matugenTemplateNeovim: false
     property bool matugenTemplateAlacritty: true
     property bool matugenTemplateWezterm: true
     property bool matugenTemplateDgop: true
@@ -531,15 +494,9 @@ Singleton {
     property bool enableFprint: false
     property int maxFprintTries: 15
     property bool fprintdAvailable: false
-    property bool enableU2f: false
-    property string u2fMode: "or"
-    property bool u2fAvailable: false
     property string lockScreenActiveMonitor: "all"
     property string lockScreenInactiveColor: "#000000"
     property int lockScreenNotificationMode: 0
-    property bool lockScreenVideoEnabled: false
-    property string lockScreenVideoPath: ""
-    property bool lockScreenVideoCycling: false
     property bool hideBrightnessSlider: false
 
     property int notificationTimeoutLow: 5000
@@ -645,7 +602,7 @@ Singleton {
             "scrollYBehavior": "workspace",
             "shadowIntensity": 0,
             "shadowOpacity": 60,
-            "shadowColorMode": "default",
+            "shadowColorMode": "text",
             "shadowCustomColor": "#000000",
             "clickThrough": false
         }
@@ -1025,7 +982,6 @@ Singleton {
             loadSettings();
             initializeListModels();
             Processes.detectFprintd();
-            Processes.detectU2f();
             Processes.checkPluginSettings();
         }
     }
@@ -1173,7 +1129,7 @@ Singleton {
             "updateCompositorLayout": updateCompositorLayout,
             "applyStoredIconTheme": applyStoredIconTheme,
             "updateBarConfigs": updateBarConfigs,
-            "updateCompositorCursor": updateCompositorCursor,
+            "updateCompositorCursor": updateCompositorCursor
         })
 
     function set(key, value) {

quickshell/Common/Theme.qml

@@ -673,232 +673,6 @@ Singleton {
     property color shadowMedium: Qt.rgba(0, 0, 0, 0.08)
     property color shadowStrong: Qt.rgba(0, 0, 0, 0.3)
 
-    readonly property bool elevationEnabled: typeof SettingsData !== "undefined" && (SettingsData.m3ElevationEnabled ?? true)
-    readonly property real elevationBlurMax: typeof SettingsData !== "undefined" && SettingsData.m3ElevationIntensity !== undefined ? Math.min(128, Math.max(32, SettingsData.m3ElevationIntensity * 2)) : 64
-
-    readonly property real _elevMult: typeof SettingsData !== "undefined" && SettingsData.m3ElevationIntensity !== undefined ? SettingsData.m3ElevationIntensity / 12 : 1
-    readonly property real _opMult: typeof SettingsData !== "undefined" && SettingsData.m3ElevationOpacity !== undefined ? SettingsData.m3ElevationOpacity / 60 : 1
-    function normalizeElevationDirection(direction) {
-        switch (direction) {
-        case "top":
-        case "topLeft":
-        case "topRight":
-        case "bottom":
-        case "bottomLeft":
-        case "bottomRight":
-        case "left":
-        case "right":
-        case "autoBar":
-            return direction;
-        default:
-            return "top";
-        }
-    }
-
-    readonly property string elevationLightDirection: {
-        if (typeof SettingsData === "undefined" || !SettingsData.m3ElevationLightDirection)
-            return "top";
-        switch (SettingsData.m3ElevationLightDirection) {
-        case "autoBar":
-        case "top":
-        case "topLeft":
-        case "topRight":
-        case "bottom":
-            return SettingsData.m3ElevationLightDirection;
-        default:
-            return "top";
-        }
-    }
-    readonly property real _elevDiagRatio: 0.55
-    readonly property string _globalElevationDirForTokens: {
-        const normalized = normalizeElevationDirection(elevationLightDirection);
-        return normalized === "autoBar" ? "top" : normalized;
-    }
-    readonly property real _elevDirX: {
-        switch (_globalElevationDirForTokens) {
-        case "topLeft":
-        case "bottomLeft":
-        case "left":
-            return 1;
-        case "topRight":
-        case "bottomRight":
-        case "right":
-            return -1;
-        default:
-            return 0;
-        }
-    }
-    readonly property real _elevDirY: {
-        switch (_globalElevationDirForTokens) {
-        case "bottom":
-        case "bottomLeft":
-        case "bottomRight":
-            return -1;
-        case "left":
-        case "right":
-            return 0;
-        default:
-            return 1;
-        }
-    }
-    readonly property real _elevDirXScale: (_globalElevationDirForTokens === "left" || _globalElevationDirForTokens === "right") ? 1 : _elevDiagRatio
-
-    readonly property var elevationLevel1: ({
-            blurPx: 4 * _elevMult,
-            offsetX: 1 * _elevMult * _elevDirXScale * _elevDirX,
-            offsetY: 1 * _elevMult * _elevDirY,
-            spreadPx: 0,
-            alpha: 0.2 * _opMult
-        })
-    readonly property var elevationLevel2: ({
-            blurPx: 8 * _elevMult,
-            offsetX: 4 * _elevMult * _elevDirXScale * _elevDirX,
-            offsetY: 4 * _elevMult * _elevDirY,
-            spreadPx: 0,
-            alpha: 0.25 * _opMult
-        })
-    readonly property var elevationLevel3: ({
-            blurPx: 12 * _elevMult,
-            offsetX: 6 * _elevMult * _elevDirXScale * _elevDirX,
-            offsetY: 6 * _elevMult * _elevDirY,
-            spreadPx: 0,
-            alpha: 0.3 * _opMult
-        })
-    readonly property var elevationLevel4: ({
-            blurPx: 16 * _elevMult,
-            offsetX: 8 * _elevMult * _elevDirXScale * _elevDirX,
-            offsetY: 8 * _elevMult * _elevDirY,
-            spreadPx: 0,
-            alpha: 0.3 * _opMult
-        })
-    readonly property var elevationLevel5: ({
-            blurPx: 20 * _elevMult,
-            offsetX: 10 * _elevMult * _elevDirXScale * _elevDirX,
-            offsetY: 10 * _elevMult * _elevDirY,
-            spreadPx: 0,
-            alpha: 0.3 * _opMult
-        })
-
-    function elevationOffsetMagnitude(level, fallback, direction) {
-        if (!level) {
-            return fallback !== undefined ? Math.abs(fallback) : 0;
-        }
-        const yMag = Math.abs(level.offsetY !== undefined ? level.offsetY : 0);
-        if (yMag > 0)
-            return yMag;
-        const xMag = Math.abs(level.offsetX !== undefined ? level.offsetX : 0);
-        if (xMag > 0) {
-            if (direction === "left" || direction === "right")
-                return xMag;
-            return xMag / _elevDiagRatio;
-        }
-        return fallback !== undefined ? Math.abs(fallback) : 0;
-    }
-
-    function elevationOffsetXFor(level, direction, fallback) {
-        const dir = normalizeElevationDirection(direction || elevationLightDirection);
-        const mag = elevationOffsetMagnitude(level, fallback, dir);
-        switch (dir) {
-        case "topLeft":
-        case "bottomLeft":
-            return mag * _elevDiagRatio;
-        case "topRight":
-        case "bottomRight":
-            return -mag * _elevDiagRatio;
-        case "left":
-            return mag;
-        case "right":
-            return -mag;
-        default:
-            return 0;
-        }
-    }
-
-    function elevationOffsetYFor(level, direction, fallback) {
-        const dir = normalizeElevationDirection(direction || elevationLightDirection);
-        const mag = elevationOffsetMagnitude(level, fallback, dir);
-        switch (dir) {
-        case "bottom":
-        case "bottomLeft":
-        case "bottomRight":
-            return -mag;
-        case "left":
-        case "right":
-            return 0;
-        default:
-            return mag;
-        }
-    }
-
-    function elevationOffsetX(level, fallback) {
-        return elevationOffsetXFor(level, elevationLightDirection, fallback);
-    }
-
-    function elevationOffsetY(level, fallback) {
-        return elevationOffsetYFor(level, elevationLightDirection, fallback);
-    }
-
-    function elevationRenderPadding(level, direction, fallbackOffset, extraPadding, minPadding) {
-        const dir = direction !== undefined ? direction : elevationLightDirection;
-        const blur = (level && level.blurPx !== undefined) ? Math.max(0, level.blurPx) : 0;
-        const spread = (level && level.spreadPx !== undefined) ? Math.max(0, level.spreadPx) : 0;
-        const fallback = fallbackOffset !== undefined ? fallbackOffset : 0;
-        const extra = extraPadding !== undefined ? extraPadding : 8;
-        const minPad = minPadding !== undefined ? minPadding : 16;
-        const offsetX = Math.abs(elevationOffsetXFor(level, dir, fallback));
-        const offsetY = Math.abs(elevationOffsetYFor(level, dir, fallback));
-        return Math.max(minPad, blur + spread + Math.max(offsetX, offsetY) + extra);
-    }
-
-    function elevationShadowColor(level) {
-        const alpha = (level && level.alpha !== undefined) ? level.alpha : 0.3;
-        let r = 0;
-        let g = 0;
-        let b = 0;
-
-        if (typeof SettingsData !== "undefined") {
-            const mode = SettingsData.m3ElevationColorMode || "default";
-            if (mode === "default") {
-                r = 0;
-                g = 0;
-                b = 0;
-            } else if (mode === "text") {
-                r = surfaceText.r;
-                g = surfaceText.g;
-                b = surfaceText.b;
-            } else if (mode === "primary") {
-                r = primary.r;
-                g = primary.g;
-                b = primary.b;
-            } else if (mode === "surfaceVariant") {
-                r = surfaceVariant.r;
-                g = surfaceVariant.g;
-                b = surfaceVariant.b;
-            } else if (mode === "custom" && SettingsData.m3ElevationCustomColor) {
-                const c = Qt.color(SettingsData.m3ElevationCustomColor);
-                r = c.r;
-                g = c.g;
-                b = c.b;
-            }
-        }
-        return Qt.rgba(r, g, b, alpha);
-    }
-    function elevationTintOpacity(level) {
-        if (!level)
-            return 0;
-        if (level === elevationLevel1)
-            return 0.05;
-        if (level === elevationLevel2)
-            return 0.08;
-        if (level === elevationLevel3)
-            return 0.11;
-        if (level === elevationLevel4)
-            return 0.12;
-        if (level === elevationLevel5)
-            return 0.14;
-        return 0.08;
-    }
-
     readonly property var animationDurations: [
         {
             "shorter": 0,
@@ -960,24 +734,6 @@ Singleton {
         "expressiveEffects": [0.34, 0.8, 0.34, 1, 1, 1]
     }
 
-    // Delegates to AnimVariants.qml for curves, timing, scale, and offsets.
-    readonly property list<real> variantEnterCurve: AnimVariants.variantEnterCurve
-    readonly property list<real> variantExitCurve: AnimVariants.variantExitCurve
-    readonly property list<real> variantModalEnterCurve: AnimVariants.variantModalEnterCurve
-    readonly property list<real> variantModalExitCurve: AnimVariants.variantModalExitCurve
-    readonly property list<real> variantPopoutEnterCurve: AnimVariants.variantPopoutEnterCurve
-    readonly property list<real> variantPopoutExitCurve: AnimVariants.variantPopoutExitCurve
-    readonly property real variantEnterDurationFactor: AnimVariants.variantEnterDurationFactor
-    readonly property real variantExitDurationFactor: AnimVariants.variantExitDurationFactor
-    readonly property real variantOpacityDurationScale: AnimVariants.variantOpacityDurationScale
-    readonly property bool isDirectionalEffect: AnimVariants.isDirectionalEffect
-    readonly property bool isDepthEffect: AnimVariants.isDepthEffect
-    readonly property real effectScaleCollapsed: AnimVariants.effectScaleCollapsed
-    readonly property real effectAnimOffset: AnimVariants.effectAnimOffset
-    function variantDuration(baseDuration, entering) { return AnimVariants.variantDuration(baseDuration, entering); }
-    function variantExitCleanupPadding() { return AnimVariants.variantExitCleanupPadding(); }
-    function variantCloseInterval(baseDuration) { return AnimVariants.variantCloseInterval(baseDuration); }
-
     readonly property var animationPresetDurations: {
         "none": 0,
         "short": 250,

quickshell/Common/settings/Processes.qml

@@ -18,10 +18,6 @@ Singleton {
         fprintdDetectionProcess.running = true;
     }
 
-    function detectU2f() {
-        u2fDetectionProcess.running = true;
-    }
-
     function checkPluginSettings() {
         pluginSettingsCheckProcess.running = true;
     }
@@ -61,16 +57,6 @@ Singleton {
         }
     }
 
-    property var u2fDetectionProcess: Process {
-        command: ["sh", "-c", "(test -f /usr/lib/security/pam_u2f.so || test -f /usr/lib64/security/pam_u2f.so) && (test -f /etc/pam.d/dankshell-u2f || test -f \"$HOME/.config/Yubico/u2f_keys\")"]
-        running: false
-        onExited: function (exitCode) {
-            if (!settingsRoot)
-                return;
-            settingsRoot.u2fAvailable = (exitCode === 0);
-        }
-    }
-
     property var pluginSettingsCheckProcess: Process {
         command: ["test", "-f", settingsRoot?.pluginSettingsPath || ""]
         running: false

quickshell/Common/settings/SessionSpec.js

@@ -79,9 +79,6 @@ var SPEC = {
     hiddenOutputDeviceNames: { def: [] },
     hiddenInputDeviceNames: { def: [] },
 
-    locale: { def: "", onChange: "updateLocale" },
-    timeLocale: { def: "" },
-
     launcherLastMode: { def: "all" },
     appDrawerLastMode: { def: "apps" },
     niriOverviewLastMode: { def: "apps" }

quickshell/Common/settings/SettingsSpec.js

@@ -21,7 +21,7 @@ var SPEC = {
     widgetColorMode: { def: "default" },
     controlCenterTileColorMode: { def: "primary" },
     buttonColorMode: { def: "primary" },
-    cornerRadius: { def: 16, onChange: "updateCompositorLayout" },
+    cornerRadius: { def: 12, onChange: "updateCompositorLayout" },
     niriLayoutGapsOverride: { def: -1, onChange: "updateCompositorLayout" },
     niriLayoutRadiusOverride: { def: -1, onChange: "updateCompositorLayout" },
     niriLayoutBorderSize: { def: -1, onChange: "updateCompositorLayout" },
@@ -32,7 +32,6 @@ var SPEC = {
     mangoLayoutRadiusOverride: { def: -1, onChange: "updateCompositorLayout" },
     mangoLayoutBorderSize: { def: -1, onChange: "updateCompositorLayout" },
 
-    firstDayOfWeek: { def: -1 },
     use24HourClock: { def: true },
     showSeconds: { def: false },
     padHours12Hour: { def: false },
@@ -47,18 +46,6 @@ var SPEC = {
     modalAnimationSpeed: { def: 1 },
     modalCustomAnimationDuration: { def: 150 },
     enableRippleEffects: { def: true },
-    animationVariant: { def: 0 },
-    motionEffect: { def: 0 },
-    directionalAnimationMode: { def: 0 },
-    m3ElevationEnabled: { def: true },
-    m3ElevationIntensity: { def: 12 },
-    m3ElevationOpacity: { def: 30 },
-    m3ElevationColorMode: { def: "default" },
-    m3ElevationLightDirection: { def: "top" },
-    m3ElevationCustomColor: { def: "#000000" },
-    modalElevationEnabled: { def: true },
-    popoutElevationEnabled: { def: true },
-    barElevationEnabled: { def: true },
     wallpaperFillMode: { def: "Fill" },
     blurredWallpaperLayer: { def: false },
     blurWallpaperOnOverview: { def: false },
@@ -275,7 +262,7 @@ var SPEC = {
     matugenTemplateKitty: { def: true },
     matugenTemplateFoot: { def: true },
     matugenTemplateAlacritty: { def: true },
-    matugenTemplateNeovim: { def: true },
+    matugenTemplateNeovim: { def: false },
     matugenTemplateWezterm: { def: true },
     matugenTemplateDgop: { def: true },
     matugenTemplateKcolorscheme: { def: true },
@@ -330,15 +317,9 @@ var SPEC = {
     enableFprint: { def: false },
     maxFprintTries: { def: 15 },
     fprintdAvailable: { def: false, persist: false },
-    enableU2f: { def: false },
-    u2fMode: { def: "or" },
-    u2fAvailable: { def: false, persist: false },
     lockScreenActiveMonitor: { def: "all" },
     lockScreenInactiveColor: { def: "#000000" },
     lockScreenNotificationMode: { def: 0 },
-    lockScreenVideoEnabled: { def: false },
-    lockScreenVideoPath: { def: "" },
-    lockScreenVideoCycling: { def: false },
     hideBrightnessSlider: { def: false },
 
     notificationTimeoutLow: { def: 5000 },
@@ -444,7 +425,7 @@ var SPEC = {
             scrollYBehavior: "workspace",
             shadowIntensity: 0,
             shadowOpacity: 60,
-            shadowColorMode: "default",
+            shadowColorMode: "text",
             shadowCustomColor: "#000000",
             clickThrough: false
         }], onChange: "updateBarConfigs"

quickshell/Common/settings/SettingsStore.js

@@ -9,9 +9,6 @@ function parse(root, jsonObj) {
 
     for (var k in SPEC) {
         if (k === "pluginSettings") continue;
-        // Runtime-only keys are never in the JSON; resetting them here
-        // would wipe values set by detection processes on every reload.
-        if (SPEC[k].persist === false) continue;
         if (!(k in jsonObj)) {
             root[k] = SPEC[k].def;
         }
@@ -229,25 +226,6 @@ function migrateToVersion(obj, targetVersion) {
         settings.configVersion = 5;
     }
 
-    if (currentVersion < 6) {
-        console.info("Migrating settings from version", currentVersion, "to version 6");
-
-        if (settings.barElevationEnabled === undefined) {
-            var legacyBars = Array.isArray(settings.barConfigs) ? settings.barConfigs : [];
-            var hadLegacyBarShadowEnabled = false;
-            for (var j = 0; j < legacyBars.length; j++) {
-                var legacyIntensity = Number(legacyBars[j] && legacyBars[j].shadowIntensity);
-                if (!isNaN(legacyIntensity) && legacyIntensity > 0) {
-                    hadLegacyBarShadowEnabled = true;
-                    break;
-                }
-            }
-            settings.barElevationEnabled = hadLegacyBarShadowEnabled;
-        }
-
-        settings.configVersion = 6;
-    }
-
     return settings;
 }
 

quickshell/DMSShell.qml

@@ -154,18 +154,18 @@ Item {
 
     property string _barLayoutStateJson: {
         const configs = SettingsData.barConfigs;
-        const mapped = configs.map(c => ({
+        const mapped = configs.map((c, i) => ({
                     id: c.id,
                     position: c.position,
                     autoHide: c.autoHide,
-                    visible: c.visible
+                    visible: c.visible,
+                    _origIndex: i
                 })).sort((a, b) => {
             const aVertical = a.position === SettingsData.Position.Left || a.position === SettingsData.Position.Right;
             const bVertical = b.position === SettingsData.Position.Left || b.position === SettingsData.Position.Right;
-            if (aVertical !== bVertical) {
+            if (aVertical !== bVertical)
                 return aVertical - bVertical;
-            }
-            return String(a.id).localeCompare(String(b.id));
+            return a._origIndex - b._origIndex;
         });
         return JSON.stringify(mapped);
     }
@@ -365,23 +365,6 @@ Item {
         }
     }
 
-    LazyLoader {
-        id: wifiQRCodeModalLoader
-        active: false
-
-        Component.onCompleted: {
-            PopoutService.wifiQRCodeModalLoader = wifiQRCodeModalLoader;
-        }
-
-        WifiQRCodeModal {
-            id: wifiQRCodeModalItem
-
-            Component.onCompleted: {
-                PopoutService.wifiQRCodeModal = wifiQRCodeModalItem;
-            }
-        }
-    }
-
     LazyLoader {
         id: polkitAuthModalLoader
         active: false

quickshell/Modals/Clipboard/ClipboardContent.qml

@@ -86,7 +86,7 @@ Item {
         anchors.bottom: parent.bottom
         anchors.leftMargin: Theme.spacingM
         anchors.rightMargin: Theme.spacingM
-        anchors.bottomMargin: (modal.showKeyboardHints ? (ClipboardConstants.keyboardHintsHeight + Theme.spacingM * 2) : 0) + Theme.spacingXS
+        anchors.bottomMargin: modal.showKeyboardHints ? (ClipboardConstants.keyboardHintsHeight + Theme.spacingM * 2) : 0
         clip: true
 
         DankListView {
@@ -112,7 +112,14 @@ Item {
                 if (index < 0 || index >= count) {
                     return;
                 }
-                positionViewAtIndex(index, ListView.Contain);
+                const itemHeight = ClipboardConstants.itemHeight + spacing;
+                const itemY = index * itemHeight;
+                const itemBottom = itemY + itemHeight;
+                if (itemY < contentY) {
+                    contentY = itemY;
+                } else if (itemBottom > contentY + height) {
+                    contentY = itemBottom - height;
+                }
             }
 
             onCurrentIndexChanged: {
@@ -171,7 +178,14 @@ Item {
                 if (index < 0 || index >= count) {
                     return;
                 }
-                positionViewAtIndex(index, ListView.Contain);
+                const itemHeight = ClipboardConstants.itemHeight + spacing;
+                const itemY = index * itemHeight;
+                const itemBottom = itemY + itemHeight;
+                if (itemY < contentY) {
+                    contentY = itemY;
+                } else if (itemBottom > contentY + height) {
+                    contentY = itemBottom - height;
+                }
             }
 
             onCurrentIndexChanged: {

quickshell/Modals/Clipboard/ClipboardThumbnail.qml

@@ -31,13 +31,13 @@ Item {
         sourceSize.height: 128
 
         function tryLoadImage() {
-            if (thumbnailImage.loadQueued || entryType !== "image" || thumbnailImage.cachedImageData) {
+            if (loadQueued || entryType !== "image" || cachedImageData) {
                 return;
             }
-            thumbnailImage.loadQueued = true;
+            loadQueued = true;
             if (modal.activeImageLoads < modal.maxConcurrentLoads) {
                 modal.activeImageLoads++;
-                thumbnailImage.loadImage();
+                loadImage();
             } else {
                 retryTimer.restart();
             }
@@ -47,7 +47,7 @@ Item {
             DMSService.sendRequest("clipboard.getEntry", {
                 "id": entry.id
             }, function (response) {
-                thumbnailImage.loadQueued = false;
+                loadQueued = false;
                 if (modal.activeImageLoads > 0) {
                     modal.activeImageLoads--;
                 }
@@ -57,7 +57,7 @@ Item {
                 }
                 const data = response.result?.data;
                 if (data) {
-                    thumbnailImage.cachedImageData = data;
+                    cachedImageData = data;
                 }
             });
         }

quickshell/Modals/Common/DankModal.qml

@@ -26,15 +26,15 @@ Item {
     property bool closeOnBackgroundClick: true
     property string animationType: "scale"
     property int animationDuration: Theme.modalAnimationDuration
-    property real animationScaleCollapsed: Theme.effectScaleCollapsed
-    property real animationOffset: Theme.effectAnimOffset
-    property list<real> animationEnterCurve: Theme.variantModalEnterCurve
-    property list<real> animationExitCurve: Theme.variantModalExitCurve
+    property real animationScaleCollapsed: 0.96
+    property real animationOffset: Theme.spacingL
+    property list<real> animationEnterCurve: Theme.expressiveCurves.expressiveDefaultSpatial
+    property list<real> animationExitCurve: Theme.expressiveCurves.emphasized
     property color backgroundColor: Theme.surfaceContainer
     property color borderColor: Theme.outlineMedium
-    property real borderWidth: 0
+    property real borderWidth: 1
     property real cornerRadius: Theme.cornerRadius
-    property bool enableShadow: true
+    property bool enableShadow: false
     property alias modalFocusScope: focusScope
     property bool shouldBeVisible: false
     property bool shouldHaveFocus: shouldBeVisible
@@ -44,13 +44,11 @@ Item {
     property bool keepPopoutsOpen: false
     property var customKeyboardFocus: null
     property bool useOverlayLayer: false
-    property real frozenMotionOffsetX: 0
-    property real frozenMotionOffsetY: 0
     readonly property alias contentWindow: contentWindow
     readonly property alias clickCatcher: clickCatcher
     readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
     readonly property bool useBackground: showBackground && SettingsData.modalDarkenBackground
-    readonly property bool useSingleWindow: CompositorService.isHyprland
+    readonly property bool useSingleWindow: CompositorService.isHyprland || useBackground
 
     signal opened
     signal dialogClosed
@@ -60,34 +58,19 @@ Item {
 
     function open() {
         closeTimer.stop();
-        animationsEnabled = false;
-        frozenMotionOffsetX = modalContainer ? modalContainer.offsetX : 0;
-        frozenMotionOffsetY = modalContainer ? modalContainer.offsetY : animationOffset;
-
         const focusedScreen = CompositorService.getFocusedScreen();
         if (focusedScreen) {
             contentWindow.screen = focusedScreen;
             if (!useSingleWindow)
                 clickCatcher.screen = focusedScreen;
         }
-
-        if (Theme.isDirectionalEffect || root.useBackground) {
-            if (!useSingleWindow)
-                clickCatcher.visible = true;
-            contentWindow.visible = true;
-        }
         ModalManager.openModal(root);
-
-        Qt.callLater(() => {
-            animationsEnabled = true;
-            shouldBeVisible = true;
-            if (!useSingleWindow && !clickCatcher.visible)
-                clickCatcher.visible = true;
-            if (!contentWindow.visible)
-                contentWindow.visible = true;
-            shouldHaveFocus = false;
-            Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible));
-        });
+        shouldBeVisible = true;
+        if (!useSingleWindow)
+            clickCatcher.visible = true;
+        contentWindow.visible = true;
+        shouldHaveFocus = false;
+        Qt.callLater(() => shouldHaveFocus = Qt.binding(() => shouldBeVisible));
     }
 
     function close() {
@@ -148,7 +131,7 @@ Item {
 
     Timer {
         id: closeTimer
-        interval: Theme.variantCloseInterval(animationDuration)
+        interval: animationDuration + 50
         onTriggered: {
             if (shouldBeVisible)
                 return;
@@ -159,21 +142,7 @@ Item {
         }
     }
 
-    readonly property var shadowLevel: Theme.elevationLevel3
-    readonly property real shadowFallbackOffset: 6
-    readonly property real shadowRenderPadding: (root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
-    readonly property real shadowMotionPadding: {
-        if (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode > 0 && Theme.isDirectionalEffect)
-            return 0; // Wayland native overlap mask
-        if (animationType === "slide")
-            return 30;
-        if (Theme.isDirectionalEffect)
-            return Math.max(Math.max(0, animationOffset), Math.max(alignedWidth, alignedHeight) * 0.9);
-        if (Theme.isDepthEffect)
-            return Math.max(Math.max(0, animationOffset), Math.max(alignedWidth, alignedHeight) * 0.35);
-        return Math.max(0, animationOffset);
-    }
-    readonly property real shadowBuffer: Theme.snap(shadowRenderPadding + shadowMotionPadding, dpr)
+    readonly property real shadowBuffer: 5
     readonly property real alignedWidth: Theme.px(modalWidth, dpr)
     readonly property real alignedHeight: Theme.px(modalHeight, dpr)
 
@@ -232,26 +201,9 @@ Item {
 
         MouseArea {
             anchors.fill: parent
-            enabled: !root.useSingleWindow && root.closeOnBackgroundClick && root.shouldBeVisible
+            enabled: root.closeOnBackgroundClick && root.shouldBeVisible
             onClicked: root.backgroundClicked()
         }
-
-        Rectangle {
-            anchors.fill: parent
-            z: -1
-            color: "black"
-            opacity: (!root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-            visible: opacity > 0
-
-            Behavior on opacity {
-                enabled: root.animationsEnabled && !Theme.isDirectionalEffect
-                NumberAnimation {
-                    duration: Math.round(Theme.variantDuration(root.animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
-                }
-            }
-        }
     }
 
     PanelWindow {
@@ -294,12 +246,9 @@ Item {
             bottom: root.useSingleWindow
         }
 
-        readonly property real actualMarginLeft: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedX - shadowBuffer, dpr))
-        readonly property real actualMarginTop: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedY - shadowBuffer, dpr))
-
         WlrLayershell.margins {
-            left: actualMarginLeft
-            top: actualMarginTop
+            left: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedX - shadowBuffer, dpr))
+            top: root.useSingleWindow ? 0 : Math.max(0, Theme.snap(root.alignedY - shadowBuffer, dpr))
             right: 0
             bottom: 0
         }
@@ -329,14 +278,13 @@ Item {
             anchors.fill: parent
             z: -1
             color: "black"
-            opacity: (root.useSingleWindow && root.useBackground) ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
-            visible: opacity > 0
+            opacity: root.useBackground ? (root.shouldBeVisible ? root.backgroundOpacity : 0) : 0
+            visible: root.useBackground
 
             Behavior on opacity {
-                enabled: root.animationsEnabled && !Theme.isDirectionalEffect
-                NumberAnimation {
-                    duration: Math.round(Theme.variantDuration(root.animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
-                    easing.type: Easing.BezierSpline
+                enabled: root.animationsEnabled
+                DankAnim {
+                    duration: root.animationDuration
                     easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
                 }
             }
@@ -344,8 +292,8 @@ Item {
 
         Item {
             id: modalContainer
-            x: (root.useSingleWindow ? root.alignedX : (root.alignedX - contentWindow.actualMarginLeft)) + Theme.snap(animX, root.dpr)
-            y: (root.useSingleWindow ? root.alignedY : (root.alignedY - contentWindow.actualMarginTop)) + Theme.snap(animY, root.dpr)
+            x: root.useSingleWindow ? root.alignedX : shadowBuffer
+            y: root.useSingleWindow ? root.alignedY : shadowBuffer
 
             width: root.alignedWidth
             height: root.alignedHeight
@@ -361,117 +309,45 @@ Item {
             }
 
             readonly property bool slide: root.animationType === "slide"
-            readonly property bool directionalEffect: Theme.isDirectionalEffect
-            readonly property bool depthEffect: Theme.isDepthEffect
-            readonly property real directionalTravel: Math.max(root.animationOffset, Math.max(root.alignedWidth, root.alignedHeight) * 0.8)
-            readonly property real depthTravel: Math.max(root.animationOffset * 0.8, 36)
-            readonly property real customAnchorX: root.alignedX + root.alignedWidth * 0.5
-            readonly property real customAnchorY: root.alignedY + root.alignedHeight * 0.5
-            readonly property real customDistLeft: customAnchorX
-            readonly property real customDistRight: root.screenWidth - customAnchorX
-            readonly property real customDistTop: customAnchorY
-            readonly property real customDistBottom: root.screenHeight - customAnchorY
-            readonly property real offsetX: {
-                if (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 && Theme.isDirectionalEffect)
-                    return 0;
-                if (slide && !directionalEffect && !depthEffect)
-                    return 15;
-                if (directionalEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return 0;
-                    case "custom":
-                        if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
-                            return -directionalTravel;
-                        if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
-                            return directionalTravel;
-                        return 0;
-                    default:
-                        return 0;
-                    }
-                }
-                if (depthEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return 0;
-                    case "custom":
-                        if (customDistLeft <= customDistRight && customDistLeft <= customDistTop && customDistLeft <= customDistBottom)
-                            return -depthTravel;
-                        if (customDistRight <= customDistTop && customDistRight <= customDistBottom)
-                            return depthTravel;
-                        return 0;
-                    default:
-                        return 0;
-                    }
-                }
-                return 0;
-            }
-            readonly property real offsetY: {
-                if (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 && Theme.isDirectionalEffect)
-                    return 0;
-                if (slide && !directionalEffect && !depthEffect)
-                    return -30;
-                if (directionalEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return -Math.max(directionalTravel * 0.65, 96);
-                    case "custom":
-                        if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
-                            return -directionalTravel;
-                        if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
-                            return directionalTravel;
-                        return 0;
-                    default:
-                        // Default to sliding down from top when centered
-                        return -Math.max(directionalTravel, root.screenHeight * 0.24);
-                    }
-                }
-                if (depthEffect) {
-                    switch (root.positioning) {
-                    case "top-right":
-                        return -depthTravel * 0.75;
-                    case "custom":
-                        if (customDistTop <= customDistBottom && customDistTop <= customDistLeft && customDistTop <= customDistRight)
-                            return -depthTravel;
-                        if (customDistBottom <= customDistLeft && customDistBottom <= customDistRight)
-                            return depthTravel;
-                        return depthTravel * 0.45;
-                    default:
-                        return -depthTravel;
-                    }
-                }
-                return root.animationOffset;
-            }
+            readonly property real offsetX: slide ? 15 : 0
+            readonly property real offsetY: slide ? -30 : root.animationOffset
 
-            property real animX: root.shouldBeVisible ? 0 : root.frozenMotionOffsetX
-            property real animY: root.shouldBeVisible ? 0 : root.frozenMotionOffsetY
+            property real animX: 0
+            property real animY: 0
+            property real scaleValue: root.animationScaleCollapsed
 
-            readonly property real computedScaleCollapsed: (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 && Theme.isDirectionalEffect) ? 0.0 : root.animationScaleCollapsed
-            property real scaleValue: root.shouldBeVisible ? 1.0 : computedScaleCollapsed
+            onOffsetXChanged: animX = Theme.snap(root.shouldBeVisible ? 0 : offsetX, root.dpr)
+            onOffsetYChanged: animY = Theme.snap(root.shouldBeVisible ? 0 : offsetY, root.dpr)
+
+            Connections {
+                target: root
+                function onShouldBeVisibleChanged() {
+                    modalContainer.animX = Theme.snap(root.shouldBeVisible ? 0 : modalContainer.offsetX, root.dpr);
+                    modalContainer.animY = Theme.snap(root.shouldBeVisible ? 0 : modalContainer.offsetY, root.dpr);
+                    modalContainer.scaleValue = root.shouldBeVisible ? 1.0 : root.animationScaleCollapsed;
+                }
+            }
 
             Behavior on animX {
                 enabled: root.animationsEnabled
-                NumberAnimation {
-                    duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
-                    easing.type: Easing.BezierSpline
+                DankAnim {
+                    duration: root.animationDuration
                     easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
                 }
             }
 
             Behavior on animY {
                 enabled: root.animationsEnabled
-                NumberAnimation {
-                    duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
-                    easing.type: Easing.BezierSpline
+                DankAnim {
+                    duration: root.animationDuration
                     easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
                 }
             }
 
             Behavior on scaleValue {
                 enabled: root.animationsEnabled
-                NumberAnimation {
-                    duration: Theme.variantDuration(root.animationDuration, root.shouldBeVisible)
-                    easing.type: Easing.BezierSpline
+                DankAnim {
+                    duration: root.animationDuration
                     easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
                 }
             }
@@ -487,29 +363,26 @@ Item {
                     id: animatedContent
                     anchors.fill: parent
                     clip: false
-                    opacity: Theme.isDirectionalEffect ? 1 : (root.shouldBeVisible ? 1 : 0)
+                    opacity: root.shouldBeVisible ? 1 : 0
                     scale: modalContainer.scaleValue
-                    transformOrigin: Item.Center
+                    x: Theme.snap(modalContainer.animX, root.dpr) + (parent.width - width) * (1 - modalContainer.scaleValue) * 0.5
+                    y: Theme.snap(modalContainer.animY, root.dpr) + (parent.height - height) * (1 - modalContainer.scaleValue) * 0.5
 
                     Behavior on opacity {
-                        enabled: root.animationsEnabled && !Theme.isDirectionalEffect
+                        enabled: root.animationsEnabled
                         NumberAnimation {
-                            duration: Math.round(Theme.variantDuration(animationDuration, root.shouldBeVisible) * Theme.variantOpacityDurationScale)
+                            duration: animationDuration
                             easing.type: Easing.BezierSpline
                             easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
                         }
                     }
 
-                    ElevationShadow {
-                        id: modalShadowLayer
+                    Rectangle {
                         anchors.fill: parent
-                        level: root.shadowLevel
-                        fallbackOffset: root.shadowFallbackOffset
-                        targetRadius: root.cornerRadius
-                        targetColor: root.backgroundColor
-                        borderColor: root.borderColor
-                        borderWidth: root.borderWidth
-                        shadowEnabled: root.enableShadow && Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
+                        color: root.backgroundColor
+                        border.color: root.borderColor
+                        border.width: root.borderWidth
+                        radius: root.cornerRadius
                     }
 
                     FocusScope {

quickshell/Modals/DankLauncherV2/Controller.qml

@@ -51,15 +51,6 @@ Item {
         }
     }
 
-    onSearchModeChanged: {
-        if (searchMode === "apps") {
-            _loadAppCategories();
-        } else {
-            appCategory = "";
-            appCategories = [];
-        }
-    }
-
     Connections {
         target: SettingsData
         function onSortAppsAlphabeticallyChanged() {
@@ -74,12 +65,8 @@ Item {
             if (!active)
                 return;
             _clearModeCache();
-            if (searchMode === "apps") {
-                _loadAppCategories();
+            if (!searchQuery && searchMode === "all")
                 performSearch();
-            } else if (!searchQuery && searchMode === "all") {
-                performSearch();
-            }
         }
     }
 
@@ -175,17 +162,10 @@ Item {
         }
     ]
 
-    property string fileSearchType: "all"
-    property string fileSearchExt: ""
-    property string fileSearchFolder: ""
-    property string fileSearchSort: "score"
-
     property string pluginFilter: ""
     property string activePluginName: ""
     property var activePluginCategories: []
     property string activePluginCategory: ""
-    property string appCategory: ""
-    property var appCategories: []
 
     function getSectionViewMode(sectionId) {
         if (sectionId === "browse_plugins")
@@ -366,10 +346,6 @@ Item {
         previousSearchMode = "all";
         autoSwitchedToFiles = false;
         isFileSearching = false;
-        fileSearchType = "all";
-        fileSearchExt = "";
-        fileSearchFolder = "";
-        fileSearchSort = "score";
         sections = [];
         flatModel = [];
         selectedFlatIndex = 0;
@@ -379,8 +355,6 @@ Item {
         activePluginName = "";
         activePluginCategories = [];
         activePluginCategory = "";
-        appCategory = "";
-        appCategories = [];
         pluginFilter = "";
         collapsedSections = {};
         _clearModeCache();
@@ -425,47 +399,6 @@ Item {
         performSearch();
     }
 
-    function setAppCategory(category) {
-        if (appCategory === category)
-            return;
-        appCategory = category;
-        _queryDrivenSearch = true;
-        _clearModeCache();
-        performSearch();
-    }
-
-    function _loadAppCategories() {
-        appCategories = AppSearchService.getAllCategories();
-    }
-
-    function setFileSearchType(type) {
-        if (fileSearchType === type)
-            return;
-        fileSearchType = type;
-        performFileSearch();
-    }
-
-    function setFileSearchExt(ext) {
-        if (fileSearchExt === ext)
-            return;
-        fileSearchExt = ext;
-        performFileSearch();
-    }
-
-    function setFileSearchFolder(folder) {
-        if (fileSearchFolder === folder)
-            return;
-        fileSearchFolder = folder;
-        performFileSearch();
-    }
-
-    function setFileSearchSort(sort) {
-        if (fileSearchSort === sort)
-            return;
-        fileSearchSort = sort;
-        performFileSearch();
-    }
-
     function clearPluginFilter() {
         if (pluginFilter) {
             pluginFilter = "";
@@ -622,9 +555,8 @@ Item {
         }
 
         if (searchMode === "apps") {
-            var isCategoryFiltered = appCategory && appCategory !== I18n.tr("All");
             var cachedSections = AppSearchService.getCachedDefaultSections();
-            if (cachedSections && !searchQuery && !isCategoryFiltered) {
+            if (cachedSections && !searchQuery) {
                 var modeCache = _getCachedModeData("apps");
                 if (modeCache) {
                     _applyHighlights(modeCache.sections, "");
@@ -654,23 +586,9 @@ Item {
                 return;
             }
 
-            if (isCategoryFiltered) {
-                var rawApps = AppSearchService.getAppsInCategory(appCategory);
-                for (var i = 0; i < rawApps.length; i++) {
-                    allItems.push(getOrTransformApp(rawApps[i]));
-                }
-                // Also include core apps (DMS Settings etc.) that match this category
-                var allCoreApps = AppSearchService.getCoreApps("");
-                for (var i = 0; i < allCoreApps.length; i++) {
-                    var coreAppCats = AppSearchService.getCategoriesForApp(allCoreApps[i]);
-                    if (coreAppCats.indexOf(appCategory) !== -1)
-                        allItems.push(transformCoreApp(allCoreApps[i]));
-                }
-            } else {
-                var apps = searchApps(searchQuery);
-                for (var i = 0; i < apps.length; i++) {
-                    allItems.push(apps[i]);
-                }
+            var apps = searchApps(searchQuery);
+            for (var i = 0; i < apps.length; i++) {
+                allItems.push(apps[i]);
             }
 
             var scoredItems = Scorer.scoreItems(allItems, searchQuery, getFrecencyForItem);
@@ -909,20 +827,10 @@ Item {
         var params = {
             limit: 20,
             fuzzy: true,
-            sort: fileSearchSort || "score",
+            sort: "score",
             desc: true
         };
 
-        if (DSearchService.supportsTypeFilter) {
-            params.type = (fileSearchType && fileSearchType !== "all") ? fileSearchType : "all";
-        }
-        if (fileSearchExt) {
-            params.ext = fileSearchExt;
-        }
-        if (fileSearchFolder) {
-            params.folder = fileSearchFolder;
-        }
-
         DSearchService.search(fileQuery, params, function (response) {
             isFileSearching = false;
             if (response.error)
@@ -932,73 +840,34 @@ Item {
 
             for (var i = 0; i < hits.length; i++) {
                 var hit = hits[i];
-                var docTypes = hit.locations?.doc_type;
-                var isDir = docTypes ? !!docTypes["dir"] : false;
                 fileItems.push(transformFileResult({
                     path: hit.id || "",
-                    score: hit.score || 0,
-                    is_dir: isDir
+                    score: hit.score || 0
                 }));
             }
 
-            var fileSections = [];
-            var showType = fileSearchType || "all";
-
-            if (showType === "all" && DSearchService.supportsTypeFilter) {
-                var onlyFiles = [];
-                var onlyDirs = [];
-                for (var j = 0; j < fileItems.length; j++) {
-                    if (fileItems[j].data?.is_dir)
-                        onlyDirs.push(fileItems[j]);
-                    else
-                        onlyFiles.push(fileItems[j]);
-                }
-                if (onlyFiles.length > 0) {
-                    fileSections.push({
-                        id: "files",
-                        title: I18n.tr("Files"),
-                        icon: "insert_drive_file",
-                        priority: 4,
-                        items: onlyFiles,
-                        collapsed: collapsedSections["files"] || false,
-                        flatStartIndex: 0
-                    });
-                }
-                if (onlyDirs.length > 0) {
-                    fileSections.push({
-                        id: "folders",
-                        title: I18n.tr("Folders"),
-                        icon: "folder",
-                        priority: 4.1,
-                        items: onlyDirs,
-                        collapsed: collapsedSections["folders"] || false,
-                        flatStartIndex: 0
-                    });
-                }
-            } else {
-                var filesIcon = showType === "dir" ? "folder" : showType === "file" ? "insert_drive_file" : "folder";
-                var filesTitle = showType === "dir" ? I18n.tr("Folders") : I18n.tr("Files");
-                if (fileItems.length > 0) {
-                    fileSections.push({
-                        id: "files",
-                        title: filesTitle,
-                        icon: filesIcon,
-                        priority: 4,
-                        items: fileItems,
-                        collapsed: collapsedSections["files"] || false,
-                        flatStartIndex: 0
-                    });
-                }
-            }
+            var fileSection = {
+                id: "files",
+                title: I18n.tr("Files"),
+                icon: "folder",
+                priority: 4,
+                items: fileItems,
+                collapsed: collapsedSections["files"] || false,
+                flatStartIndex: 0
+            };
 
             var newSections;
             if (searchMode === "files") {
-                newSections = fileSections;
+                newSections = fileItems.length > 0 ? [fileSection] : [];
             } else {
                 var existingNonFile = sections.filter(function (s) {
-                    return s.id !== "files" && s.id !== "folders";
+                    return s.id !== "files";
                 });
-                newSections = existingNonFile.concat(fileSections);
+                if (fileItems.length > 0) {
+                    newSections = existingNonFile.concat([fileSection]);
+                } else {
+                    newSections = existingNonFile;
+                }
             }
             newSections.sort(function (a, b) {
                 return a.priority - b.priority;
@@ -1006,9 +875,7 @@ Item {
             _applyHighlights(newSections, searchQuery);
             flatModel = Scorer.flattenSections(newSections);
             sections = newSections;
-            if (selectedFlatIndex >= flatModel.length) {
-                selectedFlatIndex = getFirstItemIndex();
-            }
+            selectedFlatIndex = getFirstItemIndex();
             updateSelectedItem();
         });
     }
@@ -1044,7 +911,7 @@ Item {
     }
 
     function transformFileResult(file) {
-        return Transform.transformFileResult(file, I18n.tr("Open"), I18n.tr("Open folder"), I18n.tr("Copy path"), I18n.tr("Open in terminal"));
+        return Transform.transformFileResult(file, I18n.tr("Open"), I18n.tr("Open folder"), I18n.tr("Copy path"));
     }
 
     function detectTrigger(query) {
@@ -1712,9 +1579,6 @@ Item {
         case "copy_path":
             copyToClipboard(item.data.path);
             break;
-        case "open_terminal":
-            openTerminal(item.data.path);
-            break;
         case "copy":
             copyToClipboard(item.name);
             break;
@@ -1796,16 +1660,6 @@ Item {
         Qt.openUrlExternally("file://" + folder);
     }
 
-    function openTerminal(path) {
-        if (!path)
-            return;
-        var terminal = Quickshell.env("TERMINAL") || "xterm";
-        Quickshell.execDetached({
-            command: [terminal],
-            workingDirectory: path
-        });
-    }
-
     function copyToClipboard(text) {
         if (!text)
             return;

quickshell/Modals/DankLauncherV2/DankLauncherV2Modal.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Effects
 import Quickshell
 import Quickshell.Wayland
 import Quickshell.Hyprland
@@ -14,7 +13,6 @@ Item {
     property bool spotlightOpen: false
     property bool keyboardActive: false
     property bool contentVisible: false
-    readonly property bool launcherMotionVisible: Theme.isDirectionalEffect ? spotlightOpen : _motionActive
     property var spotlightContent: launcherContentLoader.item
     property bool openedFromOverview: false
     property bool isClosing: false
@@ -24,14 +22,8 @@ Item {
     property string _pendingMode: ""
     readonly property bool unloadContentOnClose: SettingsData.dankLauncherV2UnloadOnClose
 
-    // Animation state — matches DankPopout/DankModal pattern
-    property bool animationsEnabled: true
-    property bool _motionActive: false
-    property real _frozenMotionX: 0
-    property real _frozenMotionY: 0
-
     readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
-    readonly property var effectiveScreen: contentWindow.screen
+    readonly property var effectiveScreen: launcherWindow.screen
     readonly property real screenWidth: effectiveScreen?.width ?? 1920
     readonly property real screenHeight: effectiveScreen?.height ?? 1080
     readonly property real dpr: effectiveScreen ? CompositorService.getScreenScale(effectiveScreen) : 1
@@ -83,35 +75,7 @@ Item {
             return Theme.primary;
         }
     }
-    readonly property int borderWidth: SettingsData.dankLauncherV2BorderEnabled ? SettingsData.dankLauncherV2BorderThickness : 0
-
-    // Shadow padding for the content window (render padding only, no motion padding)
-    readonly property var shadowLevel: Theme.elevationLevel3
-    readonly property real shadowFallbackOffset: 6
-    readonly property real shadowRenderPadding: (Theme.elevationEnabled && SettingsData.modalElevationEnabled) ? Theme.elevationRenderPadding(shadowLevel, Theme.elevationLightDirection, shadowFallbackOffset, 8, 16) : 0
-    readonly property real shadowPad: Theme.snap(shadowRenderPadding, dpr)
-    readonly property real alignedWidth: Theme.px(modalWidth, dpr)
-    readonly property real alignedHeight: Theme.px(modalHeight, dpr)
-    readonly property real alignedX: Theme.snap(modalX, dpr)
-    readonly property real alignedY: Theme.snap(modalY, dpr)
-
-    // For directional/depth: window extends from screen top (content slides within)
-    // For standard: small window tightly around the modal + shadow padding
-    readonly property bool _needsExtendedWindow: Theme.isDirectionalEffect || Theme.isDepthEffect
-    // Content window geometry
-    readonly property real _cwMarginLeft: Theme.snap(alignedX - shadowPad, dpr)
-    readonly property real _cwMarginTop: _needsExtendedWindow ? 0 : Theme.snap(alignedY - shadowPad, dpr)
-    readonly property real _cwWidth: alignedWidth + shadowPad * 2
-    readonly property real _cwHeight: {
-        if (Theme.isDirectionalEffect)
-            return screenHeight + shadowPad;
-        if (Theme.isDepthEffect)
-            return alignedY + alignedHeight + shadowPad;
-        return alignedHeight + shadowPad * 2;
-    }
-    // Where the content container sits inside the content window
-    readonly property real _ccX: shadowPad
-    readonly property real _ccY: _needsExtendedWindow ? alignedY : shadowPad
+    readonly property int borderWidth: SettingsData.dankLauncherV2BorderEnabled ? SettingsData.dankLauncherV2BorderThickness : 1
 
     signal dialogClosed
 
@@ -132,8 +96,7 @@ Item {
         if (!spotlightContent)
             return;
         contentVisible = true;
-        // NOTE: forceActiveFocus() is deliberately NOT called here.
-        // It is deferred to after animation starts to avoid compositor IPC stalls.
+        spotlightContent.searchField.forceActiveFocus();
 
         if (spotlightContent.searchField) {
             spotlightContent.searchField.text = query;
@@ -144,10 +107,6 @@ Item {
             spotlightContent.controller.activePluginId = "";
             spotlightContent.controller.activePluginName = "";
             spotlightContent.controller.pluginFilter = "";
-            spotlightContent.controller.fileSearchType = "all";
-            spotlightContent.controller.fileSearchExt = "";
-            spotlightContent.controller.fileSearchFolder = "";
-            spotlightContent.controller.fileSearchSort = "score";
             spotlightContent.controller.collapsedSections = {};
             spotlightContent.controller.selectedFlatIndex = 0;
             spotlightContent.controller.selectedItem = null;
@@ -166,59 +125,40 @@ Item {
         }
     }
 
-    function _openCommon(query, mode) {
+    function show() {
         closeCleanupTimer.stop();
         isClosing = false;
         openedFromOverview = false;
 
-        // Disable animations so the snap is instant
-        animationsEnabled = false;
-
-        // Freeze the collapsed offsets (they depend on height which could change)
-        _frozenMotionX = contentContainer ? contentContainer.collapsedMotionX : 0;
-        _frozenMotionY = contentContainer ? contentContainer.collapsedMotionY : (Theme.isDirectionalEffect ? Math.max(root.screenHeight - root._ccY + root.shadowPad, Theme.effectAnimOffset * 1.1) : -Theme.effectAnimOffset);
-
         var focusedScreen = CompositorService.getFocusedScreen();
-        if (focusedScreen) {
-            backgroundWindow.screen = focusedScreen;
-            contentWindow.screen = focusedScreen;
-        }
+        if (focusedScreen)
+            launcherWindow.screen = focusedScreen;
 
-        // _motionActive = false ensures motionX/Y snap to frozen collapsed position
-        _motionActive = false;
-
-        // Make windows visible but do NOT request keyboard focus yet
-        ModalManager.openModal(root);
         spotlightOpen = true;
-        backgroundWindow.visible = true;
-        contentWindow.visible = true;
+        keyboardActive = true;
+        ModalManager.openModal(root);
         if (useHyprlandFocusGrab)
             focusGrab.active = true;
 
-        // Load content and initialize (but no forceActiveFocus — that's deferred)
-        _ensureContentLoadedAndInitialize(query || "", mode || "");
-
-        // Frame 1: enable animations and trigger enter motion
-        Qt.callLater(() => {
-            root.animationsEnabled = true;
-            root._motionActive = true;
-
-            // Frame 2: request keyboard focus + activate search field
-            // Double-deferred to avoid compositor IPC competing with animation frames
-            Qt.callLater(() => {
-                root.keyboardActive = true;
-                if (root.spotlightContent && root.spotlightContent.searchField)
-                    root.spotlightContent.searchField.forceActiveFocus();
-            });
-        });
-    }
-
-    function show() {
-        _openCommon("", "");
+        _ensureContentLoadedAndInitialize("", "");
     }
 
     function showWithQuery(query) {
-        _openCommon(query, "");
+        closeCleanupTimer.stop();
+        isClosing = false;
+        openedFromOverview = false;
+
+        var focusedScreen = CompositorService.getFocusedScreen();
+        if (focusedScreen)
+            launcherWindow.screen = focusedScreen;
+
+        spotlightOpen = true;
+        keyboardActive = true;
+        ModalManager.openModal(root);
+        if (useHyprlandFocusGrab)
+            focusGrab.active = true;
+
+        _ensureContentLoadedAndInitialize(query, "");
     }
 
     function hide() {
@@ -226,17 +166,13 @@ Item {
             return;
         openedFromOverview = false;
         isClosing = true;
-        // For directional effects, defer contentVisible=false so content stays rendered during exit slide
-        if (!Theme.isDirectionalEffect)
-            contentVisible = false;
-
-        // Trigger exit animation — Behaviors will animate motionX/Y to frozen collapsed position
-        _motionActive = false;
+        contentVisible = false;
 
         keyboardActive = false;
         spotlightOpen = false;
         focusGrab.active = false;
         ModalManager.closeModal(root);
+
         closeCleanupTimer.start();
     }
 
@@ -245,7 +181,21 @@ Item {
     }
 
     function showWithMode(mode) {
-        _openCommon("", mode);
+        closeCleanupTimer.stop();
+        isClosing = false;
+        openedFromOverview = false;
+
+        var focusedScreen = CompositorService.getFocusedScreen();
+        if (focusedScreen)
+            launcherWindow.screen = focusedScreen;
+
+        spotlightOpen = true;
+        keyboardActive = true;
+        ModalManager.openModal(root);
+        if (useHyprlandFocusGrab)
+            focusGrab.active = true;
+
+        _ensureContentLoadedAndInitialize("", mode);
     }
 
     function toggleWithMode(mode) {
@@ -266,13 +216,10 @@ Item {
 
     Timer {
         id: closeCleanupTimer
-        interval: Theme.variantCloseInterval(Theme.modalAnimationDuration)
+        interval: Theme.modalAnimationDuration + 50
         repeat: false
         onTriggered: {
             isClosing = false;
-            contentVisible = false;
-            contentWindow.visible = false;
-            backgroundWindow.visible = false;
             if (root.unloadContentOnClose)
                 launcherContentLoader.active = false;
             dialogClosed();
@@ -290,7 +237,7 @@ Item {
 
     HyprlandFocusGrab {
         id: focusGrab
-        windows: [contentWindow]
+        windows: [launcherWindow]
         active: false
 
         onCleared: {
@@ -315,7 +262,7 @@ Item {
             if (Quickshell.screens.length === 0)
                 return;
 
-            const screen = contentWindow.screen;
+            const screen = launcherWindow.screen;
             const screenName = screen?.name;
 
             let needsReset = !screen || !screenName;
@@ -337,31 +284,35 @@ Item {
                 return;
 
             root._windowEnabled = false;
-            backgroundWindow.screen = newScreen;
-            contentWindow.screen = newScreen;
+            launcherWindow.screen = newScreen;
             Qt.callLater(() => {
                 root._windowEnabled = true;
             });
         }
     }
 
-    // ── Background window: fullscreen, handles darkening + click-to-dismiss ──
     PanelWindow {
-        id: backgroundWindow
-        visible: false
+        id: launcherWindow
+        visible: root._windowEnabled && (spotlightOpen || isClosing)
         color: "transparent"
+        exclusionMode: ExclusionMode.Ignore
 
-        WlrLayershell.namespace: "dms:spotlight:bg"
-        WlrLayershell.layer: WlrLayershell.Top
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-
-        WlrLayershell.margins {
-            top: contentContainer.dockTop ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 0 ? Theme.px(42, root.dpr) : 0)
-            bottom: contentContainer.dockBottom ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 1 ? Theme.px(42, root.dpr) : 0)
-            left: contentContainer.dockLeft ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 2 ? Theme.px(42, root.dpr) : 0)
-            right: contentContainer.dockRight ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 3 ? Theme.px(42, root.dpr) : 0)
+        WlrLayershell.namespace: "dms:spotlight"
+        WlrLayershell.layer: {
+            switch (Quickshell.env("DMS_MODAL_LAYER")) {
+            case "bottom":
+                console.error("DankModal: 'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
+                return WlrLayershell.Top;
+            case "background":
+                console.error("DankModal: 'background' layer is not valid for modals. Defaulting to 'top' layer.");
+                return WlrLayershell.Top;
+            case "overlay":
+                return WlrLayershell.Overlay;
+            default:
+                return WlrLayershell.Top;
+            }
         }
+        WlrLayershell.keyboardFocus: keyboardActive ? (root.useHyprlandFocusGrab ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.Exclusive) : WlrKeyboardFocus.None
 
         anchors {
             top: true
@@ -371,11 +322,11 @@ Item {
         }
 
         mask: Region {
-            item: (spotlightOpen || isClosing) ? bgFullScreenMask : null
+            item: spotlightOpen ? fullScreenMask : null
         }
 
         Item {
-            id: bgFullScreenMask
+            id: fullScreenMask
             anchors.fill: parent
         }
 
@@ -383,14 +334,13 @@ Item {
             id: backgroundDarken
             anchors.fill: parent
             color: "black"
-            opacity: launcherMotionVisible && SettingsData.modalDarkenBackground ? 0.5 : 0
-            visible: launcherMotionVisible || opacity > 0
+            opacity: contentVisible && SettingsData.modalDarkenBackground ? 0.5 : 0
+            visible: contentVisible || opacity > 0
 
             Behavior on opacity {
-                enabled: root.animationsEnabled && !Theme.isDirectionalEffect
                 DankAnim {
-                    duration: Math.round(Theme.variantDuration(Theme.modalAnimationDuration, launcherMotionVisible) * Theme.variantOpacityDurationScale)
-                    easing.bezierCurve: launcherMotionVisible ? Theme.variantModalEnterCurve : Theme.variantModalExitCurve
+                    duration: Theme.modalAnimationDuration
+                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
                 }
             }
         }
@@ -398,240 +348,84 @@ Item {
         MouseArea {
             anchors.fill: parent
             enabled: spotlightOpen
-            onClicked: root.hide()
-        }
-    }
+            onClicked: mouse => {
+                var contentX = modalContainer.x;
+                var contentY = modalContainer.y;
+                var contentW = modalContainer.width;
+                var contentH = modalContainer.height;
 
-    // ── Content window: SMALL, positioned with margins — only renders the modal area ──
-    PanelWindow {
-        id: contentWindow
-        visible: false
-        color: "transparent"
-
-        WlrLayershell.namespace: "dms:spotlight"
-        WlrLayershell.layer: {
-            switch (Quickshell.env("DMS_MODAL_LAYER")) {
-            case "bottom":
-                console.error("DankLauncherV2Modal: 'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "background":
-                console.error("DankLauncherV2Modal: 'background' layer is not valid for modals. Defaulting to 'top' layer.");
-                return WlrLayershell.Top;
-            case "overlay":
-                return WlrLayershell.Overlay;
-            default:
-                return WlrLayershell.Top;
+                if (mouse.x < contentX || mouse.x > contentX + contentW || mouse.y < contentY || mouse.y > contentY + contentH) {
+                    root.hide();
+                }
             }
         }
-        WlrLayershell.exclusiveZone: -1
-        WlrLayershell.keyboardFocus: keyboardActive ? (root.useHyprlandFocusGrab ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.Exclusive) : WlrKeyboardFocus.None
-
-        anchors {
-            left: true
-            top: true
-        }
-
-        WlrLayershell.margins {
-            left: root._cwMarginLeft
-            top: root._cwMarginTop
-        }
-
-        implicitWidth: root._cwWidth
-        implicitHeight: root._cwHeight
-
-        mask: Region {
-            item: contentInputMask
-        }
 
         Item {
-            id: contentInputMask
-            visible: false
-            x: contentContainer.x + contentWrapper.x
-            y: contentContainer.y + contentWrapper.y
-            width: root.alignedWidth
-            height: root.alignedHeight
-        }
+            id: modalContainer
+            x: root.modalX
+            y: root.modalY
+            width: root.modalWidth
+            height: root.modalHeight
+            visible: contentVisible || opacity > 0
 
-        Item {
-            id: contentContainer
+            opacity: contentVisible ? 1 : 0
+            scale: contentVisible ? 1 : 0.96
+            transformOrigin: Item.Center
 
-            // For directional/depth: contentContainer is at alignedY from window top (window starts at screen top)
-            // For standard: contentContainer is at shadowPad from window top (window starts near modal)
-            x: root._ccX
-            y: root._ccY
-            width: root.alignedWidth
-            height: root.alignedHeight
-
-            readonly property int dockEdge: typeof SettingsData !== "undefined" ? SettingsData.dockPosition : 1
-            readonly property bool dockTop: dockEdge === 0
-            readonly property bool dockBottom: dockEdge === 1
-            readonly property bool dockLeft: dockEdge === 2
-            readonly property bool dockRight: dockEdge === 3
-
-            readonly property real dockThickness: typeof SettingsData !== "undefined" && SettingsData.showDock ? Theme.px(SettingsData.dockIconSize + (SettingsData.dockMargin * 2) + SettingsData.dockSpacing + 8, root.dpr) : Theme.px(60, root.dpr)
-
-            readonly property bool directionalEffect: Theme.isDirectionalEffect
-            readonly property bool depthEffect: Theme.isDepthEffect
-            readonly property real collapsedMotionX: {
-                if (directionalEffect) {
-                    if (dockLeft)
-                        return -(root._ccX + root.alignedWidth + Theme.effectAnimOffset);
-                    if (dockRight)
-                        return root.screenWidth - root._ccX + Theme.effectAnimOffset;
-                }
-                if (depthEffect)
-                    return Theme.effectAnimOffset * 0.25;
-                return 0;
-            }
-            readonly property real collapsedMotionY: {
-                if (directionalEffect) {
-                    if (dockTop)
-                        return -(root._ccY + root.alignedHeight + Theme.effectAnimOffset);
-                    if (dockBottom)
-                        return root.screenHeight - root._ccY + root.shadowPad + Theme.effectAnimOffset;
-                    return 0;
-                }
-                if (depthEffect)
-                    return -Math.max(Theme.effectAnimOffset * 0.85, 34);
-                return -Math.max((root.shadowPad || 0) + Theme.effectAnimOffset, 40);
-            }
-
-            // animX/animY are Behavior-animated — DankPopout pattern
-            property real animX: 0
-            property real animY: 0
-            property real scaleValue: Theme.isDirectionalEffect && typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 ? Theme.effectScaleCollapsed : (Theme.isDirectionalEffect ? 1 : Theme.effectScaleCollapsed)
-
-            Component.onCompleted: {
-                animX = Theme.snap(root._motionActive ? 0 : collapsedMotionX, root.dpr);
-                animY = Theme.snap(root._motionActive ? 0 : collapsedMotionY, root.dpr);
-                scaleValue = root._motionActive ? 1.0 : (Theme.isDirectionalEffect && typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 ? Theme.effectScaleCollapsed : (Theme.isDirectionalEffect ? 1 : Theme.effectScaleCollapsed));
-            }
-
-            Connections {
-                target: root
-                function on_MotionActiveChanged() {
-                    contentContainer.animX = Theme.snap(root._motionActive ? 0 : root._frozenMotionX, root.dpr);
-                    contentContainer.animY = Theme.snap(root._motionActive ? 0 : root._frozenMotionY, root.dpr);
-                    contentContainer.scaleValue = root._motionActive ? 1.0 : (Theme.isDirectionalEffect && typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2 ? Theme.effectScaleCollapsed : (Theme.isDirectionalEffect ? 1 : Theme.effectScaleCollapsed));
-                }
-            }
-
-            Behavior on animX {
-                enabled: root.animationsEnabled
+            Behavior on opacity {
                 DankAnim {
-                    duration: Theme.variantDuration(Theme.modalAnimationDuration, root._motionActive)
-                    easing.bezierCurve: root._motionActive ? Theme.variantModalEnterCurve : Theme.variantModalExitCurve
+                    duration: Theme.modalAnimationDuration
+                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
                 }
             }
 
-            Behavior on animY {
-                enabled: root.animationsEnabled
+            Behavior on scale {
                 DankAnim {
-                    duration: Theme.variantDuration(Theme.modalAnimationDuration, root._motionActive)
-                    easing.bezierCurve: root._motionActive ? Theme.variantModalEnterCurve : Theme.variantModalExitCurve
+                    duration: Theme.modalAnimationDuration
+                    easing.bezierCurve: contentVisible ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
                 }
             }
 
-            Behavior on scaleValue {
-                enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || (typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode === 2))
-                DankAnim {
-                    duration: Theme.variantDuration(Theme.modalAnimationDuration, root._motionActive)
-                    easing.bezierCurve: root._motionActive ? Theme.variantModalEnterCurve : Theme.variantModalExitCurve
-                }
+            Rectangle {
+                anchors.fill: parent
+                color: root.backgroundColor
+                border.color: root.borderColor
+                border.width: root.borderWidth
+                radius: root.cornerRadius
             }
 
-            Item {
-                id: directionalClipMask
-                readonly property bool shouldClip: Theme.isDirectionalEffect && typeof SettingsData !== "undefined" && SettingsData.directionalAnimationMode > 0
-                readonly property real clipOversize: 2000
+            MouseArea {
+                anchors.fill: parent
+                onPressed: mouse => mouse.accepted = true
+            }
 
-                clip: shouldClip
+            FocusScope {
+                anchors.fill: parent
+                focus: keyboardActive
 
-                x: shouldClip ? (contentContainer.dockRight ? -clipOversize : (contentContainer.dockLeft ? contentContainer.dockThickness - root._ccX : -clipOversize)) : 0
-                y: shouldClip ? (contentContainer.dockBottom ? -clipOversize : (contentContainer.dockTop ? contentContainer.dockThickness - root._ccY : -clipOversize)) : 0
-
-                width: shouldClip ? parent.width + clipOversize + (contentContainer.dockRight ? (root.screenWidth - contentContainer.dockThickness - root._ccX - parent.width) : (contentContainer.dockLeft ? clipOversize : clipOversize)) : parent.width
-                height: shouldClip ? parent.height + clipOversize + (contentContainer.dockBottom ? (root.screenHeight - contentContainer.dockThickness - root._ccY - parent.height) : (contentContainer.dockTop ? clipOversize : clipOversize)) : parent.height
-
-                Item {
-                    id: aligner
-                    x: directionalClipMask.x !== 0 ? -directionalClipMask.x : 0
-                    y: directionalClipMask.y !== 0 ? -directionalClipMask.y : 0
-                    width: contentContainer.width
-                    height: contentContainer.height
-
-                    // Shadow mirrors contentWrapper position/scale/opacity
-                    ElevationShadow {
-                        id: launcherShadowLayer
-                        width: parent.width
-                        height: parent.height
-                        opacity: contentWrapper.opacity
-                        scale: contentWrapper.scale
-                        x: contentWrapper.x
-                        y: contentWrapper.y
-                        level: root.shadowLevel
-                        fallbackOffset: root.shadowFallbackOffset
-                        targetColor: root.backgroundColor
-                        borderColor: root.borderColor
-                        borderWidth: root.borderWidth
-                        targetRadius: root.cornerRadius
-                        shadowEnabled: Theme.elevationEnabled && SettingsData.modalElevationEnabled && Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
+                Loader {
+                    id: launcherContentLoader
+                    anchors.fill: parent
+                    active: !root.unloadContentOnClose || root.spotlightOpen || root.isClosing || root.contentVisible || root._pendingInitialize
+                    asynchronous: false
+                    sourceComponent: LauncherContent {
+                        focus: true
+                        parentModal: root
                     }
 
-                    // contentWrapper moves inside static contentContainer — DankPopout pattern
-                    Item {
-                        id: contentWrapper
-                        width: parent.width
-                        height: parent.height
-                        opacity: Theme.isDirectionalEffect ? 1 : (launcherMotionVisible ? 1 : 0)
-                        visible: opacity > 0
-                        scale: contentContainer.scaleValue
-                        x: Theme.snap(contentContainer.animX + (parent.width - width) * (1 - contentContainer.scaleValue) * 0.5, root.dpr)
-                        y: Theme.snap(contentContainer.animY + (parent.height - height) * (1 - contentContainer.scaleValue) * 0.5, root.dpr)
-
-                        Behavior on opacity {
-                            enabled: root.animationsEnabled && !Theme.isDirectionalEffect
-                            DankAnim {
-                                duration: Math.round(Theme.variantDuration(Theme.modalAnimationDuration, launcherMotionVisible) * Theme.variantOpacityDurationScale)
-                                easing.bezierCurve: launcherMotionVisible ? Theme.variantModalEnterCurve : Theme.variantModalExitCurve
-                            }
+                    onLoaded: {
+                        if (root._pendingInitialize) {
+                            root._initializeAndShow(root._pendingQuery, root._pendingMode);
+                            root._pendingInitialize = false;
                         }
+                    }
+                }
 
-                        MouseArea {
-                            anchors.fill: parent
-                            onPressed: mouse => mouse.accepted = true
-                        }
-
-                        FocusScope {
-                            anchors.fill: parent
-                            focus: keyboardActive
-
-                            Loader {
-                                id: launcherContentLoader
-                                anchors.fill: parent
-                                active: !root.unloadContentOnClose || root.spotlightOpen || root.isClosing || root.contentVisible || root._pendingInitialize
-                                asynchronous: false
-                                sourceComponent: LauncherContent {
-                                    focus: true
-                                    parentModal: root
-                                }
-
-                                onLoaded: {
-                                    if (root._pendingInitialize) {
-                                        root._initializeAndShow(root._pendingQuery, root._pendingMode);
-                                        root._pendingInitialize = false;
-                                    }
-                                }
-                            }
-
-                            Keys.onEscapePressed: event => {
-                                root.hide();
-                                event.accepted = true;
-                            }
-                        }
-                    } // contentWrapper
-                } // aligner
-            } // directionalClipMask
-        } // contentContainer
-    } // PanelWindow
+                Keys.onEscapePressed: event => {
+                    root.hide();
+                    event.accepted = true;
+                }
+            }
+        }
+    }
 }

quickshell/Modals/DankLauncherV2/ItemTransformers.js

@@ -116,43 +116,31 @@ function transformBuiltInLauncherItem(item, pluginId, openLabel) {
     };
 }
 
-function transformFileResult(file, openLabel, openFolderLabel, copyPathLabel, openTerminalLabel) {
+function transformFileResult(file, openLabel, openFolderLabel, copyPathLabel) {
     var filename = file.path ? file.path.split("/").pop() : "";
     var dirname = file.path ? file.path.substring(0, file.path.lastIndexOf("/")) : "";
-    var isDir = file.is_dir || false;
-
-    var actions = [];
-    if (isDir) {
-        if (openTerminalLabel) {
-            actions.push({
-                name: openTerminalLabel,
-                icon: "terminal",
-                action: "open_terminal"
-            });
-        }
-    } else {
-        actions.push({
-            name: openFolderLabel,
-            icon: "folder_open",
-            action: "open_folder"
-        });
-    }
-    actions.push({
-        name: copyPathLabel,
-        icon: "content_copy",
-        action: "copy_path"
-    });
 
     return {
         id: file.path || "",
         type: "file",
         name: filename,
         subtitle: dirname,
-        icon: isDir ? "folder" : Utils.getFileIcon(filename),
+        icon: Utils.getFileIcon(filename),
         iconType: "material",
         section: "files",
         data: file,
-        actions: actions,
+        actions: [
+            {
+                name: openFolderLabel,
+                icon: "folder_open",
+                action: "open_folder"
+            },
+            {
+                name: copyPathLabel,
+                icon: "content_copy",
+                action: "copy_path"
+            }
+        ],
         primaryAction: {
             name: openLabel,
             icon: "open_in_new",

quickshell/Modals/DankLauncherV2/LauncherContent.qml

@@ -86,7 +86,7 @@ FocusScope {
 
     Controller {
         id: controller
-        active: root.parentModal ? (root.parentModal.spotlightOpen || root.parentModal.isClosing) : true
+        active: root.parentModal?.spotlightOpen ?? true
         viewModeContext: root.viewModeContext
 
         onItemExecuted: {
@@ -462,7 +462,7 @@ FocusScope {
                     showClearButton: true
                     textColor: Theme.surfaceText
                     font.pixelSize: Theme.fontSizeLarge
-                    enabled: root.parentModal ? (root.parentModal.spotlightOpen || root.parentModal.isClosing) : true
+                    enabled: root.parentModal ? root.parentModal.spotlightOpen : true
                     placeholderText: ""
                     ignoreUpDownKeys: true
                     ignoreTabKeys: true
@@ -496,9 +496,8 @@ FocusScope {
             Row {
                 id: categoryRow
                 width: parent.width
-                readonly property bool showPluginCategories: controller.activePluginCategories.length > 0
-                height: showPluginCategories ? 36 : 0
-                visible: showPluginCategories
+                height: controller.activePluginCategories.length > 0 ? 36 : 0
+                visible: controller.activePluginCategories.length > 0
                 spacing: Theme.spacingS
 
                 clip: true
@@ -512,7 +511,6 @@ FocusScope {
 
                 DankDropdown {
                     id: categoryDropdown
-                    visible: categoryRow.showPluginCategories
                     width: Math.min(200, parent.width)
                     compactMode: true
                     dropdownWidth: 200
@@ -551,158 +549,9 @@ FocusScope {
             }
 
             Item {
-                id: fileFilterRow
                 width: parent.width
-                height: showFileFilters ? fileFilterContent.height : 0
-                visible: showFileFilters
-
-                readonly property bool showFileFilters: controller.searchMode === "files"
-
-                Behavior on height {
-                    NumberAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.standardEasing
-                    }
-                }
-
-                Row {
-                    id: fileFilterContent
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    Row {
-                        id: typeChips
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: 2
-                        visible: DSearchService.supportsTypeFilter
-
-                        Repeater {
-                            model: [
-                                {
-                                    id: "all",
-                                    label: I18n.tr("All"),
-                                    icon: "search"
-                                },
-                                {
-                                    id: "file",
-                                    label: I18n.tr("Files"),
-                                    icon: "insert_drive_file"
-                                },
-                                {
-                                    id: "dir",
-                                    label: I18n.tr("Folders"),
-                                    icon: "folder"
-                                }
-                            ]
-
-                            Rectangle {
-                                required property var modelData
-                                required property int index
-
-                                width: chipContent.width + Theme.spacingM * 2
-                                height: sortDropdown.height
-                                radius: Theme.cornerRadius
-                                color: controller.fileSearchType === modelData.id || chipArea.containsMouse ? Theme.primaryContainer : "transparent"
-
-                                Row {
-                                    id: chipContent
-                                    anchors.centerIn: parent
-                                    spacing: Theme.spacingXS
-
-                                    DankIcon {
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        name: modelData.icon
-                                        size: 14
-                                        color: controller.fileSearchType === modelData.id ? Theme.primary : Theme.surfaceVariantText
-                                    }
-
-                                    StyledText {
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        text: modelData.label
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: controller.fileSearchType === modelData.id ? Theme.primary : Theme.surfaceText
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: chipArea
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-                                    onClicked: controller.setFileSearchType(modelData.id)
-                                }
-                            }
-                        }
-                    }
-
-                    Rectangle {
-                        width: 1
-                        height: 20
-                        anchors.verticalCenter: parent.verticalCenter
-                        color: Theme.outlineMedium
-                        visible: typeChips.visible
-                    }
-
-                    DankDropdown {
-                        id: sortDropdown
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: Math.min(130, parent.width / 3)
-                        compactMode: true
-                        dropdownWidth: 130
-                        popupWidth: 150
-                        maxPopupHeight: 200
-                        currentValue: {
-                            switch (controller.fileSearchSort) {
-                            case "score":
-                                return I18n.tr("Score");
-                            case "name":
-                                return I18n.tr("Name");
-                            case "modified":
-                                return I18n.tr("Modified");
-                            case "size":
-                                return I18n.tr("Size");
-                            default:
-                                return I18n.tr("Score");
-                            }
-                        }
-                        options: [I18n.tr("Score"), I18n.tr("Name"), I18n.tr("Modified"), I18n.tr("Size")]
-
-                        onValueChanged: value => {
-                            var sortMap = {};
-                            sortMap[I18n.tr("Score")] = "score";
-                            sortMap[I18n.tr("Name")] = "name";
-                            sortMap[I18n.tr("Modified")] = "modified";
-                            sortMap[I18n.tr("Size")] = "size";
-                            controller.setFileSearchSort(sortMap[value] || "score");
-                        }
-                    }
-
-                    DankTextField {
-                        id: extFilterField
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: Math.min(100, parent.width / 4)
-                        height: sortDropdown.height
-                        placeholderText: I18n.tr("ext")
-                        font.pixelSize: Theme.fontSizeSmall
-                        showClearButton: text.length > 0
-
-                        onTextChanged: {
-                            controller.setFileSearchExt(text.trim());
-                        }
-                    }
-                }
-            }
-
-            Item {
-                width: parent.width
-                height: parent.height - searchField.height - categoryRow.height - fileFilterRow.height - actionPanel.height - Theme.spacingXS * ((categoryRow.visible ? 1 : 0) + (fileFilterRow.visible ? 1 : 0) + 2)
-                opacity: {
-                    if (!root.parentModal)
-                        return 1;
-                    if (Theme.isDirectionalEffect && root.parentModal.isClosing)
-                        return 1;
-                    return root.parentModal.isClosing ? 0 : 1;
-                }
+                height: parent.height - searchField.height - categoryRow.height - actionPanel.height - Theme.spacingXS * (categoryRow.visible ? 3 : 2)
+                opacity: root.parentModal?.isClosing ? 0 : 1
 
                 ResultsList {
                     id: resultsList
@@ -737,9 +586,6 @@ FocusScope {
         function onSearchQueryRequested(query) {
             searchField.text = query;
         }
-        function onModeChanged() {
-            extFilterField.text = "";
-        }
     }
 
     FocusScope {

quickshell/Modals/DankLauncherV2/ResultItem.qml

@@ -113,7 +113,6 @@ Rectangle {
                 font.family: Theme.fontFamily
                 color: Theme.surfaceVariantText
                 elide: Text.ElideRight
-                clip: true
                 visible: (root.item?.subtitle ?? "").length > 0
                 horizontalAlignment: Text.AlignLeft
             }
@@ -182,7 +181,7 @@ Rectangle {
                         case "plugin":
                             return I18n.tr("Plugin");
                         case "file":
-                            return root.item.data?.is_dir ? I18n.tr("Folder") : I18n.tr("File");
+                            return I18n.tr("File");
                         default:
                             return "";
                         }

quickshell/Modals/DankLauncherV2/ResultsList.qml

@@ -435,15 +435,7 @@ Item {
                     var mode = root.controller?.searchMode ?? "all";
                     switch (mode) {
                     case "files":
-                        var fileType = root.controller?.fileSearchType ?? "all";
-                        switch (fileType) {
-                        case "dir":
-                            return "folder_open";
-                        case "file":
-                            return "insert_drive_file";
-                        default:
-                            return "folder_open";
-                        }
+                        return "folder_open";
                     case "plugins":
                         return "extension";
                     case "apps":
@@ -468,20 +460,12 @@ Item {
                     switch (mode) {
                     case "files":
                         if (!DSearchService.dsearchAvailable)
-                            return I18n.tr("File search requires dsearch\nInstall from github.com/morelazers/dsearch");
+                            return I18n.tr("File search requires dsearch\nInstall from github.com/AvengeMedia/danksearch");
                         if (!hasQuery)
                             return I18n.tr("Type to search files");
                         if (root.controller.searchQuery.length < 2)
                             return I18n.tr("Type at least 2 characters");
-                        var fileType = root.controller?.fileSearchType ?? "all";
-                        switch (fileType) {
-                        case "dir":
-                            return I18n.tr("No folders found");
-                        case "file":
-                            return I18n.tr("No files found");
-                        default:
-                            return I18n.tr("No results found");
-                        }
+                        return I18n.tr("No files found");
                     case "plugins":
                         return hasQuery ? I18n.tr("No plugin results") : I18n.tr("Browse or search plugins");
                     case "apps":

quickshell/Modals/DankLauncherV2/SectionHeader.qml

@@ -1,9 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import QtQuick.Controls
 import qs.Common
-import qs.Services
 import qs.Widgets
 
 Rectangle {
@@ -37,190 +35,21 @@ Rectangle {
         anchors.verticalCenter: parent.verticalCenter
         spacing: Theme.spacingS
 
-        // Whether the apps category picker should replace the plain title
-        readonly property bool hasAppCategories: root.section?.id === "apps" && (root.controller?.appCategories?.length ?? 0) > 0
-
         DankIcon {
             anchors.verticalCenter: parent.verticalCenter
-            // Hide section icon when the category chip already shows one
-            visible: !leftContent.hasAppCategories
             name: root.section?.icon ?? "folder"
             size: 16
             color: Theme.surfaceVariantText
         }
 
-        // Plain title — hidden when the category chip is shown
         StyledText {
             anchors.verticalCenter: parent.verticalCenter
-            visible: !leftContent.hasAppCategories
             text: root.section?.title ?? ""
             font.pixelSize: Theme.fontSizeSmall
             font.weight: Font.Medium
             color: Theme.surfaceVariantText
         }
 
-        // Compact inline category chip — only visible on the apps section
-        Item {
-            id: categoryChip
-            visible: leftContent.hasAppCategories
-            anchors.verticalCenter: parent.verticalCenter
-            // Size to content with a fixed-min width so it doesn't jump around
-            width: chipRow.implicitWidth + Theme.spacingM * 2
-            height: 24
-
-            readonly property string currentCategory: root.controller?.appCategory || (root.controller?.appCategories?.length > 0 ? root.controller.appCategories[0] : "")
-            readonly property var iconMap: {
-                const cats = root.controller?.appCategories ?? [];
-                const m = {};
-                cats.forEach(c => { m[c] = AppSearchService.getCategoryIcon(c); });
-                return m;
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                radius: Theme.cornerRadius
-                color: chipArea.containsMouse || categoryPopup.visible ? Theme.surfaceContainerHigh : "transparent"
-                border.color: categoryPopup.visible ? Theme.primary : Theme.outlineMedium
-                border.width: categoryPopup.visible ? 2 : 1
-            }
-
-            Row {
-                id: chipRow
-                anchors.centerIn: parent
-                spacing: Theme.spacingXS
-
-                DankIcon {
-                    anchors.verticalCenter: parent.verticalCenter
-                    name: categoryChip.iconMap[categoryChip.currentCategory] ?? "apps"
-                    size: 14
-                    color: Theme.surfaceText
-                }
-
-                StyledText {
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: categoryChip.currentCategory
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                }
-
-                DankIcon {
-                    anchors.verticalCenter: parent.verticalCenter
-                    name: categoryPopup.visible ? "expand_less" : "expand_more"
-                    size: 14
-                    color: Theme.surfaceVariantText
-                }
-            }
-
-            MouseArea {
-                id: chipArea
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    if (categoryPopup.visible) {
-                        categoryPopup.close();
-                    } else {
-                        const pos = categoryChip.mapToItem(Overlay.overlay, 0, 0);
-                        categoryPopup.x = pos.x;
-                        categoryPopup.y = pos.y + categoryChip.height + 4;
-                        categoryPopup.open();
-                    }
-                }
-            }
-
-            Popup {
-                id: categoryPopup
-                parent: Overlay.overlay
-                width: Math.max(categoryChip.width, 180)
-                padding: 0
-                modal: true
-                dim: false
-                closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-                background: Rectangle { color: "transparent" }
-
-                contentItem: Rectangle {
-                    radius: Theme.cornerRadius
-                    color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 1)
-                    border.color: Theme.primary
-                    border.width: 2
-
-                    ElevationShadow {
-                        anchors.fill: parent
-                        z: -1
-                        level: Theme.elevationLevel2
-                        fallbackOffset: 4
-                        targetRadius: parent.radius
-                        targetColor: parent.color
-                        borderColor: parent.border.color
-                        borderWidth: parent.border.width
-                        shadowEnabled: Theme.elevationEnabled && SettingsData.popoutElevationEnabled
-                    }
-
-                    ListView {
-                        id: categoryList
-                        anchors.fill: parent
-                        anchors.margins: Theme.spacingS
-                        model: root.controller?.appCategories ?? []
-                        spacing: 2
-                        clip: true
-                        interactive: contentHeight > height
-                        implicitHeight: contentHeight
-
-                        delegate: Rectangle {
-                            id: catDelegate
-                            required property string modelData
-                            required property int index
-                            width: categoryList.width
-                            height: 32
-                            radius: Theme.cornerRadius
-                            readonly property bool isCurrent: categoryChip.currentCategory === modelData
-                            color: isCurrent ? Theme.primaryHover : catArea.containsMouse ? Theme.primaryHoverLight : "transparent"
-
-                            Row {
-                                anchors.left: parent.left
-                                anchors.right: parent.right
-                                anchors.verticalCenter: parent.verticalCenter
-                                anchors.leftMargin: Theme.spacingS
-                                anchors.rightMargin: Theme.spacingS
-                                spacing: Theme.spacingS
-
-                                DankIcon {
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    name: categoryChip.iconMap[catDelegate.modelData] ?? "apps"
-                                    size: 16
-                                    color: catDelegate.isCurrent ? Theme.primary : Theme.surfaceText
-                                }
-
-                                StyledText {
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    text: catDelegate.modelData
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    color: catDelegate.isCurrent ? Theme.primary : Theme.surfaceText
-                                    font.weight: catDelegate.isCurrent ? Font.Medium : Font.Normal
-                                }
-                            }
-
-                            MouseArea {
-                                id: catArea
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                onClicked: {
-                                    if (root.controller)
-                                        root.controller.setAppCategory(catDelegate.modelData);
-                                    categoryPopup.close();
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // Size to list content, cap at 10 visible items
-                height: Math.min((root.controller?.appCategories?.length ?? 0) * 34, 10 * 34) + Theme.spacingS * 2 + 4
-            }
-        }
-
         StyledText {
             anchors.verticalCenter: parent.verticalCenter
             text: root.section?.items?.length ?? 0

quickshell/Modals/Greeter/GreeterDoctorPage.qml

@@ -225,13 +225,7 @@ Item {
                     }
 
                     StyledText {
-                        text: {
-                            if (root.errorCount === 0)
-                                return I18n.tr("All checks passed", "greeter doctor page success");
-                            return root.errorCount === 1
-                                ? I18n.tr("%1 issue found", "greeter doctor page error count").arg(root.errorCount)
-                                : I18n.tr("%1 issues found", "greeter doctor page error count").arg(root.errorCount);
-                        }
+                        text: root.errorCount > 0 ? I18n.tr("%1 issue(s) found", "greeter doctor page error count").arg(root.errorCount) : I18n.tr("All checks passed", "greeter doctor page success")
                         font.pixelSize: Theme.fontSizeMedium
                         color: root.errorCount > 0 ? Theme.error : Theme.surfaceVariantText
                     }

quickshell/Modals/Settings/SettingsContent.qml

@@ -470,22 +470,7 @@ FocusScope {
 
             onActiveChanged: {
                 if (active && item)
-                Qt.callLater(() => item.forceActiveFocus());
-            }
-        }
-
-        Loader {
-            id: localeLoader
-            anchors.fill: parent
-            active: root.currentIndex === 30
-            visible: active
-            focus: active
-
-            sourceComponent: LocaleTab {}
-
-            onActiveChanged: {
-                if (active && item)
-                Qt.callLater(() => item.forceActiveFocus());
+                    Qt.callLater(() => item.forceActiveFocus());
             }
         }
     }

quickshell/Modals/Settings/SettingsSidebar.qml

@@ -246,12 +246,6 @@ Rectangle {
                     "icon": "headphones",
                     "tabIndex": 29
                 },
-                {
-                    "id": "locale",
-                    "text": I18n.tr("Locale"),
-                    "icon": "language",
-                    "tabIndex": 30
-                },
                 {
                     "id": "clipboard",
                     "text": I18n.tr("Clipboard"),

quickshell/Modals/WifiQRCodeModal.qml

@@ -1,170 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Effects
-import Quickshell
-import Quickshell.Io
-import qs.Modals.Common
-import qs.Modals.FileBrowser
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-DankModal {
-    id: root
-    visible: false
-    layerNamespace: "dms:wifi-qrcode"
-
-    property bool disablePopupTransparency: true
-    property string wifiSSID: ""
-    property string themedQrCodePath: ""
-    property string normalQrCodePath: ""
-    modalWidth: 420
-    modalHeight: 480
-    onBackgroundClicked: hide()
-    onOpened: {
-        Qt.callLater(() => {
-            modalFocusScope.forceActiveFocus();
-            contentLoader.item.wifiSSID = wifiSSID;
-            contentLoader.item.themedQrCodePath = themedQrCodePath;
-            contentLoader.item.saveBrowserLoader = saveBrowserLoader;
-        });
-    }
-
-    function show(ssid) {
-        wifiSSID = ssid;
-        fetchNetworkQRCode(ssid);
-    }
-
-    function hide() {
-        if (themedQrCodePath !== "") {
-            deleteQRCodeFile(themedQrCodePath);
-        }
-        if (normalQrCodePath !== "") {
-            deleteQRCodeFile(normalQrCodePath);
-        }
-        close();
-    }
-
-    function fetchNetworkQRCode(ssid) {
-        // TODO: Add loading UI?
-
-        DMSService.sendRequest("network.qrcode", {
-            ssid: ssid
-        }, response => {
-            if (response.error) {
-                ToastService.showError("Failed to fetch network QR code: ", JSON.stringify(response.error));
-            } else if (response.result) {
-                themedQrCodePath = response.result[0];
-                normalQrCodePath = response.result[1];
-                open();
-            }
-        });
-    }
-
-    function deleteQRCodeFile(path) {
-        DMSService.sendRequest("network.delete-qrcode", {
-            path: path
-        }, response => {
-            if (response.error) {
-                ToastService.showError(`Failed to remove QR code at ${path}: `, JSON.stringify(response.error));
-            }
-        })
-    }
-
-    LazyLoader {
-        id: saveBrowserLoader
-        active: false
-
-        FileBrowserSurfaceModal {
-            id: saveBrowser
-
-            browserTitle: I18n.tr("Save QR Code")
-            browserIcon: "qr_code"
-            browserType: "default"
-            fileExtensions: ["*.png"]
-            allowStacking: true
-            saveMode: true
-            defaultFileName: `${root.wifiSSID ?? "wifi-qrcode"}.png`
-            onFileSelected: path => {
-                const cleanPath = decodeURI(path.toString().replace(/^file:\/\//, ''));
-                const fileName = cleanPath.split('/').pop();
-                const fileUrl = "file://" + cleanPath;
-
-                copyQrCodeProcess.exec(["cp", root.normalQrCodePath, cleanPath, "-f"])
-            }
-
-            Process {
-                id: copyQrCodeProcess
-                stdout: StdioCollector {
-                    onStreamFinished: {
-                        saveBrowser.close();
-                    }
-                }
-            }
-        }
-    }
-
-    content: Component {
-        Item {
-            id: theItem
-            property alias themedQrCodePath: qrCodeImg.source
-            property var saveBrowserLoader: null
-            property string wifiSSID: ""
-            anchors.fill: parent
-
-            Column {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                spacing: Theme.spacingL
-
-                RowLayout {
-                    id: modalTitle
-                    width: parent.width
-
-                    StyledText {
-                        text: I18n.tr("WiFi QR code for ") + theItem.wifiSSID
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Bold
-                        Layout.alignment: Qt.AlignLeft
-                    }
-
-                    DankActionButton {
-                        iconName: "save"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: {
-                            saveBrowserLoader.active = true;
-                            if (saveBrowserLoader.item) {
-                                saveBrowserLoader.item.open();
-                            }
-                        }
-                        Layout.alignment: Qt.AlignRight
-                    }
-
-                    DankActionButton {
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 4
-                        iconColor: Theme.surfaceText
-                        onClicked: root.hide()
-                        Layout.alignment: Qt.AlignRight
-                    }
-                }
-
-                Image {
-                    id: qrCodeImg
-                    height: parent.height - parent.spacing - modalTitle.height
-                    width: height
-                    anchors.horizontalCenter: parent.horizontalCenter
-
-                    MultiEffect {
-                        source: qrCodeImg
-                        anchors.fill: source
-                        colorization: 1.0
-                        colorizationColor: Theme.primary
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/AppDrawer/AppDrawerPopout.qml

@@ -8,6 +8,9 @@ DankPopout {
 
     layerNamespace: "dms:app-launcher"
 
+    readonly property real screenWidth: screen?.width ?? 1920
+    readonly property real screenHeight: screen?.height ?? 1080
+
     property string _pendingMode: ""
     property string _pendingQuery: ""
 
@@ -41,8 +44,35 @@ DankPopout {
         openWithQuery(query);
     }
 
-    popupWidth: 560
-    popupHeight: 640
+    readonly property int _baseWidth: {
+        switch (SettingsData.dankLauncherV2Size) {
+        case "micro":
+            return 500;
+        case "medium":
+            return 720;
+        case "large":
+            return 860;
+        default:
+            return 620;
+        }
+    }
+
+    readonly property int _baseHeight: {
+        switch (SettingsData.dankLauncherV2Size) {
+        case "micro":
+            return 480;
+        case "medium":
+            return 720;
+        case "large":
+            return 860;
+        default:
+            return 600;
+        }
+    }
+
+    popupWidth: Math.min(_baseWidth, screenWidth - 100)
+    popupHeight: Math.min(_baseHeight, screenHeight - 100)
+
     triggerWidth: 40
     positioning: ""
     contentHandlesKeys: contentLoader.item?.launcherContent?.editMode ?? false
@@ -106,7 +136,7 @@ DankPopout {
             QtObject {
                 id: modalAdapter
                 property bool spotlightOpen: appDrawerPopout.shouldBeVisible
-                property bool isClosing: appDrawerPopout.isClosing
+                property bool isClosing: false
 
                 function hide() {
                     appDrawerPopout.close();

quickshell/Modules/BuiltinDesktopPlugins/DesktopClockWidget.qml

@@ -271,8 +271,8 @@ Item {
 
                 text: {
                     if (SettingsData.clockDateFormat && SettingsData.clockDateFormat.length > 0)
-                        return systemClock.date?.toLocaleDateString(I18n.locale(), SettingsData.clockDateFormat) ?? "";
-                    return systemClock.date?.toLocaleDateString(I18n.locale(), "ddd, MMM d") ?? "";
+                        return systemClock.date?.toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat) ?? "";
+                    return systemClock.date?.toLocaleDateString(Qt.locale(), "ddd, MMM d") ?? "";
                 }
                 font.pixelSize: Theme.fontSizeSmall
                 color: root.accentColor
@@ -324,8 +324,8 @@ Item {
                     anchors.horizontalCenter: parent.horizontalCenter
                     text: {
                         if (SettingsData.clockDateFormat && SettingsData.clockDateFormat.length > 0)
-                            return systemClock.date?.toLocaleDateString(I18n.locale(), SettingsData.clockDateFormat) ?? "";
-                        return systemClock.date?.toLocaleDateString(I18n.locale(), "ddd, MMM d") ?? "";
+                            return systemClock.date?.toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat) ?? "";
+                        return systemClock.date?.toLocaleDateString(Qt.locale(), "ddd, MMM d") ?? "";
                     }
                     font.pixelSize: digitalRoot.smallSize
                     color: Theme.withAlpha(root.accentColor, 0.7)
@@ -528,7 +528,7 @@ Item {
                 StyledText {
                     visible: stackedRoot.hasDate
                     anchors.horizontalCenter: parent.horizontalCenter
-                    text: systemClock.date?.toLocaleDateString(I18n.locale(), "MMM dd") ?? ""
+                    text: systemClock.date?.toLocaleDateString(Qt.locale(), "MMM dd") ?? ""
                     font.pixelSize: stackedRoot.smallSize * 0.7
                     color: Theme.withAlpha(root.accentColor, 0.7)
                 }

quickshell/Modules/ControlCenter/ControlCenterPopout.qml

@@ -12,7 +12,7 @@ DankPopout {
     id: root
 
     layerNamespace: "dms:control-center"
-    fullHeightSurface: false
+    fullHeightSurface: true
 
     property string expandedSection: ""
     property var triggerScreen: null
@@ -126,11 +126,9 @@ DankPopout {
                 z: 5000
 
                 Behavior on opacity {
-                    enabled: !Theme.isDirectionalEffect
                     NumberAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Easing.BezierSpline
-                        easing.bezierCurve: root.shouldBeVisible ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+                        duration: 200
+                        easing.type: Easing.OutCubic
                     }
                 }
             }

quickshell/Modules/ControlCenter/Details/NetworkDetail.qml

@@ -651,7 +651,6 @@ Rectangle {
             }
 
             Rectangle {
-                id: pinButton
                 anchors.right: parent.right
                 anchors.rightMargin: optionsButton.width + Theme.spacingM + Theme.spacingS
                 anchors.verticalCenter: parent.verticalCenter
@@ -712,19 +711,6 @@ Rectangle {
                 }
             }
 
-            DankActionButton {
-                id: qrCodeButton
-                visible: modelData.secured && modelData.saved
-                anchors.right: parent.right
-                anchors.rightMargin: optionsButton.width + pinWifiRow.width + 3 * Theme.spacingM + Theme.spacingS
-                anchors.verticalCenter: parent.verticalCenter
-                iconName: "qr_code"
-                buttonSize: 28
-                onClicked: {
-                    PopoutService.showWifiQRCodeModal(modelData.ssid);
-                }
-            }
-
             DankRipple {
                 id: wifiRipple
                 cornerRadius: parent.radius
@@ -733,7 +719,7 @@ Rectangle {
             MouseArea {
                 id: networkMouseArea
                 anchors.fill: parent
-                anchors.rightMargin: optionsButton.width + pinWifiRow.width + (qrCodeButton.visible ? qrCodeButton.width : 0) + Theme.spacingS * 5 + Theme.spacingM
+                anchors.rightMargin: optionsButton.width + Theme.spacingM + Theme.spacingS + pinWifiRow.width + Theme.spacingS * 4
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
                 onPressed: mouse => wifiRipple.trigger(mouse.x, mouse.y)

quickshell/Modules/DankBar/BarCanvas.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Effects
 import QtQuick.Shapes
 import qs.Common
 import qs.Services
@@ -52,43 +53,15 @@ Item {
         }
     }
 
-    // M3 elevation shadow — Level 2 baseline (navigation bar), with per-bar override support
-    readonly property bool hasPerBarOverride: (barConfig?.shadowIntensity ?? 0) > 0
-    readonly property var elevLevel: Theme.elevationLevel2
-    readonly property bool shadowEnabled: (Theme.elevationEnabled && (typeof SettingsData !== "undefined" ? (SettingsData.barElevationEnabled ?? true) : false)) || hasPerBarOverride
-    readonly property string autoBarShadowDirection: isTop ? "top" : (isBottom ? "bottom" : (isLeft ? "left" : (isRight ? "right" : "top")))
-    readonly property string globalShadowDirection: Theme.elevationLightDirection === "autoBar" ? autoBarShadowDirection : Theme.elevationLightDirection
-    readonly property string perBarShadowDirectionMode: barConfig?.shadowDirectionMode ?? "inherit"
-    readonly property string perBarManualShadowDirection: {
-        switch (barConfig?.shadowDirection) {
-        case "top":
-        case "topLeft":
-        case "topRight":
-        case "bottom":
-            return barConfig.shadowDirection;
-        default:
-            return "top";
-        }
-    }
-    readonly property string effectiveShadowDirection: {
-        if (!hasPerBarOverride)
-            return globalShadowDirection;
-        switch (perBarShadowDirectionMode) {
-        case "autoBar":
-            return autoBarShadowDirection;
-        case "manual":
-            return perBarManualShadowDirection === "autoBar" ? autoBarShadowDirection : perBarManualShadowDirection;
-        default:
-            return globalShadowDirection;
-        }
-    }
-
-    // Per-bar override values (when barConfig.shadowIntensity > 0)
-    readonly property real overrideBlurPx: (barConfig?.shadowIntensity ?? 0) * 0.2
-    readonly property real overrideOpacity: (barConfig?.shadowOpacity ?? 60) / 100
-    readonly property string overrideColorMode: barConfig?.shadowColorMode ?? "default"
-    readonly property color overrideBaseColor: {
-        switch (overrideColorMode) {
+    readonly property real shadowIntensity: barConfig?.shadowIntensity ?? 0
+    readonly property bool shadowEnabled: shadowIntensity > 0
+    readonly property int blurMax: 64
+    readonly property real shadowBlurPx: shadowIntensity * 0.2
+    readonly property real shadowBlur: Math.max(0, Math.min(1, shadowBlurPx / blurMax))
+    readonly property real shadowOpacity: (barConfig?.shadowOpacity ?? 60) / 100
+    readonly property string shadowColorMode: barConfig?.shadowColorMode ?? "text"
+    readonly property color shadowBaseColor: {
+        switch (shadowColorMode) {
         case "surface":
             return Theme.surface;
         case "primary":
@@ -98,16 +71,10 @@ Item {
         case "custom":
             return barConfig?.shadowCustomColor ?? "#000000";
         default:
-            return "#000000";
+            return Theme.surfaceText;
         }
     }
-
-    // Resolved values — per-bar override wins if set, otherwise use global M3 elevation
-    readonly property real shadowBlurPx: hasPerBarOverride ? overrideBlurPx : (elevLevel.blurPx ?? 8)
-    readonly property color shadowColor: hasPerBarOverride ? Theme.withAlpha(overrideBaseColor, overrideOpacity) : Theme.elevationShadowColor(elevLevel)
-    readonly property real shadowOffsetMagnitude: hasPerBarOverride ? (overrideBlurPx * 0.5) : Theme.elevationOffsetMagnitude(elevLevel, 4, effectiveShadowDirection)
-    readonly property real shadowOffsetX: Theme.elevationOffsetXFor(hasPerBarOverride ? null : elevLevel, effectiveShadowDirection, shadowOffsetMagnitude)
-    readonly property real shadowOffsetY: Theme.elevationOffsetYFor(hasPerBarOverride ? null : elevLevel, effectiveShadowDirection, shadowOffsetMagnitude)
+    readonly property color shadowColor: Theme.withAlpha(shadowBaseColor, shadowOpacity * barWindow._backgroundAlpha)
 
     readonly property string mainPath: generatePathForPosition(width, height)
     readonly property string borderFullPath: generateBorderFullPath(width, height)
@@ -151,28 +118,42 @@ Item {
         }
     }
 
-    ElevationShadow {
-        id: barShadow
-        visible: root.shadowEnabled && root.width > 0 && root.height > 0
+    Loader {
+        id: shadowLoader
+        anchors.fill: parent
+        active: root.shadowEnabled && mainPathCorrectShape
+        asynchronous: false
+        sourceComponent: Item {
+            anchors.fill: parent
 
-        // Size to the bar's rectangular body, excluding gothic wing extensions
-        x: root.isRight ? root.wing : 0
-        y: root.isBottom ? root.wing : 0
-        width: axis.isVertical ? (parent.width - root.wing) : parent.width
-        height: axis.isVertical ? parent.height : (parent.height - root.wing)
+            layer.enabled: true
+            layer.smooth: true
+            layer.samples: 8
+            layer.textureSize: Qt.size(Math.round(width * barWindow._dpr * 2), Math.round(height * barWindow._dpr * 2))
+            layer.effect: MultiEffect {
+                shadowEnabled: true
+                shadowBlur: root.shadowBlur
+                shadowColor: root.shadowColor
+                shadowVerticalOffset: root.isTop ? root.shadowBlurPx * 0.5 : (root.isBottom ? -root.shadowBlurPx * 0.5 : 0)
+                shadowHorizontalOffset: root.isLeft ? root.shadowBlurPx * 0.5 : (root.isRight ? -root.shadowBlurPx * 0.5 : 0)
+                autoPaddingEnabled: true
+            }
 
-        shadowEnabled: root.shadowEnabled
-        level: root.hasPerBarOverride ? null : root.elevLevel
-        direction: root.effectiveShadowDirection
-        fallbackOffset: 4
-        targetRadius: root.rt
-        targetColor: barWindow._bgColor
+            Shape {
+                anchors.fill: parent
+                preferredRendererType: Shape.CurveRenderer
 
-        shadowBlurPx: root.shadowBlurPx
-        shadowOffsetX: root.shadowOffsetX
-        shadowOffsetY: root.shadowOffsetY
-        shadowColor: root.shadowColor
-        blurMax: Theme.elevationBlurMax
+                ShapePath {
+                    fillColor: barWindow._bgColor
+                    strokeColor: "transparent"
+                    strokeWidth: 0
+
+                    PathSvg {
+                        path: root.mainPath
+                    }
+                }
+            }
+        }
     }
 
     Loader {

quickshell/Modules/DankBar/DankBarContent.qml

@@ -1117,7 +1117,6 @@ Item {
                 if (!notificationCenterLoader.item) {
                     return;
                 }
-                notificationCenterLoader.item.triggerScreen = barWindow.screen;
                 const effectiveBarConfig = topBarContent.barConfig;
                 const barPosition = barWindow.axis?.edge === "left" ? 2 : (barWindow.axis?.edge === "right" ? 3 : (barWindow.axis?.edge === "top" ? 0 : 1));
                 if (notificationCenterLoader.item.setBarContext) {

quickshell/Modules/DankBar/DankBarWindow.qml

@@ -140,20 +140,6 @@ PanelWindow {
     }
     readonly property real _dpr: CompositorService.getScreenScale(barWindow.screen)
 
-    // Shadow buffer: extra window space for shadow to render beyond bar bounds
-    readonly property bool _shadowActive: (Theme.elevationEnabled && (typeof SettingsData !== "undefined" ? (SettingsData.barElevationEnabled ?? true) : false)) || (barConfig?.shadowIntensity ?? 0) > 0
-    readonly property real _shadowBuffer: {
-        if (!_shadowActive)
-            return 0;
-        const hasOverride = (barConfig?.shadowIntensity ?? 0) > 0;
-        if (hasOverride) {
-            const blur = (barConfig.shadowIntensity ?? 0) * 0.2;
-            const offset = blur * 0.5;
-            return Theme.snap(Math.max(16, blur + offset + 8), _dpr);
-        }
-        return Theme.snap(Theme.elevationRenderPadding(Theme.elevationLevel2, "top", 4, 8, 16), _dpr);
-    }
-
     property string screenName: modelData.name
 
     property bool hasMaximizedToplevel: false
@@ -368,8 +354,8 @@ PanelWindow {
     }
 
     screen: modelData
-    implicitHeight: !isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((barConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
-    implicitWidth: isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((barConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
+    implicitHeight: !isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((barConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) : 0
+    implicitWidth: isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((barConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) : 0
     color: "transparent"
 
     property var nativeInhibitor: null
@@ -647,7 +633,7 @@ PanelWindow {
     Item {
         id: topBarCore
         anchors.fill: parent
-        layer.enabled: false
+        layer.enabled: true
 
         property bool autoHide: barConfig?.autoHide ?? false
         property bool revealSticky: false

quickshell/Modules/DankBar/Popouts/BatteryPopout.qml

@@ -167,22 +167,9 @@ DankPopout {
                     }
 
                     Column {
-                        id: headerInfoColumn
                         spacing: Theme.spacingXS
                         anchors.verticalCenter: parent.verticalCenter
                         width: parent.width - Theme.iconSizeLarge - 32 - Theme.spacingM * 2
-                        readonly property string timeInfoText: {
-                            if (!BatteryService.batteryAvailable)
-                                return "Power profile management available";
-                            const time = BatteryService.formatTimeRemaining();
-                            if (time !== "Unknown") {
-                                return BatteryService.isCharging ? `Time until full: ${time}` : `Time remaining: ${time}`;
-                            }
-                            return "";
-                        }
-                        readonly property bool showPowerRate: BatteryService.batteryAvailable && Math.abs(BatteryService.changeRate) > 0.05
-                        readonly property bool isOnAC: BatteryService.batteryAvailable && (BatteryService.isCharging || BatteryService.isPluggedIn)
-                        readonly property bool isDischarging: BatteryService.batteryAvailable && !BatteryService.isCharging && !BatteryService.isPluggedIn
 
                         Row {
                             spacing: Theme.spacingS
@@ -220,35 +207,21 @@ DankPopout {
                             }
                         }
 
-                        Row {
-                            width: parent.width
-                            spacing: Theme.spacingS
-                            visible: headerInfoColumn.timeInfoText.length > 0
-
-                            StyledText {
-                                id: powerRateText
-                                text: `${headerInfoColumn.isOnAC ? "+" : (headerInfoColumn.isDischarging ? "-" : "")}${Math.abs(BatteryService.changeRate).toFixed(1)}W`
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: {
-                                    if (headerInfoColumn.isOnAC) {
-                                        return Theme.primary;
-                                    }
-                                    if (headerInfoColumn.isDischarging) {
-                                        return Theme.warning;
-                                    }
-                                    return Theme.surfaceTextMedium;
+                        StyledText {
+                            text: {
+                                if (!BatteryService.batteryAvailable)
+                                    return "Power profile management available";
+                                const time = BatteryService.formatTimeRemaining();
+                                if (time !== "Unknown") {
+                                    return BatteryService.isCharging ? `Time until full: ${time}` : `Time remaining: ${time}`;
                                 }
-                                font.weight: Font.Medium
-                                visible: headerInfoColumn.showPowerRate
-                            }
-
-                            StyledText {
-                                text: headerInfoColumn.timeInfoText
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceTextMedium
-                                elide: Text.ElideRight
-                                width: parent.width - (powerRateText.visible ? (powerRateText.implicitWidth + parent.spacing) : 0)
+                                return "";
                             }
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceTextMedium
+                            visible: text.length > 0
+                            elide: Text.ElideRight
+                            width: parent.width
                         }
                     }
 

quickshell/Modules/DankBar/WidgetHost.qml

@@ -29,21 +29,12 @@ Loader {
 
     readonly property bool orientationMatches: (axis?.isVertical ?? false) === isInColumn
 
-    readonly property bool widgetEnabled: widgetData?.enabled !== false
-
     active: orientationMatches && getWidgetVisible(widgetId, DgopService.dgopAvailable) && (widgetId !== "music" || MprisController.activePlayer !== null)
     sourceComponent: getWidgetComponent(widgetId, components)
+    opacity: getWidgetEnabled(widgetData?.enabled) ? 1 : 0
 
     signal contentItemReady(var item)
 
-    Binding {
-        target: root.item
-        when: root.item && !root.widgetEnabled
-        property: "visible"
-        value: false
-        restoreMode: Binding.RestoreBinding
-    }
-
     Binding {
         target: root.item
         when: root.item && "parentScreen" in root.item
@@ -278,4 +269,8 @@ Loader {
 
         return widgetVisibility[widgetId] ?? true;
     }
+
+    function getWidgetEnabled(enabled) {
+        return enabled !== false;
+    }
 }

quickshell/Modules/DankBar/Widgets/Clock.qml

@@ -129,7 +129,7 @@ BasePill {
 
                     StyledText {
                         text: {
-                            const locale = I18n.locale();
+                            const locale = Qt.locale();
                             const dateFormatShort = locale.dateFormat(Locale.ShortFormat);
                             const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M');
                             const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0');
@@ -144,7 +144,7 @@ BasePill {
 
                     StyledText {
                         text: {
-                            const locale = I18n.locale();
+                            const locale = Qt.locale();
                             const dateFormatShort = locale.dateFormat(Locale.ShortFormat);
                             const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M');
                             const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0');
@@ -165,7 +165,7 @@ BasePill {
 
                     StyledText {
                         text: {
-                            const locale = I18n.locale();
+                            const locale = Qt.locale();
                             const dateFormatShort = locale.dateFormat(Locale.ShortFormat);
                             const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M');
                             const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0');
@@ -180,7 +180,7 @@ BasePill {
 
                     StyledText {
                         text: {
-                            const locale = I18n.locale();
+                            const locale = Qt.locale();
                             const dateFormatShort = locale.dateFormat(Locale.ShortFormat);
                             const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M');
                             const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0');
@@ -311,9 +311,9 @@ BasePill {
                     id: dateText
                     text: {
                         if (SettingsData.clockDateFormat && SettingsData.clockDateFormat.length > 0) {
-                            return systemClock?.date?.toLocaleDateString(I18n.locale(), SettingsData.clockDateFormat);
+                            return systemClock?.date?.toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat);
                         }
-                        return systemClock?.date?.toLocaleDateString(I18n.locale(), "ddd d");
+                        return systemClock?.date?.toLocaleDateString(Qt.locale(), "ddd d");
                     }
                     font.pixelSize: clockRow.fontSize
                     color: Theme.widgetTextColor

quickshell/Modules/DankBar/Widgets/DiskUsage.qml

@@ -9,7 +9,6 @@ BasePill {
 
     property var widgetData: null
     property string mountPath: (widgetData && widgetData.mountPath !== undefined) ? widgetData.mountPath : "/"
-    property int diskUsageMode: (widgetData && widgetData.diskUsageMode !== undefined) ? widgetData.diskUsageMode : 0
     property bool isHovered: mouseArea.containsMouse
     property bool isAutoHideBar: false
 
@@ -131,13 +130,7 @@ BasePill {
                         if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
                             return "--";
                         }
-                        if (!root.selectedMount) return "--";
-                        switch (root.diskUsageMode) {
-                            case 1: return root.selectedMount.size || "--";
-                            case 2: return root.selectedMount.avail || "--";
-                            case 3: return (root.selectedMount.avail || "--") + " / " + (root.selectedMount.size || "--");
-                            default: return root.diskUsagePercent.toFixed(0);
-                        }
+                        return root.diskUsagePercent.toFixed(0);
                     }
                     font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
                     color: Theme.widgetTextColor
@@ -185,13 +178,7 @@ BasePill {
                         if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
                             return "--%";
                         }
-                        if (!root.selectedMount) return "--%";
-                        switch (root.diskUsageMode) {
-                            case 1: return root.selectedMount.size || "--";
-                            case 2: return root.selectedMount.avail || "--";
-                            case 3: return (root.selectedMount.avail || "--") + " / " + (root.selectedMount.size || "--");
-                            default: return root.diskUsagePercent.toFixed(0) + "%";
-                        }
+                        return root.diskUsagePercent.toFixed(0) + "%";
                     }
                     font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
                     color: Theme.widgetTextColor
@@ -202,14 +189,7 @@ BasePill {
                     StyledTextMetrics {
                         id: diskBaseline
                         font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
-                        text: {
-                            switch (root.diskUsageMode) {
-                                case 3: return "888.8G / 888.8G";
-                                case 1:
-                                case 2: return "888.8G";
-                                default: return "100%";
-                            }
-                        }
+                        text: "100%"
                     }
 
                     width: Math.max(diskBaseline.width, paintedWidth)

quickshell/Modules/DankBar/Widgets/Media.qml

@@ -178,9 +178,8 @@ BasePill {
                             if (root.popoutTarget && root.popoutTarget.setTriggerPosition) {
                                 const globalPos = parent.mapToItem(null, 0, 0);
                                 const currentScreen = root.parentScreen || Screen;
-                                const barPosition = root.axis?.edge === "left" ? 2 : (root.axis?.edge === "right" ? 3 : (root.axis?.edge === "top" ? 0 : 1));
-                                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, parent.width, root.barSpacing, barPosition, root.barConfig);
-                                root.popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen, barPosition, root.barThickness, root.barSpacing, root.barConfig);
+                                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, parent.width);
+                                root.popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen);
                             }
                             root.clicked();
                         }
@@ -335,9 +334,8 @@ BasePill {
                                 if (root.popoutTarget && root.popoutTarget.setTriggerPosition) {
                                     const globalPos = mapToItem(null, 0, 0);
                                     const currentScreen = root.parentScreen || Screen;
-                                    const barPosition = root.axis?.edge === "left" ? 2 : (root.axis?.edge === "right" ? 3 : (root.axis?.edge === "top" ? 0 : 1));
-                                    const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, root.width, root.barSpacing, barPosition, root.barConfig);
-                                    root.popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen, barPosition, root.barThickness, root.barSpacing, root.barConfig);
+                                    const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, root.width);
+                                    root.popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen);
                                 }
                                 root.clicked();
                             }

quickshell/Modules/DankBar/Widgets/RamMonitor.qml

@@ -14,7 +14,6 @@ BasePill {
     property var widgetData: null
     property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
     property bool showSwap: (widgetData && widgetData.showSwap !== undefined) ? widgetData.showSwap : false
-    property bool showInGb: (widgetData && widgetData.showInGb !== undefined) ? widgetData.showInGb : false
     readonly property real swapUsage: DgopService.totalSwapKB > 0 ? (DgopService.usedSwapKB / DgopService.totalSwapKB) * 100 : 0
 
     signal ramClicked
@@ -60,10 +59,6 @@ BasePill {
                             return "--";
                         }
 
-                        if (root.showInGb) {
-                            return (DgopService.usedMemoryMB / 1024).toFixed(1);
-                        }
-
                         return DgopService.memoryUsage.toFixed(0);
                     }
                     font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
@@ -118,14 +113,13 @@ BasePill {
                         id: ramBaseline
                         font.pixelSize: Theme.barTextSize(root.barThickness, root.barConfig?.fontScale, root.barConfig?.maximizeWidgetText)
                         text: {
-                            let baseText = root.showInGb ? "88.8 GB" : "88%";
                             if (!root.showSwap) {
-                                return baseText;
+                                return "88%";
                             }
                             if (root.swapUsage < 10) {
-                                return baseText + " · 0%";
+                                return "88% · 0%";
                             }
-                            return baseText + " · 88%";
+                            return "88% · 88%";
                         }
                     }
 
@@ -133,16 +127,10 @@ BasePill {
                         id: ramText
                         text: {
                             if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
-                                return root.showInGb ? "-- GB" : "--%";
-                            }
-
-                            let ramText = "";
-                            if (root.showInGb) {
-                                ramText = (DgopService.usedMemoryMB / 1024).toFixed(1) + " GB";
-                            } else {
-                                ramText = DgopService.memoryUsage.toFixed(0) + "%";
+                                return "--%";
                             }
 
+                            let ramText = DgopService.memoryUsage.toFixed(0) + "%";
                             if (root.showSwap && DgopService.totalSwapKB > 0) {
                                 return ramText + " · " + root.swapUsage.toFixed(0) + "%";
                             }

quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -940,10 +940,9 @@ BasePill {
                     }
                 })(), overflowMenu.dpr)
 
-            readonly property var elev: Theme.elevationLevel2
-            property real shadowBlurPx: elev && elev.blurPx !== undefined ? elev.blurPx : 8
-            property real shadowSpreadPx: elev && elev.spreadPx !== undefined ? elev.spreadPx : 0
-            property real shadowBaseAlpha: elev && elev.alpha !== undefined ? elev.alpha : 0.25
+            property real shadowBlurPx: 10
+            property real shadowSpreadPx: 0
+            property real shadowBaseAlpha: 0.60
             readonly property real popupSurfaceAlpha: Theme.popupTransparency
             readonly property real effectiveShadowAlpha: Math.max(0, Math.min(1, shadowBaseAlpha * popupSurfaceAlpha))
 
@@ -964,26 +963,37 @@ BasePill {
                 }
             }
 
-            ElevationShadow {
+            Item {
                 id: bgShadowLayer
                 anchors.fill: parent
-                level: menuContainer.elev
-                fallbackOffset: 4
-                shadowBlurPx: menuContainer.shadowBlurPx
-                shadowSpreadPx: menuContainer.shadowSpreadPx
-                shadowColor: {
-                    const baseColor = Theme.isLightMode ? Qt.rgba(0, 0, 0, 1) : Theme.surfaceContainerHighest;
-                    return Theme.withAlpha(baseColor, menuContainer.effectiveShadowAlpha);
-                }
-                targetColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-                targetRadius: Theme.cornerRadius
-                sourceRect.antialiasing: true
-                sourceRect.smooth: true
-                shadowEnabled: Theme.elevationEnabled
+                layer.enabled: true
                 layer.smooth: true
                 layer.textureSize: Qt.size(Math.round(width * overflowMenu.dpr * 2), Math.round(height * overflowMenu.dpr * 2))
                 layer.textureMirroring: ShaderEffectSource.MirrorVertically
                 layer.samples: 4
+
+                readonly property int blurMax: 64
+
+                layer.effect: MultiEffect {
+                    autoPaddingEnabled: true
+                    shadowEnabled: true
+                    blurEnabled: false
+                    maskEnabled: false
+                    shadowBlur: Math.max(0, Math.min(1, menuContainer.shadowBlurPx / bgShadowLayer.blurMax))
+                    shadowScale: 1 + (2 * menuContainer.shadowSpreadPx) / Math.max(1, Math.min(bgShadowLayer.width, bgShadowLayer.height))
+                    shadowColor: {
+                        const baseColor = Theme.isLightMode ? Qt.rgba(0, 0, 0, 1) : Theme.surfaceContainerHighest;
+                        return Theme.withAlpha(baseColor, menuContainer.effectiveShadowAlpha);
+                    }
+                }
+
+                Rectangle {
+                    anchors.fill: parent
+                    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+                    radius: Theme.cornerRadius
+                    antialiasing: true
+                    smooth: true
+                }
             }
 
             Grid {
@@ -1402,10 +1412,9 @@ BasePill {
                             }
                         })(), menuWindow.dpr)
 
-                    readonly property var elev: Theme.elevationLevel2
-                    property real shadowBlurPx: elev && elev.blurPx !== undefined ? elev.blurPx : 8
-                    property real shadowSpreadPx: elev && elev.spreadPx !== undefined ? elev.spreadPx : 0
-                    property real shadowBaseAlpha: elev && elev.alpha !== undefined ? elev.alpha : 0.25
+                    property real shadowBlurPx: 10
+                    property real shadowSpreadPx: 0
+                    property real shadowBaseAlpha: 0.60
                     readonly property real popupSurfaceAlpha: Theme.popupTransparency
                     readonly property real effectiveShadowAlpha: Math.max(0, Math.min(1, shadowBaseAlpha * popupSurfaceAlpha))
 
@@ -1426,24 +1435,35 @@ BasePill {
                         }
                     }
 
-                    ElevationShadow {
+                    Item {
                         id: menuBgShadowLayer
                         anchors.fill: parent
-                        level: menuContainer.elev
-                        fallbackOffset: 4
-                        shadowBlurPx: menuContainer.shadowBlurPx
-                        shadowSpreadPx: menuContainer.shadowSpreadPx
-                        shadowColor: {
-                            const baseColor = Theme.isLightMode ? Qt.rgba(0, 0, 0, 1) : Theme.surfaceContainerHighest;
-                            return Theme.withAlpha(baseColor, menuContainer.effectiveShadowAlpha);
-                        }
-                        targetColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
-                        targetRadius: Theme.cornerRadius
-                        sourceRect.antialiasing: true
-                        shadowEnabled: Theme.elevationEnabled
+                        layer.enabled: true
                         layer.smooth: true
                         layer.textureSize: Qt.size(Math.round(width * menuWindow.dpr), Math.round(height * menuWindow.dpr))
                         layer.textureMirroring: ShaderEffectSource.MirrorVertically
+
+                        readonly property int blurMax: 64
+
+                        layer.effect: MultiEffect {
+                            autoPaddingEnabled: true
+                            shadowEnabled: true
+                            blurEnabled: false
+                            maskEnabled: false
+                            shadowBlur: Math.max(0, Math.min(1, menuContainer.shadowBlurPx / menuBgShadowLayer.blurMax))
+                            shadowScale: 1 + (2 * menuContainer.shadowSpreadPx) / Math.max(1, Math.min(menuBgShadowLayer.width, menuBgShadowLayer.height))
+                            shadowColor: {
+                                const baseColor = Theme.isLightMode ? Qt.rgba(0, 0, 0, 1) : Theme.surfaceContainerHighest;
+                                return Theme.withAlpha(baseColor, menuContainer.effectiveShadowAlpha);
+                            }
+                        }
+
+                        Rectangle {
+                            anchors.fill: parent
+                            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
+                            radius: Theme.cornerRadius
+                            antialiasing: true
+                        }
                     }
 
                     QsMenuAnchor {

quickshell/Modules/DankBar/Widgets/SystemUpdate.qml

@@ -177,9 +177,8 @@ BasePill {
             if (popoutTarget && popoutTarget.setTriggerPosition) {
                 const globalPos = root.visualContent.mapToItem(null, 0, 0);
                 const currentScreen = parentScreen || Screen;
-                const barPosition = root.axis?.edge === "left" ? 2 : (root.axis?.edge === "right" ? 3 : (root.axis?.edge === "top" ? 0 : 1));
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth, root.barSpacing, barPosition, root.barConfig);
-                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen, barPosition, barThickness, root.barSpacing, root.barConfig);
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth);
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen);
             }
             root.clicked();
         }

quickshell/Modules/DankDash/DankDashPopout.qml

@@ -16,6 +16,7 @@ DankPopout {
     popupHeight: contentLoader.item ? contentLoader.item.implicitHeight : 500
     triggerWidth: 80
     screen: triggerScreen
+    shouldBeVisible: dashVisible
 
     property bool __focusArmed: false
     property bool __contentReady: false

quickshell/Modules/DankDash/MediaDropdownOverlay.qml

@@ -44,43 +44,6 @@ Item {
 
     property int __volumeHoverCount: 0
 
-    readonly property bool directionalEffect: Theme.isDirectionalEffect
-    readonly property bool depthEffect: Theme.isDepthEffect
-
-    function panelMotionX(panelWidth, active) {
-        if (active)
-            return 0;
-        if (directionalEffect) {
-            const travel = Math.max(Theme.effectAnimOffset, panelWidth * 0.85);
-            return isRightEdge ? -travel : travel;
-        }
-        if (depthEffect) {
-            const travel = Math.max(Theme.effectAnimOffset * 0.7, panelWidth * 0.32);
-            return isRightEdge ? -travel : travel;
-        }
-        return 0;
-    }
-
-    function panelMotionY(panelType, panelHeight, active) {
-        if (active)
-            return 0;
-        if (directionalEffect) {
-            if (panelType === 2)
-                return panelHeight * 0.08;
-            if (panelType === 3)
-                return -panelHeight * 0.08;
-            return 0;
-        }
-        if (depthEffect) {
-            if (panelType === 2)
-                return panelHeight * 0.04;
-            if (panelType === 3)
-                return -panelHeight * 0.04;
-            return 0;
-        }
-        return 0;
-    }
-
     function volumeAreaEntered() {
         __volumeHoverCount++;
         panelEntered();
@@ -99,62 +62,41 @@ Item {
         visible: dropdownType === 1 && volumeAvailable
         width: 60
         height: 180
-        x: (isRightEdge ? anchorPos.x : anchorPos.x - width) + panelMotionX(width, dropdownType === 1)
-        y: anchorPos.y - height / 2 + panelMotionY(1, height, dropdownType === 1)
+        x: isRightEdge ? anchorPos.x : anchorPos.x - width
+        y: anchorPos.y - height / 2
         radius: Theme.cornerRadius * 2
         color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95)
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3)
         border.width: 1
 
-        opacity: Theme.isDirectionalEffect ? 1 : (dropdownType === 1 ? 1 : 0)
-        scale: Theme.isDirectionalEffect ? 1 : (dropdownType === 1 ? 1 : Theme.effectScaleCollapsed)
+        opacity: dropdownType === 1 ? 1 : 0
+        scale: dropdownType === 1 ? 1 : 0.96
         transformOrigin: isRightEdge ? Item.Left : Item.Right
 
         Behavior on opacity {
-            enabled: !Theme.isDirectionalEffect
-            DankAnim {
-                duration: Math.round(Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 1) * Theme.variantOpacityDurationScale)
-                easing.bezierCurve: dropdownType === 1 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+            NumberAnimation {
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
         Behavior on scale {
-            enabled: !Theme.isDirectionalEffect
             NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 1)
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
                 easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 1 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
-        Behavior on x {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 1)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 1 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on y {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 1)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 1 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        ElevationShadow {
-            id: volumeShadowLayer
-            anchors.fill: parent
-            z: -1
-            level: Theme.elevationLevel2
-            fallbackOffset: 4
-            targetRadius: volumePanel.radius
-            targetColor: volumePanel.color
-            borderColor: volumePanel.border.color
-            borderWidth: volumePanel.border.width
-            shadowOpacity: Theme.elevationLevel2 && Theme.elevationLevel2.alpha !== undefined ? Theme.elevationLevel2.alpha : 0.25
-            shadowEnabled: Theme.elevationEnabled
+        layer.enabled: true
+        layer.effect: MultiEffect {
+            shadowEnabled: true
+            shadowHorizontalOffset: 0
+            shadowVerticalOffset: 8
+            shadowBlur: 1.0
+            shadowColor: Qt.rgba(0, 0, 0, 0.4)
+            shadowOpacity: 0.7
         }
 
         MouseArea {
@@ -251,65 +193,44 @@ Item {
 
     Rectangle {
         id: audioDevicesPanel
-        visible: dropdownType === 2 && activePlayer !== null
+        visible: dropdownType === 2
         width: 280
         height: Math.max(200, Math.min(280, availableDevices.length * 50 + 100))
-        x: (isRightEdge ? anchorPos.x : anchorPos.x - width) + panelMotionX(width, dropdownType === 2)
-        y: anchorPos.y - height / 2 + panelMotionY(2, height, dropdownType === 2)
+        x: isRightEdge ? anchorPos.x : anchorPos.x - width
+        y: anchorPos.y - height / 2
         radius: Theme.cornerRadius * 2
         color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.98)
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.6)
         border.width: 2
 
-        opacity: Theme.isDirectionalEffect ? 1 : (dropdownType === 2 ? 1 : 0)
-        scale: Theme.isDirectionalEffect ? 1 : (dropdownType === 2 ? 1 : Theme.effectScaleCollapsed)
+        opacity: dropdownType === 2 ? 1 : 0
+        scale: dropdownType === 2 ? 1 : 0.96
         transformOrigin: isRightEdge ? Item.Left : Item.Right
 
         Behavior on opacity {
-            enabled: !Theme.isDirectionalEffect
-            DankAnim {
-                duration: Math.round(Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 2) * Theme.variantOpacityDurationScale)
-                easing.bezierCurve: dropdownType === 2 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+            NumberAnimation {
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
         Behavior on scale {
-            enabled: !Theme.isDirectionalEffect
             NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 2)
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
                 easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 2 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
-        Behavior on x {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 2)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 2 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on y {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 2)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 2 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        ElevationShadow {
-            id: audioDevicesShadowLayer
-            anchors.fill: parent
-            z: -1
-            level: Theme.elevationLevel2
-            fallbackOffset: 4
-            targetRadius: audioDevicesPanel.radius
-            targetColor: audioDevicesPanel.color
-            borderColor: audioDevicesPanel.border.color
-            borderWidth: audioDevicesPanel.border.width
-            shadowOpacity: Theme.elevationLevel2 && Theme.elevationLevel2.alpha !== undefined ? Theme.elevationLevel2.alpha : 0.25
-            shadowEnabled: Theme.elevationEnabled
+        layer.enabled: true
+        layer.effect: MultiEffect {
+            shadowEnabled: true
+            shadowHorizontalOffset: 0
+            shadowVerticalOffset: 8
+            shadowBlur: 1.0
+            shadowColor: Qt.rgba(0, 0, 0, 0.4)
+            shadowOpacity: 0.7
         }
 
         Column {
@@ -425,62 +346,41 @@ Item {
         visible: dropdownType === 3
         width: 240
         height: Math.max(180, Math.min(240, (allPlayers?.length || 0) * 50 + 80))
-        x: (isRightEdge ? anchorPos.x : anchorPos.x - width) + panelMotionX(width, dropdownType === 3)
-        y: anchorPos.y - height / 2 + panelMotionY(3, height, dropdownType === 3)
+        x: isRightEdge ? anchorPos.x : anchorPos.x - width
+        y: anchorPos.y - height / 2
         radius: Theme.cornerRadius * 2
         color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.98)
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.6)
         border.width: 2
 
-        opacity: Theme.isDirectionalEffect ? 1 : (dropdownType === 3 ? 1 : 0)
-        scale: Theme.isDirectionalEffect ? 1 : (dropdownType === 3 ? 1 : Theme.effectScaleCollapsed)
+        opacity: dropdownType === 3 ? 1 : 0
+        scale: dropdownType === 3 ? 1 : 0.96
         transformOrigin: isRightEdge ? Item.Left : Item.Right
 
         Behavior on opacity {
-            enabled: !Theme.isDirectionalEffect
-            DankAnim {
-                duration: Math.round(Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 3) * Theme.variantOpacityDurationScale)
-                easing.bezierCurve: dropdownType === 3 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+            NumberAnimation {
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
         Behavior on scale {
-            enabled: !Theme.isDirectionalEffect
             NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 3)
+                duration: Theme.expressiveDurations.expressiveDefaultSpatial
                 easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 3 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
+                easing.bezierCurve: Theme.expressiveCurves.expressiveDefaultSpatial
             }
         }
 
-        Behavior on x {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 3)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 3 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        Behavior on y {
-            NumberAnimation {
-                duration: Theme.variantDuration(Theme.expressiveDurations.expressiveDefaultSpatial, dropdownType === 3)
-                easing.type: Easing.BezierSpline
-                easing.bezierCurve: dropdownType === 3 ? Theme.variantPopoutEnterCurve : Theme.variantPopoutExitCurve
-            }
-        }
-
-        ElevationShadow {
-            id: playersShadowLayer
-            anchors.fill: parent
-            z: -1
-            level: Theme.elevationLevel2
-            fallbackOffset: 4
-            targetRadius: playersPanel.radius
-            targetColor: playersPanel.color
-            borderColor: playersPanel.border.color
-            borderWidth: playersPanel.border.width
-            shadowOpacity: Theme.elevationLevel2 && Theme.elevationLevel2.alpha !== undefined ? Theme.elevationLevel2.alpha : 0.25
-            shadowEnabled: Theme.elevationEnabled
+        layer.enabled: true
+        layer.effect: MultiEffect {
+            shadowEnabled: true
+            shadowHorizontalOffset: 0
+            shadowVerticalOffset: 8
+            shadowBlur: 1.0
+            shadowColor: Qt.rgba(0, 0, 0, 0.4)
+            shadowOpacity: 0.7
         }
 
         Column {

quickshell/Modules/DankDash/MediaPlayerTab.qml

@@ -529,15 +529,14 @@ Item {
                                     onClicked: activePlayer && activePlayer.togglePlaying()
                                 }
 
-                                ElevationShadow {
-                                    anchors.fill: parent
-                                    z: -1
-                                    level: Theme.elevationLevel1
-                                    fallbackOffset: 1
-                                    targetRadius: parent.radius
-                                    targetColor: parent.color
-                                    shadowOpacity: Theme.elevationLevel1 && Theme.elevationLevel1.alpha !== undefined ? Theme.elevationLevel1.alpha : 0.2
-                                    shadowEnabled: Theme.elevationEnabled
+                                layer.enabled: true
+                                layer.effect: MultiEffect {
+                                    shadowEnabled: true
+                                    shadowHorizontalOffset: 0
+                                    shadowVerticalOffset: 0
+                                    shadowBlur: 1.0
+                                    shadowColor: Qt.rgba(0, 0, 0, 0.3)
+                                    shadowOpacity: 0.3
                                 }
                             }
                         }

quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml

@@ -14,15 +14,8 @@ Rectangle {
 
     signal closeDash
 
-    function weekStartQt() {
-        if (SettingsData.firstDayOfWeek >= 7 || SettingsData.firstDayOfWeek < 0) {
-            return Qt.locale().firstDayOfWeek;
-        }
-        return SettingsData.firstDayOfWeek;
-    }
-
     function weekStartJs() {
-        return weekStartQt() % 7;
+        return Qt.locale().firstDayOfWeek % 7;
     }
 
     function startOfWeek(dateObj) {
@@ -186,7 +179,7 @@ Rectangle {
             StyledText {
                 width: parent.width - 56
                 height: 28
-                text: calendarGrid.displayDate.toLocaleDateString(I18n.locale(), "MMMM yyyy")
+                text: calendarGrid.displayDate.toLocaleDateString(Qt.locale(), "MMMM yyyy")
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceText
                 font.weight: Font.Medium
@@ -230,10 +223,11 @@ Rectangle {
             Repeater {
                 model: {
                     const days = [];
-                    const qtFirst = weekStartQt();
+                    const loc = Qt.locale();
+                    const qtFirst = loc.firstDayOfWeek;
                     for (let i = 0; i < 7; ++i) {
                         const qtDay = ((qtFirst - 1 + i) % 7) + 1;
-                        days.push(I18n.locale().dayName(qtDay, Locale.ShortFormat));
+                        days.push(loc.dayName(qtDay, Locale.ShortFormat));
                     }
                     return days;
                 }

quickshell/Modules/DankDash/Overview/ClockCard.qml

@@ -99,7 +99,7 @@ Card {
         }
 
         StyledText {
-            text: systemClock?.date?.toLocaleDateString(I18n.locale(), "MMM dd")
+            text: systemClock?.date?.toLocaleDateString(Qt.locale(), "MMM dd")
             font.pixelSize: Theme.fontSizeSmall
             color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
             anchors.horizontalCenter: parent.horizontalCenter

quickshell/Modules/DankDash/WeatherTab.qml

@@ -241,15 +241,14 @@ Item {
                             color: Theme.primary
                             anchors.verticalCenter: parent.verticalCenter
 
-                            layer.enabled: Theme.elevationEnabled
+                            layer.enabled: true
                             layer.effect: MultiEffect {
-                                shadowEnabled: Theme.elevationEnabled
-                                shadowHorizontalOffset: Theme.elevationOffsetX(Theme.elevationLevel1)
-                                shadowVerticalOffset: Theme.elevationOffsetY(Theme.elevationLevel1, 1)
-                                shadowBlur: Theme.elevationEnabled ? Math.max(0, Math.min(1, (Theme.elevationLevel1 && Theme.elevationLevel1.blurPx !== undefined ? Theme.elevationLevel1.blurPx : 4) / Theme.elevationBlurMax)) : 0
-                                blurMax: Theme.elevationBlurMax
-                                shadowColor: Theme.elevationShadowColor(Theme.elevationLevel1)
-                                shadowOpacity: Theme.elevationLevel1 && Theme.elevationLevel1.alpha !== undefined ? Theme.elevationLevel1.alpha : 0.2
+                                shadowEnabled: true
+                                shadowHorizontalOffset: 0
+                                shadowVerticalOffset: 4
+                                shadowBlur: 0.8
+                                shadowColor: Qt.rgba(0, 0, 0, 0.2)
+                                shadowOpacity: 0.2
                             }
                         }
 
@@ -813,14 +812,14 @@ Item {
                     x: (pos?.h ?? 0) * skyBox.effectiveWidth - (moonPhase.width / 2) + skyBox.hMargin
                     y: (pos?.v ?? 0) * -(skyBox.effectiveHeight / 2) + skyBox.effectiveHeight / 2 - (moonPhase.height / 2) + skyBox.vMargin
 
-                    layer.enabled: Theme.elevationEnabled
+                    layer.enabled: true
                     layer.effect: MultiEffect {
-                        shadowEnabled: Theme.elevationEnabled
-                        shadowHorizontalOffset: Theme.elevationOffsetX(Theme.elevationLevel2)
-                        shadowVerticalOffset: Theme.elevationOffsetY(Theme.elevationLevel2, 4)
-                        shadowBlur: Theme.elevationEnabled ? Math.max(0, Math.min(1, (Theme.elevationLevel2 && Theme.elevationLevel2.blurPx !== undefined ? Theme.elevationLevel2.blurPx : 8) / Theme.elevationBlurMax)) : 0
-                        blurMax: Theme.elevationBlurMax
-                        shadowColor: Theme.elevationShadowColor(Theme.elevationLevel2)
+                        shadowEnabled: true
+                        shadowHorizontalOffset: 0
+                        shadowVerticalOffset: 4
+                        shadowBlur: 0.8
+                        shadowColor: Qt.rgba(0, 0, 0, 0.2)
+                        shadowOpacity: 0.2
                     }
                 }
 
@@ -835,14 +834,14 @@ Item {
                     x: (pos?.h ?? 0) * skyBox.effectiveWidth - (sun.width / 2) + skyBox.hMargin
                     y: (pos?.v ?? 0) * -(skyBox.effectiveHeight / 2) + skyBox.effectiveHeight / 2 - (sun.height / 2) + skyBox.vMargin
 
-                    layer.enabled: Theme.elevationEnabled
+                    layer.enabled: true
                     layer.effect: MultiEffect {
-                        shadowEnabled: Theme.elevationEnabled
-                        shadowHorizontalOffset: Theme.elevationOffsetX(Theme.elevationLevel2)
-                        shadowVerticalOffset: Theme.elevationOffsetY(Theme.elevationLevel2, 4)
-                        shadowBlur: Theme.elevationEnabled ? Math.max(0, Math.min(1, (Theme.elevationLevel2 && Theme.elevationLevel2.blurPx !== undefined ? Theme.elevationLevel2.blurPx : 8) / Theme.elevationBlurMax)) : 0
-                        blurMax: Theme.elevationBlurMax
-                        shadowColor: Theme.elevationShadowColor(Theme.elevationLevel2)
+                        shadowEnabled: true
+                        shadowHorizontalOffset: 0
+                        shadowVerticalOffset: 4
+                        shadowBlur: 0.8
+                        shadowColor: Qt.rgba(0, 0, 0, 0.2)
+                        shadowOpacity: 0.2
                     }
                 }
             }

quickshell/Modules/Greetd/GreeterContent.qml

@@ -218,7 +218,7 @@ Item {
 
                 property string fullTimeStr: {
                     const format = GreetdSettings.getEffectiveTimeFormat();
-                    return systemClock.date.toLocaleTimeString(I18n.locale(), format);
+                    return systemClock.date.toLocaleTimeString(Qt.locale(), format);
                 }
                 property var timeParts: fullTimeStr.split(':')
                 property string hours: timeParts[0] || ""
@@ -328,9 +328,9 @@ Item {
             anchors.topMargin: 4
             text: {
                 if (GreetdSettings.lockDateFormat && GreetdSettings.lockDateFormat.length > 0) {
-                    return systemClock.date.toLocaleDateString(I18n.locale(), GreetdSettings.lockDateFormat);
+                    return systemClock.date.toLocaleDateString(Qt.locale(), GreetdSettings.lockDateFormat);
                 }
-                return systemClock.date.toLocaleDateString(I18n.locale(), Locale.LongFormat);
+                return systemClock.date.toLocaleDateString(Qt.locale(), Locale.LongFormat);
             }
             font.pixelSize: Theme.fontSizeXLarge
             color: "white"

quickshell/Modules/Lock/LockScreenContent.qml

@@ -333,9 +333,9 @@ Item {
             visible: SettingsData.lockScreenShowDate
             text: {
                 if (SettingsData.lockDateFormat && SettingsData.lockDateFormat.length > 0) {
-                    return systemClock.date.toLocaleDateString(I18n.locale(), SettingsData.lockDateFormat);
+                    return systemClock.date.toLocaleDateString(Qt.locale(), SettingsData.lockDateFormat);
                 }
-                return systemClock.date.toLocaleDateString(I18n.locale(), Locale.LongFormat);
+                return systemClock.date.toLocaleDateString(Qt.locale(), Locale.LongFormat);
             }
             font.pixelSize: Theme.fontSizeXLarge
             color: "white"
@@ -687,24 +687,14 @@ Item {
 
                             anchors.centerIn: parent
                             name: {
-                                if (pam.u2fPending)
-                                    return "passkey";
                                 if (pam.fprint.tries >= SettingsData.maxFprintTries)
                                     return "fingerprint_off";
                                 if (pam.fprint.active)
                                     return "fingerprint";
-                                if (pam.u2f.active)
-                                    return "passkey";
                                 return "lock";
                             }
                             size: 20
-                            color: {
-                                if (pam.fprint.tries >= SettingsData.maxFprintTries)
-                                    return Theme.error;
-                                if (pam.u2fState !== "")
-                                    return Theme.tertiary;
-                                return passwordField.activeFocus ? Theme.primary : Theme.surfaceVariantText;
-                            }
+                            color: pam.fprint.tries >= SettingsData.maxFprintTries ? Theme.error : (passwordField.activeFocus ? Theme.primary : Theme.surfaceVariantText)
                             opacity: pam.passwd.active ? 0 : 1
 
                             Behavior on opacity {
@@ -755,7 +745,8 @@ Item {
                             }
                         }
                         onAccepted: {
-                            if (!demoMode && !pam.passwd.active && !pam.u2fPending) {
+                            if (!demoMode && !pam.passwd.active) {
+                                console.log("Enter pressed, starting PAM authentication");
                                 pam.passwd.start();
                             }
                         }
@@ -765,11 +756,6 @@ Item {
                             }
 
                             if (event.key === Qt.Key_Escape) {
-                                if (pam.u2fPending) {
-                                    pam.cancelU2fPending();
-                                    event.accepted = true;
-                                    return;
-                                }
                                 clear();
                             }
 
@@ -834,11 +820,6 @@ Item {
                             if (root.unlocking) {
                                 return "Unlocking...";
                             }
-                            if (pam.u2fPending) {
-                                if (pam.u2fState === "insert")
-                                    return "Insert your security key...";
-                                return "Touch your security key...";
-                            }
                             if (pam.passwd.active) {
                                 return "Authenticating...";
                             }
@@ -913,7 +894,7 @@ Item {
                         anchors.verticalCenter: parent.verticalCenter
                         iconName: "keyboard"
                         buttonSize: 32
-                        visible: !demoMode && !pam.passwd.active && !root.unlocking && !pam.u2fPending
+                        visible: !demoMode && !pam.passwd.active && !root.unlocking
                         enabled: visible
                         onClicked: {
                             if (keyboardController.isKeyboardActive) {
@@ -1014,10 +995,11 @@ Item {
                         anchors.verticalCenter: parent.verticalCenter
                         iconName: "keyboard_return"
                         buttonSize: 36
-                        visible: (demoMode || (!pam.passwd.active && !root.unlocking && !pam.u2fPending))
+                        visible: (demoMode || (!pam.passwd.active && !root.unlocking))
                         enabled: !demoMode
                         onClicked: {
-                            if (!demoMode && !pam.u2fPending) {
+                            if (!demoMode) {
+                                console.log("Enter button clicked, starting PAM authentication");
                                 pam.passwd.start();
                             }
                         }
@@ -1043,12 +1025,6 @@ Item {
                 Layout.fillWidth: true
                 Layout.preferredHeight: 20
                 text: {
-                    if (pam.u2fState === "insert" && !pam.u2fPending) {
-                        return "Insert your security key...";
-                    }
-                    if (pam.u2fState === "waiting" && !pam.u2fPending) {
-                        return "Touch your security key...";
-                    }
                     if (root.pamState === "error") {
                         return "Authentication error - try again";
                     }
@@ -1060,10 +1036,10 @@ Item {
                     }
                     return "";
                 }
-                color: (pam.u2fState === "waiting" || pam.u2fState === "insert") ? Theme.outline : Theme.error
+                color: Theme.error
                 font.pixelSize: Theme.fontSizeSmall
                 horizontalAlignment: Text.AlignHCenter
-                opacity: (root.pamState !== "" || ((pam.u2fState === "waiting" || pam.u2fState === "insert") && !pam.u2fPending)) ? 1 : 0
+                opacity: root.pamState !== "" ? 1 : 0
 
                 Behavior on opacity {
                     NumberAnimation {
@@ -1631,14 +1607,6 @@ Item {
                 root.passwordBuffer = "";
             }
         }
-        onU2fPendingChanged: {
-            if (u2fPending) {
-                passwordField.text = "";
-                root.passwordBuffer = "";
-                if (keyboardController.isKeyboardActive)
-                    keyboardController.hide();
-            }
-        }
     }
 
     Binding {

quickshell/Modules/Lock/LockSurface.qml

@@ -2,9 +2,8 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell.Wayland
-import qs.Common
 
-FocusScope {
+Rectangle {
     id: root
 
     required property WlSessionLock lock
@@ -15,17 +14,7 @@ FocusScope {
     signal passwordChanged(string newPassword)
     signal unlockRequested
 
-    Keys.onPressed: event => {
-        if (videoScreensaver.active && videoScreensaver.inputEnabled) {
-            videoScreensaver.dismiss();
-            event.accepted = true;
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        color: "transparent"
-    }
+    color: "transparent"
 
     LockScreenContent {
         id: lockContent
@@ -34,38 +23,17 @@ FocusScope {
         demoMode: false
         passwordBuffer: root.sharedPasswordBuffer
         screenName: root.screenName
-        enabled: !videoScreensaver.active
-        focus: !videoScreensaver.active
-        opacity: videoScreensaver.active ? 0 : 1
         onUnlockRequested: root.unlockRequested()
         onPasswordBufferChanged: {
             if (root.sharedPasswordBuffer !== passwordBuffer) {
                 root.passwordChanged(passwordBuffer);
             }
         }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 200
-            }
-        }
     }
 
-    VideoScreensaver {
-        id: videoScreensaver
-        anchors.fill: parent
-        screenName: root.screenName
-    }
-
-    Component.onCompleted: forceActiveFocus()
-
     onIsLockedChanged: {
         if (isLocked) {
-            forceActiveFocus();
             lockContent.resetLockState();
-            if (SettingsData.lockScreenVideoEnabled) {
-                videoScreensaver.start();
-            }
             return;
         }
         lockContent.unlocking = false;