settings: make horizontal change more smart

- Implement deep search icon resolution in DesktopService with runtime caching.
- Update Paths.getAppIcon to utilize enhanced resolution for mismatched app IDs.
- Align Workspace Switcher fallback icons with AppsDock visual style.
- Synchronize fallback text logic between Switcher and Dock using app names.

.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/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/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/loginctl/constants.go

@@ -5,6 +5,5 @@ const (
 	dbusPath             = "/org/freedesktop/login1"
 	dbusManagerInterface = "org.freedesktop.login1.Manager"
 	dbusSessionInterface = "org.freedesktop.login1.Session"
-	dbusUserInterface    = "org.freedesktop.login1.User"
 	dbusPropsInterface   = "org.freedesktop.DBus.Properties"
 )

core/internal/server/loginctl/manager.go

@@ -17,8 +17,15 @@ func NewManager() (*Manager, error) {
 		return nil, fmt.Errorf("failed to connect to system bus: %w", err)
 	}
 
+	sessionID := os.Getenv("XDG_SESSION_ID")
+	if sessionID == "" {
+		sessionID = "self"
+	}
+
 	m := &Manager{
-		state:      &SessionState{},
+		state: &SessionState{
+			SessionID: sessionID,
+		},
 		stateMutex: sync.RWMutex{},
 
 		stopChan: make(chan struct{}),
@@ -53,13 +60,12 @@ func (m *Manager) initialize() error {
 
 	m.initializeFallbackDelay()
 
-	sessionID, sessionPath, err := m.discoverSession()
+	sessionPath, err := m.getSession(m.state.SessionID)
 	if err != nil {
 		return fmt.Errorf("failed to get session path: %w", err)
 	}
 
 	m.stateMutex.Lock()
-	m.state.SessionID = sessionID
 	m.state.SessionPath = string(sessionPath)
 	m.sessionPath = sessionPath
 	m.stateMutex.Unlock()
@@ -73,41 +79,6 @@ func (m *Manager) initialize() error {
 	return nil
 }
 
-func (m *Manager) discoverSession() (string, dbus.ObjectPath, error) {
-	// 1. Explicit XDG_SESSION_ID
-	if id := os.Getenv("XDG_SESSION_ID"); id != "" {
-		if path, err := m.getSession(id); err == nil {
-			fmt.Fprintf(os.Stderr, "loginctl: using XDG_SESSION_ID=%s\n", id)
-			return id, path, nil
-		}
-	}
-
-	// 2. PID-based lookup (works when caller is inside a session cgroup)
-	if id, path, err := m.getSessionByPID(uint32(os.Getpid())); err == nil {
-		fmt.Fprintf(os.Stderr, "loginctl: found session %s via PID\n", id)
-		return id, path, nil
-	}
-
-	// 3. User's primary display session (handles UWSM and similar)
-	if id, path, err := m.getUserDisplaySession(); err == nil {
-		fmt.Fprintf(os.Stderr, "loginctl: found session %s via User.Display\n", id)
-		return id, path, nil
-	}
-
-	// 4. Score all sessions for current UID
-	if id, path, err := m.findBestSession(); err == nil {
-		fmt.Fprintf(os.Stderr, "loginctl: found session %s via ListSessions scoring\n", id)
-		return id, path, nil
-	}
-
-	// 5. Last resort: "self"
-	path, err := m.getSession("self")
-	if err != nil {
-		return "", "", fmt.Errorf("%w", err)
-	}
-	return "self", path, nil
-}
-
 func (m *Manager) getSession(id string) (dbus.ObjectPath, error) {
 	var out dbus.ObjectPath
 	err := m.managerObj.Call(dbusManagerInterface+".GetSession", 0, id).Store(&out)
@@ -117,166 +88,6 @@ func (m *Manager) getSession(id string) (dbus.ObjectPath, error) {
 	return out, nil
 }
 
-func (m *Manager) getSessionByPID(pid uint32) (string, dbus.ObjectPath, error) {
-	var path dbus.ObjectPath
-	if err := m.managerObj.Call(dbusManagerInterface+".GetSessionByPID", 0, pid).Store(&path); err != nil {
-		return "", "", err
-	}
-
-	sessionObj := m.conn.Object(dbusDest, path)
-	var id dbus.Variant
-	if err := sessionObj.Call(dbusPropsInterface+".Get", 0, dbusSessionInterface, "Id").Store(&id); err != nil {
-		return "", "", err
-	}
-	return id.Value().(string), path, nil
-}
-
-func (m *Manager) getUserDisplaySession() (string, dbus.ObjectPath, error) {
-	uid := uint32(os.Getuid())
-
-	var userPath dbus.ObjectPath
-	if err := m.managerObj.Call(dbusManagerInterface+".GetUser", 0, uid).Store(&userPath); err != nil {
-		return "", "", err
-	}
-
-	userObj := m.conn.Object(dbusDest, userPath)
-	var display dbus.Variant
-	if err := userObj.Call(dbusPropsInterface+".Get", 0, dbusUserInterface, "Display").Store(&display); err != nil {
-		return "", "", err
-	}
-
-	pair, ok := display.Value().([]any)
-	if !ok || len(pair) < 2 {
-		return "", "", fmt.Errorf("unexpected Display format")
-	}
-
-	sessionID, _ := pair[0].(string)
-	sessionPath, _ := pair[1].(dbus.ObjectPath)
-	if sessionID == "" || sessionPath == "" {
-		return "", "", fmt.Errorf("empty Display session")
-	}
-
-	return sessionID, sessionPath, nil
-}
-
-type sessionCandidate struct {
-	id   string
-	path dbus.ObjectPath
-}
-
-func (m *Manager) findBestSession() (string, dbus.ObjectPath, error) {
-	// ListSessions returns a(susso): [][]any where each entry is [id, uid, name, seat, path]
-	var raw [][]any
-	if err := m.managerObj.Call(dbusManagerInterface+".ListSessions", 0).Store(&raw); err != nil {
-		return "", "", err
-	}
-
-	uid := uint32(os.Getuid())
-	var candidates []sessionCandidate
-	for _, entry := range raw {
-		if len(entry) < 5 {
-			continue
-		}
-		entryUID, _ := entry[1].(uint32)
-		if entryUID != uid {
-			continue
-		}
-		id, _ := entry[0].(string)
-		path, _ := entry[4].(dbus.ObjectPath)
-		if id != "" && path != "" {
-			candidates = append(candidates, sessionCandidate{id: id, path: path})
-		}
-	}
-	if len(candidates) == 0 {
-		return "", "", fmt.Errorf("no sessions for uid %d", uid)
-	}
-
-	bestScore := -1
-	var best sessionCandidate
-	for _, c := range candidates {
-		score := m.scoreSession(c.path)
-		if score > bestScore {
-			bestScore = score
-			best = c
-		}
-	}
-	if bestScore < 0 {
-		return "", "", fmt.Errorf("no viable session found")
-	}
-	return best.id, best.path, nil
-}
-
-func (m *Manager) scoreSession(path dbus.ObjectPath) int {
-	obj := m.conn.Object(dbusDest, path)
-	var props map[string]dbus.Variant
-	if err := obj.Call(dbusPropsInterface+".GetAll", 0, dbusSessionInterface).Store(&props); err != nil {
-		return -1
-	}
-
-	getStr := func(key string) string {
-		if v, ok := props[key]; ok {
-			if s, ok := v.Value().(string); ok {
-				return s
-			}
-		}
-		return ""
-	}
-	getBool := func(key string) bool {
-		if v, ok := props[key]; ok {
-			if b, ok := v.Value().(bool); ok {
-				return b
-			}
-		}
-		return false
-	}
-	getUint32 := func(key string) uint32 {
-		if v, ok := props[key]; ok {
-			if u, ok := v.Value().(uint32); ok {
-				return u
-			}
-		}
-		return 0
-	}
-
-	class := getStr("Class")
-	if class != "user" {
-		return -1
-	}
-	if getBool("Remote") {
-		return -1
-	}
-
-	score := 0
-
-	if getBool("Active") {
-		score += 100
-	}
-
-	switch getStr("Type") {
-	case "wayland", "x11":
-		score += 80
-	case "tty":
-		score += 10
-	}
-
-	if v, ok := props["Seat"]; ok {
-		if seatArr, ok := v.Value().([]any); ok && len(seatArr) >= 1 {
-			if seat, ok := seatArr[0].(string); ok && seat != "" {
-				score += 40
-				if seat == "seat0" {
-					score += 10
-				}
-			}
-		}
-	}
-
-	if getUint32("VTNr") > 0 {
-		score += 20
-	}
-
-	return score
-}
-
 func (m *Manager) refreshSessionBinding() error {
 	if m.managerObj == nil || m.conn == nil {
 		return fmt.Errorf("manager not fully initialized")

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

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/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

@@ -182,7 +182,6 @@
               with pkgs;
               [
                 go_1_25
-                go-mockery_2
                 gopls
                 delve
                 go-tools

quickshell/CODENAME

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

quickshell/Common/I18n.qml

@@ -8,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;
@@ -23,8 +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
 
@@ -37,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 {
@@ -51,51 +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() {
-        return presentLocales[_resolvedLocale] ?? presentLocales["en"];
-    }
-
-    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 = ({});
@@ -103,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,8 +126,6 @@ Singleton {
     property var hiddenOutputDeviceNames: []
     property var hiddenInputDeviceNames: []
 
-    property string locale: ""
-
     property string launcherLastMode: "all"
     property string appDrawerLastMode: "apps"
     property string niriOverviewLastMode: "apps"
@@ -1108,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

@@ -494,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
@@ -988,7 +982,6 @@ Singleton {
             loadSettings();
             initializeListModels();
             Processes.detectFprintd();
-            Processes.detectU2f();
             Processes.checkPluginSettings();
         }
     }
@@ -1136,7 +1129,7 @@ Singleton {
             "updateCompositorLayout": updateCompositorLayout,
             "applyStoredIconTheme": applyStoredIconTheme,
             "updateBarConfigs": updateBarConfigs,
-            "updateCompositorCursor": updateCompositorCursor,
+            "updateCompositorCursor": updateCompositorCursor
         })
 
     function set(key, value) {

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,8 +79,6 @@ var SPEC = {
     hiddenOutputDeviceNames: { def: [] },
     hiddenInputDeviceNames: { def: [] },
 
-    locale: { def: "", onChange: "updateLocale" },
-
     launcherLastMode: { def: "all" },
     appDrawerLastMode: { def: "apps" },
     niriOverviewLastMode: { def: "apps" }

quickshell/Common/settings/SettingsSpec.js

@@ -317,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 },

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;
         }

quickshell/DMSShell.qml

@@ -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/DankLauncherV2/Controller.qml

@@ -162,11 +162,6 @@ Item {
         }
     ]
 
-    property string fileSearchType: "all"
-    property string fileSearchExt: ""
-    property string fileSearchFolder: ""
-    property string fileSearchSort: "score"
-
     property string pluginFilter: ""
     property string activePluginName: ""
     property var activePluginCategories: []
@@ -351,10 +346,6 @@ Item {
         previousSearchMode = "all";
         autoSwitchedToFiles = false;
         isFileSearching = false;
-        fileSearchType = "all";
-        fileSearchExt = "";
-        fileSearchFolder = "";
-        fileSearchSort = "score";
         sections = [];
         flatModel = [];
         selectedFlatIndex = 0;
@@ -408,34 +399,6 @@ Item {
         performSearch();
     }
 
-    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 = "";
@@ -864,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)
@@ -887,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;
@@ -999,7 +913,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) {
@@ -1667,9 +1581,6 @@ Item {
         case "copy_path":
             copyToClipboard(item.data.path);
             break;
-        case "open_terminal":
-            openTerminal(item.data.path);
-            break;
         case "copy":
             copyToClipboard(item.name);
             break;
@@ -1751,16 +1662,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

@@ -107,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;

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

@@ -549,151 +549,8 @@ 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)
+                height: parent.height - searchField.height - categoryRow.height - actionPanel.height - Theme.spacingXS * (categoryRow.visible ? 3 : 2)
                 opacity: root.parentModal?.isClosing ? 0 : 1
 
                 ResultsList {
@@ -729,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":
@@ -473,15 +465,7 @@ Item {
                             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/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/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/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/DankBarWindow.qml

@@ -624,7 +624,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/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

@@ -41,12 +41,6 @@ BasePill {
         return `${id}::${tooltipTitle}`;
     }
 
-    // ! TODO - replace with either native dbus client (like plugins use) or just a DMS cli or something
-    function callContextMenuFallback(trayItemId, globalX, globalY) {
-        const script = ['ITEMS=$(dbus-send --session --print-reply --dest=org.kde.StatusNotifierWatcher /StatusNotifierWatcher org.freedesktop.DBus.Properties.Get string:org.kde.StatusNotifierWatcher string:RegisteredStatusNotifierItems 2>/dev/null)', 'while IFS= read -r line; do', '  line="${line#*\\\"}"', '  line="${line%\\\"*}"', '  [ -z "$line" ] && continue', '  BUS="${line%%/*}"', '  OBJ="/${line#*/}"', '  ID=$(dbus-send --session --print-reply --dest="$BUS" "$OBJ" org.freedesktop.DBus.Properties.Get string:org.kde.StatusNotifierItem string:Id 2>/dev/null | grep -oP "(?<=\\\")(.*?)(?=\\\")" | tail -1)', '  if [ "$ID" = "$1" ]; then', '    dbus-send --session --type=method_call --dest="$BUS" "$OBJ" org.kde.StatusNotifierItem.ContextMenu int32:"$2" int32:"$3"', '    exit 0', '  fi', 'done <<< "$ITEMS"',].join("\n");
-        Quickshell.execDetached(["bash", "-c", script, "_", trayItemId, String(globalX), String(globalY)]);
-    }
-
     property int _trayOrderTrigger: 0
 
     Connections {
@@ -386,11 +380,8 @@ BasePill {
                                 return;
                             if (mouse.button !== Qt.RightButton)
                                 return;
-                            if (!delegateRoot.trayItem?.hasMenu) {
-                                const gp = trayItemArea.mapToGlobal(mouse.x, mouse.y);
-                                root.callContextMenuFallback(delegateRoot.trayItem.id, Math.round(gp.x), Math.round(gp.y));
+                            if (!delegateRoot.trayItem?.hasMenu)
                                 return;
-                            }
                             root.menuOpen = false;
                             root.showForTrayItem(delegateRoot.trayItem, visualContent, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
                         }
@@ -646,11 +637,8 @@ BasePill {
                                 return;
                             if (mouse.button !== Qt.RightButton)
                                 return;
-                            if (!delegateRoot.trayItem?.hasMenu) {
-                                const gp = trayItemArea.mapToGlobal(mouse.x, mouse.y);
-                                root.callContextMenuFallback(delegateRoot.trayItem.id, Math.round(gp.x), Math.round(gp.y));
+                            if (!delegateRoot.trayItem?.hasMenu)
                                 return;
-                            }
                             root.menuOpen = false;
                             root.showForTrayItem(delegateRoot.trayItem, visualContent, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
                         }
@@ -1077,11 +1065,9 @@ BasePill {
                                     root.menuOpen = false;
                                     return;
                                 }
-                                if (!trayItem.hasMenu) {
-                                    const gp = itemArea.mapToGlobal(mouse.x, mouse.y);
-                                    root.callContextMenuFallback(trayItem.id, Math.round(gp.x), Math.round(gp.y));
+
+                                if (!trayItem.hasMenu)
                                     return;
-                                }
                                 root.showForTrayItem(trayItem, menuContainer, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
                             }
                         }

quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml

@@ -179,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
@@ -223,10 +223,11 @@ Rectangle {
             Repeater {
                 model: {
                     const days = [];
-                    const qtFirst = Qt.locale().firstDayOfWeek;
+                    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/Greetd/GreetdSettings.qml

@@ -41,11 +41,6 @@ Singleton {
     property string lockDateFormat: ""
     property bool lockScreenShowPowerActions: true
     property bool lockScreenShowProfileImage: true
-    property bool powerActionConfirm: true
-    property real powerActionHoldDuration: 0.5
-    property var powerMenuActions: ["reboot", "logout", "poweroff", "lock", "suspend", "restart"]
-    property string powerMenuDefaultAction: "logout"
-    property bool powerMenuGridLayout: false
     property var screenPreferences: ({})
     property int animationSpeed: 2
     property string wallpaperFillMode: "Fill"
@@ -80,11 +75,6 @@ Singleton {
                 lockDateFormat = settings.lockDateFormat !== undefined ? settings.lockDateFormat : "";
                 lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true;
                 lockScreenShowProfileImage = settings.lockScreenShowProfileImage !== undefined ? settings.lockScreenShowProfileImage : true;
-                powerActionConfirm = settings.powerActionConfirm !== undefined ? settings.powerActionConfirm : true;
-                powerActionHoldDuration = settings.powerActionHoldDuration !== undefined ? settings.powerActionHoldDuration : 0.5;
-                powerMenuActions = settings.powerMenuActions !== undefined ? settings.powerMenuActions : ["reboot", "logout", "poweroff", "lock", "suspend", "restart"];
-                powerMenuDefaultAction = settings.powerMenuDefaultAction !== undefined ? settings.powerMenuDefaultAction : "logout";
-                powerMenuGridLayout = settings.powerMenuGridLayout !== undefined ? settings.powerMenuGridLayout : false;
                 screenPreferences = settings.screenPreferences !== undefined ? settings.screenPreferences : ({});
                 animationSpeed = settings.animationSpeed !== undefined ? settings.animationSpeed : 2;
                 wallpaperFillMode = settings.wallpaperFillMode !== undefined ? settings.wallpaperFillMode : "Fill";

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"
@@ -1231,12 +1231,6 @@ Item {
     LockPowerMenu {
         id: powerMenu
         showLogout: false
-        powerActionConfirmOverride: GreetdSettings.powerActionConfirm
-        powerActionHoldDurationOverride: GreetdSettings.powerActionHoldDuration
-        powerMenuActionsOverride: GreetdSettings.powerMenuActions
-        powerMenuDefaultActionOverride: GreetdSettings.powerMenuDefaultAction
-        powerMenuGridLayoutOverride: GreetdSettings.powerMenuGridLayout
-        requiredActions: ["poweroff"]
         onClosed: {
             if (isPrimaryScreen && inputField && inputField.forceActiveFocus) {
                 Qt.callLater(() => inputField.forceActiveFocus());

quickshell/Modules/Lock/LockPowerMenu.qml

@@ -24,20 +24,13 @@ Rectangle {
     property real holdProgress: 0
     property bool showHoldHint: false
 
-    property var powerActionConfirmOverride: undefined
-    property var powerActionHoldDurationOverride: undefined
-    property var powerMenuActionsOverride: undefined
-    property var powerMenuDefaultActionOverride: undefined
-    property var powerMenuGridLayoutOverride: undefined
-    property var requiredActions: []
-
-    readonly property bool needsConfirmation: powerActionConfirmOverride !== undefined ? powerActionConfirmOverride : SettingsData.powerActionConfirm
-    readonly property int holdDurationMs: (powerActionHoldDurationOverride !== undefined ? powerActionHoldDurationOverride : SettingsData.powerActionHoldDuration) * 1000
+    readonly property bool needsConfirmation: SettingsData.powerActionConfirm
+    readonly property int holdDurationMs: SettingsData.powerActionHoldDuration * 1000
 
     signal closed
 
     function updateVisibleActions() {
-        const allActions = powerMenuActionsOverride !== undefined ? powerMenuActionsOverride : ((typeof SettingsData !== "undefined" && SettingsData.powerMenuActions) ? SettingsData.powerMenuActions : ["logout", "suspend", "hibernate", "reboot", "poweroff"]);
+        const allActions = (typeof SettingsData !== "undefined" && SettingsData.powerMenuActions) ? SettingsData.powerMenuActions : ["logout", "suspend", "hibernate", "reboot", "poweroff"];
         const hibernateSupported = (typeof SessionService !== "undefined" && SessionService.hibernateSupported) || false;
         let filtered = allActions.filter(action => {
             if (action === "hibernate" && !hibernateSupported)
@@ -51,14 +44,9 @@ Rectangle {
             return true;
         });
 
-        for (const action of requiredActions) {
-            if (!filtered.includes(action))
-                filtered.push(action);
-        }
-
         visibleActions = filtered;
 
-        useGridLayout = powerMenuGridLayoutOverride !== undefined ? powerMenuGridLayoutOverride : ((typeof SettingsData !== "undefined" && SettingsData.powerMenuGridLayout !== undefined) ? SettingsData.powerMenuGridLayout : false);
+        useGridLayout = (typeof SettingsData !== "undefined" && SettingsData.powerMenuGridLayout !== undefined) ? SettingsData.powerMenuGridLayout : false;
         if (!useGridLayout)
             return;
         const count = visibleActions.length;
@@ -85,7 +73,7 @@ Rectangle {
     }
 
     function getDefaultActionIndex() {
-        const defaultAction = powerMenuDefaultActionOverride !== undefined ? powerMenuDefaultActionOverride : ((typeof SettingsData !== "undefined" && SettingsData.powerMenuDefaultAction) ? SettingsData.powerMenuDefaultAction : "suspend");
+        const defaultAction = (typeof SettingsData !== "undefined" && SettingsData.powerMenuDefaultAction) ? SettingsData.powerMenuDefaultAction : "suspend";
         const index = visibleActions.indexOf(defaultAction);
         return index >= 0 ? index : 0;
     }
@@ -792,9 +780,8 @@ Rectangle {
                     }
 
                     StyledText {
-                        readonly property real totalMs: root.holdDurationMs
+                        readonly property real totalMs: SettingsData.powerActionHoldDuration * 1000
                         readonly property int remainingMs: Math.ceil(totalMs * (1 - root.holdProgress))
-                        readonly property real durationSec: root.holdDurationMs / 1000
                         text: {
                             if (root.showHoldHint)
                                 return I18n.tr("Hold longer to confirm");
@@ -805,7 +792,7 @@ Rectangle {
                             }
                             if (totalMs < 1000)
                                 return I18n.tr("Hold to confirm (%1 ms)").arg(totalMs);
-                            return I18n.tr("Hold to confirm (%1s)").arg(durationSec);
+                            return I18n.tr("Hold to confirm (%1s)").arg(SettingsData.powerActionHoldDuration);
                         }
                         font.pixelSize: Theme.fontSizeSmall
                         color: root.showHoldHint ? Theme.warning : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)

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;

quickshell/Modules/Lock/Pam.qml

@@ -14,51 +14,14 @@ Scope {
 
     readonly property alias passwd: passwd
     readonly property alias fprint: fprint
-    readonly property alias u2f: u2f
     property string lockMessage
     property string state
     property string fprintState
-    property string u2fState
-    property bool u2fPending: false
     property string buffer
 
     signal flashMsg
     signal unlockRequested
 
-    function completeUnlock(): void {
-        if (!unlockInProgress) {
-            unlockInProgress = true;
-            passwd.abort();
-            fprint.abort();
-            u2f.abort();
-            errorRetry.running = false;
-            u2fErrorRetry.running = false;
-            u2fPendingTimeout.running = false;
-            u2fPending = false;
-            u2fState = "";
-            unlockRequested();
-        }
-    }
-
-    function proceedAfterPrimaryAuth(): void {
-        if (SettingsData.enableU2f && SettingsData.u2fMode === "and" && u2f.available) {
-            u2f.startForSecondFactor();
-        } else {
-            completeUnlock();
-        }
-    }
-
-    function cancelU2fPending(): void {
-        if (!u2fPending)
-            return;
-        u2f.abort();
-        u2fErrorRetry.running = false;
-        u2fPendingTimeout.running = false;
-        u2fPending = false;
-        u2fState = "";
-        fprint.checkAvail();
-    }
-
     FileView {
         id: dankshellConfigWatcher
 
@@ -67,9 +30,9 @@ Scope {
     }
 
     FileView {
-        id: u2fConfigWatcher
+        id: loginConfigWatcher
 
-        path: "/etc/pam.d/dankshell-u2f"
+        path: "/etc/pam.d/login"
         printErrors: false
     }
 
@@ -77,7 +40,7 @@ Scope {
         id: passwd
 
         config: dankshellConfigWatcher.loaded ? "dankshell" : "login"
-        configDirectory: dankshellConfigWatcher.loaded ? "/etc/pam.d" : Quickshell.shellDir + "/assets/pam"
+        configDirectory: dankshellConfigWatcher.loaded || loginConfigWatcher.loaded ? "/etc/pam.d" : Quickshell.shellDir + "/assets/pam"
 
         onMessageChanged: {
             if (message.startsWith("The account is locked"))
@@ -96,8 +59,9 @@ Scope {
         onCompleted: res => {
             if (res === PamResult.Success) {
                 if (!root.unlockInProgress) {
+                    root.unlockInProgress = true;
                     fprint.abort();
-                    root.proceedAfterPrimaryAuth();
+                    root.unlockRequested();
                 }
                 return;
             }
@@ -141,8 +105,9 @@ Scope {
 
             if (res === PamResult.Success) {
                 if (!root.unlockInProgress) {
+                    root.unlockInProgress = true;
                     passwd.abort();
-                    root.proceedAfterPrimaryAuth();
+                    root.unlockRequested();
                 }
                 return;
             }
@@ -170,74 +135,6 @@ Scope {
         }
     }
 
-    PamContext {
-        id: u2f
-
-        property bool available
-
-        function checkAvail(): void {
-            if (!available || !SettingsData.enableU2f || !root.lockSecured) {
-                abort();
-                return;
-            }
-
-            if (SettingsData.u2fMode === "or") {
-                start();
-            }
-        }
-
-        function startForSecondFactor(): void {
-            if (!available || !SettingsData.enableU2f) {
-                root.completeUnlock();
-                return;
-            }
-            abort();
-            root.u2fPending = true;
-            root.u2fState = "";
-            u2fPendingTimeout.restart();
-            start();
-        }
-
-        config: u2fConfigWatcher.loaded ? "dankshell-u2f" : "u2f"
-        configDirectory: u2fConfigWatcher.loaded ? "/etc/pam.d" : Quickshell.shellDir + "/assets/pam"
-
-        onMessageChanged: {
-            if (message.toLowerCase().includes("touch"))
-                root.u2fState = "waiting";
-        }
-
-        onCompleted: res => {
-            if (!available || root.unlockInProgress)
-                return;
-
-            if (res === PamResult.Success) {
-                root.completeUnlock();
-                return;
-            }
-
-            if (res === PamResult.Error || res === PamResult.MaxTries || res === PamResult.Failed) {
-                abort();
-
-                if (root.u2fPending) {
-                    if (root.u2fState === "waiting") {
-                        // AND mode: device was found but auth failed → back to password
-                        root.u2fPending = false;
-                        root.u2fState = "";
-                        fprint.checkAvail();
-                    } else {
-                        // AND mode: no device found → keep pending, show "Insert...", retry
-                        root.u2fState = "insert";
-                        u2fErrorRetry.restart();
-                    }
-                } else {
-                    // OR mode: prompt to insert key, silently retry
-                    root.u2fState = "insert";
-                    u2fErrorRetry.restart();
-                }
-            }
-        }
-    }
-
     Process {
         id: availProc
 
@@ -248,16 +145,6 @@ Scope {
         }
     }
 
-    Process {
-        id: u2fAvailProc
-
-        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\")"]
-        onExited: code => {
-            u2f.available = code === 0;
-            u2f.checkAvail();
-        }
-    }
-
     Timer {
         id: errorRetry
 
@@ -265,20 +152,6 @@ Scope {
         onTriggered: fprint.start()
     }
 
-    Timer {
-        id: u2fErrorRetry
-
-        interval: 800
-        onTriggered: u2f.start()
-    }
-
-    Timer {
-        id: u2fPendingTimeout
-
-        interval: 30000
-        onTriggered: root.cancelU2fPending()
-    }
-
     Timer {
         id: stateReset
 
@@ -302,22 +175,13 @@ Scope {
     onLockSecuredChanged: {
         if (lockSecured) {
             availProc.running = true;
-            u2fAvailProc.running = true;
             root.state = "";
             root.fprintState = "";
-            root.u2fState = "";
-            root.u2fPending = false;
             root.lockMessage = "";
             root.unlockInProgress = false;
         } else {
             fprint.abort();
             passwd.abort();
-            u2f.abort();
-            errorRetry.running = false;
-            u2fErrorRetry.running = false;
-            u2fPendingTimeout.running = false;
-            root.u2fPending = false;
-            root.u2fState = "";
             root.unlockInProgress = false;
         }
     }
@@ -328,20 +192,5 @@ Scope {
         function onEnableFprintChanged(): void {
             fprint.checkAvail();
         }
-
-        function onEnableU2fChanged(): void {
-            u2f.checkAvail();
-        }
-
-        function onU2fModeChanged(): void {
-            if (root.lockSecured) {
-                u2f.abort();
-                u2fErrorRetry.running = false;
-                u2fPendingTimeout.running = false;
-                root.u2fPending = false;
-                root.u2fState = "";
-                u2f.checkAvail();
-            }
-        }
     }
 }

quickshell/Modules/Lock/VideoScreensaver.qml

@@ -1,200 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell.Io
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-
-    required property string screenName
-    property bool active: false
-    property string videoSource: ""
-    property bool inputEnabled: false
-    property point lastMousePos: Qt.point(-1, -1)
-    property bool mouseInitialized: false
-    property var videoPlayer: null
-
-    signal dismissed
-
-    visible: active
-    z: 1000
-
-    Rectangle {
-        id: background
-        anchors.fill: parent
-        color: "black"
-        visible: root.active
-    }
-
-    Timer {
-        id: inputEnableTimer
-        interval: 500
-        onTriggered: root.inputEnabled = true
-    }
-
-    Process {
-        id: videoPicker
-        property string result: ""
-        property string folder: ""
-
-        command: ["sh", "-c", "find '" + folder + "' -maxdepth 1 -type f \\( " + "-iname '*.mp4' -o -iname '*.mkv' -o -iname '*.webm' -o " + "-iname '*.mov' -o -iname '*.avi' -o -iname '*.m4v' " + "\\) 2>/dev/null | shuf -n1"]
-
-        stdout: SplitParser {
-            onRead: data => {
-                const path = data.trim();
-                if (path) {
-                    videoPicker.result = path;
-                    root.videoSource = "file://" + path;
-                }
-            }
-        }
-
-        onExited: exitCode => {
-            if (exitCode !== 0 || !videoPicker.result) {
-                console.warn("VideoScreensaver: no video found in folder");
-                ToastService.showError(I18n.tr("Video Screensaver"), I18n.tr("No video found in folder"));
-                root.dismiss();
-            }
-        }
-    }
-
-    Process {
-        id: fileChecker
-        command: ["test", "-d", SettingsData.lockScreenVideoPath]
-
-        onExited: exitCode => {
-            const isDir = exitCode === 0;
-            const videoPath = SettingsData.lockScreenVideoPath;
-
-            if (isDir) {
-                videoPicker.folder = videoPath;
-                videoPicker.running = true;
-            } else if (SettingsData.lockScreenVideoCycling) {
-                const parentFolder = videoPath.substring(0, videoPath.lastIndexOf('/'));
-                videoPicker.folder = parentFolder;
-                videoPicker.running = true;
-            } else {
-                root.videoSource = "file://" + videoPath;
-            }
-        }
-    }
-
-    function createVideoPlayer() {
-        if (videoPlayer)
-            return true;
-
-        try {
-            videoPlayer = Qt.createQmlObject(`
-                import QtQuick
-                import QtMultimedia
-                Video {
-                    anchors.fill: parent
-                    fillMode: VideoOutput.PreserveAspectCrop
-                    loops: MediaPlayer.Infinite
-                    volume: 0
-                }
-            `, background, "VideoScreensaver.VideoPlayer");
-
-            videoPlayer.errorOccurred.connect((error, errorString) => {
-                console.warn("VideoScreensaver: playback error:", errorString);
-                ToastService.showError(I18n.tr("Video Screensaver"), I18n.tr("Playback error: ") + errorString);
-                root.dismiss();
-            });
-
-            return true;
-        } catch (e) {
-            console.warn("VideoScreensaver: Failed to create video player:", e);
-            return false;
-        }
-    }
-
-    function destroyVideoPlayer() {
-        if (videoPlayer) {
-            videoPlayer.stop();
-            videoPlayer.destroy();
-            videoPlayer = null;
-        }
-    }
-
-    function start() {
-        if (!SettingsData.lockScreenVideoEnabled || !SettingsData.lockScreenVideoPath)
-            return;
-
-        if (!MultimediaService.available) {
-            ToastService.showError(I18n.tr("Video Screensaver"), I18n.tr("QtMultimedia is not available"));
-            return;
-        }
-
-        if (!createVideoPlayer())
-            return;
-
-        videoPicker.result = "";
-        videoPicker.folder = "";
-        inputEnabled = false;
-        mouseInitialized = false;
-        lastMousePos = Qt.point(-1, -1);
-        active = true;
-        inputEnableTimer.start();
-        fileChecker.running = true;
-    }
-
-    function dismiss() {
-        if (!active)
-            return;
-        destroyVideoPlayer();
-        inputEnabled = false;
-        active = false;
-        videoSource = "";
-        dismissed();
-    }
-
-    onVideoSourceChanged: {
-        if (videoSource && active && videoPlayer) {
-            videoPlayer.source = videoSource;
-            videoPlayer.play();
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        enabled: root.active && root.inputEnabled
-        hoverEnabled: true
-        propagateComposedEvents: false
-
-        onPositionChanged: mouse => {
-            if (!root.mouseInitialized) {
-                root.lastMousePos = Qt.point(mouse.x, mouse.y);
-                root.mouseInitialized = true;
-                return;
-            }
-            var dx = Math.abs(mouse.x - root.lastMousePos.x);
-            var dy = Math.abs(mouse.y - root.lastMousePos.y);
-            if (dx > 5 || dy > 5) {
-                root.dismiss();
-            }
-        }
-        onClicked: root.dismiss()
-        onPressed: root.dismiss()
-        onWheel: root.dismiss()
-    }
-
-    Connections {
-        target: IdleService
-
-        function onLockRequested() {
-            if (SettingsData.lockScreenVideoEnabled && !root.active) {
-                root.start();
-            }
-        }
-
-        function onFadeToLockRequested() {
-            if (SettingsData.lockScreenVideoEnabled && !root.active) {
-                IdleService.cancelFadeToLock();
-                root.start();
-            }
-        }
-    }
-}

quickshell/Modules/Notifications/Center/NotificationSettings.qml

@@ -34,51 +34,51 @@ Rectangle {
 
     readonly property var timeoutOptions: [
         {
-            "text": I18n.tr("Never"),
+            "text": "Never",
             "value": 0
         },
         {
-            "text": I18n.tr("1 second"),
+            "text": "1 second",
             "value": 1000
         },
         {
-            "text": I18n.tr("3 seconds"),
+            "text": "3 seconds",
             "value": 3000
         },
         {
-            "text": I18n.tr("5 seconds"),
+            "text": "5 seconds",
             "value": 5000
         },
         {
-            "text": I18n.tr("8 seconds"),
+            "text": "8 seconds",
             "value": 8000
         },
         {
-            "text": I18n.tr("10 seconds"),
+            "text": "10 seconds",
             "value": 10000
         },
         {
-            "text": I18n.tr("15 seconds"),
+            "text": "15 seconds",
             "value": 15000
         },
         {
-            "text": I18n.tr("30 seconds"),
+            "text": "30 seconds",
             "value": 30000
         },
         {
-            "text": I18n.tr("1 minute"),
+            "text": "1 minute",
             "value": 60000
         },
         {
-            "text": I18n.tr("2 minutes"),
+            "text": "2 minutes",
             "value": 120000
         },
         {
-            "text": I18n.tr("5 minutes"),
+            "text": "5 minutes",
             "value": 300000
         },
         {
-            "text": I18n.tr("10 minutes"),
+            "text": "10 minutes",
             "value": 600000
         }
     ]

quickshell/Modules/Plugins/DesktopPluginWrapper.qml

@@ -351,7 +351,6 @@ Item {
         Loader {
             id: contentLoader
             anchors.fill: parent
-            active: root.widgetEnabled && root.activeComponent !== null
             sourceComponent: root.activeComponent
 
             function reloadComponent() {

quickshell/Modules/Settings/DankBarTab.qml

@@ -305,9 +305,7 @@ Item {
                                                 const prefs = cfg?.screenPreferences || ["all"];
                                                 if (prefs.includes("all") || (typeof prefs[0] === "string" && prefs[0] === "all"))
                                                     return I18n.tr("All displays");
-                                                return prefs.length === 1
-                                                    ? I18n.tr("%1 display").arg(prefs.length)
-                                                    : I18n.tr("%1 displays").arg(prefs.length);
+                                                return I18n.tr("%1 display(s)").replace("%1", prefs.length);
                                             }
                                             font.pixelSize: Theme.fontSizeSmall
                                             color: Theme.surfaceVariantText

quickshell/Modules/Settings/KeybindsTab.qml

@@ -344,11 +344,7 @@ Item {
                                         return I18n.tr("%1 exists but is not included in config. Custom keybinds will not work until this is fixed.").arg(bindsFile);
                                     if (warningBox.showWarning) {
                                         const count = warningBox.status.overriddenBy;
-                                        return I18n.ntr(
-                                            "%1 DMS bind may be overridden by config binds that come after the include.",
-                                            "%1 DMS binds may be overridden by config binds that come after the include.",
-                                            count
-                                        ).arg(count);
+                                        return I18n.tr("%1 DMS bind(s) may be overridden by config binds that come after the include.").arg(count);
                                     }
                                     return "";
                                 }

quickshell/Modules/Settings/LauncherTab.qml

@@ -1170,7 +1170,7 @@ Item {
                                     spacing: 2
 
                                     StyledText {
-                                        text: modelData.name || I18n.tr("Unknown App")
+                                        text: modelData.name || "Unknown App"
                                         font.pixelSize: Theme.fontSizeMedium
                                         font.weight: Font.Medium
                                         color: Theme.surfaceText
@@ -1179,7 +1179,7 @@ Item {
                                     StyledText {
                                         text: {
                                             if (!modelData.lastUsed)
-                                                return I18n.tr("Never used");
+                                                return "Never used";
                                             var date = new Date(modelData.lastUsed);
                                             var now = new Date();
                                             var diffMs = now - date;
@@ -1189,17 +1189,11 @@ Item {
                                             if (diffMins < 1)
                                                 return I18n.tr("Last launched just now");
                                             if (diffMins < 60)
-                                                return diffMins === 1
-                                                    ? I18n.tr("Last launched %1 minute ago").arg(diffMins)
-                                                    : I18n.tr("Last launched %1 minutes ago").arg(diffMins);
+                                                return I18n.tr("Last launched %1 minute%2 ago").arg(diffMins).arg(diffMins === 1 ? "" : "s");
                                             if (diffHours < 24)
-                                                return diffHours === 1
-                                                    ? I18n.tr("Last launched %1 hour ago").arg(diffHours)
-                                                    : I18n.tr("Last launched %1 hours ago").arg(diffHours);
+                                                return I18n.tr("Last launched %1 hour%2 ago").arg(diffHours).arg(diffHours === 1 ? "" : "s");
                                             if (diffDays < 7)
-                                                return diffDays === 1
-                                                    ? I18n.tr("Last launched %1 day ago").arg(diffDays)
-                                                    : I18n.tr("Last launched %1 days ago").arg(diffDays);
+                                                return I18n.tr("Last launched %1 day%2 ago").arg(diffDays).arg(diffDays === 1 ? "" : "s");
                                             return I18n.tr("Last launched %1").arg(date.toLocaleDateString());
                                         }
                                         font.pixelSize: Theme.fontSizeSmall

quickshell/Modules/Settings/LocaleTab.qml

@@ -1,74 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.Settings.Widgets
-
-Item {
-    id: localeTab
-
-    readonly property string _systemDefaultLabel: I18n.tr("System Default")
-
-    function capitalizeNativeLanguageName(localeCode) {
-        if (I18n.presentLocales[localeCode] == undefined) {
-            return;
-        }
-        const nativeName = I18n.presentLocales[localeCode].nativeLanguageName;
-        return nativeName[0].toUpperCase() + nativeName.slice(1);
-    }
-
-    function _displayValue() {
-        if (!SessionData.locale) return _systemDefaultLabel;
-        return capitalizeNativeLanguageName(SessionData.locale);
-    }
-
-    DankFlickable {
-        anchors.fill: parent
-        clip: true
-        contentHeight: mainColumn.height + Theme.spacingXL
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-            topPadding: 4
-            width: Math.min(550, parent.width - Theme.spacingL * 2)
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: Theme.spacingXL
-
-            SettingsCard {
-                tab: "locale"
-                tags: ["locale", "language", "country"]
-                title: I18n.tr("Locale Settings")
-                iconName: "language"
-
-                SettingsDropdownRow {
-                    id: localeDropdown
-                    tab: "locale"
-                    tags: ["locale", "language", "country"]
-                    settingKey: "locale"
-                    text: I18n.tr("Current Locale")
-                    description: I18n.tr("Change the locale used by the DMS interface.")
-                    options: [localeTab._systemDefaultLabel].concat(Object.keys(I18n.presentLocales).map(localeTab.capitalizeNativeLanguageName))
-                    enableFuzzySearch: true
-
-                    Component.onCompleted: {
-                        currentValue = localeTab._displayValue();
-                    }
-
-                    onValueChanged: value => {
-                        if (value === localeTab._systemDefaultLabel) {
-                            SessionData.set("locale", "");
-                            return;
-                        }
-                        for (let code of Object.keys(I18n.presentLocales)) {
-                            if (localeTab.capitalizeNativeLanguageName(code) === value) {
-                                SessionData.set("locale", code);
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/Settings/LockScreenTab.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import Quickshell
 import qs.Common
-import qs.Modals.FileBrowser
 import qs.Services
 import qs.Widgets
 import qs.Modules.Settings.Widgets
@@ -9,16 +8,6 @@ import qs.Modules.Settings.Widgets
 Item {
     id: root
 
-    FileBrowserModal {
-        id: videoBrowserModal
-        browserTitle: I18n.tr("Select Video or Folder")
-        browserIcon: "movie"
-        browserType: "video"
-        showHiddenFiles: false
-        fileExtensions: ["*.mp4", "*.mkv", "*.webm", "*.mov", "*.avi", "*.m4v"]
-        onFileSelected: path => SettingsData.set("lockScreenVideoPath", path)
-    }
-
     DankFlickable {
         anchors.fill: parent
         clip: true
@@ -172,120 +161,11 @@ Item {
                     settingKey: "enableFprint"
                     tags: ["lock", "screen", "fingerprint", "authentication", "biometric", "fprint"]
                     text: I18n.tr("Enable fingerprint authentication")
-                    description: SettingsData.fprintdAvailable ? I18n.tr("Use fingerprint reader for lock screen authentication (requires enrolled fingerprints)") : I18n.tr("Not enrolled", "fingerprint not detected status")
-                    descriptionColor: SettingsData.fprintdAvailable ? Theme.surfaceVariantText : Theme.warning
+                    description: I18n.tr("Use fingerprint reader for lock screen authentication (requires enrolled fingerprints)")
                     checked: SettingsData.enableFprint
-                    enabled: SettingsData.fprintdAvailable
+                    visible: SettingsData.fprintdAvailable
                     onToggled: checked => SettingsData.set("enableFprint", checked)
                 }
-
-                SettingsToggleRow {
-                    settingKey: "enableU2f"
-                    tags: ["lock", "screen", "u2f", "yubikey", "security", "key", "fido", "authentication", "hardware"]
-                    text: I18n.tr("Enable security key authentication", "Enable FIDO2/U2F hardware security key for lock screen")
-                    description: SettingsData.u2fAvailable ? I18n.tr("Use a FIDO2/U2F security key (e.g. YubiKey) for lock screen authentication (requires enrolled keys)", "lock screen U2F security key setting") : I18n.tr("Not enrolled", "security key not detected status")
-                    descriptionColor: SettingsData.u2fAvailable ? Theme.surfaceVariantText : Theme.warning
-                    checked: SettingsData.enableU2f
-                    enabled: SettingsData.u2fAvailable
-                    onToggled: checked => SettingsData.set("enableU2f", checked)
-                }
-
-                SettingsDropdownRow {
-                    settingKey: "u2fMode"
-                    tags: ["lock", "screen", "u2f", "yubikey", "security", "key", "mode", "factor", "second"]
-                    text: I18n.tr("Security key mode", "lock screen U2F security key mode setting")
-                    description: I18n.tr("'Alternative' lets the key unlock on its own. 'Second factor' requires password or fingerprint first, then the key.", "lock screen U2F security key mode setting")
-                    visible: SettingsData.u2fAvailable && SettingsData.enableU2f
-                    options: [I18n.tr("Alternative (OR)", "U2F mode option: key works as standalone unlock method"), I18n.tr("Second Factor (AND)", "U2F mode option: key required after password or fingerprint")]
-                    currentValue: SettingsData.u2fMode === "and" ? I18n.tr("Second Factor (AND)", "U2F mode option: key required after password or fingerprint") : I18n.tr("Alternative (OR)", "U2F mode option: key works as standalone unlock method")
-                    onValueChanged: value => {
-                        if (value === I18n.tr("Second Factor (AND)", "U2F mode option: key required after password or fingerprint"))
-                            SettingsData.set("u2fMode", "and");
-                        else
-                            SettingsData.set("u2fMode", "or");
-                    }
-                }
-            }
-
-            SettingsCard {
-                width: parent.width
-                iconName: "movie"
-                title: I18n.tr("Video Screensaver")
-                settingKey: "videoScreensaver"
-
-                StyledText {
-                    visible: !MultimediaService.available
-                    text: I18n.tr("QtMultimedia is not available - video screensaver requires qt multimedia services")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.warning
-                    width: parent.width
-                    wrapMode: Text.WordWrap
-                }
-
-                SettingsToggleRow {
-                    settingKey: "lockScreenVideoEnabled"
-                    tags: ["lock", "screen", "video", "screensaver", "animation", "movie"]
-                    text: I18n.tr("Enable Video Screensaver")
-                    description: I18n.tr("Play a video when the screen locks.")
-                    enabled: MultimediaService.available
-                    checked: SettingsData.lockScreenVideoEnabled
-                    onToggled: checked => SettingsData.set("lockScreenVideoEnabled", checked)
-                }
-
-                Column {
-                    width: parent.width
-                    spacing: Theme.spacingXS
-                    visible: SettingsData.lockScreenVideoEnabled && MultimediaService.available
-
-                    StyledText {
-                        text: I18n.tr("Video Path")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Path to a video file or folder containing videos")
-                        font.pixelSize: Theme.fontSizeXSmall
-                        color: Theme.outlineVariant
-                        wrapMode: Text.WordWrap
-                        width: parent.width
-                    }
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingS
-
-                        DankTextField {
-                            id: videoPathField
-                            width: parent.width - browseVideoButton.width - Theme.spacingS
-                            placeholderText: I18n.tr("/path/to/videos")
-                            text: SettingsData.lockScreenVideoPath
-                            backgroundColor: Theme.surfaceContainerHighest
-                            onTextChanged: {
-                                if (text !== SettingsData.lockScreenVideoPath) {
-                                    SettingsData.set("lockScreenVideoPath", text);
-                                }
-                            }
-                        }
-
-                        DankButton {
-                            id: browseVideoButton
-                            text: I18n.tr("Browse")
-                            onClicked: videoBrowserModal.open()
-                        }
-                    }
-                }
-
-                SettingsToggleRow {
-                    settingKey: "lockScreenVideoCycling"
-                    tags: ["lock", "screen", "video", "screensaver", "cycling", "random", "shuffle"]
-                    text: I18n.tr("Automatic Cycling")
-                    description: I18n.tr("Pick a different random video each time from the same folder")
-                    visible: SettingsData.lockScreenVideoEnabled && MultimediaService.available
-                    enabled: MultimediaService.available
-                    checked: SettingsData.lockScreenVideoCycling
-                    onToggled: checked => SettingsData.set("lockScreenVideoCycling", checked)
-                }
             }
 
             SettingsCard {

quickshell/Modules/Settings/NetworkTab.qml

@@ -340,9 +340,7 @@ Item {
                                     if (devices.length === 0)
                                         return I18n.tr("No adapters");
                                     if (connected === 0)
-                                        return devices.length === 1
-                                            ? I18n.tr("%1 adapter, none connected").arg(devices.length)
-                                            : I18n.tr("%1 adapters, none connected").arg(devices.length);
+                                        return I18n.tr("%1 adapter(s), none connected").arg(devices.length);
                                     return I18n.tr("%1 connected").arg(connected);
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
@@ -1283,15 +1281,6 @@ Item {
                                                     }
                                                 }
 
-                                                DankActionButton {
-                                                    iconName: "qr_code"
-                                                    buttonSize: 28
-                                                    visible: modelData.secured && modelData.saved
-                                                    onClicked: {
-                                                        PopoutService.showWifiQRCodeModal(modelData.ssid);
-                                                    }
-                                                }
-
                                                 DankActionButton {
                                                     iconName: isPinned ? "push_pin" : "push_pin"
                                                     buttonSize: 28

quickshell/Modules/Settings/PrinterTab.qml

@@ -548,7 +548,7 @@ Item {
                                     const count = CupsService.printerNames.length;
                                     if (count === 0)
                                         return I18n.tr("No printers configured");
-                                    return I18n.ntr("%1 printer", "%1 printers", count).arg(count);
+                                    return I18n.tr("%1 printer(s)").arg(count);
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Theme.surfaceVariantText
@@ -698,7 +698,7 @@ Item {
                                                     }
 
                                                     StyledText {
-                                                        text: I18n.ntr("%1 job", "%1 jobs", printerData?.jobs?.length ?? 0).arg(printerData?.jobs?.length ?? 0)
+                                                        text: I18n.tr("%1 job(s)").arg(printerData?.jobs?.length ?? 0)
                                                         font.pixelSize: Theme.fontSizeSmall
                                                         color: Theme.surfaceVariantText
                                                         visible: (printerData?.jobs?.length ?? 0) > 0
@@ -1245,7 +1245,7 @@ Item {
                             }
 
                             StyledText {
-                                text: I18n.ntr("%1 class", "%1 classes", CupsService.printerClasses.length).arg(CupsService.printerClasses.length)
+                                text: I18n.tr("%1 class(es)").arg(CupsService.printerClasses.length)
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Theme.surfaceVariantText
                                 width: parent.width
@@ -1310,7 +1310,7 @@ Item {
                                         }
 
                                         StyledText {
-                                            text: I18n.ntr("%1 printer", "%1 printers", modelData.members?.length ?? 0).arg(modelData.members?.length ?? 0)
+                                            text: I18n.tr("%1 printer(s)").arg(modelData.members?.length ?? 0)
                                             font.pixelSize: Theme.fontSizeSmall
                                             color: Theme.surfaceVariantText
                                         }

quickshell/Modules/Settings/ThemeColorsTab.qml

@@ -1908,7 +1908,6 @@ Item {
                 tags: ["modal", "darken", "background", "overlay"]
                 title: I18n.tr("Modal Background")
                 settingKey: "modalBackground"
-                iconName: "layers"
 
                 SettingsToggleRow {
                     tab: "theme"
@@ -1926,7 +1925,7 @@ Item {
                 tags: ["applications", "portal", "dark", "terminal"]
                 title: I18n.tr("Applications")
                 settingKey: "applications"
-                iconName: "apps"
+                iconName: "terminal"
 
                 SettingsToggleRow {
                     tab: "theme"
@@ -2453,7 +2452,6 @@ Item {
                 tags: ["icon", "theme", "system"]
                 title: I18n.tr("Icon Theme")
                 settingKey: "iconTheme"
-                iconName: "interests"
 
                 SettingsDropdownRow {
                     tab: "theme"
@@ -2480,7 +2478,7 @@ Item {
                 tags: ["system", "app", "theming", "gtk", "qt"]
                 title: I18n.tr("System App Theming")
                 settingKey: "systemAppTheming"
-                iconName: "brush"
+                iconName: "extension"
                 visible: Theme.matugenAvailable
 
                 Row {

quickshell/Modules/Settings/TimeWeatherTab.qml

@@ -74,7 +74,7 @@ Item {
                     tags: ["date", "format", "topbar"]
                     settingKey: "clockDateFormat"
                     text: I18n.tr("Top Bar Format")
-                    description: "Preview: " + (SettingsData.clockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.clockDateFormat) : new Date().toLocaleDateString(I18n.locale(), "ddd d"))
+                    description: "Preview: " + (SettingsData.clockDateFormat ? new Date().toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat) : new Date().toLocaleDateString(Qt.locale(), "ddd d"))
                     options: [I18n.tr("System Default", "date format option"), I18n.tr("Day Date", "date format option"), I18n.tr("Day Month Date", "date format option"), I18n.tr("Month Date", "date format option"), I18n.tr("Numeric (M/D)", "date format option"), I18n.tr("Numeric (D/M)", "date format option"), I18n.tr("Full with Year", "date format option"), I18n.tr("ISO Date", "date format option"), I18n.tr("Full Day & Month", "date format option"), I18n.tr("Custom...", "date format option")]
                     currentValue: {
                         if (!SettingsData.clockDateFormat || SettingsData.clockDateFormat.length === 0)
@@ -161,7 +161,7 @@ Item {
                     tags: ["date", "format", "lock", "screen"]
                     settingKey: "lockDateFormat"
                     text: I18n.tr("Lock Screen Format")
-                    description: "Preview: " + (SettingsData.lockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.lockDateFormat) : new Date().toLocaleDateString(I18n.locale(), Locale.LongFormat))
+                    description: "Preview: " + (SettingsData.lockDateFormat ? new Date().toLocaleDateString(Qt.locale(), SettingsData.lockDateFormat) : new Date().toLocaleDateString(Qt.locale(), Locale.LongFormat))
                     options: [I18n.tr("System Default", "date format option"), I18n.tr("Day Date", "date format option"), I18n.tr("Day Month Date", "date format option"), I18n.tr("Month Date", "date format option"), I18n.tr("Numeric (M/D)", "date format option"), I18n.tr("Numeric (D/M)", "date format option"), I18n.tr("Full with Year", "date format option"), I18n.tr("ISO Date", "date format option"), I18n.tr("Full Day & Month", "date format option"), I18n.tr("Custom...", "date format option")]
                     currentValue: {
                         if (!SettingsData.lockDateFormat || SettingsData.lockDateFormat.length === 0)

quickshell/Modules/Settings/Widgets/SystemMonitorVariantCard.qml

@@ -216,15 +216,6 @@ Rectangle {
                 onToggled: checked => root.updateConfig("showMemoryGraph", checked)
             }
 
-            DankToggle {
-                width: parent.width - Theme.spacingM * 2
-                x: Theme.spacingM
-                text: I18n.tr("Show Memory in GB")
-                visible: root.cfg.showMemory
-                checked: root.cfg.showInGb ?? false
-                onToggled: checked => root.updateConfig("showInGb", checked)
-            }
-
             SettingsDivider {}
 
             DankToggle {

quickshell/Modules/Settings/WidgetsTab.qml

@@ -398,14 +398,10 @@ Item {
             widgetObj.runningAppsCurrentWorkspace = SettingsData.runningAppsCurrentWorkspace;
             widgetObj.runningAppsCurrentMonitor = false;
         }
-        if (widgetId === "diskUsage") {
+        if (widgetId === "diskUsage")
             widgetObj.mountPath = "/";
-            widgetObj.diskUsageMode = 0;
-        }
         if (widgetId === "cpuUsage" || widgetId === "memUsage" || widgetId === "cpuTemp" || widgetId === "gpuTemp")
             widgetObj.minimumWidth = true;
-        if (widgetId === "memUsage")
-            widgetObj.showInGb = false;
 
         var widgets = getWidgetsForSection(targetSection).slice();
         widgets.push(widgetObj);
@@ -429,7 +425,7 @@ Item {
             "id": widget.id,
             "enabled": widget.enabled
         };
-        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "diskUsageMode", "minimumWidth", "showSwap", "showInGb", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge"];
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "minimumWidth", "showSwap", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge"];
         for (var i = 0; i < keys.length; i++) {
             if (widget[keys[i]] !== undefined)
                 result[keys[i]] = widget[keys[i]];
@@ -540,30 +536,6 @@ Item {
         setWidgetsForSection(sectionId, widgets);
     }
 
-    function handleShowInGbChanged(sectionId, widgetIndex, enabled) {
-        var widgets = getWidgetsForSection(sectionId).slice();
-        if (widgetIndex < 0 || widgetIndex >= widgets.length) {
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-        var newWidget = cloneWidgetData(widgets[widgetIndex]);
-        newWidget.showInGb = enabled;
-        widgets[widgetIndex] = newWidget;
-        setWidgetsForSection(sectionId, widgets);
-    }
-
-    function handleDiskUsageModeChanged(sectionId, widgetIndex, mode) {
-        var widgets = getWidgetsForSection(sectionId).slice();
-        if (widgetIndex < 0 || widgetIndex >= widgets.length) {
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-        var newWidget = cloneWidgetData(widgets[widgetIndex]);
-        newWidget.diskUsageMode = mode;
-        widgets[widgetIndex] = newWidget;
-        setWidgetsForSection(sectionId, widgets);
-    }
-
     function handleOverflowSettingChanged(sectionId, widgetIndex, settingName, value) {
         var widgets = getWidgetsForSection(sectionId).slice();
         if (widgetIndex < 0 || widgetIndex >= widgets.length) {
@@ -629,8 +601,6 @@ Item {
                     item.pciId = widget.pciId;
                 if (widget.mountPath !== undefined)
                     item.mountPath = widget.mountPath;
-                if (widget.diskUsageMode !== undefined)
-                    item.diskUsageMode = widget.diskUsageMode;
                 if (widget.showNetworkIcon !== undefined)
                     item.showNetworkIcon = widget.showNetworkIcon;
                 if (widget.showBluetoothIcon !== undefined)
@@ -659,8 +629,6 @@ Item {
                     item.minimumWidth = widget.minimumWidth;
                 if (widget.showSwap !== undefined)
                     item.showSwap = widget.showSwap;
-                if (widget.showInGb !== undefined)
-                    item.showInGb = widget.showInGb;
                 if (widget.mediaSize !== undefined)
                     item.mediaSize = widget.mediaSize;
                 if (widget.clockCompactMode !== undefined)
@@ -957,12 +925,6 @@ Item {
                         onShowSwapChanged: (sectionId, index, enabled) => {
                             widgetsTab.handleShowSwapChanged(sectionId, index, enabled);
                         }
-                        onShowInGbChanged: (sectionId, index, enabled) => {
-                            widgetsTab.handleShowInGbChanged(sectionId, index, enabled);
-                        }
-                        onDiskUsageModeChanged: (sectionId, widgetIndex, mode) => {
-                            widgetsTab.handleDiskUsageModeChanged(sectionId, widgetIndex, mode);
-                        }
                         onCompactModeChanged: (widgetId, value) => {
                             widgetsTab.handleCompactModeChanged(sectionId, widgetId, value);
                         }
@@ -1021,12 +983,6 @@ Item {
                         onShowSwapChanged: (sectionId, index, enabled) => {
                             widgetsTab.handleShowSwapChanged(sectionId, index, enabled);
                         }
-                        onShowInGbChanged: (sectionId, index, enabled) => {
-                            widgetsTab.handleShowInGbChanged(sectionId, index, enabled);
-                        }
-                        onDiskUsageModeChanged: (sectionId, widgetIndex, mode) => {
-                            widgetsTab.handleDiskUsageModeChanged(sectionId, widgetIndex, mode);
-                        }
                         onCompactModeChanged: (widgetId, value) => {
                             widgetsTab.handleCompactModeChanged(sectionId, widgetId, value);
                         }
@@ -1085,12 +1041,6 @@ Item {
                         onShowSwapChanged: (sectionId, index, enabled) => {
                             widgetsTab.handleShowSwapChanged(sectionId, index, enabled);
                         }
-                        onShowInGbChanged: (sectionId, index, enabled) => {
-                            widgetsTab.handleShowInGbChanged(sectionId, index, enabled);
-                        }
-                        onDiskUsageModeChanged: (sectionId, widgetIndex, mode) => {
-                            widgetsTab.handleDiskUsageModeChanged(sectionId, widgetIndex, mode);
-                        }
                         onCompactModeChanged: (widgetId, value) => {
                             widgetsTab.handleCompactModeChanged(sectionId, widgetId, value);
                         }

quickshell/Modules/Settings/WidgetsTabSection.qml

@@ -30,8 +30,6 @@ Column {
     signal privacySettingChanged(string sectionId, int widgetIndex, string settingName, bool value)
     signal minimumWidthChanged(string sectionId, int widgetIndex, bool enabled)
     signal showSwapChanged(string sectionId, int widgetIndex, bool enabled)
-    signal showInGbChanged(string sectionId, int widgetIndex, bool enabled)
-    signal diskUsageModeChanged(string sectionId, int widgetIndex, int mode)
     signal overflowSettingChanged(string sectionId, int widgetIndex, string settingName, var value)
 
     function cloneWidgetData(widget) {
@@ -39,7 +37,7 @@ Column {
             "id": widget.id,
             "enabled": widget.enabled
         };
-        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "diskUsageMode", "minimumWidth", "showSwap", "showInGb", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge"];
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "minimumWidth", "showSwap", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge"];
         for (var i = 0; i < keys.length; i++) {
             if (widget[keys[i]] !== undefined)
                 result[keys[i]] = widget[keys[i]];
@@ -69,6 +67,53 @@ Column {
             color: Theme.surfaceText
             Layout.alignment: Qt.AlignVCenter
         }
+
+        Item {
+            height: 1
+            Layout.fillWidth: true
+        }
+
+        RowLayout {
+            spacing: Theme.spacingXS
+            Layout.alignment: Qt.AlignVCenter
+            visible: root.sectionId === "center"
+
+            DankActionButton {
+                id: indexCenterButton
+                buttonSize: 28
+                iconName: "format_list_numbered"
+                iconSize: 16
+                iconColor: SettingsData.centeringMode === "index" ? Theme.primary : Theme.outline
+                onClicked: {
+                    console.log("Centering mode changed to: index");
+                    SettingsData.set("centeringMode", "index");
+                }
+                onEntered: {
+                    sharedTooltip.show("Index Centering", indexCenterButton, 0, 0, "bottom");
+                }
+                onExited: {
+                    sharedTooltip.hide();
+                }
+            }
+
+            DankActionButton {
+                id: geometricCenterButton
+                buttonSize: 28
+                iconName: "center_focus_weak"
+                iconSize: 16
+                iconColor: SettingsData.centeringMode === "geometric" ? Theme.primary : Theme.outline
+                onClicked: {
+                    console.log("Centering mode changed to: geometric");
+                    SettingsData.set("centeringMode", "geometric");
+                }
+                onEntered: {
+                    sharedTooltip.show("Geometric Centering", geometricCenterButton, 0, 0, "bottom");
+                }
+                onExited: {
+                    sharedTooltip.hide();
+                }
+            }
+        }
     }
 
     Column {
@@ -90,7 +135,6 @@ Column {
                 height: 70
                 z: held ? 2 : 1
 
-
                 Rectangle {
                     id: itemBackground
 
@@ -231,34 +275,6 @@ Column {
                             }
                         }
 
-                        DankActionButton {
-                            id: diskMenuButton
-                            visible: modelData.id === "diskUsage"
-                            buttonSize: 32
-                            iconName: "more_vert"
-                            iconSize: 18
-                            iconColor: Theme.outline
-                            onClicked: {
-                                diskUsageContextMenu.widgetData = modelData;
-                                diskUsageContextMenu.sectionId = root.sectionId;
-                                diskUsageContextMenu.widgetIndex = index;
-
-                                var buttonPos = diskMenuButton.mapToItem(root, 0, 0);
-                                var xPos = buttonPos.x - diskUsageContextMenu.width - Theme.spacingS;
-                                if (xPos < 0)
-                                    xPos = buttonPos.x + diskMenuButton.width + Theme.spacingS;
-                                var yPos = buttonPos.y - diskUsageContextMenu.height / 2 + diskMenuButton.height / 2;
-                                if (yPos < 0)
-                                    yPos = Theme.spacingS;
-                                else if (yPos + diskUsageContextMenu.height > root.height)
-                                    yPos = root.height - diskUsageContextMenu.height - Theme.spacingS;
-
-                                diskUsageContextMenu.x = xPos;
-                                diskUsageContextMenu.y = yPos;
-                                diskUsageContextMenu.open();
-                            }
-                        }
-
                         Item {
                             width: 32
                             height: 32
@@ -338,36 +354,23 @@ Column {
                         }
 
                         DankActionButton {
-                            id: memMenuButton
+                            id: showSwapButton
+                            buttonSize: 28
                             visible: modelData.id === "memUsage"
-                            buttonSize: 32
-                            iconName: "more_vert"
-                            iconSize: 18
-                            iconColor: Theme.outline
+                            iconName: "swap_horiz"
+                            iconSize: 16
+                            iconColor: (modelData.showSwap !== undefined ? modelData.showSwap : false) ? Theme.primary : Theme.outline
                             onClicked: {
-                                memUsageContextMenu.widgetData = modelData;
-                                memUsageContextMenu.sectionId = root.sectionId;
-                                memUsageContextMenu.widgetIndex = index;
-
-                                var buttonPos = memMenuButton.mapToItem(root, 0, 0);
-                                var popupWidth = memUsageContextMenu.width;
-                                var popupHeight = memUsageContextMenu.height;
-
-                                var xPos = buttonPos.x - popupWidth - Theme.spacingS;
-                                if (xPos < 0) {
-                                    xPos = buttonPos.x + memMenuButton.width + Theme.spacingS;
-                                }
-
-                                var yPos = buttonPos.y - popupHeight / 2 + memMenuButton.height / 2;
-                                if (yPos < 0) {
-                                    yPos = Theme.spacingS;
-                                } else if (yPos + popupHeight > root.height) {
-                                    yPos = root.height - popupHeight - Theme.spacingS;
-                                }
-
-                                memUsageContextMenu.x = xPos;
-                                memUsageContextMenu.y = yPos;
-                                memUsageContextMenu.open();
+                                var currentEnabled = modelData.showSwap !== undefined ? modelData.showSwap : false;
+                                root.showSwapChanged(root.sectionId, index, !currentEnabled);
+                            }
+                            onEntered: {
+                                var currentEnabled = modelData.showSwap !== undefined ? modelData.showSwap : false;
+                                const tooltipText = currentEnabled ? "Hide Swap" : "Show Swap";
+                                sharedTooltip.show(tooltipText, showSwapButton, 0, 0, "bottom");
+                            }
+                            onExited: {
+                                sharedTooltip.hide();
                             }
                         }
 
@@ -796,257 +799,6 @@ Column {
         }
     }
 
-    Popup {
-        id: memUsageContextMenu
-
-        property var widgetData: null
-        property string sectionId: ""
-        property int widgetIndex: -1
-
-        width: 200
-        height: 80
-        padding: 0
-        modal: true
-        focus: true
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-        background: Rectangle {
-            color: Theme.surfaceContainer
-            radius: Theme.cornerRadius
-            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-            border.width: 0
-        }
-
-        contentItem: Item {
-            Column {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingS
-                spacing: 2
-
-                Rectangle {
-                    width: parent.width
-                    height: 32
-                    radius: Theme.cornerRadius
-                    color: swapToggleArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "swap_horiz"
-                            size: 16
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Show Swap")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Normal
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        id: swapToggle
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: 40
-                        height: 20
-                        checked: memUsageContextMenu.widgetData?.showSwap ?? false
-                        onToggled: {
-                            root.showSwapChanged(memUsageContextMenu.sectionId, memUsageContextMenu.widgetIndex, toggled);
-                        }
-                    }
-
-                    MouseArea {
-                        id: swapToggleArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onPressed: {
-                            swapToggle.checked = !swapToggle.checked;
-                            root.showSwapChanged(memUsageContextMenu.sectionId, memUsageContextMenu.widgetIndex, swapToggle.checked);
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 32
-                    radius: Theme.cornerRadius
-                    color: gbToggleArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "straighten"
-                            size: 16
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Show in GB")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Normal
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        id: gbToggle
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: 40
-                        height: 20
-                        checked: memUsageContextMenu.widgetData?.showInGb ?? false
-                        onToggled: {
-                            root.showInGbChanged(memUsageContextMenu.sectionId, memUsageContextMenu.widgetIndex, toggled);
-                        }
-                    }
-
-                    MouseArea {
-                        id: gbToggleArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onPressed: {
-                            gbToggle.checked = !gbToggle.checked;
-                            root.showInGbChanged(memUsageContextMenu.sectionId, memUsageContextMenu.widgetIndex, gbToggle.checked);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Popup {
-        id: diskUsageContextMenu
-
-        property var widgetData: null
-        property string sectionId: ""
-        property int widgetIndex: -1
-        readonly property var currentWidgetData: (widgetIndex >= 0 && widgetIndex < root.items.length) ? root.items[widgetIndex] : widgetData
-
-        width: 240
-        height: diskMenuColumn.implicitHeight + Theme.spacingS * 2
-        padding: 0
-        modal: true
-        focus: true
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-        background: Rectangle {
-            color: Theme.surfaceContainer
-            radius: Theme.cornerRadius
-            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-            border.width: 0
-        }
-
-        contentItem: Item {
-            Column {
-                id: diskMenuColumn
-                anchors.fill: parent
-                anchors.margins: Theme.spacingS
-                spacing: 2
-
-                Rectangle {
-                    width: parent.width
-                    height: 32
-                    radius: Theme.cornerRadius
-                    color: "transparent"
-
-                    StyledText {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        text: I18n.tr("Disk Usage Display")
-                        font.pixelSize: Theme.fontSizeSmall
-                        font.weight: Font.Medium
-                        color: Theme.surfaceText
-                    }
-                }
-
-                Repeater {
-                    model: [
-                        { label: I18n.tr("Percentage"), mode: 0, icon: "percent" },
-                        { label: I18n.tr("Total"), mode: 1, icon: "storage" },
-                        { label: I18n.tr("Remaining"), mode: 2, icon: "hourglass_empty" },
-                        { label: I18n.tr("Remaining / Total"), mode: 3, icon: "pie_chart" }
-                    ]
-
-                    delegate: Rectangle {
-                        required property var modelData
-                        required property int index
-
-                        width: diskMenuColumn.width
-                        height: 32
-                        radius: Theme.cornerRadius
-                        color: diskOptionArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                        function isSelected() {
-                            return (diskUsageContextMenu.currentWidgetData?.diskUsageMode ?? 0) === modelData.mode;
-                        }
-
-                        Row {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingS
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingS
-
-                            DankIcon {
-                                name: modelData.icon
-                                size: 16
-                                color: isSelected() ? Theme.primary : Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            StyledText {
-                                text: modelData.label
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: isSelected() ? Theme.primary : Theme.surfaceText
-                                font.weight: isSelected() ? Font.Medium : Font.Normal
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        DankIcon {
-                            anchors.right: parent.right
-                            anchors.rightMargin: Theme.spacingS
-                            anchors.verticalCenter: parent.verticalCenter
-                            name: "check"
-                            size: 16
-                            color: Theme.primary
-                            visible: isSelected()
-                        }
-
-                        MouseArea {
-                            id: diskOptionArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                root.diskUsageModeChanged(diskUsageContextMenu.sectionId, diskUsageContextMenu.widgetIndex, modelData.mode);
-                                diskUsageContextMenu.close();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     Popup {
         id: controlCenterContextMenu
 

quickshell/PLUGINS/ExampleDesktopClock/DesktopClock.qml

@@ -128,7 +128,7 @@ DesktopPluginComponent {
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.bottom: parent.bottom
                 anchors.bottomMargin: Theme.spacingXS
-                text: systemClock.date?.toLocaleDateString(I18n.locale(), "ddd, MMM d") ?? ""
+                text: systemClock.date?.toLocaleDateString(Qt.locale(), "ddd, MMM d") ?? ""
                 font.pixelSize: Theme.fontSizeSmall
                 font.weight: Font.Medium
                 color: Theme.surfaceText
@@ -163,7 +163,7 @@ DesktopPluginComponent {
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: timeText.bottom
                 anchors.topMargin: Theme.spacingXS
-                text: systemClock.date?.toLocaleDateString(I18n.locale(), "ddd, MMM d") ?? ""
+                text: systemClock.date?.toLocaleDateString(Qt.locale(), "ddd, MMM d") ?? ""
                 font.pixelSize: digitalRoot.dateFontSize
                 color: Theme.surfaceText
             }

quickshell/Services/AudioService.qml

@@ -7,7 +7,6 @@ import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Pipewire
 import qs.Common
-import qs.Services
 
 Singleton {
     id: root
@@ -15,7 +14,7 @@ Singleton {
     readonly property PwNode sink: Pipewire.defaultAudioSink
     readonly property PwNode source: Pipewire.defaultAudioSource
 
-    readonly property bool soundsAvailable: MultimediaService.available
+    property bool soundsAvailable: false
     property bool gsettingsAvailable: false
     property var availableSoundThemes: []
     property string currentSoundTheme: ""
@@ -313,6 +312,24 @@ EOFCONFIG
         }
     }
 
+    function detectSoundsAvailability() {
+        try {
+            const testObj = Qt.createQmlObject(`
+                import QtQuick
+                import QtMultimedia
+                Item {}
+            `, root, "AudioService.TestComponent");
+            if (testObj) {
+                testObj.destroy();
+            }
+            soundsAvailable = true;
+            return true;
+        } catch (e) {
+            soundsAvailable = false;
+            return false;
+        }
+    }
+
     function checkGsettings() {
         Proc.runCommand("checkGsettings", ["sh", "-c", "gsettings get org.gnome.desktop.sound theme-name 2>/dev/null"], (output, exitCode) => {
             gsettingsAvailable = (exitCode === 0);
@@ -1011,7 +1028,10 @@ EOFCONFIG
     }
 
     Component.onCompleted: {
-        if (soundsAvailable) {
+        if (!detectSoundsAvailability()) {
+            console.warn("AudioService: QtMultimedia not available - sound effects disabled");
+        } else {
+            console.info("AudioService: Sound effects enabled");
             checkGsettings();
             Qt.callLater(createSoundPlayers);
         }

quickshell/Services/BatteryService.qml

@@ -56,8 +56,8 @@ Singleton {
     }
     readonly property bool isCharging: batteryAvailable && batteries.some(b => b.state === UPowerDeviceState.Charging)
 
-    // Is the system plugged in (Is not running on battery)
-    readonly property bool isPluggedIn: !UPower.onBattery
+    // Is the system plugged in (none of the batteries are discharging or empty)
+    readonly property bool isPluggedIn: batteryAvailable && batteries.every(b => b.state !== UPowerDeviceState.Discharging)
     readonly property bool isLowBattery: batteryAvailable && batteryLevel <= 20
 
     onIsPluggedInChanged: {

quickshell/Services/CalendarService.qml

@@ -157,12 +157,12 @@ Singleton {
                         // Parse start and end dates using detected format
                         let startDate, endDate
                         if (event['start-date']) {
-                            startDate = Date.fromLocaleString(I18n.locale(), event['start-date'], root.khalDateFormat)
+                            startDate = Date.fromLocaleString(Qt.locale(), event['start-date'], root.khalDateFormat)
                         } else {
                             startDate = new Date()
                         }
                         if (event['end-date']) {
-                            endDate = Date.fromLocaleString(I18n.locale(), event['end-date'], root.khalDateFormat)
+                            endDate = Date.fromLocaleString(Qt.locale(), event['end-date'], root.khalDateFormat)
                         } else {
                             endDate = new Date(startDate)
                         }

quickshell/Services/ChangelogService.qml

@@ -11,7 +11,7 @@ Singleton {
     id: root
 
     readonly property string currentVersion: "1.4"
-    readonly property bool changelogEnabled: false
+    readonly property bool changelogEnabled: true
 
     readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell"
     readonly property string changelogMarkerPath: configDir + "/.changelog-" + currentVersion

quickshell/Services/DSearchService.qml

@@ -1,6 +1,8 @@
 pragma Singleton
+
 pragma ComponentBehavior: Bound
 
+import QtCore
 import QtQuick
 import Quickshell
 import Quickshell.Io
@@ -11,9 +13,6 @@ Singleton {
 
     property bool dsearchAvailable: false
     property int searchIdCounter: 0
-    property int indexVersion: 0
-    property bool supportsTypeFilter: false
-    property bool versionChecked: false
 
     signal searchResultsReceived(var results)
     signal statsReceived(var stats)
@@ -27,157 +26,118 @@ Singleton {
         stdout: SplitParser {
             onRead: line => {
                 if (line && line.trim().length > 0) {
-                    root.dsearchAvailable = true;
+                    root.dsearchAvailable = true
                 }
             }
         }
 
         onExited: exitCode => {
             if (exitCode !== 0) {
-                root.dsearchAvailable = false;
-            } else {
-                root._checkVersion();
+                root.dsearchAvailable = false
             }
         }
     }
 
-    function _checkVersion() {
-        Proc.runCommand("dsearch-version", ["dsearch", "version", "--json"], (stdout, exitCode) => {
-            root.versionChecked = true;
-            if (exitCode !== 0)
-                return;
-            const response = JSON.parse(stdout);
-            root.indexVersion = response.index_schema || 0;
-            root.supportsTypeFilter = root.indexVersion >= 2;
-        });
-    }
-
     function ping(callback) {
         if (!dsearchAvailable) {
             if (callback) {
-                callback({
-                    "error": "dsearch not available"
-                });
+                callback({ "error": "dsearch not available" })
             }
-            return;
+            return
         }
 
         Proc.runCommand("dsearch-ping", ["dsearch", "ping", "--json"], (stdout, exitCode) => {
             if (callback) {
                 if (exitCode === 0) {
                     try {
-                        const response = JSON.parse(stdout);
-                        callback({
-                            "result": response
-                        });
+                        const response = JSON.parse(stdout)
+                        callback({ "result": response })
                     } catch (e) {
-                        callback({
-                            "error": "failed to parse ping response"
-                        });
+                        callback({ "error": "failed to parse ping response" })
                     }
                 } else {
-                    callback({
-                        "error": "ping failed"
-                    });
+                    callback({ "error": "ping failed" })
                 }
             }
-        });
+        })
     }
 
     function search(query, params, callback) {
         if (!query || query.length === 0) {
             if (callback) {
-                callback({
-                    "error": "query is required"
-                });
+                callback({ "error": "query is required" })
             }
-            return;
+            return
         }
 
         if (!dsearchAvailable) {
             if (callback) {
-                callback({
-                    "error": "dsearch not available"
-                });
+                callback({ "error": "dsearch not available" })
             }
-            return;
+            return
         }
 
-        const args = ["dsearch", "search", query, "--json"];
+        const args = ["dsearch", "search", query, "--json"]
 
         if (params) {
             if (params.limit !== undefined) {
-                args.push("-n", String(params.limit));
-            }
-            if (params.type) {
-                args.push("-t", params.type);
+                args.push("-n", String(params.limit))
             }
             if (params.ext) {
-                args.push("-e", params.ext);
-            }
-            if (params.folder) {
-                args.push("--folder", params.folder);
+                args.push("-e", params.ext)
             }
             if (params.field) {
-                args.push("-f", params.field);
+                args.push("-f", params.field)
             }
             if (params.fuzzy) {
-                args.push("--fuzzy");
+                args.push("--fuzzy")
             }
             if (params.sort) {
-                args.push("--sort", params.sort);
+                args.push("--sort", params.sort)
             }
             if (params.desc !== undefined) {
-                args.push("--desc=" + (params.desc ? "true" : "false"));
+                args.push("--desc=" + (params.desc ? "true" : "false"))
             }
             if (params.minSize !== undefined) {
-                args.push("--min-size", String(params.minSize));
+                args.push("--min-size", String(params.minSize))
             }
             if (params.maxSize !== undefined) {
-                args.push("--max-size", String(params.maxSize));
+                args.push("--max-size", String(params.maxSize))
             }
         }
 
         Proc.runCommand("dsearch-search", args, (stdout, exitCode) => {
             if (exitCode === 0) {
                 try {
-                    const response = JSON.parse(stdout);
-                    searchResultsReceived(response);
+                    const response = JSON.parse(stdout)
+                    searchResultsReceived(response)
                     if (callback) {
-                        callback({
-                            "result": response
-                        });
+                        callback({ "result": response })
                     }
                 } catch (e) {
-                    const error = "failed to parse search response";
-                    errorOccurred(error);
+                    const error = "failed to parse search response"
+                    errorOccurred(error)
                     if (callback) {
-                        callback({
-                            "error": error
-                        });
+                        callback({ "error": error })
                     }
                 }
             } else if (exitCode === 124) {
-                const error = "search timed out";
-                errorOccurred(error);
+                const error = "search timed out"
+                errorOccurred(error)
                 if (callback) {
-                    callback({
-                        "error": error
-                    });
+                    callback({ "error": error })
                 }
             } else {
-                const error = "search failed";
-                errorOccurred(error);
+                const error = "search failed"
+                errorOccurred(error)
                 if (callback) {
-                    callback({
-                        "error": error
-                    });
+                    callback({ "error": error })
                 }
             }
-        }, 100, 5000);
+        }, 100, 5000)
     }
 
     function rediscover() {
-        checkProcess.running = true;
+        checkProcess.running = true
     }
 }

quickshell/Services/MultimediaService.qml

@@ -1,35 +0,0 @@
-pragma Singleton
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-
-Singleton {
-    id: root
-
-    property bool available: false
-
-    function detectAvailability() {
-        try {
-            const testObj = Qt.createQmlObject(`
-                import QtQuick
-                import QtMultimedia
-                Item {}
-            `, root, "MultimediaService.TestComponent");
-            if (testObj) {
-                testObj.destroy();
-            }
-            available = true;
-            return true;
-        } catch (e) {
-            available = false;
-            return false;
-        }
-    }
-
-    Component.onCompleted: {
-        if (!detectAvailability()) {
-            console.warn("MultimediaService: QtMultimedia not available");
-        }
-    }
-}

quickshell/Services/NotificationService.qml

@@ -252,7 +252,7 @@ Singleton {
         if (daysDiff === 0)
             return timeStr;
         try {
-            const localeName = (typeof I18n !== "undefined" && I18n.locale) ? I18n.locale().name : "en-US";
+            const localeName = (typeof Qt !== "undefined" && Qt.locale) ? Qt.locale().name : "en-US";
             const weekday = date.toLocaleDateString(localeName, {
                 weekday: "long"
             });
@@ -695,7 +695,7 @@ Singleton {
             }
 
             try {
-                const localeName = (typeof I18n !== "undefined" && I18n.locale) ? I18n.locale().name : "en-US";
+                const localeName = (typeof Qt !== "undefined" && Qt.locale) ? Qt.locale().name : "en-US";
                 const weekday = time.toLocaleDateString(localeName, {
                     weekday: "long"
                 });

quickshell/Services/PopoutService.qml

@@ -41,8 +41,6 @@ Singleton {
     property var notificationModal: null
     property var wifiPasswordModal: null
     property var wifiPasswordModalLoader: null
-    property var wifiQRCodeModal: null
-    property var wifiQRCodeModalLoader: null
     property var polkitAuthModal: null
     property var polkitAuthModalLoader: null
     property var bluetoothPairingModal: null
@@ -663,13 +661,6 @@ Singleton {
             wifiPasswordModal.show(ssid);
     }
 
-    function showWifiQRCodeModal(ssid) {
-        if (wifiQRCodeModalLoader)
-            wifiQRCodeModalLoader.active = true;
-        if (wifiQRCodeModal)
-            wifiQRCodeModal.show(ssid);
-    }
-
     function showHiddenNetworkModal() {
         if (wifiPasswordModalLoader)
             wifiPasswordModalLoader.active = true;

quickshell/Services/SystemUpdateService.qml

@@ -259,7 +259,7 @@ Singleton {
         const terminal = Quickshell.env("TERMINAL") || "xterm";
 
         if (SettingsData.updaterUseCustomCommand && SettingsData.updaterCustomCommand.length > 0) {
-            const updateCommand = `${SettingsData.updaterCustomCommand} && echo -n "Updates complete! " ; echo "Press Enter to close..." && read`;
+            const updateCommand = `${SettingsData.updaterCustomCommand} && echo "Updates complete! Press Enter to close..." && read`;
             const termClass = SettingsData.updaterTerminalAdditionalParams;
 
             var finalCommand = [terminal];
@@ -274,7 +274,7 @@ Singleton {
         } else {
             const params = packageManagerParams[pkgManager].upgradeSettings.params.join(" ");
             const sudo = packageManagerParams[pkgManager].upgradeSettings.requiresSudo ? "sudo" : "";
-            const updateCommand = `${sudo} ${pkgManager} ${params} && echo -n "Updates complete! " ; echo "Press Enter to close..." && read`;
+            const updateCommand = `${sudo} ${pkgManager} ${params} && echo "Updates complete! Press Enter to close..." && read`;
 
             updater.command = [terminal, "-e", "sh", "-c", updateCommand];
         }

quickshell/Services/WeatherService.qml

@@ -444,7 +444,7 @@ Singleton {
 
         const date = new Date();
         date.setDate(date.getDate() + index);
-        const locale = I18n.locale();
+        const locale = Qt.locale();
         return locale.dayName(date.getDay(), Locale.ShortFormat);
     }
 

quickshell/VERSION

@@ -1 +1 @@
-v1.5-beta
+v1.4.3

quickshell/Widgets/DankCircularImage.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Window
 import QtQuick.Effects
 import qs.Common
 import qs.Widgets
@@ -19,30 +18,9 @@ Rectangle {
 
     signal imageSaved(string filePath)
 
-    property string _pendingSavePath: ""
-    property var _attachedWindow: root.Window.window
-
-    on_AttachedWindowChanged: {
-        if (_attachedWindow && _pendingSavePath !== "") {
-            Qt.callLater(function () {
-                if (root._pendingSavePath !== "") {
-                    let path = root._pendingSavePath;
-                    root._pendingSavePath = "";
-                    root.saveImageToFile(path);
-                }
-            });
-        }
-    }
-
     function saveImageToFile(filePath) {
         if (activeImage.status !== Image.Ready)
             return false;
-
-        if (!activeImage.Window.window) {
-            _pendingSavePath = filePath;
-            return true;
-        }
-
         activeImage.grabToImage(function (result) {
             if (result && result.saveToFile(filePath)) {
                 root.imageSaved(filePath);

quickshell/Widgets/DankPopout.qml

@@ -289,7 +289,7 @@ Item {
         visible: false
         color: "transparent"
         Component.onCompleted: {
-            if (typeof updatesEnabled !== "undefined" && !root.overlayContent)
+            if (typeof updatesEnabled !== "undefined")
                 updatesEnabled = false;
         }
 

quickshell/assets/pam/u2f

@@ -1,3 +0,0 @@
-#%PAM-1.0
-
-auth    required    pam_u2f.so  cue nouserok timeout=10

quickshell/matugen/templates/neovim.lua

@@ -4,12 +4,10 @@ return {
 		priority = 1000,
 		config = function()
 			require('base16-colorscheme').setup({
-
-				base00 = '{{colors.background.dark.hex}}',
-				base01 = '{{colors.surface_container_low.dark.hex}}',
-				base02 = '{{colors.surface_container.dark.hex}}',
-				base03 = '{{dank16.color8.dark.hex}}',
-				base0B = '{{dank16.color3.dark.hex}}',
+				base00 = '{{dank16.color0.default.hex}}',
+				base01 = '{{dank16.color0.default.hex}}',
+				base02 = '{{dank16.color8.default.hex}}',
+				base03 = '{{dank16.color8.default.hex}}',
 				base04 = '{{dank16.color7.default.hex}}',
 				base05 = '{{dank16.color15.default.hex}}',
 				base06 = '{{dank16.color15.default.hex}}',
@@ -17,12 +15,65 @@ return {
 				base08 = '{{dank16.color9.default.hex}}',
 				base09 = '{{dank16.color9.default.hex}}',
 				base0A = '{{dank16.color12.default.hex}}',
+				base0B = '{{dank16.color10.default.hex}}',
 				base0C = '{{dank16.color14.default.hex}}',
 				base0D = '{{dank16.color12.default.hex}}',
 				base0E = '{{dank16.color13.default.hex}}',
 				base0F = '{{dank16.color13.default.hex}}',
 			})
 
+			vim.api.nvim_set_hl(0, 'Visual', {
+				bg = '{{dank16.color8.default.hex}}',
+				fg = '{{dank16.color15.default.hex}}',
+				bold = true
+			})
+			vim.api.nvim_set_hl(0, 'Statusline', {
+				bg = '{{dank16.color12.default.hex}}',
+				fg = '{{dank16.color0.default.hex}}',
+			})
+			vim.api.nvim_set_hl(0, 'LineNr', { fg = '{{dank16.color8.default.hex}}' })
+			vim.api.nvim_set_hl(0, 'CursorLineNr', { fg = '{{dank16.color14.default.hex}}', bold = true })
+
+			vim.api.nvim_set_hl(0, 'Statement', {
+				fg = '{{dank16.color13.default.hex}}',
+				bold = true
+			})
+			vim.api.nvim_set_hl(0, 'Keyword', { link = 'Statement' })
+			vim.api.nvim_set_hl(0, 'Repeat', { link = 'Statement' })
+			vim.api.nvim_set_hl(0, 'Conditional', { link = 'Statement' })
+
+			vim.api.nvim_set_hl(0, 'Function', {
+				fg = '{{dank16.color12.default.hex}}',
+				bold = true
+			})
+			vim.api.nvim_set_hl(0, 'Macro', {
+				fg = '{{dank16.color12.default.hex}}',
+				italic = true
+			})
+			vim.api.nvim_set_hl(0, '@function.macro', { link = 'Macro' })
+
+			vim.api.nvim_set_hl(0, 'Type', {
+				fg = '{{dank16.color14.default.hex}}',
+				bold = true,
+				italic = true
+			})
+			vim.api.nvim_set_hl(0, 'Structure', { link = 'Type' })
+
+			vim.api.nvim_set_hl(0, 'String', {
+				fg = '{{dank16.color10.default.hex}}',
+				italic = true
+			})
+
+			vim.api.nvim_set_hl(0, 'Operator', { fg = '{{dank16.color7.default.hex}}' })
+			vim.api.nvim_set_hl(0, 'Delimiter', { fg = '{{dank16.color7.default.hex}}' })
+			vim.api.nvim_set_hl(0, '@punctuation.bracket', { link = 'Delimiter' })
+			vim.api.nvim_set_hl(0, '@punctuation.delimiter', { link = 'Delimiter' })
+
+			vim.api.nvim_set_hl(0, 'Comment', {
+				fg = '{{dank16.color8.default.hex}}',
+				italic = true
+			})
+
 			local current_file_path = vim.fn.stdpath("config") .. "/lua/plugins/dankcolors.lua"
 			if not _G._matugen_theme_watcher then
 				local uv = vim.uv or vim.loop

quickshell/translations/extract_settings_index.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-import json
 import re
+import json
 from collections import Counter
 from pathlib import Path
 
@@ -82,15 +82,7 @@ CATEGORY_KEYWORDS = {
     "Displays": ["monitor", "screen", "resolution"],
     "Desktop Widgets": ["conky", "desktop clock"],
     "Audio": ["sound", "volume", "speaker", "microphone", "headphones", "pipewire"],
-    "Window Rules": [
-        "window",
-        "rules",
-        "matching",
-        "floating",
-        "fullscreen",
-        "opacity",
-    ],
-    "Locale": ["locale", "language", "country"],
+    "Window Rules": ["window", "rules", "matching", "floating", "fullscreen", "opacity"],
 }
 
 TAB_INDEX_MAP = {
@@ -123,7 +115,6 @@ TAB_INDEX_MAP = {
     "DesktopWidgetsTab.qml": 27,
     "WindowRulesTab.qml": 28,
     "AudioTab.qml": 29,
-    "LocaleTab.qml": 30,
 }
 
 TAB_CATEGORY_MAP = {
@@ -156,7 +147,6 @@ TAB_CATEGORY_MAP = {
     27: "Desktop Widgets",
     28: "Window Rules",
     29: "Audio",
-    30: "Locale",
 }
 
 SEARCHABLE_COMPONENTS = [

quickshell/translations/poexports/it.json

@@ -2,26 +2,17 @@
   "%1 Animation Speed": {
     "%1 Animation Speed": "Velocità Animazione %1"
   },
-  "%1 DMS bind may be overridden by config binds that come after the include.": {
-    "%1 DMS bind may be overridden by config binds that come after the include.": "%1 associazione tasti di DMS potrebbe essere sovrascritta da scorciatoie di config successive all'inclusione."
+  "%1 DMS bind(s) may be overridden by config binds that come after the include.": {
+    "%1 DMS bind(s) may be overridden by config binds that come after the include.": "%1 associazione/i tasti di DMS potrebbe/ero essere sovrascritta/e da scorciatoie di config successive all'inclusione."
   },
-  "%1 DMS binds may be overridden by config binds that come after the include.": {
-    "%1 DMS binds may be overridden by config binds that come after the include.": "%1 associazioni tasti di DMS potrebbero essere sovrascritte da scorciatoie di config successive all'inclusione."
-  },
-  "%1 adapter, none connected": {
-    "%1 adapter, none connected": "%1 adattatore, nessuno connesso"
-  },
-  "%1 adapters, none connected": {
-    "%1 adapters, none connected": "%1 adattatori, nessuno connesso"
+  "%1 adapter(s), none connected": {
+    "%1 adapter(s), none connected": "%1 adattatore/i, nessuno connesso"
   },
   "%1 characters": {
     "%1 characters": "%1 caratteri"
   },
-  "%1 class": {
-    "%1 class": "%1 classe"
-  },
-  "%1 classes": {
-    "%1 classes": "%1 classi"
+  "%1 class(es)": {
+    "%1 class(es)": "%1 classe/i"
   },
   "%1 connected": {
     "%1 connected": "%1 connesso"
@@ -38,11 +29,8 @@
   "%1 disconnected (hidden)": {
     "%1 disconnected (hidden)": "%1 disconnesso (nascosto)"
   },
-  "%1 display": {
-    "%1 display": "%1 schermo"
-  },
-  "%1 displays": {
-    "%1 displays": "%1 schermi"
+  "%1 display(s)": {
+    "%1 display(s)": "%1 schermo/i"
   },
   "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": {
     "%1 exists but is not included in config. Custom keybinds will not work until this is fixed.": "%1 esiste ma non è incluso nella configurazione. Le scorciatoie personalizzate non funzioneranno finché non sarà risolto."
@@ -53,20 +41,14 @@
   "%1 is now included in config": {
     "%1 is now included in config": "%1 è ora incluso nella configurazione"
   },
-  "%1 job": {
-    "%1 job": "%1 stampa"
-  },
-  "%1 jobs": {
-    "%1 jobs": "%1 stampe"
+  "%1 job(s)": {
+    "%1 job(s)": "%1 stampa/e"
   },
   "%1 notifications": {
     "%1 notifications": "%1 notifiche"
   },
-  "%1 printer": {
-    "%1 printer": "%1 stampante"
-  },
-  "%1 printers": {
-    "%1 printers": "%1 stampanti"
+  "%1 printer(s)": {
+    "%1 printer(s)": "%1 stampante/i"
   },
   "%1 variants": {
     "%1 variants": "%1 varianti"
@@ -2797,23 +2779,14 @@
   "Last launched %1": {
     "Last launched %1": "Ultimo avvio %1"
   },
-  "Last launched %1 day ago": {
-    "Last launched %1 day ago": "Ultimo avvio %1 giorno fa"
+  "Last launched %1 day%2 ago": {
+    "Last launched %1 day%2 ago": "Ultimo avvio %1 giorno/i fa"
   },
-  "Last launched %1 days ago": {
-    "Last launched %1 days ago": "Ultimo avvio %1 giorni fa"
+  "Last launched %1 hour%2 ago": {
+    "Last launched %1 hour%2 ago": "Ultimo avvio %1 ora/e fa"
   },
-  "Last launched %1 hour ago": {
-    "Last launched %1 hour ago": "Ultimo avvio %1 ora fa"
-  },
-  "Last launched %1 hours ago": {
-    "Last launched %1 hours ago": "Ultimo avvio %1 ore fa"
-  },
-  "Last launched %1 minute ago": {
-    "Last launched %1 minute ago": "Ultimo avvio %1 minuto fa"
-  },
-  "Last launched %1 minutes ago": {
-    "Last launched %1 minutes ago": "Ultimo avvio %1 minuti fa"
+  "Last launched %1 minute%2 ago": {
+    "Last launched %1 minute%2 ago": "Ultimo avvio %1 minuto/i fa"
   },
   "Last launched just now": {
     "Last launched just now": "Appena avviato"

quickshell/translations/settings_search_index.json

@@ -3771,48 +3771,6 @@
     ],
     "description": "Use fingerprint reader for lock screen authentication (requires enrolled fingerprints)"
   },
-  {
-    "section": "enableU2f",
-    "label": "Enable security key authentication",
-    "tabIndex": 11,
-    "category": "Lock Screen",
-    "keywords": [
-      "authentication",
-      "enable",
-      "fido",
-      "hardware",
-      "key",
-      "lock",
-      "lockscreen",
-      "login",
-      "password",
-      "screen",
-      "security",
-      "u2f",
-      "yubikey"
-    ],
-    "description": "Use a FIDO2/U2F security key (e.g. YubiKey) for lock screen authentication (requires enrolled keys)"
-  },
-  {
-    "section": "u2fMode",
-    "label": "Security key mode",
-    "tabIndex": 11,
-    "category": "Lock Screen",
-    "keywords": [
-      "alternative",
-      "authentication",
-      "factor",
-      "key",
-      "lock",
-      "lockscreen",
-      "mode",
-      "second",
-      "security",
-      "u2f",
-      "yubikey"
-    ],
-    "description": "Alternative lets the key unlock on its own. Second factor requires password or fingerprint first, then the key."
-  },
   {
     "section": "loginctlLockIntegration",
     "label": "Enable loginctl lock integration",
@@ -3925,27 +3883,6 @@
     ],
     "description": "Automatically lock the screen when DMS starts"
   },
-  {
-    "section": "lockBeforeSuspend",
-    "label": "Lock before suspend",
-    "tabIndex": 11,
-    "category": "Lock Screen",
-    "keywords": [
-      "automatic",
-      "automatically",
-      "before",
-      "lock",
-      "login",
-      "password",
-      "prepares",
-      "screen",
-      "security",
-      "sleep",
-      "suspend",
-      "system"
-    ],
-    "description": "Automatically lock the screen when the system prepares to suspend"
-  },
   {
     "section": "lockScreenNotificationMode",
     "label": "Notification Display",
@@ -5870,6 +5807,27 @@
     "icon": "schedule",
     "description": "Gradually fade the screen before locking with a configurable grace period"
   },
+  {
+    "section": "lockBeforeSuspend",
+    "label": "Lock before suspend",
+    "tabIndex": 21,
+    "category": "Power & Sleep",
+    "keywords": [
+      "automatically",
+      "before",
+      "energy",
+      "lock",
+      "power",
+      "prepares",
+      "screen",
+      "security",
+      "shutdown",
+      "sleep",
+      "suspend",
+      "system"
+    ],
+    "description": "Automatically lock the screen when the system prepares to suspend"
+  },
   {
     "section": "fadeToLockGracePeriod",
     "label": "Lock fade grace period",
@@ -6437,33 +6395,5 @@
       "volume"
     ],
     "icon": "computer"
-  },
-  {
-    "section": "_tab_30",
-    "label": "Locale",
-    "tabIndex": 30,
-    "category": "Locale",
-    "keywords": [
-      "country",
-      "language",
-      "locale"
-    ],
-    "icon": "language"
-  },
-  {
-    "section": "locale",
-    "label": "Locale Settings",
-    "tabIndex": 30,
-    "category": "Locale",
-    "keywords": [
-      "change",
-      "country",
-      "interface",
-      "language",
-      "locale",
-      "settings"
-    ],
-    "icon": "language",
-    "description": "Change the locale used by the DMS interface."
   }
 ]

quickshell/translations/template.json

@@ -2043,13 +2043,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Change the locale used by the DMS interface.",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Channel",
     "translation": "",
@@ -3121,13 +3114,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Current Locale",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Current Monitor",
     "translation": "",
@@ -3863,13 +3849,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Disk Usage Display",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Disks",
     "translation": "",
@@ -6957,20 +6936,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Locale",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "Locale Settings",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Location",
     "translation": "",
@@ -10219,20 +10184,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Remaining",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "Remaining / Total",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Remove",
     "translation": "",
@@ -11598,13 +11549,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Show Memory in GB",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Show Network",
     "translation": "",
@@ -11717,13 +11661,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Show Swap",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Show System Date",
     "translation": "",
@@ -11829,13 +11766,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Show in GB",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Show launcher overlay when typing in Niri overview. Disable to use another launcher.",
     "translation": "",
@@ -12984,13 +12914,6 @@
     "reference": "",
     "comment": ""
   },
-  {
-    "term": "Total",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
   {
     "term": "Total Jobs",
     "translation": "",
@@ -14733,47 +14656,5 @@
     "context": "Keyboard hints when enter-to-paste is enabled",
     "reference": "",
     "comment": ""
-  },
-  {
-    "term": "What's New",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "Read Full Release Notes",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "Read Full Release Notes",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "Got It",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "Caps Lock is on",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
-  },
-  {
-    "term": "↑/↓: Nav • Space: Expand • Enter: Action/Expand • E: Text",
-    "translation": "",
-    "context": "",
-    "reference": "",
-    "comment": ""
   }
 ]