tailscale: add missing ID

related #2969
port 1.5

(cherry picked from commit ef191babb7)

core/internal/distros/minimal_install.go

@@ -7,7 +7,7 @@ type minimalInstallGroup struct {
 
 func shouldPreferMinimalInstall(pkg string) bool {
 	switch pkg {
-	case "niri", "niri-git":
+	case "niri", "niri-git", "hyprland", "hyprland-git":
 		return true
 	default:
 		return false

core/internal/matugen/matugen.go

@@ -44,6 +44,7 @@ type TemplateDef struct {
 	ID                 string
 	Commands           []string
 	Flatpaks           []string
+	ConfigDirs         []string
 	ConfigFile         string
 	Kind               TemplateKind
 	RunUnconditionally bool
@@ -60,9 +61,9 @@ var templateRegistry = []TemplateDef{
 	{ID: "firefox", Commands: []string{"firefox"}, ConfigFile: "firefox.toml"},
 	{ID: "pywalfox", Commands: []string{"pywalfox"}, ConfigFile: "pywalfox.toml"},
 	{ID: "zenbrowser", Commands: []string{"zen", "zen-browser", "zen-beta", "zen-twilight"}, Flatpaks: []string{"app.zen_browser.zen"}, ConfigFile: "zenbrowser.toml"},
-	{ID: "vesktop", Commands: []string{"vesktop"}, Flatpaks: []string{"dev.vencord.Vesktop"}, ConfigFile: "vesktop.toml"},
-	{ID: "vencord", Commands: []string{"discord", "Discord", "discord-canary", "DiscordCanary"}, Flatpaks: []string{"com.discordapp.Discord", "com.discordapp.DiscordCanary"}, ConfigFile: "vencord.toml"},
-	{ID: "equibop", Commands: []string{"equibop"}, ConfigFile: "equibop.toml"},
+	{ID: "vesktop", Commands: []string{"vesktop"}, Flatpaks: []string{"dev.vencord.Vesktop"}, ConfigDirs: []string{"vesktop"}, ConfigFile: "vesktop.toml"},
+	{ID: "vencord", Commands: []string{"discord", "Discord", "discord-canary", "DiscordCanary"}, Flatpaks: []string{"com.discordapp.Discord", "com.discordapp.DiscordCanary"}, ConfigDirs: []string{"Vencord"}, ConfigFile: "vencord.toml"},
+	{ID: "equibop", Commands: []string{"equibop"}, ConfigDirs: []string{"equibop"}, ConfigFile: "equibop.toml"},
 	{ID: "ghostty", Commands: []string{"ghostty"}, ConfigFile: "ghostty.toml", Kind: TemplateKindTerminal},
 	{ID: "kitty", Commands: []string{"kitty"}, ConfigFile: "kitty.toml", Kind: TemplateKindTerminal},
 	{ID: "foot", Commands: []string{"foot"}, ConfigFile: "foot.toml", Kind: TemplateKindTerminal},
@@ -459,9 +460,9 @@ output_path = '%s'
 		case TemplateKindGTK:
 			switch opts.Mode {
 			case ColorModeLight:
-				appendConfig(opts, cfgFile, nil, nil, "gtk3-light.toml")
+				appendConfig(opts, cfgFile, nil, nil, nil, "gtk3-light.toml")
 			default:
-				appendConfig(opts, cfgFile, nil, nil, "gtk3-dark.toml")
+				appendConfig(opts, cfgFile, nil, nil, nil, "gtk3-dark.toml")
 			}
 		case TemplateKindTerminal:
 			appendTerminalConfig(opts, cfgFile, tmpDir, tmpl.Commands, tmpl.Flatpaks, tmpl.ConfigFile)
@@ -474,10 +475,10 @@ output_path = '%s'
 			appendVSCodeConfig(cfgFile, "vscode-insiders", filepath.Join(homeDir, ".vscode-insiders/extensions"), opts.ShellDir)
 		case TemplateKindEmacs:
 			if utils.EmacsConfigDir() != "" {
-				appendConfig(opts, cfgFile, tmpl.Commands, tmpl.Flatpaks, tmpl.ConfigFile)
+				appendConfig(opts, cfgFile, tmpl.Commands, tmpl.Flatpaks, tmpl.ConfigDirs, tmpl.ConfigFile)
 			}
 		default:
-			appendConfig(opts, cfgFile, tmpl.Commands, tmpl.Flatpaks, tmpl.ConfigFile)
+			appendConfig(opts, cfgFile, tmpl.Commands, tmpl.Flatpaks, tmpl.ConfigDirs, tmpl.ConfigFile)
 		}
 	}
 
@@ -512,13 +513,14 @@ func appendConfig(
 	cfgFile *os.File,
 	checkCmd []string,
 	checkFlatpaks []string,
+	checkConfigDirs []string,
 	fileName string,
 ) {
 	configPath := filepath.Join(opts.ShellDir, "matugen", "configs", fileName)
 	if _, err := os.Stat(configPath); err != nil {
 		return
 	}
-	if !appExists(opts.AppChecker, checkCmd, checkFlatpaks) {
+	if !appExists(opts.AppChecker, checkCmd, checkFlatpaks) && !configDirExists(checkConfigDirs) {
 		return
 	}
 	data, err := os.ReadFile(configPath)
@@ -599,6 +601,20 @@ func templateSessionActive(tmpl TemplateDef) bool {
 	return err == nil
 }
 
+func configDirExists(names []string) bool {
+	configHome := utils.XDGConfigHome()
+	if configHome == "" {
+		return false
+	}
+	for _, name := range names {
+		info, err := os.Stat(filepath.Join(configHome, name))
+		if err == nil && info.IsDir() {
+			return true
+		}
+	}
+	return false
+}
+
 func appExists(checker utils.AppChecker, checkCmd []string, checkFlatpaks []string) bool {
 	// Both nil is treated as "skip check" / unconditionally run
 	if checkCmd == nil && checkFlatpaks == nil {
@@ -1096,7 +1112,7 @@ func CheckTemplates(checker utils.AppChecker) []TemplateCheck {
 		case tmpl.Kind == TemplateKindEmacs:
 			detected = appExists(checker, tmpl.Commands, tmpl.Flatpaks) && utils.EmacsConfigDir() != ""
 		default:
-			detected = appExists(checker, tmpl.Commands, tmpl.Flatpaks) && templateSessionActive(tmpl)
+			detected = (appExists(checker, tmpl.Commands, tmpl.Flatpaks) || configDirExists(tmpl.ConfigDirs)) && templateSessionActive(tmpl)
 		}
 
 		checks = append(checks, TemplateCheck{ID: tmpl.ID, Detected: detected})

core/internal/matugen/matugen_test.go

@@ -38,7 +38,7 @@ func TestAppendConfigBinaryExists(t *testing.T) {
 
 	opts := &Options{ShellDir: shellDir, AppChecker: mockChecker}
 
-	appendConfig(opts, cfgFile, []string{"sh"}, nil, "test.toml")
+	appendConfig(opts, cfgFile, []string{"sh"}, nil, nil, "test.toml")
 
 	cfgFile.Close()
 	output, err := os.ReadFile(outFile)
@@ -82,7 +82,7 @@ func TestAppendConfigBinaryDoesNotExist(t *testing.T) {
 
 	opts := &Options{ShellDir: shellDir, AppChecker: mockChecker}
 
-	appendConfig(opts, cfgFile, []string{"nonexistent-binary-12345"}, []string{}, "test.toml")
+	appendConfig(opts, cfgFile, []string{"nonexistent-binary-12345"}, []string{}, nil, "test.toml")
 
 	cfgFile.Close()
 	output, err := os.ReadFile(outFile)
@@ -122,7 +122,7 @@ func TestAppendConfigFlatpakExists(t *testing.T) {
 
 	opts := &Options{ShellDir: shellDir, AppChecker: mockChecker}
 
-	appendConfig(opts, cfgFile, nil, []string{"app.zen_browser.zen"}, "test.toml")
+	appendConfig(opts, cfgFile, nil, []string{"app.zen_browser.zen"}, nil, "test.toml")
 
 	cfgFile.Close()
 	output, err := os.ReadFile(outFile)
@@ -163,7 +163,7 @@ func TestAppendConfigFlatpakDoesNotExist(t *testing.T) {
 
 	opts := &Options{ShellDir: shellDir, AppChecker: mockChecker}
 
-	appendConfig(opts, cfgFile, []string{}, []string{"com.nonexistent.flatpak"}, "test.toml")
+	appendConfig(opts, cfgFile, []string{}, []string{"com.nonexistent.flatpak"}, nil, "test.toml")
 
 	cfgFile.Close()
 	output, err := os.ReadFile(outFile)
@@ -203,7 +203,7 @@ func TestAppendConfigBothExist(t *testing.T) {
 
 	opts := &Options{ShellDir: shellDir, AppChecker: mockChecker}
 
-	appendConfig(opts, cfgFile, []string{"sh"}, []string{"app.zen_browser.zen"}, "test.toml")
+	appendConfig(opts, cfgFile, []string{"sh"}, []string{"app.zen_browser.zen"}, nil, "test.toml")
 
 	cfgFile.Close()
 	output, err := os.ReadFile(outFile)
@@ -244,7 +244,7 @@ func TestAppendConfigNeitherExists(t *testing.T) {
 
 	opts := &Options{ShellDir: shellDir, AppChecker: mockChecker}
 
-	appendConfig(opts, cfgFile, []string{"nonexistent-binary-12345"}, []string{"com.nonexistent.flatpak"}, "test.toml")
+	appendConfig(opts, cfgFile, []string{"nonexistent-binary-12345"}, []string{"com.nonexistent.flatpak"}, nil, "test.toml")
 
 	cfgFile.Close()
 	output, err := os.ReadFile(outFile)
@@ -281,7 +281,7 @@ func TestAppendConfigNoChecks(t *testing.T) {
 
 	opts := &Options{ShellDir: shellDir}
 
-	appendConfig(opts, cfgFile, nil, nil, "test.toml")
+	appendConfig(opts, cfgFile, nil, nil, nil, "test.toml")
 
 	cfgFile.Close()
 	output, err := os.ReadFile(outFile)
@@ -312,7 +312,7 @@ func TestAppendConfigFileDoesNotExist(t *testing.T) {
 
 	opts := &Options{ShellDir: shellDir}
 
-	appendConfig(opts, cfgFile, nil, nil, "nonexistent.toml")
+	appendConfig(opts, cfgFile, nil, nil, nil, "nonexistent.toml")
 
 	cfgFile.Close()
 	output, err := os.ReadFile(outFile)
@@ -487,3 +487,90 @@ func TestBuildMergedConfigSkipsMangowcWithoutActiveSession(t *testing.T) {
 	}
 	assert.NotContains(t, string(output), "[templates.dmsmango]")
 }
+
+func TestAppendConfigConfigDirExists(t *testing.T) {
+	tempDir := t.TempDir()
+
+	shellDir := filepath.Join(tempDir, "shell")
+	configsDir := filepath.Join(shellDir, "matugen", "configs")
+	if err := os.MkdirAll(configsDir, 0o755); err != nil {
+		t.Fatalf("failed to create configs dir: %v", err)
+	}
+
+	testConfig := "vencord config content"
+	if err := os.WriteFile(filepath.Join(configsDir, "vencord.toml"), []byte(testConfig), 0o644); err != nil {
+		t.Fatalf("failed to write config: %v", err)
+	}
+
+	configHome := filepath.Join(tempDir, "config")
+	if err := os.MkdirAll(filepath.Join(configHome, "Vencord"), 0o755); err != nil {
+		t.Fatalf("failed to create Vencord config dir: %v", err)
+	}
+	t.Setenv("XDG_CONFIG_HOME", configHome)
+
+	outFile := filepath.Join(tempDir, "output.toml")
+	cfgFile, err := os.Create(outFile)
+	if err != nil {
+		t.Fatalf("failed to create output file: %v", err)
+	}
+	defer cfgFile.Close()
+
+	mockChecker := mocks_utils.NewMockAppChecker(t)
+	mockChecker.EXPECT().AnyCommandExists("nonexistent-binary-12345").Return(false)
+	mockChecker.EXPECT().AnyFlatpakExists("com.nonexistent.flatpak").Return(false)
+
+	opts := &Options{ShellDir: shellDir, AppChecker: mockChecker}
+
+	appendConfig(opts, cfgFile, []string{"nonexistent-binary-12345"}, []string{"com.nonexistent.flatpak"}, []string{"Vencord"}, "vencord.toml")
+
+	cfgFile.Close()
+	output, err := os.ReadFile(outFile)
+	if err != nil {
+		t.Fatalf("failed to read output: %v", err)
+	}
+
+	assert.Equal(t, testConfig+"\n", string(output))
+}
+
+func TestAppendConfigConfigDirDoesNotExist(t *testing.T) {
+	tempDir := t.TempDir()
+
+	shellDir := filepath.Join(tempDir, "shell")
+	configsDir := filepath.Join(shellDir, "matugen", "configs")
+	if err := os.MkdirAll(configsDir, 0o755); err != nil {
+		t.Fatalf("failed to create configs dir: %v", err)
+	}
+
+	if err := os.WriteFile(filepath.Join(configsDir, "vencord.toml"), []byte("vencord config content"), 0o644); err != nil {
+		t.Fatalf("failed to write config: %v", err)
+	}
+
+	configHome := filepath.Join(tempDir, "config")
+	if err := os.MkdirAll(configHome, 0o755); err != nil {
+		t.Fatalf("failed to create config home: %v", err)
+	}
+	t.Setenv("XDG_CONFIG_HOME", configHome)
+
+	outFile := filepath.Join(tempDir, "output.toml")
+	cfgFile, err := os.Create(outFile)
+	if err != nil {
+		t.Fatalf("failed to create output file: %v", err)
+	}
+	defer cfgFile.Close()
+
+	mockChecker := mocks_utils.NewMockAppChecker(t)
+	mockChecker.EXPECT().AnyCommandExists("nonexistent-binary-12345").Return(false)
+	mockChecker.EXPECT().AnyFlatpakExists("com.nonexistent.flatpak").Return(false)
+
+	opts := &Options{ShellDir: shellDir, AppChecker: mockChecker}
+
+	appendConfig(opts, cfgFile, []string{"nonexistent-binary-12345"}, []string{"com.nonexistent.flatpak"}, []string{"Vencord"}, "vencord.toml")
+
+	cfgFile.Close()
+	output, err := os.ReadFile(outFile)
+	if err != nil {
+		t.Fatalf("failed to read output: %v", err)
+	}
+
+	assert.Empty(t, string(output))
+}

core/internal/server/bluez/manager.go

@@ -43,10 +43,10 @@ func NewManager() (*Manager, error) {
 	broker := NewSubscriptionBroker(m.broadcastPairingPrompt)
 	m.promptBroker = broker
 
-	adapter, err := m.findAdapter()
+	adapter, err := findAdapter(conn)
 	if err != nil {
 		conn.Close()
-		return nil, fmt.Errorf("no bluetooth adapter found: %w", err)
+		return nil, err
 	}
 	m.adapterPath = adapter
 
@@ -74,12 +74,12 @@ func NewManager() (*Manager, error) {
 	return m, nil
 }
 
-func (m *Manager) findAdapter() (dbus.ObjectPath, error) {
-	obj := m.dbusConn.Object(bluezService, dbus.ObjectPath("/"))
+func findAdapter(conn *dbus.Conn) (dbus.ObjectPath, error) {
+	obj := conn.Object(bluezService, dbus.ObjectPath("/"))
 	var objects map[dbus.ObjectPath]map[string]map[string]dbus.Variant
 
 	if err := obj.Call(objectMgrIface+".GetManagedObjects", 0).Store(&objects); err != nil {
-		return "", err
+		return "", fmt.Errorf("%w: %v", ErrNoAdapter, err)
 	}
 
 	for path, interfaces := range objects {
@@ -89,7 +89,7 @@ func (m *Manager) findAdapter() (dbus.ObjectPath, error) {
 		}
 	}
 
-	return "", fmt.Errorf("no adapter found")
+	return "", ErrNoAdapter
 }
 
 func (m *Manager) initialize() error {
@@ -487,6 +487,11 @@ func (m *Manager) StopDiscovery() error {
 }
 
 func (m *Manager) SetPowered(powered bool) error {
+	if powered {
+		if err := rfkillUnblockBluetooth(); err != nil {
+			log.Debugf("[BluezManager] rfkill unblock failed: %v", err)
+		}
+	}
 	obj := m.dbusConn.Object(bluezService, m.adapterPath)
 	return obj.Call(propertiesIface+".Set", 0, adapter1Iface, "Powered", dbus.MakeVariant(powered)).Err
 }

core/internal/server/bluez/rfkill_freebsd.go

@@ -0,0 +1,5 @@
+package bluez
+
+func rfkillUnblockBluetooth() error {
+	return nil
+}

core/internal/server/bluez/rfkill_linux.go

@@ -0,0 +1,19 @@
+package bluez
+
+import "os"
+
+// linux/rfkill.h: struct rfkill_event { __u32 idx; __u8 type; __u8 op; __u8 soft; __u8 hard; },
+// RFKILL_TYPE_BLUETOOTH=2, RFKILL_OP_CHANGE_ALL=3
+func rfkillUnblockBluetooth() error {
+	f, err := os.OpenFile("/dev/rfkill", os.O_WRONLY, 0)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	var event [8]byte
+	event[4] = 2
+	event[5] = 3
+	_, err = f.Write(event[:])
+	return err
+}

core/internal/server/bluez/watcher.go

@@ -0,0 +1,46 @@
+package bluez
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/godbus/dbus/v5"
+)
+
+var ErrNoAdapter = errors.New("no bluetooth adapter found")
+
+func WaitForAdapter() error {
+	conn, err := dbus.ConnectSystemBus()
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+
+	if err := conn.AddMatchSignal(
+		dbus.WithMatchInterface(objectMgrIface),
+		dbus.WithMatchMember("InterfacesAdded"),
+	); err != nil {
+		return err
+	}
+
+	signals := make(chan *dbus.Signal, 64)
+	conn.Signal(signals)
+
+	if _, err := findAdapter(conn); err == nil {
+		return nil
+	}
+
+	for sig := range signals {
+		if sig == nil || sig.Name != objectMgrIface+".InterfacesAdded" || len(sig.Body) < 2 {
+			continue
+		}
+		ifaces, ok := sig.Body[1].(map[string]map[string]dbus.Variant)
+		if !ok {
+			continue
+		}
+		if _, ok := ifaces[adapter1Iface]; ok {
+			return nil
+		}
+	}
+	return fmt.Errorf("dbus signal stream closed")
+}

core/internal/server/cups/manager.go

@@ -229,6 +229,9 @@ func (m *Manager) snapshotState() CUPSState {
 func (m *Manager) Subscribe(id string) chan CUPSState {
 	ch := make(chan CUPSState, 64)
 
+	m.subLifecycleMu.Lock()
+	defer m.subLifecycleMu.Unlock()
+
 	wasEmpty := true
 	m.subscribers.Range(func(key string, ch chan CUPSState) bool {
 		wasEmpty = false
@@ -237,19 +240,25 @@ func (m *Manager) Subscribe(id string) chan CUPSState {
 
 	m.subscribers.Store(id, ch)
 
-	if wasEmpty && m.subscription != nil {
-		if err := m.subscription.Start(); err != nil {
-			log.Warnf("[CUPS] Failed to start subscription manager: %v", err)
-		} else {
-			m.eventWG.Add(1)
-			go m.eventHandler()
-		}
+	if !wasEmpty || m.subscription == nil {
+		return ch
 	}
 
+	if err := m.subscription.Start(); err != nil {
+		log.Warnf("[CUPS] Failed to start subscription manager: %v", err)
+		return ch
+	}
+
+	m.eventWG.Add(1)
+	go m.eventHandler()
+
 	return ch
 }
 
 func (m *Manager) Unsubscribe(id string) {
+	m.subLifecycleMu.Lock()
+	defer m.subLifecycleMu.Unlock()
+
 	if val, ok := m.subscribers.LoadAndDelete(id); ok {
 		close(val)
 	}
@@ -260,18 +269,22 @@ func (m *Manager) Unsubscribe(id string) {
 		return false
 	})
 
-	if isEmpty && m.subscription != nil {
-		m.subscription.Stop()
-		m.eventWG.Wait()
+	if !isEmpty || m.subscription == nil {
+		return
 	}
+
+	m.subscription.Stop()
+	m.eventWG.Wait()
 }
 
 func (m *Manager) Close() {
 	close(m.stopChan)
 
+	m.subLifecycleMu.Lock()
 	if m.subscription != nil {
 		m.subscription.Stop()
 	}
+	m.subLifecycleMu.Unlock()
 
 	m.eventWG.Wait()
 	m.notifierWg.Wait()

core/internal/server/cups/manager_test.go

@@ -1,6 +1,9 @@
 package cups
 
 import (
+	"errors"
+	"fmt"
+	"sync"
 	"testing"
 
 	mocks_cups "github.com/AvengeMedia/DankMaterialShell/core/internal/mocks/cups"
@@ -75,6 +78,67 @@ func TestManager_Subscribe(t *testing.T) {
 	assert.Equal(t, 0, count)
 }
 
+// mirrors the real managers: eventChan guarded by mu, conn/running deliberately
+// unsynchronized so overlapping Start/Stop trips the race detector
+type stubSubscription struct {
+	mu      sync.Mutex
+	events  chan SubscriptionEvent
+	conn    *int
+	running bool
+}
+
+func (s *stubSubscription) Start() error {
+	if s.running {
+		return errors.New("already running")
+	}
+	s.running = true
+
+	s.mu.Lock()
+	s.events = make(chan SubscriptionEvent)
+	s.mu.Unlock()
+
+	v := 0
+	s.conn = &v
+	*s.conn++
+
+	return nil
+}
+
+func (s *stubSubscription) Stop() {
+	if !s.running {
+		return
+	}
+	s.running = false
+	s.conn = nil
+
+	s.mu.Lock()
+	close(s.events)
+	s.mu.Unlock()
+}
+
+func (s *stubSubscription) Events() <-chan SubscriptionEvent {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.events
+}
+
+func TestManager_SubscribeUnsubscribeRace(t *testing.T) {
+	m := NewTestManager(mocks_cups.NewMockCUPSClientInterface(t), nil)
+	m.subscription = &stubSubscription{}
+
+	var wg sync.WaitGroup
+	for i := range 8 {
+		wg.Go(func() {
+			id := fmt.Sprintf("client-%d", i)
+			for range 50 {
+				m.Subscribe(id)
+				m.Unsubscribe(id)
+			}
+		})
+	}
+	wg.Wait()
+}
+
 func TestManager_Close(t *testing.T) {
 	mockClient := mocks_cups.NewMockCUPSClientInterface(t)
 

core/internal/server/cups/types.go

@@ -79,6 +79,7 @@ type Manager struct {
 	client            CUPSClientInterface
 	pkHelper          PkHelper
 	subscription      SubscriptionManagerInterface
+	subLifecycleMu    sync.Mutex
 	stateMutex        sync.RWMutex
 	subscribers       syncmap.Map[string, chan CUPSState]
 	stopChan          chan struct{}

core/internal/server/router.go

@@ -117,11 +117,12 @@ func RouteRequest(conn net.Conn, req models.Request) {
 	}
 
 	if strings.HasPrefix(req.Method, "cups.") {
-		if cupsManager == nil {
+		mgr, err := ensureCupsManager()
+		if err != nil {
 			models.RespondError(conn, req.ID, "CUPS manager not initialized")
 			return
 		}
-		cups.HandleRequest(conn, req, cupsManager)
+		cups.HandleRequest(conn, req, mgr)
 		return
 	}
 

core/internal/server/server.go

@@ -12,7 +12,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"syscall"
 	"time"
 
@@ -85,8 +84,8 @@ var geoClientInstance geolocation.Client
 const dbusClientID = "dms-dbus-client"
 
 var capabilitySubscribers syncmap.Map[string, chan ServerInfo]
-var cupsSubscribers syncmap.Map[string, bool]
-var cupsSubscriberCount atomic.Int32
+var cupsMu sync.Mutex
+var cupsSubscriberCount int
 
 func getSocketDir() string {
 	if runtime := os.Getenv("XDG_RUNTIME_DIR"); runtime != "" {
@@ -243,17 +242,55 @@ func InitializeAppPickerManager() error {
 	return nil
 }
 
-func InitializeCupsManager() error {
+func initializeCupsManagerLocked() (bool, error) {
+	if cupsManager != nil {
+		return false, nil
+	}
 	manager, err := cups.NewManager()
 	if err != nil {
 		log.Warnf("Failed to initialize cups manager: %v", err)
-		return err
+		return false, err
 	}
-
 	cupsManager = manager
-
 	log.Info("CUPS manager initialized")
-	return nil
+	return true, nil
+}
+
+func ensureCupsManager() (*cups.Manager, error) {
+	cupsMu.Lock()
+	created, err := initializeCupsManagerLocked()
+	mgr := cupsManager
+	cupsMu.Unlock()
+	if err != nil {
+		return nil, err
+	}
+	if created {
+		notifyCapabilityChange()
+	}
+	return mgr, nil
+}
+
+func cupsAvailable() bool {
+	cupsMu.Lock()
+	defer cupsMu.Unlock()
+	return cupsManager != nil
+}
+
+func releaseCupsSubscriber() {
+	cupsMu.Lock()
+	cupsSubscriberCount--
+	var mgr *cups.Manager
+	if cupsSubscriberCount == 0 && cupsManager != nil {
+		mgr = cupsManager
+		cupsManager = nil
+	}
+	cupsMu.Unlock()
+	if mgr == nil {
+		return
+	}
+	log.Info("Last CUPS subscriber disconnected, shutting down CUPS manager")
+	mgr.Close()
+	notifyCapabilityChange()
 }
 
 func InitializeBrightnessManager() error {
@@ -463,7 +500,7 @@ func getCapabilities() Capabilities {
 		caps = append(caps, "browser")
 	}
 
-	if cupsManager != nil {
+	if cupsAvailable() {
 		caps = append(caps, "cups")
 	}
 
@@ -533,7 +570,7 @@ func getServerInfo() ServerInfo {
 		caps = append(caps, "browser")
 	}
 
-	if cupsManager != nil {
+	if cupsAvailable() {
 		caps = append(caps, "cups")
 	}
 
@@ -997,38 +1034,31 @@ func handleSubscribe(conn net.Conn, req models.Request) {
 	}
 
 	if shouldSubscribe("cups") {
-		cupsSubscribers.Store(clientID+"-cups", true)
-		count := cupsSubscriberCount.Add(1)
+		cupsMu.Lock()
+		cupsSubscriberCount++
+		created, err := initializeCupsManagerLocked()
+		mgr := cupsManager
+		cupsMu.Unlock()
 
-		if count == 1 {
-			if err := InitializeCupsManager(); err != nil {
-				log.Warnf("Failed to initialize CUPS manager for subscription: %v", err)
-			} else {
-				notifyCapabilityChange()
-			}
+		if err != nil {
+			log.Warnf("Failed to initialize CUPS manager for subscription: %v", err)
+		} else if created {
+			notifyCapabilityChange()
 		}
 
-		if cupsManager != nil {
+		if mgr == nil {
+			releaseCupsSubscriber()
+		} else {
 			wg.Add(1)
-			cupsChan := cupsManager.Subscribe(clientID + "-cups")
+			cupsChan := mgr.Subscribe(clientID + "-cups")
 			go func() {
 				defer wg.Done()
 				defer func() {
-					cupsManager.Unsubscribe(clientID + "-cups")
-					cupsSubscribers.Delete(clientID + "-cups")
-					count := cupsSubscriberCount.Add(-1)
-
-					if count == 0 {
-						log.Info("Last CUPS subscriber disconnected, shutting down CUPS manager")
-						if cupsManager != nil {
-							cupsManager.Close()
-							cupsManager = nil
-							notifyCapabilityChange()
-						}
-					}
+					mgr.Unsubscribe(clientID + "-cups")
+					releaseCupsSubscriber()
 				}()
 
-				initialState := cupsManager.GetState()
+				initialState := mgr.GetState()
 				select {
 				case eventChan <- ServiceEvent{Service: "cups", Data: initialState}:
 				case <-stopChan:
@@ -1338,9 +1368,12 @@ func cleanupManagers() {
 	if appPickerManager != nil {
 		appPickerManager.Close()
 	}
+	cupsMu.Lock()
 	if cupsManager != nil {
 		cupsManager.Close()
+		cupsManager = nil
 	}
+	cupsMu.Unlock()
 	if brightnessManager != nil {
 		brightnessManager.Close()
 	}
@@ -1698,10 +1731,21 @@ func Start(printDocs bool) error {
 	}()
 
 	go func() {
-		if err := InitializeBluezManager(); err != nil {
+		for {
+			err := InitializeBluezManager()
+			if err == nil {
+				notifyCapabilityChange()
+				return
+			}
 			log.Warnf("Bluez manager unavailable: %v", err)
-		} else {
-			notifyCapabilityChange()
+			if !errors.Is(err, bluez.ErrNoAdapter) {
+				return
+			}
+			if err := bluez.WaitForAdapter(); err != nil {
+				log.Warnf("Bluetooth adapter watch failed: %v", err)
+				return
+			}
+			log.Info("Bluetooth adapter appeared, initializing bluez manager")
 		}
 	}()
 

core/internal/server/sysupdate/executor.go

@@ -143,7 +143,8 @@ func wrapInTerminal(term, title, shellCmd string, extraArgs []string) []string {
 	case "konsole":
 		argv = []string{term, "-p", "tabtitle=" + title}
 	case "gnome-terminal":
-		argv = []string{term, "--title=" + title}
+		// --wait: the factory process otherwise returns immediately
+		argv = []string{term, "--wait", "--title=" + title}
 		execFlag = "--"
 	default:
 		argv = []string{term}

core/internal/server/sysupdate/manager.go

@@ -412,25 +412,30 @@ func (m *Manager) runCustomUpgrade(ctx context.Context, opts UpgradeOptions) {
 	onLine := func(line string) { m.appendLog(line) }
 	argv := wrapInTerminal(term, "DMS — System Update (custom)", opts.CustomCommand, opts.TerminalArgs)
 	if err := Run(ctx, argv, RunOptions{OnLine: onLine}); err != nil {
-		code := ErrCodeBackendFailed
 		switch {
 		case errors.Is(ctx.Err(), context.DeadlineExceeded):
-			code = ErrCodeTimeout
+			m.failCustomUpgrade(ErrCodeTimeout, err)
+			return
 		case errors.Is(ctx.Err(), context.Canceled):
-			code = ErrCodeCancelled
+			m.failCustomUpgrade(ErrCodeCancelled, err)
+			return
 		}
-		m.mu.Lock()
-		m.state.Phase = PhaseError
-		m.state.Error = &ErrorInfo{Code: code, Message: err.Error()}
-		m.mu.Unlock()
-		m.markDirty()
-		return
+		// exit status reflects the trailing `read`, not the update command
+		m.appendLog(fmt.Sprintf("Terminal exited early: %v", err))
 	}
 
 	m.finishSuccessfulUpgrade(false)
 	m.runRefresh(context.Background(), false)
 }
 
+func (m *Manager) failCustomUpgrade(code ErrorCode, err error) {
+	m.mu.Lock()
+	m.state.Phase = PhaseError
+	m.state.Error = &ErrorInfo{Code: code, Message: err.Error()}
+	m.mu.Unlock()
+	m.markDirty()
+}
+
 func (m *Manager) finishSuccessfulUpgrade(clearPackages bool) {
 	m.appendLog("Upgrade complete.")
 

core/internal/server/sysupdate/upgrade_commands_test.go

@@ -233,3 +233,27 @@ func TestUpgradeBackendsFiltersFlatpakOnly(t *testing.T) {
 		t.Fatalf("upgradeBackends(mixed) = %#v, want dnf5 then flatpak", got)
 	}
 }
+
+func TestWrapInTerminal(t *testing.T) {
+	tests := []struct {
+		term       string
+		wantPrefix []string
+	}{
+		{"kitty", []string{"kitty", "--class", "com.danklinux.dms", "-T", "Title"}},
+		{"gnome-terminal", []string{"gnome-terminal", "--wait", "--title=Title"}},
+		{"foot", []string{"foot", "--app-id=com.danklinux.dms", "--title=Title"}},
+	}
+	for _, tt := range tests {
+		got := wrapInTerminal(tt.term, "Title", "echo hi", nil)
+		if len(got) < len(tt.wantPrefix) || !reflect.DeepEqual(got[:len(tt.wantPrefix)], tt.wantPrefix) {
+			t.Errorf("wrapInTerminal(%q) = %#v, want prefix %#v", tt.term, got, tt.wantPrefix)
+		}
+		tail := got[len(got)-3:]
+		if tail[0] != "sh" || tail[1] != "-c" {
+			t.Errorf("wrapInTerminal(%q) tail = %#v, want [sh -c <cmd>]", tt.term, tail)
+		}
+		if !strings.Contains(tail[2], "echo hi") {
+			t.Errorf("wrapInTerminal(%q) command %q does not contain shell command", tt.term, tail[2])
+		}
+	}
+}

core/internal/windowrules/providers/niri_parser.go

@@ -928,8 +928,8 @@ func (p *NiriWritableProvider) formatRule(rule windowrules.WindowRule) string {
 	if a.Opacity != nil {
 		lines = append(lines, fmt.Sprintf("    opacity %.2f", *a.Opacity))
 	}
-	if a.OpenFloating != nil && *a.OpenFloating {
-		lines = append(lines, "    open-floating true")
+	if a.OpenFloating != nil {
+		lines = append(lines, fmt.Sprintf("    open-floating %t", *a.OpenFloating))
 	}
 	if a.OpenMaximized != nil && *a.OpenMaximized {
 		lines = append(lines, "    open-maximized true")

distro/nix/greeter.nix

@@ -200,7 +200,9 @@ in
     ];
     # DMS currently relies on /etc/pam.d/login for lock screen password auth on NixOS.
     # Declare security.pam.services.dankshell only if you want to override that runtime fallback.
-    # U2F and fingerprint are handled separately by DMS — do not add pam_u2f or pam_fprintd here.
+    # Do not add pam_u2f or pam_fprintd here for security-key unlock, enable
+    # programs.dank-material-shell.lockscreen.securityKey.enable, which declares the
+    # dedicated dankshell-u2f service DMS drives on its own.
     # security.pam.services.dankshell = {
     #   # Example: add faillock
     #   faillock.enable = true;

distro/nix/nixos.nix

@@ -23,6 +23,15 @@ in
     description = "Systemd target to bind to.";
     default = "graphical-session.target";
   };
+  options.programs.dank-material-shell.lockscreen.securityKey = {
+    enable = lib.mkEnableOption "FIDO2/U2F security key unlock for the DMS lock screen via a dedicated dankshell-u2f PAM service";
+    package = lib.mkPackageOption pkgs "pam_u2f" { };
+    moduleArgs = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ "cue" ];
+      description = "Arguments passed to pam_u2f.so in the dankshell-u2f PAM service.";
+    };
+  };
   config = lib.mkIf cfg.enable {
     systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
       description = "DankMaterialShell";
@@ -46,6 +55,18 @@ in
       inherit value;
     }) common.plugins;
 
+    # DMS's bundled U2F fallback stack references pam_u2f.so by name, which NixOS's
+    # libpam cannot resolve; the dedicated service below uses the absolute store path
+    # and is picked up automatically by the lock screen when present.
+    security.pam.services."dankshell-u2f" = lib.mkIf cfg.lockscreen.securityKey.enable {
+      text = ''
+        auth     required ${cfg.lockscreen.securityKey.package}/lib/security/pam_u2f.so ${lib.concatStringsSep " " cfg.lockscreen.securityKey.moduleArgs}
+        account  required pam_permit.so
+        password required pam_deny.so
+        session  required pam_permit.so
+      '';
+    };
+
     services.power-profiles-daemon.enable = lib.mkDefault true;
     services.accounts-daemon.enable = lib.mkDefault true;
     services.geoclue2.enable = lib.mkDefault true;

distro/nix/tests/nixos-module.nix

@@ -19,6 +19,7 @@ pkgs.testers.runNixOSTest {
     programs.dank-material-shell = {
       enable = true;
       systemd.enable = true;
+      lockscreen.securityKey.enable = true;
       plugins = {
         TestPlugin = {
           src = pkgs.emptyDirectory;
@@ -39,6 +40,7 @@ pkgs.testers.runNixOSTest {
     machine.succeed("su -- danklinux -c 'dms --help >/dev/null'")
     machine.succeed("test -d /etc/xdg/quickshell/dms-plugins")
     machine.succeed("test -f /run/current-system/sw/lib/systemd/user/dms.service")
+    machine.succeed("grep -q 'lib/security/pam_u2f.so cue' /etc/pam.d/dankshell-u2f")
 
     payload = json.loads(machine.succeed("su -- danklinux -c 'dms doctor --json'"))
     t.assertIn("summary", payload)

quickshell/Common/CacheData.qml

@@ -11,7 +11,7 @@ Singleton {
     id: root
     readonly property var log: Log.scoped("CacheData")
 
-    readonly property int cacheConfigVersion: 1
+    readonly property int cacheConfigVersion: 2
 
     readonly property bool isGreeterMode: Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true"
 
@@ -19,10 +19,21 @@ Singleton {
     readonly property string _stateDir: Paths.strip(_stateUrl)
 
     property bool _loading: false
+    property bool _hasLoaded: false
+    property int _loadedCacheVersion: 0
+
+    readonly property var _pinKeys: ["brightnessDevicePins", "wifiNetworkPins", "bluetoothDevicePins", "audioInputDevicePins", "audioOutputDevicePins"]
+    readonly property var _dataKeys: ["wallpaperLastPath", "profileLastPath", "fileBrowserSettings"].concat(_pinKeys)
 
     property string wallpaperLastPath: ""
     property string profileLastPath: ""
 
+    property var brightnessDevicePins: ({})
+    property var wifiNetworkPins: ({})
+    property var bluetoothDevicePins: ({})
+    property var audioInputDevicePins: ({})
+    property var audioOutputDevicePins: ({})
+
     property var fileBrowserSettings: ({
             "wallpaper": {
                 "lastPath": "",
@@ -82,8 +93,46 @@ Singleton {
 
     function loadCache() {
         _loading = true;
-        parseCache(cacheFile.text());
-        _loading = false;
+        try {
+            parseCache(cacheFile.text());
+        } finally {
+            _loading = false;
+            _hasLoaded = true;
+        }
+    }
+
+    function set(key, value) {
+        if (_dataKeys.indexOf(key) < 0) {
+            log.warn("Unknown cache key:", key);
+            return;
+        }
+        root[key] = value;
+        saveCache();
+    }
+
+    function migratePins(pins) {
+        if (!pins)
+            return;
+        if (!_hasLoaded)
+            loadCache();
+        if (_loadedCacheVersion >= cacheConfigVersion)
+            return;
+
+        let migrated = false;
+        for (const key of _pinKeys) {
+            const legacy = pins[key];
+            if (!legacy || Object.keys(legacy).length === 0)
+                continue;
+            if (Object.keys(root[key] || {}).length > 0)
+                continue;
+            root[key] = legacy;
+            migrated = true;
+        }
+
+        if (!migrated)
+            return;
+        log.info("Migrated device pins from settings.json");
+        saveCache();
     }
 
     function parseCache(content) {
@@ -91,6 +140,7 @@ Singleton {
         try {
             if (content && content.trim()) {
                 const cache = JSON.parse(content);
+                _loadedCacheVersion = cache.configVersion || 0;
 
                 wallpaperLastPath = cache.wallpaperLastPath !== undefined ? cache.wallpaperLastPath : "";
                 profileLastPath = cache.profileLastPath !== undefined ? cache.profileLastPath : "";
@@ -126,6 +176,10 @@ Singleton {
                     };
                 }
 
+                for (const key of _pinKeys) {
+                    root[key] = cache[key] !== undefined ? cache[key] : {};
+                }
+
                 if (cache.configVersion === undefined) {
                     migrateFromUndefinedToV1(cache);
                     cleanupUnusedKeys();
@@ -142,12 +196,16 @@ Singleton {
     function saveCache() {
         if (_loading)
             return;
-        cacheFile.setText(JSON.stringify({
+        const data = {
             "wallpaperLastPath": wallpaperLastPath,
             "profileLastPath": profileLastPath,
             "fileBrowserSettings": fileBrowserSettings,
             "configVersion": cacheConfigVersion
-        }, null, 2));
+        };
+        for (const key of _pinKeys) {
+            data[key] = root[key];
+        }
+        cacheFile.setText(JSON.stringify(data, null, 2));
     }
 
     function migrateFromUndefinedToV1(cache) {
@@ -155,7 +213,7 @@ Singleton {
     }
 
     function cleanupUnusedKeys() {
-        const validKeys = ["wallpaperLastPath", "profileLastPath", "fileBrowserSettings", "configVersion"];
+        const validKeys = _dataKeys.concat(["configVersion"]);
 
         try {
             const content = cacheFile.text();

quickshell/Common/PopoutManager.qml

@@ -65,16 +65,35 @@ Singleton {
 
     function _openPopout(popout) {
         if (popout.dashVisible !== undefined) {
-            if (popout.dashVisible && !popout.shouldBeVisible && !popout.isClosing)
+            let flagStayedTrue = popout.dashVisible === true;
+            if (popout.dashVisible && !popout.shouldBeVisible && !popout.isClosing) {
                 popout.dashVisible = false;
+                flagStayedTrue = false;
+            }
             popout.dashVisible = true;
+            // Flag already true (e.g. retargeting to another monitor) won't re-fire
+            // the change handler, so drive the surface open explicitly.
+            if (flagStayedTrue)
+                _ensureSurfaceOpen(popout);
             return;
         }
         if (popout.notificationHistoryVisible !== undefined) {
+            const flagStayedTrue = popout.notificationHistoryVisible === true;
             popout.notificationHistoryVisible = true;
+            if (flagStayedTrue)
+                _ensureSurfaceOpen(popout);
             return;
         }
-        popout.open();
+        _ensureSurfaceOpen(popout);
+    }
+
+    function _ensureSurfaceOpen(popout) {
+        if (typeof popout.present === "function") {
+            popout.present();
+            return;
+        }
+        if (typeof popout.open === "function")
+            popout.open();
     }
 
     function _closePopout(popout) {

quickshell/Common/SettingsData.qml

@@ -15,7 +15,7 @@ Singleton {
     id: root
     readonly property var log: Log.scoped("SettingsData")
 
-    readonly property int settingsConfigVersion: 12
+    readonly property int settingsConfigVersion: 13
 
     readonly property bool isGreeterMode: Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true"
 
@@ -773,11 +773,6 @@ Singleton {
     property bool fadeToDpmsEnabled: true
     property int fadeToDpmsGracePeriod: 5
     property string launchPrefix: ""
-    property var brightnessDevicePins: ({})
-    property var wifiNetworkPins: ({})
-    property var bluetoothDevicePins: ({})
-    property var audioInputDevicePins: ({})
-    property var audioOutputDevicePins: ({})
 
     property bool gtkThemingEnabled: false
     property bool qtThemingEnabled: false
@@ -1741,6 +1736,7 @@ Singleton {
             let obj = (txt && txt.trim()) ? JSON.parse(txt) : null;
 
             const oldVersion = obj?.configVersion ?? 0;
+            const legacyPins = oldVersion < 13 ? Store.extractPins(obj) : null;
             if (oldVersion < settingsConfigVersion) {
                 const migrated = Store.migrateToVersion(obj, settingsConfigVersion);
                 if (migrated) {
@@ -1748,6 +1744,8 @@ Singleton {
                     obj = migrated;
                 }
             }
+            if (legacyPins)
+                Qt.callLater(() => CacheData.migratePins(legacyPins));
 
             if (obj?.lockScreenActiveMonitor !== undefined) {
                 var oldVal = obj.lockScreenActiveMonitor;

quickshell/Common/settings/Processes.qml

@@ -604,7 +604,7 @@ Singleton {
                 let details = out;
                 if (err !== "")
                     details = details !== "" ? details + "\n\nstderr:\n" + err : "stderr:\n" + err;
-                ToastService.showInfo(I18n.tr("Authentication changes applied"), details, "", "auth-sync");
+                ToastService.showInfo(I18n.tr("Authentication changes applied."), details, "", "auth-sync");
                 root.detectAuthCapabilities();
                 root.finishAuthApply();
                 return;

quickshell/Common/settings/SettingsSpec.js

@@ -354,11 +354,6 @@ var SPEC = {
     fadeToDpmsEnabled: { def: true },
     fadeToDpmsGracePeriod: { def: 5 },
     launchPrefix: { def: "" },
-    brightnessDevicePins: { def: {} },
-    wifiNetworkPins: { def: {} },
-    bluetoothDevicePins: { def: {} },
-    audioInputDevicePins: { def: {} },
-    audioOutputDevicePins: { def: {} },
 
     gtkThemingEnabled: { def: false, onChange: "regenSystemThemes" },
     qtThemingEnabled: { def: false, onChange: "regenSystemThemes" },

quickshell/Common/settings/SettingsStore.js

@@ -2,6 +2,21 @@
 
     .import "./SettingsSpec.js" as SpecModule
 
+var PIN_KEYS = ["brightnessDevicePins", "wifiNetworkPins", "bluetoothDevicePins", "audioInputDevicePins", "audioOutputDevicePins"];
+
+function extractPins(obj) {
+    if (!obj) return null;
+
+    var pins = null;
+    for (var i = 0; i < PIN_KEYS.length; i++) {
+        var value = obj[PIN_KEYS[i]];
+        if (!value || Object.keys(value).length === 0) continue;
+        if (!pins) pins = {};
+        pins[PIN_KEYS[i]] = value;
+    }
+    return pins;
+}
+
 function parse(root, jsonObj) {
     var SPEC = SpecModule.SPEC;
 
@@ -263,6 +278,17 @@ function migrateToVersion(obj, targetVersion) {
         settings.configVersion = 12;
     }
 
+    if (currentVersion < 13) {
+        console.info("Migrating settings from version", currentVersion, "to version 13");
+        console.info("Moving device and network pins to cache.json");
+
+        for (var p = 0; p < PIN_KEYS.length; p++) {
+            delete settings[PIN_KEYS[p]];
+        }
+
+        settings.configVersion = 13;
+    }
+
     return settings;
 }
 

quickshell/DMSShell.qml

@@ -139,6 +139,14 @@ Item {
                         return;
                     fadeDpmsWindowLoader.loadedWindow.cancelFade();
                 }
+
+                function onMonitorsOffChanged() {
+                    if (IdleService.monitorsOff)
+                        return;
+                    if (!fadeDpmsWindowLoader.loadedWindow)
+                        return;
+                    fadeDpmsWindowLoader.loadedWindow.dismiss();
+                }
             }
         }
     }

quickshell/Modals/DankLauncherV2/Controller.qml

@@ -449,7 +449,12 @@ Item {
         searchQuery = query;
         requestSearch();
 
-        if (searchMode !== "plugins" && query.startsWith("/")) {
+        if (autoSwitchedToFiles && !query.startsWith("/")) {
+            restorePreviousMode();
+            return;
+        }
+
+        if (query.startsWith("/")) {
             var prefix = Utils.parseFileSearchPrefix(query);
             var explicitType = prefix && prefix.type !== null ? prefix.type : null;
             var targetType = explicitType !== null ? explicitType : (SessionData.launcherLastFileSearchType || "all");

quickshell/Modals/DankLauncherV2/DankLauncherV2ModalStandalone.qml

@@ -174,9 +174,12 @@ Item {
             spotlightContent.controller.selectedFlatIndex = 0;
             spotlightContent.controller.selectedItem = null;
             spotlightContent.controller.historyIndex = -1;
-            spotlightContent.controller.searchQuery = targetQuery;
-
-            spotlightContent.controller.performSearch();
+            if (targetQuery) {
+                spotlightContent.controller.setSearchQuery(targetQuery);
+            } else {
+                spotlightContent.controller.searchQuery = "";
+                spotlightContent.controller.performSearch();
+            }
         }
         if (spotlightContent.resetScroll) {
             spotlightContent.resetScroll();
@@ -271,7 +274,7 @@ Item {
         target: spotlightContent?.controller ?? null
 
         function onModeChanged(mode, userInitiated) {
-            if (!userInitiated || !SettingsData.rememberLastMode || (mode !== "all" && mode !== "apps"))
+            if (!userInitiated || !SettingsData.rememberLastMode)
                 return;
             SessionData.setLauncherLastMode(mode);
         }

quickshell/Modals/PowerMenuModal.qml

@@ -27,7 +27,7 @@ DankModal {
     property real holdProgress: 0
     property bool showHoldHint: false
     property bool holdFromKeyboard: false
-    property string pendingKeyAction: ""
+    property string committedAction: ""
 
     readonly property bool needsConfirmation: SettingsData.powerActionConfirm
     readonly property int holdDurationMs: SettingsData.powerActionHoldDuration * 1000
@@ -39,10 +39,16 @@ DankModal {
         return action !== "lock" && action !== "restart";
     }
 
+    function actionWakesOnKeyRelease(action) {
+        return action === "suspend" || action === "hibernate";
+    }
+
     function startHold(action, actionIndex) {
+        if (committedAction !== "")
+            return;
         if (!needsConfirmation || !actionNeedsConfirm(action)) {
-            if (holdFromKeyboard) {
-                pendingKeyAction = action;
+            if (holdFromKeyboard && actionWakesOnKeyRelease(action)) {
+                commitAction(action, actionIndex);
                 return;
             }
             executeAction(action);
@@ -56,7 +62,6 @@ DankModal {
     }
 
     function cancelHold() {
-        pendingKeyAction = "";
         if (holdAction === "")
             return;
         const wasHolding = holdProgress > 0;
@@ -76,8 +81,8 @@ DankModal {
             return;
         }
         holdTimer.stop();
-        if (holdFromKeyboard) {
-            pendingKeyAction = holdAction;
+        if (holdFromKeyboard && actionWakesOnKeyRelease(holdAction)) {
+            commitAction(holdAction, holdActionIndex);
             return;
         }
         const action = holdAction;
@@ -87,6 +92,25 @@ DankModal {
         executeAction(action);
     }
 
+    function commitAction(action, actionIndex) {
+        holdTimer.stop();
+        holdAction = "";
+        holdActionIndex = actionIndex;
+        committedAction = action;
+        commitFallbackTimer.restart();
+    }
+
+    function executeCommittedAction() {
+        if (committedAction === "")
+            return;
+        commitFallbackTimer.stop();
+        const action = committedAction;
+        committedAction = "";
+        holdActionIndex = -1;
+        holdProgress = 0;
+        executeAction(action);
+    }
+
     signal switchUserRequested
 
     function executeAction(action) {
@@ -128,6 +152,12 @@ DankModal {
         onTriggered: root.showHoldHint = false
     }
 
+    Timer {
+        id: commitFallbackTimer
+        interval: 5000
+        onTriggered: root.executeCommittedAction()
+    }
+
     function openCentered() {
         parentBounds = Qt.rect(0, 0, 0, 0);
         parentScreen = null;
@@ -286,7 +316,8 @@ DankModal {
         holdProgress = 0;
         showHoldHint = false;
         holdFromKeyboard = false;
-        pendingKeyAction = "";
+        committedAction = "";
+        commitFallbackTimer.stop();
         updateVisibleActions();
         const defaultIndex = getDefaultActionIndex();
         selectedIndex = defaultIndex;
@@ -309,6 +340,10 @@ DankModal {
             event.accepted = true;
             return;
         }
+        if (committedAction !== "") {
+            event.accepted = true;
+            return;
+        }
         holdFromKeyboard = true;
         if (SettingsData.powerMenuGridLayout) {
             handleGridNavigation(event, true);
@@ -321,6 +356,11 @@ DankModal {
             event.accepted = true;
             return;
         }
+        if (committedAction !== "") {
+            event.accepted = true;
+            executeCommittedAction();
+            return;
+        }
         if (SettingsData.powerMenuGridLayout) {
             handleGridNavigation(event, false);
         } else {
@@ -331,16 +371,7 @@ DankModal {
     function handleListNavigation(event, isPressed) {
         if (!isPressed) {
             if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter || event.key === Qt.Key_R || event.key === Qt.Key_X || event.key === Qt.Key_L || event.key === Qt.Key_S || event.key === Qt.Key_H || event.key === Qt.Key_D || (event.key === Qt.Key_P && !(event.modifiers & Qt.ControlModifier))) {
-                if (pendingKeyAction !== "") {
-                    const action = pendingKeyAction;
-                    pendingKeyAction = "";
-                    holdAction = "";
-                    holdActionIndex = -1;
-                    holdProgress = 0;
-                    executeAction(action);
-                } else {
-                    cancelHold();
-                }
+                cancelHold();
                 event.accepted = true;
             }
             return;
@@ -434,16 +465,7 @@ DankModal {
     function handleGridNavigation(event, isPressed) {
         if (!isPressed) {
             if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter || event.key === Qt.Key_R || event.key === Qt.Key_X || event.key === Qt.Key_L || event.key === Qt.Key_S || event.key === Qt.Key_H || event.key === Qt.Key_D || (event.key === Qt.Key_P && !(event.modifiers & Qt.ControlModifier))) {
-                if (pendingKeyAction !== "") {
-                    const action = pendingKeyAction;
-                    pendingKeyAction = "";
-                    holdAction = "";
-                    holdActionIndex = -1;
-                    holdProgress = 0;
-                    executeAction(action);
-                } else {
-                    cancelHold();
-                }
+                cancelHold();
                 event.accepted = true;
             }
             return;
@@ -812,6 +834,7 @@ DankModal {
 
             Row {
                 id: hintRow
+                readonly property bool selectedNeedsHold: root.actionNeedsConfirm(root.getActionAtIndex(root.selectedIndex))
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.bottom: parent.bottom
                 anchors.bottomMargin: Theme.spacingS
@@ -826,7 +849,13 @@ DankModal {
                 }
 
                 DankIcon {
-                    name: root.showHoldHint ? "warning" : "touch_app"
+                    name: {
+                        if (root.showHoldHint)
+                            return "warning";
+                        if (!hintRow.selectedNeedsHold)
+                            return "bolt";
+                        return "touch_app";
+                    }
                     size: Theme.fontSizeSmall
                     color: root.showHoldHint ? Theme.warning : Theme.surfaceTextSecondary
                     anchors.verticalCenter: parent.verticalCenter
@@ -836,8 +865,12 @@ DankModal {
                     readonly property real totalMs: SettingsData.powerActionHoldDuration * 1000
                     readonly property int remainingMs: Math.ceil(totalMs * (1 - root.holdProgress))
                     text: {
+                        if (root.committedAction !== "")
+                            return I18n.tr("Release to confirm");
                         if (root.showHoldHint)
                             return I18n.tr("Hold longer to confirm");
+                        if (!hintRow.selectedNeedsHold)
+                            return I18n.tr("Activates immediately");
                         if (root.holdProgress > 0) {
                             if (totalMs < 1000)
                                 return I18n.tr("Hold to confirm (%1 ms)").arg(remainingMs);

quickshell/Modals/Settings/SettingsModal.qml

@@ -41,6 +41,9 @@ FloatingWindow {
     signal closingModal
 
     function show() {
+        if (visible && !backingWindowVisible) {
+            visible = false;
+        }
         visible = true;
     }
 
@@ -49,7 +52,11 @@ FloatingWindow {
     }
 
     function toggle() {
-        visible = !visible;
+        if (visible && backingWindowVisible) {
+            hide();
+            return;
+        }
+        show();
     }
 
     function setTabIndex(tabIndex: int) {
@@ -61,13 +68,12 @@ FloatingWindow {
 
     function showWithTab(tabIndex: int) {
         setTabIndex(tabIndex);
-        visible = true;
+        show();
     }
 
     function showWithTabName(tabName: string) {
-        var idx = sidebar.resolveTabIndex(tabName);
-        setTabIndex(idx);
-        visible = true;
+        setTabIndex(sidebar.resolveTabIndex(tabName));
+        show();
     }
 
     function resolveTabIndex(tabName: string): int {

quickshell/Modals/WindowRuleModal.qml

@@ -52,6 +52,7 @@ FloatingWindow {
         condInitialised.triState = 0;
         opacityEnabled.checked = false;
         opacitySlider.value = 100;
+        floatingCond.triState = 0;
         floatingToggle.checked = false;
         maximizedToggle.checked = false;
         maximizedToEdgesToggle.checked = false;
@@ -164,6 +165,7 @@ FloatingWindow {
         opacityEnabled.checked = hasOpacity;
         opacitySlider.value = hasOpacity ? Math.round(actions.opacity * 100) : 100;
 
+        floatingCond.triState = triFromBool(actions.openFloating);
         floatingToggle.checked = actions.openFloating || false;
         maximizedToggle.checked = actions.openMaximized || false;
         maximizedToEdgesToggle.checked = actions.openMaximizedToEdges || false;
@@ -318,7 +320,9 @@ FloatingWindow {
 
         if (opacityEnabled.checked)
             actions.opacity = opacitySlider.value / 100;
-        if (floatingToggle.checked)
+        if (isNiri)
+            applyCond(actions, "openFloating", floatingCond.triState);
+        else if (floatingToggle.checked)
             actions.openFloating = true;
         if (maximizedToggle.checked)
             actions.openMaximized = true;
@@ -943,6 +947,17 @@ FloatingWindow {
                     title: I18n.tr("Window Opening")
                 }
 
+                Flow {
+                    width: parent.width
+                    spacing: Theme.spacingS
+                    visible: isNiri
+
+                    MatchCond {
+                        id: floatingCond
+                        label: I18n.tr("Float")
+                    }
+                }
+
                 Flow {
                     width: parent.width
                     spacing: Theme.spacingL
@@ -950,6 +965,7 @@ FloatingWindow {
                     CheckboxRow {
                         id: floatingToggle
                         label: I18n.tr("Float")
+                        visible: !isNiri
                     }
                     CheckboxRow {
                         id: maximizedToggle

quickshell/Modules/ControlCenter/BuiltinPlugins/TailscaleWidget.qml

@@ -469,6 +469,8 @@ PluginComponent {
                                     }
 
                                     MouseArea {
+                                        id: peerMouseArea
+
                                         z: -1
                                         anchors.fill: parent
                                         hoverEnabled: true

quickshell/Modules/ControlCenter/ControlCenterPopout.qml

@@ -77,6 +77,12 @@ DankPopout {
 
     readonly property color _containerBg: Theme.nestedSurface
 
+    // Defer open one tick so screen-change geometry settles before the surface
+    // maps; a synchronous open churns the surface and loses the blur on a switch.
+    function present() {
+        Qt.callLater(open);
+    }
+
     function openWithSection(section) {
         StateUtils.openWithSection(root, section);
     }

quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml

@@ -159,7 +159,7 @@ Rectangle {
         }
 
         function getPinnedInputs() {
-            const pins = SettingsData.audioInputDevicePins || {};
+            const pins = CacheData.audioInputDevicePins || {};
             return normalizePinList(pins["preferredInput"]);
         }
 
@@ -315,7 +315,7 @@ Rectangle {
                             cursorShape: Qt.PointingHandCursor
                             onPressed: mouse => pinRipple.trigger(mouse.x, mouse.y)
                             onClicked: {
-                                const pins = JSON.parse(JSON.stringify(SettingsData.audioInputDevicePins || {}));
+                                const pins = JSON.parse(JSON.stringify(CacheData.audioInputDevicePins || {}));
                                 let pinnedList = audioContent.normalizePinList(pins["preferredInput"]);
                                 const pinIndex = pinnedList.indexOf(modelData.name);
 
@@ -332,7 +332,7 @@ Rectangle {
                                 else
                                     delete pins["preferredInput"];
 
-                                SettingsData.set("audioInputDevicePins", pins);
+                                CacheData.set("audioInputDevicePins", pins);
                             }
                         }
                     }

quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml

@@ -169,7 +169,7 @@ Rectangle {
         }
 
         function getPinnedOutputs() {
-            const pins = SettingsData.audioOutputDevicePins || {};
+            const pins = CacheData.audioOutputDevicePins || {};
             return normalizePinList(pins["preferredOutput"]);
         }
 
@@ -324,7 +324,7 @@ Rectangle {
                             cursorShape: Qt.PointingHandCursor
                             onPressed: mouse => pinRipple.trigger(mouse.x, mouse.y)
                             onClicked: {
-                                const pins = JSON.parse(JSON.stringify(SettingsData.audioOutputDevicePins || {}));
+                                const pins = JSON.parse(JSON.stringify(CacheData.audioOutputDevicePins || {}));
                                 let pinnedList = audioContent.normalizePinList(pins["preferredOutput"]);
                                 const pinIndex = pinnedList.indexOf(modelData.name);
 
@@ -341,7 +341,7 @@ Rectangle {
                                 else
                                     delete pins["preferredOutput"];
 
-                                SettingsData.set("audioOutputDevicePins", pins);
+                                CacheData.set("audioOutputDevicePins", pins);
                             }
                         }
                     }

quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml

@@ -112,7 +112,7 @@ Rectangle {
     }
 
     function getPinnedDevices() {
-        const pins = SettingsData.bluetoothDevicePins || {};
+        const pins = CacheData.bluetoothDevicePins || {};
         return normalizePinList(pins["preferredDevice"]);
     }
 
@@ -400,7 +400,7 @@ Rectangle {
                             anchors.fill: parent
                             cursorShape: Qt.PointingHandCursor
                             onClicked: {
-                                const pins = JSON.parse(JSON.stringify(SettingsData.bluetoothDevicePins || {}));
+                                const pins = JSON.parse(JSON.stringify(CacheData.bluetoothDevicePins || {}));
                                 let pinnedList = root.normalizePinList(pins["preferredDevice"]);
                                 const pinIndex = pinnedList.indexOf(pairedDelegate.modelData.address);
 
@@ -418,7 +418,7 @@ Rectangle {
                                     delete pins["preferredDevice"];
                                 }
 
-                                SettingsData.set("bluetoothDevicePins", pins);
+                                CacheData.set("bluetoothDevicePins", pins);
                             }
                         }
                     }

quickshell/Modules/ControlCenter/Details/BrightnessDetail.qml

@@ -37,7 +37,7 @@ Rectangle {
 
         const pinKey = getScreenPinKey();
         if (pinKey.length > 0) {
-            const pins = SettingsData.brightnessDevicePins || {};
+            const pins = CacheData.brightnessDevicePins || {};
             const pinnedDevice = pins[pinKey];
             if (pinnedDevice && pinnedDevice.length > 0) {
                 const found = devices.find(d => d.name === pinnedDevice);
@@ -85,12 +85,12 @@ Rectangle {
         }
         const pinKey = getScreenPinKey();
         if (pinKey.length > 0) {
-            const pins = SettingsData.brightnessDevicePins || {};
+            const pins = CacheData.brightnessDevicePins || {};
             const existing = pins[pinKey];
             if (existing && existing !== deviceName) {
                 const next = JSON.parse(JSON.stringify(pins));
                 delete next[pinKey];
-                SettingsData.set("brightnessDevicePins", next);
+                CacheData.set("brightnessDevicePins", next);
             }
         }
         root.currentDeviceName = deviceName;
@@ -106,7 +106,7 @@ Rectangle {
         const pinKey = getScreenPinKey();
         if (!pinKey || !deviceName)
             return false;
-        const pins = SettingsData.brightnessDevicePins || {};
+        const pins = CacheData.brightnessDevicePins || {};
         return pins[pinKey] === deviceName;
     }
 
@@ -114,13 +114,13 @@ Rectangle {
         const pinKey = getScreenPinKey();
         if (!pinKey || !deviceName)
             return;
-        const pins = JSON.parse(JSON.stringify(SettingsData.brightnessDevicePins || {}));
+        const pins = JSON.parse(JSON.stringify(CacheData.brightnessDevicePins || {}));
         if (pins[pinKey] === deviceName) {
             delete pins[pinKey];
         } else {
             pins[pinKey] = deviceName;
         }
-        SettingsData.set("brightnessDevicePins", pins);
+        CacheData.set("brightnessDevicePins", pins);
     }
 
     implicitHeight: {
@@ -269,7 +269,7 @@ Rectangle {
 
                     readonly property bool selected: !!(modelData && modelData.name === root.currentDeviceName)
                     readonly property bool devicePinnedHere: {
-                        SettingsData.brightnessDevicePins;
+                        CacheData.brightnessDevicePins;
                         return root.isDevicePinnedToScreen(modelData ? modelData.name : "");
                     }
 

quickshell/Modules/ControlCenter/Details/NetworkDetail.qml

@@ -49,7 +49,7 @@ Rectangle {
     }
 
     function getPinnedNetworks() {
-        const pins = SettingsData.wifiNetworkPins || {};
+        const pins = CacheData.wifiNetworkPins || {};
         return normalizePinList(pins["preferredWifi"]);
     }
 
@@ -710,7 +710,7 @@ Rectangle {
                     cursorShape: Qt.PointingHandCursor
                     onPressed: mouse => pinRipple.trigger(mouse.x, mouse.y)
                     onClicked: {
-                        const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}));
+                        const pins = JSON.parse(JSON.stringify(CacheData.wifiNetworkPins || {}));
                         let pinnedList = root.normalizePinList(pins["preferredWifi"]);
                         const pinIndex = pinnedList.indexOf(modelData.ssid);
 
@@ -727,7 +727,7 @@ Rectangle {
                         else
                             delete pins["preferredWifi"];
 
-                        SettingsData.set("wifiNetworkPins", pins);
+                        CacheData.set("wifiNetworkPins", pins);
                     }
                 }
             }

quickshell/Modules/ControlCenter/Widgets/BrightnessSliderRow.qml

@@ -34,7 +34,7 @@ Row {
         if (screenName && screenName.length > 0) {
             const screen = Quickshell.screens.find(s => s.name === screenName);
             const pinKey = screen ? SettingsData.getScreenDisplayName(screen) : screenName;
-            const pins = SettingsData.brightnessDevicePins || {};
+            const pins = CacheData.brightnessDevicePins || {};
             const pinnedDevice = pins[pinKey];
             if (pinnedDevice && pinnedDevice.length > 0) {
                 const found = DisplayService.devices.find(dev => dev.name === pinnedDevice);

quickshell/Modules/DankBar/CenterSection.qml

@@ -29,6 +29,8 @@ Item {
     property var centerWidgets: []
     property int totalWidgets: 0
     property real totalSize: 0
+    property real contentStart: 0
+    property real contentSize: 0
 
     function updateLayout() {
         if (SettingsData.centeringMode === "geometric") {
@@ -36,6 +38,25 @@ Item {
         } else {
             applyIndexLayout();
         }
+        updateContentExtent();
+    }
+
+    function updateContentExtent() {
+        if (centerWidgets.length === 0) {
+            contentStart = 0;
+            contentSize = 0;
+            return;
+        }
+        let start = Infinity;
+        let end = -Infinity;
+        for (const widget of centerWidgets) {
+            const pos = isVertical ? widget.y : widget.x;
+            const size = isVertical ? widget.height : widget.width;
+            start = Math.min(start, pos);
+            end = Math.max(end, pos + size);
+        }
+        contentStart = start;
+        contentSize = end - start;
     }
 
     function applyGeometricLayout() {

quickshell/Modules/DankBar/DankBarContent.qml

@@ -39,7 +39,7 @@ Item {
     readonly property real _barInsetPaddingAuto: _barIsVertical ? Theme.spacingXS : _edgeBaseMargin
     readonly property real _barInsetPadding: _barInsetPaddingRaw < 0 ? _barInsetPaddingAuto : _barInsetPaddingRaw
     // Connected-frame Bar Inset Padding: absolute free-end inset (auto < 0 = frameThickness, 0 = edge-to-edge).
-    // Any amount beyond the frameThickness baseline is also added at the bar-clearance ends (all ends).
+    // FrameExclusions already moves a free bar end inward by frameThickness so use frame inset to mangage the gap
     readonly property real _frameInsetResolved: SettingsData.frameBarInsetPadding < 0 ? SettingsData.frameThickness : SettingsData.frameBarInsetPadding
     readonly property real _frameInsetExtra: Math.max(0, _frameInsetResolved - SettingsData.frameThickness)
 
@@ -47,28 +47,28 @@ Item {
         if (_barIsVertical)
             return _edgeBaseMargin;
         if (_usesFrameBarChrome)
-            return hasAdjacentLeftBarLive ? (_edgeBaseMargin + SettingsData.frameBarSize + _frameInsetExtra) : Math.max(0, _frameInsetResolved);
+            return hasAdjacentLeftBarLive ? (_edgeBaseMargin + SettingsData.frameBarSize + _frameInsetExtra) : _frameInsetExtra;
         return Math.max(0, _barInsetPadding);
     }
     readonly property real _rightMargin: {
         if (_barIsVertical)
             return _edgeBaseMargin;
         if (_usesFrameBarChrome)
-            return hasAdjacentRightBarLive ? (_edgeBaseMargin + SettingsData.frameBarSize + _frameInsetExtra) : Math.max(0, _frameInsetResolved);
+            return hasAdjacentRightBarLive ? (_edgeBaseMargin + SettingsData.frameBarSize + _frameInsetExtra) : _frameInsetExtra;
         return Math.max(0, _barInsetPadding);
     }
     readonly property real _topMargin: {
         if (!_barIsVertical)
             return 0;
         if (_usesFrameBarChrome)
-            return hasAdjacentTopBarLive ? (outlineThickness + SettingsData.frameThickness + _frameInsetExtra) : Math.max(0, _frameInsetResolved);
+            return hasAdjacentTopBarLive ? (outlineThickness + SettingsData.frameThickness + _frameInsetExtra) : _frameInsetExtra;
         return Math.max(0, _barInsetPadding);
     }
     readonly property real _bottomMargin: {
         if (!_barIsVertical)
             return 0;
         if (_usesFrameBarChrome)
-            return hasAdjacentBottomBarLive ? (outlineThickness + SettingsData.frameThickness + _frameInsetExtra) : Math.max(0, _frameInsetResolved);
+            return hasAdjacentBottomBarLive ? (outlineThickness + SettingsData.frameThickness + _frameInsetExtra) : _frameInsetExtra;
         return Math.max(0, _barInsetPadding);
     }
 

quickshell/Modules/DankBar/DankBarWindow.qml

@@ -833,16 +833,30 @@ PanelWindow {
         const pos = section.mapToItem(barWindow.contentItem, 0, 0);
         const implW = section.implicitWidth || 0;
         const implH = section.implicitHeight || 0;
+        const contentSize = isCenter ? (section.contentSize || 0) : 0;
 
-        const offsetX = isCenter && !barWindow.isVertical ? (section.width - implW) / 2 : 0;
-        const offsetY = !barWindow.isVertical ? (section.height - implH) / 2 : (isCenter ? (section.height - implH) / 2 : 0);
+        let offsetX = isCenter && !barWindow.isVertical ? (section.width - implW) / 2 : 0;
+        let offsetY = !barWindow.isVertical ? (section.height - implH) / 2 : (isCenter ? (section.height - implH) / 2 : 0);
+        let w = implW;
+        let h = implH;
+
+        // index centering lays content out asymmetrically; use the real extent
+        if (contentSize > 0) {
+            if (barWindow.isVertical) {
+                offsetY = section.contentStart;
+                h = contentSize;
+            } else {
+                offsetX = section.contentStart;
+                w = contentSize;
+            }
+        }
 
         const edgePad = 2;
         return {
             "x": pos.x + offsetX - edgePad,
             "y": pos.y + offsetY - edgePad,
-            "w": implW + edgePad * 2,
-            "h": implH + edgePad * 2
+            "w": w + edgePad * 2,
+            "h": h + edgePad * 2
         };
     }
 

quickshell/Modules/DankBar/Widgets/ClipboardButton.qml

@@ -63,8 +63,8 @@ BasePill {
         anchors.fill: parent
         acceptedButtons: Qt.LeftButton | Qt.RightButton
         cursorShape: Qt.PointingHandCursor
-        onPressed: mouse => root.triggerRipple(this, mouse.x, mouse.y)
-        onClicked: function (mouse) {
+        onPressed: function (mouse) {
+            root.triggerRipple(this, mouse.x, mouse.y);
             switch (mouse.button) {
             case Qt.RightButton:
                 openContextMenu();

quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml

@@ -203,7 +203,7 @@ BasePill {
         const pinKey = getScreenPinKey();
         if (!pinKey)
             return "";
-        const pins = SettingsData.brightnessDevicePins || {};
+        const pins = CacheData.brightnessDevicePins || {};
         return pins[pinKey] || "";
     }
 

quickshell/Modules/DankBar/Widgets/NotificationCenterButton.qml

@@ -35,44 +35,42 @@ BasePill {
         }
     }
 
-    onRightClicked: (rx, ry) => {
+    onRightClicked: {
         const screen = root.parentScreen || Screen;
         if (!screen)
             return;
-        const globalPos = root.visualContent.mapToItem(null, 0, 0);
+
         const isVertical = root.axis?.isVertical ?? false;
         const edge = root.axis?.edge ?? "top";
         const gap = Math.max(Theme.spacingXS, root.barSpacing ?? Theme.spacingXS);
         const barOffset = root.barThickness + root.barSpacing + gap;
+        const localPos = root.visualContent.mapToItem(null, root.visualContent.width / 2, root.visualContent.height / 2);
 
         let anchorX;
         let anchorY;
-        let anchorEdge;
         if (isVertical) {
-            anchorY = globalPos.y - (screen.y || 0) + root.visualContent.height / 2;
-            if (edge === "left") {
-                anchorX = barOffset;
-                anchorEdge = "top";
-            } else {
-                anchorX = screen.width - barOffset;
-                anchorEdge = "top";
-            }
+            anchorX = edge === "left" ? barOffset : screen.width - barOffset;
+            anchorY = localPos.y;
         } else {
-            anchorX = globalPos.x - (screen.x || 0) + root.visualContent.width / 2;
-            if (edge === "bottom") {
-                anchorY = screen.height - barOffset;
-                anchorEdge = "bottom";
-            } else {
-                anchorY = barOffset;
-                anchorEdge = "top";
-            }
+            anchorX = localPos.x;
+            anchorY = edge === "bottom" ? screen.height - barOffset : barOffset;
         }
 
         dndPopupLoader.active = true;
         const popup = dndPopupLoader.item;
         if (!popup)
             return;
-        popup.showAt(anchorX, anchorY, screen, anchorEdge);
+
+        popup.showAt(anchorX, anchorY, isVertical, edge, screen);
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.MiddleButton
+        onPressed: mouse => {
+            root.triggerRipple(this, mouse.x, mouse.y);
+            SessionData.setDoNotDisturb(!SessionData.doNotDisturb);
+        }
     }
 
     Loader {

quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -1250,13 +1250,8 @@ BasePill {
 
                     if (root.isVerticalOrientation) {
                         const edge = root.axis?.edge;
-                        if (edge === "left") {
-                            const targetX = overflowMenu.anchorPos.x;
-                            return Math.max(left, Math.min(right, targetX));
-                        } else {
-                            const targetX = overflowMenu.anchorPos.x - alignedWidth;
-                            return Math.max(left, Math.min(right, targetX));
-                        }
+                        const targetX = edge === "left" ? overflowMenu.anchorPos.x : overflowMenu.anchorPos.x - alignedWidth;
+                        return Math.max(10, Math.min(overflowMenu.width - alignedWidth - 10, targetX));
                     } else {
                         const want = overflowMenu.anchorPos.x - alignedWidth / 2;
                         return Math.max(left, Math.min(right, want));
@@ -1271,13 +1266,8 @@ BasePill {
                         const want = overflowMenu.anchorPos.y - alignedHeight / 2;
                         return Math.max(top, Math.min(bottom, want));
                     } else {
-                        if (root.isAtBottom) {
-                            const targetY = overflowMenu.anchorPos.y - alignedHeight;
-                            return Math.max(top, Math.min(bottom, targetY));
-                        } else {
-                            const targetY = overflowMenu.anchorPos.y;
-                            return Math.max(top, Math.min(bottom, targetY));
-                        }
+                        const targetY = root.isAtBottom ? overflowMenu.anchorPos.y - alignedHeight : overflowMenu.anchorPos.y;
+                        return Math.max(10, Math.min(overflowMenu.height - alignedHeight - 10, targetY));
                     }
                 })(), overflowMenu.dpr)
 
@@ -1770,13 +1760,8 @@ BasePill {
 
                             if (menuRoot.isVertical) {
                                 const edge = menuRoot.axis?.edge;
-                                if (edge === "left") {
-                                    const targetX = menuWindow.anchorPos.x;
-                                    return Math.max(left, Math.min(right, targetX));
-                                } else {
-                                    const targetX = menuWindow.anchorPos.x - alignedWidth;
-                                    return Math.max(left, Math.min(right, targetX));
-                                }
+                                const targetX = edge === "left" ? menuWindow.anchorPos.x : menuWindow.anchorPos.x - alignedWidth;
+                                return Math.max(10, Math.min(menuWindow.width - alignedWidth - 10, targetX));
                             } else {
                                 const want = menuWindow.anchorPos.x - alignedWidth / 2;
                                 return Math.max(left, Math.min(right, want));
@@ -1791,13 +1776,8 @@ BasePill {
                                 const want = menuWindow.anchorPos.y - alignedHeight / 2;
                                 return Math.max(top, Math.min(bottom, want));
                             } else {
-                                if (menuRoot.isAtBottom) {
-                                    const targetY = menuWindow.anchorPos.y - alignedHeight;
-                                    return Math.max(top, Math.min(bottom, targetY));
-                                } else {
-                                    const targetY = menuWindow.anchorPos.y;
-                                    return Math.max(top, Math.min(bottom, targetY));
-                                }
+                                const targetY = menuRoot.isAtBottom ? menuWindow.anchorPos.y - alignedHeight : menuWindow.anchorPos.y;
+                                return Math.max(10, Math.min(menuWindow.height - alignedHeight - 10, targetY));
                             }
                         })(), menuWindow.dpr)
 

quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml

@@ -1079,7 +1079,7 @@ Rectangle {
 
                 Text {
                     text: I18n.tr("Add a task...", "placeholder in the new-task input field")
-                    color: Theme.onSurface_38
+                    color: Theme.outlineButton
                     visible: taskInput.text.length === 0
                     font.pixelSize: Theme.fontSizeSmall
                     anchors.verticalCenter: parent.verticalCenter

quickshell/Modules/DankDash/Overview/WeatherOverviewCard.qml

@@ -1,5 +1,4 @@
 import QtQuick
-import QtQuick.Controls
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -19,6 +18,7 @@ Card {
         anchors.centerIn: parent
         spacing: Theme.spacingS
         visible: !WeatherService.weather.available
+        z: 1
 
         DankSpinner {
             size: 24
@@ -42,9 +42,9 @@ Card {
             anchors.horizontalCenter: parent.horizontalCenter
         }
 
-        Button {
+        DankButton {
             text: I18n.tr("Refresh")
-            flat: true
+            buttonHeight: 32
             visible: !WeatherService.weather.loading
             anchors.horizontalCenter: parent.horizontalCenter
             onClicked: WeatherService.forceRefresh()

quickshell/Modules/DankDash/WeatherTab.qml

@@ -141,52 +141,27 @@ Item {
                 anchors.verticalCenter: parent.verticalCenter
             }
 
-            DankIcon {
+            DankActionButton {
                 id: refreshButtonTwo
-                name: "refresh"
-                size: Theme.iconSize - 4
-                color: Theme.withAlpha(Theme.surfaceText, 0.4)
-                anchors.top: parent.top
                 anchors.verticalCenter: parent.verticalCenter
-                smoothTransform: isRefreshing
-
-                property bool isRefreshing: false
+                iconName: isRefreshing ? "" : "refresh"
+                iconColor: Theme.withAlpha(Theme.surfaceText, 0.4)
+                tooltipText: I18n.tr("Refresh Weather")
+                tooltipSide: "left"
                 enabled: !isRefreshing
 
-                MouseArea {
-                    id: refreshButtonMouseAreaTwo
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: parent.enabled ? Qt.PointingHandCursor : Qt.ForbiddenCursor
-                    enabled: parent.enabled
+                property bool isRefreshing: false
 
-                    Timer {
-                        id: hoverDelayTwo
-                        interval: 300
-                        repeat: false
-                        onTriggered: {
-                            refreshButtonTooltipTwo.show(I18n.tr("Refresh Weather"), refreshButtonTwo, 0, 0, "left");
-                        }
-                    }
-
-                    onEntered: {
-                        hoverDelayTwo.restart();
-                    }
-
-                    onExited: {
-                        hoverDelayTwo.stop();
-                        refreshButtonTooltipTwo.hide();
-                    }
-
-                    onClicked: {
-                        refreshButtonTwo.isRefreshing = true;
-                        WeatherService.forceRefresh();
-                        refreshTimerTwo.restart();
-                    }
+                onClicked: {
+                    isRefreshing = true;
+                    WeatherService.forceRefresh();
+                    refreshTimerTwo.restart();
                 }
 
-                DankTooltipV2 {
-                    id: refreshButtonTooltipTwo
+                DankSpinner {
+                    anchors.centerIn: parent
+                    size: refreshButtonTwo.iconSize
+                    visible: refreshButtonTwo.isRefreshing
                 }
 
                 Timer {
@@ -194,14 +169,6 @@ Item {
                     interval: 2000
                     onTriggered: refreshButtonTwo.isRefreshing = false
                 }
-
-                RotationAnimator on rotation {
-                    running: refreshButtonTwo.isRefreshing
-                    from: 0
-                    to: 360
-                    duration: 1000
-                    loops: Animation.Infinite
-                }
             }
         }
     }
@@ -864,52 +831,28 @@ Item {
                 onClicked: SessionData.setWeatherHourlyDetailed(!SessionData.weatherHourlyDetailed)
             }
 
-            DankIcon {
+            DankActionButton {
                 id: refreshButton
-                name: "refresh"
-                size: Theme.iconSize - 4
-                color: Theme.withAlpha(Theme.surfaceText, 0.4)
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                smoothTransform: isRefreshing
-
-                property bool isRefreshing: false
+                iconName: isRefreshing ? "" : "refresh"
+                iconColor: Theme.withAlpha(Theme.surfaceText, 0.4)
+                tooltipText: I18n.tr("Refresh Weather")
+                tooltipSide: "left"
                 enabled: !isRefreshing
 
-                MouseArea {
-                    id: refreshButtonMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: parent.enabled ? Qt.PointingHandCursor : Qt.ForbiddenCursor
-                    enabled: parent.enabled
+                property bool isRefreshing: false
 
-                    Timer {
-                        id: hoverDelay
-                        interval: 300
-                        repeat: false
-                        onTriggered: {
-                            refreshButtonTooltip.show(I18n.tr("Refresh Weather"), refreshButton, 0, 0, "left");
-                        }
-                    }
-
-                    onEntered: {
-                        hoverDelay.restart();
-                    }
-
-                    onExited: {
-                        hoverDelay.stop();
-                        refreshButtonTooltip.hide();
-                    }
-
-                    onClicked: {
-                        refreshButton.isRefreshing = true;
-                        WeatherService.forceRefresh();
-                        refreshTimer.restart();
-                    }
+                onClicked: {
+                    isRefreshing = true;
+                    WeatherService.forceRefresh();
+                    refreshTimer.restart();
                 }
 
-                DankTooltipV2 {
-                    id: refreshButtonTooltip
+                DankSpinner {
+                    anchors.centerIn: parent
+                    size: refreshButton.iconSize
+                    visible: refreshButton.isRefreshing
                 }
 
                 Timer {
@@ -917,14 +860,6 @@ Item {
                     interval: 2000
                     onTriggered: refreshButton.isRefreshing = false
                 }
-
-                RotationAnimator on rotation {
-                    running: refreshButton.isRefreshing
-                    from: 0
-                    to: 360
-                    duration: 1000
-                    loops: Animation.Infinite
-                }
             }
         }
 

quickshell/Modules/Dock/Dock.qml

@@ -438,20 +438,55 @@ Variants {
             parent: dock.contentItem
             visible: false
             readonly property bool expanded: dock.reveal
+            readonly property bool chrome: dock.usesConnectedFrameChrome
+            readonly property bool atEndEdge: SettingsData.dockPosition === SettingsData.Position.Bottom || SettingsData.dockPosition === SettingsData.Position.Right
+            readonly property real innerReach: borderThickness + (SettingsData.appsDockEnlargeOnHover ? animationHeadroom : 0)
+            readonly property real bodyX: dockBackground.x + dockContainer.x + dockMouseArea.x + dockCore.x + dockSlide.x
+            readonly property real bodyY: dockBackground.y + dockContainer.y + dockMouseArea.y + dockCore.y + dockSlide.y
             x: {
-                const baseX = dockCore.x + dockMouseArea.x;
-                if (isVertical && SettingsData.dockPosition === SettingsData.Position.Right)
-                    return baseX - (expanded ? animationHeadroom + borderThickness + dock.horizontalConnectorExtent : 0);
-                return baseX - (expanded ? borderThickness + dock.horizontalConnectorExtent : 0);
+                if (chrome) {
+                    const baseX = dockCore.x + dockMouseArea.x;
+                    if (isVertical && atEndEdge)
+                        return baseX - (expanded ? animationHeadroom + borderThickness + dock.horizontalConnectorExtent : 0);
+                    return baseX - (expanded ? borderThickness + dock.horizontalConnectorExtent : 0);
+                }
+                if (!isVertical)
+                    return dockCore.x + dockMouseArea.x - (expanded ? borderThickness : 0);
+                if (!atEndEdge)
+                    return 0;
+                return expanded ? Math.min(bodyX - innerReach, dock.width - 1) : dock.width - 1;
             }
             y: {
-                const baseY = dockCore.y + dockMouseArea.y;
-                if (!isVertical && SettingsData.dockPosition === SettingsData.Position.Bottom)
-                    return baseY - (expanded ? animationHeadroom + borderThickness + dock.verticalConnectorExtent : 0);
-                return baseY - (expanded ? borderThickness + dock.verticalConnectorExtent : 0);
+                if (chrome) {
+                    const baseY = dockCore.y + dockMouseArea.y;
+                    if (!isVertical && atEndEdge)
+                        return baseY - (expanded ? animationHeadroom + borderThickness + dock.verticalConnectorExtent : 0);
+                    return baseY - (expanded ? borderThickness + dock.verticalConnectorExtent : 0);
+                }
+                if (isVertical)
+                    return dockCore.y + dockMouseArea.y - (expanded ? borderThickness : 0);
+                if (!atEndEdge)
+                    return 0;
+                return expanded ? Math.min(bodyY - innerReach, dock.height - 1) : dock.height - 1;
+            }
+            width: {
+                if (chrome)
+                    return dockMouseArea.width + (isVertical && expanded ? animationHeadroom : 0) + (expanded ? borderThickness * 2 + dock.horizontalConnectorExtent * 2 : 0);
+                if (!isVertical)
+                    return dockMouseArea.width + (expanded ? borderThickness * 2 : 0);
+                if (!expanded)
+                    return 1;
+                return atEndEdge ? dock.width - x : Math.max(bodyX + dockBackground.width + innerReach, 1);
+            }
+            height: {
+                if (chrome)
+                    return dockMouseArea.height + (!isVertical && expanded ? animationHeadroom : 0) + (expanded ? borderThickness * 2 + dock.verticalConnectorExtent * 2 : 0);
+                if (isVertical)
+                    return dockMouseArea.height + (expanded ? borderThickness * 2 : 0);
+                if (!expanded)
+                    return 1;
+                return atEndEdge ? dock.height - y : Math.max(bodyY + dockBackground.height + innerReach, 1);
             }
-            width: dockMouseArea.width + (isVertical && expanded ? animationHeadroom : 0) + (expanded ? borderThickness * 2 + dock.horizontalConnectorExtent * 2 : 0)
-            height: dockMouseArea.height + (!isVertical && expanded ? animationHeadroom : 0) + (expanded ? borderThickness * 2 + dock.verticalConnectorExtent * 2 : 0)
         }
 
         mask: Region {

quickshell/Modules/Greetd/GreeterContent.qml

@@ -1773,6 +1773,7 @@ Item {
                     const idx = GreeterState.sessionList.indexOf(value);
                     if (idx < 0)
                         return;
+                    GreeterState.sessionManuallySelected = true;
                     GreeterState.currentSessionIndex = idx;
                     GreeterState.selectedSession = GreeterState.sessionExecs[idx];
                     GreeterState.selectedSessionPath = GreeterState.sessionPaths[idx];
@@ -1785,6 +1786,8 @@ Item {
     property string currentSessionName: GreeterState.sessionList[GreeterState.currentSessionIndex] || ""
 
     function finalizeSessionSelection() {
+        if (GreeterState.sessionManuallySelected)
+            return;
         if (GreeterState.sessionList.length === 0)
             return;
         if (!GreetdMemory.memoryReady)

quickshell/Modules/Greetd/GreeterState.qml

@@ -21,6 +21,7 @@ Singleton {
     property var sessionPaths: []
     property var sessionDesktopIds: []
     property int currentSessionIndex: 0
+    property bool sessionManuallySelected: false
     property var availableUsers: []
     property int selectedUserIndex: -1
 

quickshell/Modules/Greetd/assets/dms-greeter

@@ -386,16 +386,20 @@ end)
 HYPRLAND_LUA_EOF
             COMPOSITOR_CONFIG="$TEMP_CONFIG"
         elif [[ -z "$COMPOSITOR_CONFIG" ]]; then
-            TEMP_CONFIG=$(mktemp)
-            cat > "$TEMP_CONFIG" << HYPRLAND_EOF
-env = DMS_RUN_GREETER,1
+            TEMP_CONFIG=$(mktemp --suffix=.lua)
+            cat > "$TEMP_CONFIG" << HYPRLAND_LUA_EOF
+hl.env("DMS_RUN_GREETER", "1")
 
-misc {
-    disable_hyprland_logo = true
-}
+hl.config({
+    misc = {
+        disable_hyprland_logo = true,
+    },
+})
 
-exec-once = sh -c "$QS_CMD; hyprctl dispatch exit"
-HYPRLAND_EOF
+hl.on("hyprland.start", function()
+    hl.exec_cmd('sh -c "$QS_CMD; hyprctl dispatch exit"')
+end)
+HYPRLAND_LUA_EOF
             COMPOSITOR_CONFIG="$TEMP_CONFIG"
         else
             TEMP_CONFIG=$(mktemp)

quickshell/Modules/Lock/FadeToDpmsWindow.qml

@@ -4,11 +4,13 @@ import QtQuick
 import Quickshell
 import Quickshell.Wayland
 import qs.Common
+import qs.Services
 
 PanelWindow {
     id: root
 
     property bool active: false
+    property bool _completed: false
 
     signal fadeCompleted
     signal fadeCancelled
@@ -35,7 +37,8 @@ PanelWindow {
         opacity: 0
 
         onOpacityChanged: {
-            if (opacity >= 0.99 && root.active) {
+            if (opacity >= 0.99 && root.active && !root._completed) {
+                root._completed = true;
                 root.fadeCompleted();
             }
         }
@@ -58,6 +61,7 @@ PanelWindow {
     function startFade() {
         if (!SettingsData.fadeToDpmsEnabled)
             return;
+        _completed = false;
         active = true;
         fadeOverlay.opacity = 0.0;
         fadeSeq.stop();
@@ -65,10 +69,24 @@ PanelWindow {
     }
 
     function cancelFade() {
+        dismiss();
+        fadeCancelled();
+    }
+
+    function dismiss() {
         fadeSeq.stop();
         fadeOverlay.opacity = 0.0;
         active = false;
-        fadeCancelled();
+        _completed = false;
+    }
+
+    Connections {
+        target: IdleService
+        function onIsShellLockedChanged() {
+            if (IdleService.isShellLocked)
+                return;
+            root.dismiss();
+        }
     }
 
     MouseArea {

quickshell/Modules/Lock/KeyboardController.qml

@@ -27,11 +27,14 @@ Item {
     function hide() {
         if (isKeyboardActive && keyboard !== null) {
             keyboard.destroy();
+            keyboard = null;
             isKeyboardActive = false;
         } else
             log.debug("The keyboard is already hidden");
     }
 
+    Component.onDestruction: hide()
+
     // private
     property Item keyboard: null
     Component {

quickshell/Modules/Lock/Lock.qml

@@ -10,6 +10,8 @@ import qs.Services
 Scope {
     id: root
 
+    readonly property var log: Log.scoped("Lock")
+
     property string sharedPasswordBuffer: ""
     property bool shouldLock: false
 
@@ -21,26 +23,13 @@ Scope {
 
     onShouldLockChanged: {
         IdleService.isShellLocked = shouldLock;
-        if (shouldLock && lockPowerOffArmed) {
-            lockStateCheck.restart();
-        }
-    }
-
-    Timer {
-        id: lockStateCheck
-        interval: 100
-        repeat: false
-        onTriggered: {
-            if (sessionLock.locked && lockPowerOffArmed) {
-                pendingLock = false;
-                lockPowerOffArmed = false;
-                beginPowerOff();
-            }
-        }
     }
 
     property bool lockInitiatedLocally: false
     property bool pendingLock: false
+    readonly property int maxLockRetries: 3
+    property int lockRetryAttempts: 0
+    property bool lockRetryPending: false
     property bool lockPowerOffArmed: false
     property bool lockWakeAllowed: false
     property bool customLockerSpawned: false
@@ -116,6 +105,24 @@ Scope {
         return true;
     }
 
+    function resetLockRetry() {
+        lockRetryAttempts = 0;
+        lockRetryPending = false;
+        lockRetryTimer.stop();
+    }
+
+    function handleLockLost() {
+        if (lockRetryAttempts >= maxLockRetries) {
+            log.error("Compositor refused session lock", maxLockRetries, "times - resetting lock state");
+            forceReset();
+            return;
+        }
+        lockRetryAttempts++;
+        lockRetryPending = true;
+        lockRetryTimer.restart();
+        log.warn("Session lock lost while lock requested - retry", lockRetryAttempts, "/", maxLockRetries);
+    }
+
     function lock() {
         if (SettingsData.customPowerActionLock?.length > 0) {
             spawnCustomLocker();
@@ -124,6 +131,7 @@ Scope {
         if (shouldLock || pendingLock)
             return;
 
+        resetLockRetry();
         lockInitiatedLocally = true;
         lockPowerOffArmed = powerOffOnLock;
 
@@ -139,7 +147,7 @@ Scope {
 
     function lockAndOutputsOff() {
         IdleService.lockPowerOffRequested = true;
-        if (sessionLock.locked) {
+        if (sessionLock.secure) {
             beginPowerOff();
             return;
         }
@@ -150,6 +158,7 @@ Scope {
     function unlock() {
         if (!shouldLock)
             return;
+        resetLockRetry();
         lockInitiatedLocally = false;
         notifyLoginctl(false);
         shouldLock = false;
@@ -160,6 +169,7 @@ Scope {
         pendingLock = false;
         shouldLock = false;
         customLockerSpawned = false;
+        resetLockRetry();
         resetPowerOffFade();
         IdleService.lockPowerOffRequested = false;
     }
@@ -198,6 +208,12 @@ Scope {
             shouldLock = false;
         }
 
+        function onSessionResumed() {
+            if (!shouldLock || sessionLock.locked)
+                return;
+            resumeRelockTimer.restart();
+        }
+
         function onLoginctlStateChanged() {
             if (SessionService.active && pendingLock) {
                 pendingLock = false;
@@ -239,7 +255,7 @@ Scope {
     WlSessionLock {
         id: sessionLock
 
-        locked: shouldLock
+        locked: shouldLock && !lockRetryPending
 
         WlSessionLockSurface {
             id: lockSurface
@@ -312,16 +328,23 @@ Scope {
     Connections {
         target: sessionLock
 
-        function onLockedChanged() {
-            notifyLockedHint(sessionLock.locked);
-            if (sessionLock.locked) {
-                pendingLock = false;
-                if (lockPowerOffArmed && powerOffOnLock)
-                    beginPowerOff();
-                lockPowerOffArmed = false;
+        function onSecureChanged() {
+            notifyLockedHint(sessionLock.secure);
+            if (!sessionLock.secure)
                 return;
-            }
+            IdleService.dismissFadeToLock();
+            lockRetryAttempts = 0;
+            pendingLock = false;
+            if (lockPowerOffArmed && powerOffOnLock)
+                beginPowerOff();
+            lockPowerOffArmed = false;
+        }
 
+        function onLockedChanged() {
+            if (sessionLock.locked)
+                return;
+            if (shouldLock && (IdleService.monitorsOff || lockPowerOffArmed || IdleService.lockPowerOffRequested))
+                return;
             lockWakeAllowed = false;
             resetPowerOffFade();
             if (IdleService.monitorsOff && powerOffOnLock) {
@@ -329,6 +352,8 @@ Scope {
                 CompositorService.powerOnMonitors();
             }
             IdleService.lockPowerOffRequested = false;
+            if (shouldLock && !lockRetryPending)
+                handleLockLost();
         }
     }
 
@@ -360,13 +385,15 @@ Scope {
         }
 
         function isLocked(): bool {
-            return sessionLock.locked;
+            return sessionLock.secure;
         }
 
         function status(): string {
             return JSON.stringify({
                 shouldLock: root.shouldLock,
                 sessionLockLocked: sessionLock.locked,
+                sessionLockSecure: sessionLock.secure,
+                lockRetryAttempts: root.lockRetryAttempts,
                 lockInitiatedLocally: root.lockInitiatedLocally,
                 pendingLock: root.pendingLock,
                 loginctlLocked: SessionService.locked,
@@ -395,6 +422,29 @@ Scope {
         }
     }
 
+    Timer {
+        id: lockRetryTimer
+        interval: 1000
+        repeat: false
+        onTriggered: root.lockRetryPending = false
+    }
+
+    Timer {
+        id: resumeRelockTimer
+        interval: 1000
+        repeat: false
+        onTriggered: {
+            if (!root.shouldLock || sessionLock.locked)
+                return;
+            if (IdleService.monitorsOff || root.lockPowerOffArmed || IdleService.lockPowerOffRequested)
+                return;
+            root.log.warn("Session lock dead after resume - re-locking");
+            root.resetLockRetry();
+            root.lockRetryPending = true;
+            root.lockRetryPending = false;
+        }
+    }
+
     Timer {
         id: dpmsReapplyTimer
         interval: 100
@@ -407,7 +457,7 @@ Scope {
         interval: 200
         repeat: false
         onTriggered: {
-            if (!sessionLock.locked)
+            if (!sessionLock.secure)
                 return;
             if (!powerOffOnLock)
                 return;
@@ -426,7 +476,7 @@ Scope {
 
     MouseArea {
         anchors.fill: parent
-        enabled: sessionLock.locked
+        enabled: sessionLock.secure
         hoverEnabled: enabled
         onPressed: lockWakeDebounce.restart()
         onPositionChanged: lockWakeDebounce.restart()
@@ -435,10 +485,10 @@ Scope {
 
     FocusScope {
         anchors.fill: parent
-        focus: sessionLock.locked
+        focus: sessionLock.secure
 
         Keys.onPressed: event => {
-            if (!sessionLock.locked)
+            if (!sessionLock.secure)
                 return;
             lockWakeDebounce.restart();
         }

quickshell/Modules/Lock/LockScreenContent.qml

@@ -35,6 +35,7 @@ Item {
     property int hyprlandLayoutCount: 0
     property bool lockerReadySent: false
     property bool lockerReadyArmed: false
+    property var sessionLock: null
     readonly property bool hasCustomWallpaper: SettingsData.lockScreenWallpaperPath !== ""
     readonly property string lockFontFamily: SettingsData.lockScreenFontFamily
 
@@ -111,6 +112,8 @@ Item {
     }
 
     function sendLockerReadyOnce() {
+        if (root.demoMode)
+            return;
         if (lockerReadySent)
             return;
         if (root.unlocking)
@@ -133,12 +136,27 @@ Item {
             return;
         if (!root.visible || root.opacity <= 0)
             return;
+        // Don't report ready until the compositor has confirmed the session is
+        // locked (ext-session-lock `locked` event). Qt's afterRendering fires
+        // before the lock surface is committed/presented, so releasing the sleep
+        // inhibitor on it lets the machine freeze with the desktop still on screen,
+        // which then flashes on resume. secure=true guarantees the desktop is hidden.
+        if (root.sessionLock && !root.sessionLock.secure)
+            return;
         Qt.callLater(() => {
             if (root.visible && root.opacity > 0 && !root.unlocking)
                 sendLockerReadyOnce();
         });
     }
 
+    Connections {
+        target: root.sessionLock
+        enabled: target !== null
+        function onSecureChanged() {
+            root.maybeSend();
+        }
+    }
+
     Connections {
         target: root.Window.window
         enabled: target !== null
@@ -778,7 +796,7 @@ Item {
                                     return "passkey";
                                 if (pam.fprint.tries >= SettingsData.maxFprintTries)
                                     return "fingerprint_off";
-                                if (pam.fprint.active)
+                                if (pam.fprint.active || pam.fprint.retrying)
                                     return "fingerprint";
                                 if (pam.u2f.active)
                                     return "passkey";

quickshell/Modules/Lock/LockSurface.qml

@@ -33,6 +33,7 @@ FocusScope {
 
         anchors.fill: parent
         demoMode: false
+        sessionLock: root.lock
         pam: root.pam
         passwordBuffer: root.sharedPasswordBuffer
         screenName: root.screenName

quickshell/Modules/Lock/Pam.qml

@@ -262,9 +262,11 @@ Scope {
         property bool available: SettingsData.lockFingerprintReady
         property int tries
         property int errorTries
+        property bool retrying: false
 
         function checkAvail(): void {
             if (!available || !SettingsData.enableFprint || !root.lockSecured || root.fprintSuppressedByPrimaryPam) {
+                retrying = false;
                 abort();
                 return;
             }
@@ -273,6 +275,7 @@ Scope {
 
             tries = 0;
             errorTries = 0;
+            retrying = false;
             start();
         }
 
@@ -285,6 +288,7 @@ Scope {
 
             switch (res) {
             case PamResult.Success:
+                retrying = false;
                 if (!root.unlockInProgress) {
                     passwd.abort();
                     root.proceedAfterPrimaryAuth();
@@ -293,13 +297,16 @@ Scope {
             case PamResult.Error:
                 errorTries++;
                 if (errorTries < 200) {
+                    retrying = true;
                     abort();
                     errorRetry.restart();
                     return;
                 }
+                retrying = false;
                 abort();
                 return;
             case PamResult.MaxTries:
+                retrying = false;
                 tries++;
                 if (tries < SettingsData.maxFprintTries) {
                     root.fprintState = "fail";
@@ -418,7 +425,7 @@ Scope {
     Timer {
         id: errorRetry
 
-        interval: 1500
+        interval: Math.min(1500 * Math.pow(2, Math.max(0, fprint.errorTries - 1)), 30000)
         onTriggered: fprint.start()
     }
 

quickshell/Modules/Notifications/Center/DndDurationPopup.qml

@@ -31,14 +31,16 @@ PanelWindow {
     }
 
     property point anchorPos: Qt.point(0, 0)
-    property string anchorEdge: "top"
+    property bool isVertical: false
+    property string edge: "top"
     visible: false
 
-    function showAt(x, y, targetScreen, edge) {
+    function showAt(x, y, vertical, barEdge, targetScreen) {
         if (targetScreen)
             root.screen = targetScreen;
         anchorPos = Qt.point(x, y);
-        anchorEdge = edge || "top";
+        isVertical = vertical ?? false;
+        edge = barEdge ?? "top";
         visible = true;
     }
 
@@ -66,21 +68,19 @@ PanelWindow {
         visible: root.visible
 
         x: {
-            const left = 10;
-            const right = root.width - width - 10;
-            const want = root.anchorPos.x - width / 2;
-            return Math.max(left, Math.min(right, want));
+            if (root.isVertical) {
+                if (root.edge === "left")
+                    return Math.min(root.width - width - 10, root.anchorPos.x);
+                return Math.max(10, root.anchorPos.x - width);
+            }
+            return Math.max(10, Math.min(root.width - width - 10, root.anchorPos.x - width / 2));
         }
         y: {
-            switch (root.anchorEdge) {
-            case "bottom":
-                return Math.max(10, root.anchorPos.y - height);
-            case "left":
-            case "right":
+            if (root.isVertical)
                 return Math.max(10, Math.min(root.height - height - 10, root.anchorPos.y - height / 2));
-            default:
-                return Math.min(root.height - height - 10, root.anchorPos.y);
-            }
+            if (root.edge === "bottom")
+                return Math.max(10, root.anchorPos.y - height);
+            return Math.min(root.height - height - 10, root.anchorPos.y);
         }
 
         onDismissed: root.closeMenu()

quickshell/Modules/Notifications/Center/NotificationCenterPopout.qml

@@ -61,6 +61,11 @@ DankPopout {
         notificationHistoryVisible = !notificationHistoryVisible;
     }
 
+    // Re-open without toggling the flag (used when retargeting to another monitor).
+    function present() {
+        openSized();
+    }
+
     function openSized() {
         if (!notificationHistoryVisible)
             return;

quickshell/Modules/Notifications/Popup/NotificationPopup.qml

@@ -45,6 +45,14 @@ PanelWindow {
         blurWidth: !win._finalized && !win.connectedFrameMode ? innerW * s : 0
         blurHeight: !win._finalized && !win.connectedFrameMode ? innerH * s : 0
         blurRadius: win.connectedFrameMode ? Theme.connectedSurfaceRadius : Theme.cornerRadius
+        // Slide-out translates the card past the surface edge; intersecting with the
+        // resting bounds keeps the committed region on the visible content instead of
+        // leaving a stray blur sliver at the edge (#2917).
+        clipEnabled: true
+        clipX: content.x + content.cardInset
+        clipY: content.y + content.cardInset
+        clipWidth: innerW
+        clipHeight: innerH
     }
 
     WlrLayershell.namespace: "dms:notification-popup"

quickshell/Modules/Settings/AutoStartTab.qml

@@ -375,6 +375,8 @@ Item {
             visible: DesktopService.autostartAvailable
 
             SettingsCard {
+                settingKey: "autostartAddEntry"
+                tags: ["autostart", "add", "entry", "command", "startup"]
                 width: parent.width
                 iconName: "add_circle"
                 title: I18n.tr("Add Entry")
@@ -764,6 +766,8 @@ Item {
             }
 
             SettingsCard {
+                settingKey: "autostartTrayIconFix"
+                tags: ["tray", "icons", "fix", "systemd"]
                 width: parent.width
                 iconName: "handyman"
                 title: I18n.tr("Tray Icon Fix")

quickshell/Modules/Settings/DankBarTab.qml

@@ -463,6 +463,7 @@ Item {
             }
 
             SettingsCard {
+                settingKey: "barEnable"
                 iconName: selectedBarConfig?.enabled ? "visibility" : "visibility_off"
                 title: I18n.tr("Enable Bar")
                 visible: !dankBarTab.appearanceOnly && selectedBarId !== "default"
@@ -651,6 +652,8 @@ Item {
                 visible: !dankBarTab.appearanceOnly && selectedBarConfig?.enabled
 
                 SettingsToggleRow {
+                    settingKey: "barAutoHide"
+                    tags: ["autohide", "auto-hide", "reveal", "intellihide"]
                     text: I18n.tr("Auto-hide")
                     description: I18n.tr("Automatically hide the bar when the pointer moves away")
                     checked: selectedBarConfig?.autoHide ?? false
@@ -700,6 +703,8 @@ Item {
                     }
 
                     SettingsToggleRow {
+                        settingKey: "barAutoHideStrict"
+                        tags: ["autohide", "strict", "popout"]
                         width: parent.width - parent.leftPadding
                         text: I18n.tr("Strict auto-hide", "Dank bar setting: hide the bar when the pointer leaves even if a menu or bar popover is still open")
                         description: I18n.tr("Hide the bar when the pointer leaves even if a popout is still open")
@@ -713,6 +718,8 @@ Item {
                     }
 
                     SettingsToggleRow {
+                        settingKey: "barHideWhenWindowsOpen"
+                        tags: ["hide", "windows", "empty", "workspace"]
                         width: parent.width - parent.leftPadding
                         visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isMango
                         text: I18n.tr("Hide When Windows Open")
@@ -734,6 +741,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "barManualVisibility"
+                    tags: ["manual", "show", "hide", "ipc", "toggle"]
                     text: I18n.tr("Manual Show/Hide")
                     description: I18n.tr("Toggle bar visibility manually via IPC")
                     checked: selectedBarConfig?.visible ?? true
@@ -753,6 +762,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "barClickThrough"
+                    tags: ["clickthrough", "click", "through", "mouse", "input", "mask", "passthrough"]
                     text: I18n.tr("Click Through")
                     description: I18n.tr("Mouse clicks pass through the bar to windows behind it")
                     checked: selectedBarConfig?.clickThrough ?? false
@@ -910,6 +921,8 @@ Item {
 
                 SettingsSliderRow {
                     id: exclusiveZoneSlider
+                    settingKey: "barExclusiveZone"
+                    tags: ["exclusive", "zone", "reserved", "offset"]
                     visible: !SettingsData.frameEnabled
                     text: I18n.tr("Exclusive Zone Offset")
                     description: I18n.tr("Fine-tune the space reserved for the bar from the screen edge")
@@ -933,6 +946,8 @@ Item {
 
                 SettingsSliderRow {
                     id: sizeSlider
+                    settingKey: "barSize"
+                    tags: ["size", "thickness", "height", "inner"]
                     visible: !SettingsData.frameEnabled
                     text: I18n.tr("Size")
                     description: I18n.tr("Adjust the bar height via inner padding")
@@ -1154,6 +1169,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "barSquareCorners"
+                    tags: ["square", "corners", "rounding"]
                     text: I18n.tr("Square Corners")
                     description: I18n.tr("Remove corner rounding from the bar")
                     visible: !SettingsData.frameEnabled
@@ -1164,6 +1181,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "barNoBackground"
+                    tags: ["transparent", "background", "invisible"]
                     text: I18n.tr("No Background")
                     description: I18n.tr("Make the bar background fully transparent")
                     visible: !SettingsData.frameEnabled
@@ -1174,6 +1193,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "barMaximizeWidgetIcons"
+                    tags: ["maximize", "icons", "stretch"]
                     text: I18n.tr("Maximize Widget Icons")
                     description: I18n.tr("Stretch widget icons to fill the available bar height")
                     checked: selectedBarConfig?.maximizeWidgetIcons ?? false
@@ -1183,6 +1204,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "barMaximizeWidgetText"
+                    tags: ["maximize", "text", "stretch"]
                     text: I18n.tr("Maximize Widget Text")
                     description: I18n.tr("Stretch widget text to fill the available bar height")
                     checked: selectedBarConfig?.maximizeWidgetText ?? false
@@ -1192,6 +1215,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "barRemoveWidgetPadding"
+                    tags: ["padding", "compact", "widgets"]
                     text: I18n.tr("Remove Widget Padding")
                     description: I18n.tr("Remove inner padding from all widgets")
                     checked: selectedBarConfig?.removeWidgetPadding ?? false
@@ -1208,6 +1233,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "barGothCorners"
+                    tags: ["goth", "corners", "concave", "cutout"]
                     text: I18n.tr("Goth Corners")
                     description: I18n.tr("Apply inverse concave corner cutouts to the bar")
                     visible: !SettingsData.frameEnabled
@@ -1302,6 +1329,8 @@ Item {
             }
 
             SettingsToggleCard {
+                settingKey: "barMaximizeDetection"
+                tags: ["maximize", "gaps", "border", "fullscreen"]
                 iconName: "fit_screen"
                 title: I18n.tr("Maximize Detection")
                 description: I18n.tr("Remove gaps and border when windows are maximized")
@@ -1847,6 +1876,8 @@ Item {
 
             SettingsToggleCard {
                 iconName: "mouse"
+                settingKey: "barScrollWheel"
+                tags: ["scroll", "wheel", "workspace", "axis"]
                 title: I18n.tr("Scroll Wheel")
                 description: I18n.tr("Control workspaces and columns by scrolling on the bar")
                 visible: !dankBarTab.appearanceOnly && selectedBarConfig?.enabled

quickshell/Modules/Settings/DefaultAppsTab.qml

@@ -267,6 +267,8 @@ Item {
             spacing: Theme.spacingXL
 
             SettingsCard {
+                settingKey: "defaultAppsInternet"
+                tags: ["browser", "mail", "email", "web"]
                 title: I18n.tr("Internet", "Internet")
                 iconName: "public"
 
@@ -293,6 +295,8 @@ Item {
             }
 
             SettingsCard {
+                settingKey: "defaultAppsUtilities"
+                tags: ["file", "manager", "terminal", "editor"]
                 title: I18n.tr("Utilities", "Utilities")
                 iconName: "terminal"
 
@@ -317,6 +321,8 @@ Item {
             }
 
             SettingsCard {
+                settingKey: "defaultAppsDocuments"
+                tags: ["pdf", "text", "reader", "office"]
                 title: I18n.tr("Documents", "Documents")
                 iconName: "edit_document"
 
@@ -335,6 +341,8 @@ Item {
             }
 
             SettingsCard {
+                settingKey: "defaultAppsMultimedia"
+                tags: ["image", "video", "music", "viewer", "player"]
                 title: I18n.tr("Multimedia", "Multimedia")
                 iconName: "movie"
                 AppSelector {

quickshell/Modules/Settings/DesktopWidgetsTab.qml

@@ -166,6 +166,8 @@ Item {
             spacing: Theme.spacingXL
 
             SettingsCard {
+                settingKey: "desktopWidgetsManage"
+                tags: ["desktop", "widgets", "clock", "conky"]
                 width: parent.width
                 iconName: "widgets"
                 title: I18n.tr("Desktop Widgets")
@@ -203,6 +205,8 @@ Item {
             }
 
             SettingsCard {
+                settingKey: "desktopWidgetGroups"
+                tags: ["groups", "profiles", "layouts"]
                 width: parent.width
                 iconName: "folder"
                 title: I18n.tr("Groups")

quickshell/Modules/Settings/DisplayConfig/DisplayConfigState.qml

@@ -17,6 +17,7 @@ Singleton {
     readonly property var wlrOutputs: WlrOutputService.outputs
     property var outputs: ({})
     property var savedOutputs: ({})
+    property var savedParsedOutputs: ({})
     property var allOutputs: buildAllOutputsMap()
 
     property var includeStatus: ({
@@ -911,15 +912,18 @@ Singleton {
         const paths = getConfigPaths();
         if (!paths) {
             savedOutputs = {};
+            savedParsedOutputs = {};
             return;
         }
 
         Proc.runCommand("load-saved-outputs", ["cat", paths.outputsFile], (content, exitCode) => {
             if (exitCode !== 0 || !content.trim()) {
                 savedOutputs = {};
+                savedParsedOutputs = {};
                 return;
             }
             const parsed = parseOutputsConfig(content);
+            savedParsedOutputs = parsed;
             const filtered = filterDisconnectedOnly(parsed);
             savedOutputs = filtered;
 
@@ -1092,20 +1096,7 @@ Singleton {
             const name = match[1];
             const body = match[2];
 
-            if (body.trim() === "off") {
-                result[name] = {
-                    "name": name,
-                    "disabled": true,
-                    "logical": {
-                        "x": 0,
-                        "y": 0,
-                        "scale": 1.0,
-                        "transform": "Normal"
-                    }
-                };
-                continue;
-            }
-
+            const disabled = /^\s*off\s*$/m.test(body);
             const modeMatch = body.match(/mode\s+"(\d+)x(\d+)@([\d.]+)"/);
             const posMatch = body.match(/position\s+x=(-?\d+)\s+y=(-?\d+)/);
             const scaleMatch = body.match(/scale\s+([\d.]+)/);
@@ -1115,6 +1106,7 @@ Singleton {
 
             result[name] = {
                 "name": name,
+                "disabled": disabled,
                 "logical": {
                     "x": posMatch ? parseInt(posMatch[1]) : 0,
                     "y": posMatch ? parseInt(posMatch[2]) : 0,
@@ -1778,6 +1770,41 @@ Singleton {
         return normalized;
     }
 
+    function findSavedParsedOutput(outputName) {
+        const output = outputs[outputName];
+        const candidates = [outputName];
+        if (output?.make && output?.model) {
+            candidates.push(output.make + " " + output.model + " " + (output.serial || "Unknown"));
+            candidates.push(output.make + " " + output.model);
+        }
+        for (const savedName in savedParsedOutputs) {
+            if (candidates.includes(savedName.trim()))
+                return savedParsedOutputs[savedName];
+        }
+        return null;
+    }
+
+    // A disabled wlr head reports no current mode, scale 0 and position 0,0 —
+    // overlay the last written config so rewrites don't discard real settings.
+    function overlaySavedDisabledOutput(entry, outputName) {
+        const saved = findSavedParsedOutput(outputName);
+        if (!saved)
+            return;
+
+        const savedMode = saved.modes?.[saved.current_mode ?? 0];
+        if (savedMode && !entry.configured_mode)
+            entry.configured_mode = savedMode.width + "x" + savedMode.height + "@" + (savedMode.refresh_rate / 1000).toFixed(3);
+        if (saved.vrr_enabled !== undefined)
+            entry.vrr_enabled = saved.vrr_enabled;
+        if (!saved.logical || !entry.logical)
+            return;
+
+        entry.logical.x = saved.logical.x;
+        entry.logical.y = saved.logical.y;
+        entry.logical.scale = saved.logical.scale;
+        entry.logical.transform = saved.logical.transform;
+    }
+
     function buildOutputsWithPendingChanges() {
         const result = {};
 
@@ -1787,7 +1814,10 @@ Singleton {
         }
 
         for (const outputName in outputs) {
-            result[outputName] = JSON.parse(JSON.stringify(outputs[outputName]));
+            const entry = JSON.parse(JSON.stringify(outputs[outputName]));
+            if (entry.enabled === false)
+                overlaySavedDisabledOutput(entry, outputName);
+            result[outputName] = entry;
         }
 
         for (const outputName in pendingChanges) {
@@ -1799,6 +1829,8 @@ Singleton {
                 result[outputName].logical.y = changes.position.y;
             }
             if (changes.mode !== undefined && result[outputName].modes) {
+                if (result[outputName].configured_mode)
+                    result[outputName].configured_mode = changes.mode;
                 for (var i = 0; i < result[outputName].modes.length; i++) {
                     if (formatMode(result[outputName].modes[i]) === changes.mode) {
                         result[outputName].current_mode = i;

quickshell/Modules/Settings/DockTab.qml

@@ -618,6 +618,8 @@ Item {
                 }
 
                 SettingsSliderRow {
+                    settingKey: "dockExclusiveZone"
+                    tags: ["exclusive", "zone", "reserved", "offset"]
                     text: I18n.tr("Exclusive Zone Offset")
                     visible: !root.connectedFrameModeActive || root.connectedPersistentDockActive
                     value: SettingsData.dockBottomGap

quickshell/Modules/Settings/GreeterTab.qml

@@ -19,39 +19,39 @@ Item {
 
     function greeterFingerprintDescription() {
         if (SettingsData.greeterPamExternallyManaged)
-            return I18n.tr("Managed by the primary PAM source", "factor managed by PAM source status");
+            return I18n.tr("Managed by the primary PAM source.", "factor managed by PAM source status");
         if (SettingsData.greeterFingerprintSource === "pam")
             return I18n.tr("PAM already provides fingerprint auth. Enable this to show it at login.", "greeter fingerprint login setting");
 
         switch (SettingsData.greeterFingerprintReason) {
         case "ready":
-            return I18n.tr("Authentication changes apply automatically", "greeter auth setting description");
+            return I18n.tr("Authentication changes apply automatically.", "greeter auth setting description");
         case "missing_enrollment":
             return I18n.tr("Fingerprint reader detected, but no prints are enrolled yet. You can enable this now and run Sync later.", "greeter fingerprint login setting");
         case "missing_reader":
-            return I18n.tr("No fingerprint reader detected", "fingerprint setting status");
+            return I18n.tr("No fingerprint reader detected.", "fingerprint setting status");
         case "missing_pam_support":
             return I18n.tr("Not available — install fprintd and pam_fprintd, or configure greetd PAM.", "greeter fingerprint login setting");
         default:
-            return I18n.tr("Fingerprint availability could not be confirmed", "fingerprint setting status");
+            return I18n.tr("Fingerprint availability could not be confirmed.", "fingerprint setting status");
         }
     }
 
     function greeterU2fDescription() {
         if (SettingsData.greeterPamExternallyManaged)
-            return I18n.tr("Managed by the primary PAM source", "factor managed by PAM source status");
+            return I18n.tr("Managed by the primary PAM source.", "factor managed by PAM source status");
         if (SettingsData.greeterU2fSource === "pam")
             return I18n.tr("PAM already provides security-key auth. Enable this to show it at login.", "greeter security key login setting");
 
         switch (SettingsData.greeterU2fReason) {
         case "ready":
-            return I18n.tr("Authentication changes apply automatically", "greeter auth setting description");
+            return I18n.tr("Authentication changes apply automatically.", "greeter auth setting description");
         case "missing_key_registration":
             return I18n.tr("Security-key support was detected, but no registered key was found yet. You can enable this now and register one later.", "security key setting status");
         case "missing_pam_support":
             return I18n.tr("Not available — install or configure pam_u2f, or configure greetd PAM.", "greeter security key login setting");
         default:
-            return I18n.tr("Security-key availability could not be confirmed", "security key setting status");
+            return I18n.tr("Security-key availability could not be confirmed.", "security key setting status");
         }
     }
 
@@ -400,7 +400,7 @@ Item {
                 settingKey: "greeterStatus"
 
                 StyledText {
-                    text: I18n.tr("Sync applies your theme and settings to the login screen. Shared users should run dms greeter sync --profile instead of a primary user sync.")
+                    text: I18n.tr("Sync applies your theme and settings to the login screen. Other users should run dms greeter sync --profile instead of a full sync. Authentication changes apply automatically.")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText
                     width: parent.width
@@ -474,7 +474,7 @@ Item {
                 settingKey: "greeterAuth"
 
                 StyledText {
-                    text: I18n.tr("Enable fingerprint or security key for DMS Greeter")
+                    text: I18n.tr("Enable fingerprint or security key for DMS Greeter. Authentication changes apply automatically.")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText
                     width: parent.width
@@ -486,7 +486,7 @@ Item {
                     settingKey: "greeterPamExternallyManaged"
                     tags: ["greeter", "pam", "managed", "external", "greetd", "auth"]
                     text: I18n.tr("Use system PAM authentication", "system PAM policy toggle")
-                    description: I18n.tr("DMS removes its managed block from /etc/pam.d/greetd and stops write services", "greeter system PAM toggle description")
+                    description: I18n.tr("DMS removes its managed block from /etc/pam.d/greetd and stops writing to it", "greeter system PAM toggle description")
                     checked: SettingsData.greeterPamExternallyManaged
                     onToggled: checked => SettingsData.set("greeterPamExternallyManaged", checked)
                 }
@@ -553,7 +553,7 @@ Item {
                     settingKey: "greeterLockDateFormat"
                     tags: ["greeter", "date", "format"]
                     text: I18n.tr("Date Format")
-                    description: I18n.tr("Format the date on the login screen")
+                    description: I18n.tr("Greeter only — format for the date on the login screen")
                     options: root._lockDateFormatPresets.map(p => p.label)
                     currentValue: {
                         var current = (SettingsData.greeterLockDateFormat !== undefined && SettingsData.greeterLockDateFormat !== "") ? SettingsData.greeterLockDateFormat : SettingsData.lockDateFormat || "";
@@ -577,7 +577,7 @@ Item {
                 }
 
                 StyledText {
-                    text: I18n.tr("Use a custom image for the login screen, or leave empty to use desktop wallpaper")
+                    text: I18n.tr("Use a custom image for the login screen, or leave empty to use your desktop wallpaper.")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText
                     width: parent.width
@@ -605,7 +605,7 @@ Item {
                 settingKey: "greeterBehavior"
 
                 StyledText {
-                    text: I18n.tr("Convenience options for the login screen")
+                    text: I18n.tr("Convenience options for the login screen. Sync to apply.")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText
                     width: parent.width
@@ -649,7 +649,7 @@ Item {
                 settingKey: "greeterDeps"
 
                 StyledText {
-                    text: I18n.tr("Requires greetd, dms-greeter, and your user in the greeter group (plus fprintd/pam_fprintd for fingerprint, pam_u2f for security keys).")
+                    text: I18n.tr("Requires greetd, dms-greeter, and your user in the greeter group (plus fprintd/pam_fprintd for fingerprint, pam_u2f for security keys). Auth changes apply automatically and may open a terminal for sudo.")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText
                     width: parent.width
@@ -658,7 +658,7 @@ Item {
                 }
 
                 StyledText {
-                    text: I18n.tr("Installation and PAM setup are documented in the ") + "<a href=\"https://danklinux.com/docs/dankgreeter/installation\" style=\"text-decoration:none; color:" + Theme.primary + ";\">DankGreeter docs.</a> "
+                    text: I18n.tr("Installation and PAM setup: see the ") + "<a href=\"https://danklinux.com/docs/dankgreeter/installation\" style=\"text-decoration:none; color:" + Theme.primary + ";\">DankGreeter docs</a> " + I18n.tr("or run ") + "'dms greeter install'."
                     textFormat: Text.RichText
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText

quickshell/Modules/Settings/LockScreenTab.qml

@@ -96,28 +96,28 @@ Item {
     function lockFingerprintDescription() {
         switch (SettingsData.lockFingerprintReason) {
         case "ready":
-            return I18n.tr("Use fingerprint authentication for the lock screen", "lock screen fingerprint setting");
+            return I18n.tr("Use fingerprint authentication for the lock screen.", "lock screen fingerprint setting");
         case "missing_enrollment":
             return I18n.tr("Fingerprint reader detected, but no prints are enrolled yet. You can enable this now and enroll later.", "lock screen fingerprint setting");
         case "missing_reader":
-            return I18n.tr("No fingerprint reader detected", "fingerprint setting status");
+            return I18n.tr("No fingerprint reader detected.", "fingerprint setting status");
         case "missing_pam_support":
-            return I18n.tr("Not available - install fprintd and pam_fprintd", "lock screen fingerprint setting");
+            return I18n.tr("Not available — install fprintd and pam_fprintd.", "lock screen fingerprint setting");
         default:
-            return I18n.tr("Fingerprint availability could not be confirmed", "fingerprint setting status");
+            return I18n.tr("Fingerprint availability could not be confirmed.", "fingerprint setting status");
         }
     }
 
     function lockU2fDescription() {
         switch (SettingsData.lockU2fReason) {
         case "ready":
-            return I18n.tr("Use a security key for lock screen authentication", "lock screen U2F security key setting");
+            return I18n.tr("Use a security key for lock screen authentication.", "lock screen U2F security key setting");
         case "missing_key_registration":
             return I18n.tr("Security-key support was detected, but no registered key was found yet. You can enable this now and register one later.", "security key setting status");
         case "missing_pam_support":
-            return I18n.tr("Not available - install or configure pam_u2f", "lock screen security key setting");
+            return I18n.tr("Not available — install or configure pam_u2f.", "lock screen security key setting");
         default:
-            return I18n.tr("Security-key availability could not be confirmed", "security key setting status");
+            return I18n.tr("Security-key availability could not be confirmed.", "security key setting status");
         }
     }
 
@@ -207,7 +207,7 @@ Item {
             const warns = Array.isArray(data.warnings) ? data.warnings : [];
             root.authValidateOk = true;
             root.authValidateWarn = warns.length > 0;
-            root.authValidateMessage = [I18n.tr("Authentication changes applied"), ...warns].join("\n");
+            root.authValidateMessage = [I18n.tr("Authentication changes applied."), ...warns].join("\n");
         }
     }
 
@@ -245,7 +245,7 @@ Item {
             const warns = Array.isArray(data.warnings) ? data.warnings : [];
             root.u2fValidateOk = true;
             root.u2fValidateWarn = warns.length > 0;
-            root.u2fValidateMessage = [I18n.tr("Authentication changes applied"), ...warns].join("\n");
+            root.u2fValidateMessage = [I18n.tr("Authentication changes applied."), ...warns].join("\n");
             root.refreshAuthDetection();
         }
     }
@@ -400,7 +400,7 @@ Item {
                 settingKey: "lockAuthSource"
 
                 StyledText {
-                    text: I18n.tr("Authentication changes apply automatically")
+                    text: I18n.tr("Authentication changes apply automatically.")
                     font.pixelSize: Theme.fontSizeSmall
                     color: Theme.surfaceVariantText
                     width: parent.width
@@ -484,7 +484,7 @@ Item {
                     settingKey: "enableFprint"
                     tags: ["lock", "screen", "fingerprint", "authentication", "biometric", "fprint"]
                     text: I18n.tr("Enable fingerprint authentication")
-                    description: root.lockFprintControlledByPrimary ? I18n.tr("Managed by the primary PAM source", "factor managed by PAM source status") : root.lockFingerprintDescription()
+                    description: root.lockFprintControlledByPrimary ? I18n.tr("Managed by the primary PAM source.", "factor managed by PAM source status") : root.lockFingerprintDescription()
                     descriptionColor: root.lockFprintControlledByPrimary || SettingsData.lockFingerprintReason === "ready" ? Theme.surfaceVariantText : Theme.warning
                     checked: SettingsData.enableFprint || root.primaryPamHasFprint
                     enabled: root.lockFprintToggleAvailable && !root.lockFprintControlledByPrimary
@@ -495,7 +495,7 @@ Item {
                     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: root.lockU2fControlledByPrimary ? I18n.tr("Managed by the primary PAM source", "factor managed by PAM source status") : root.lockU2fDescription()
+                    description: root.lockU2fControlledByPrimary ? I18n.tr("Managed by the primary PAM source.", "factor managed by PAM source status") : root.lockU2fDescription()
                     descriptionColor: root.lockU2fControlledByPrimary || SettingsData.lockU2fReason === "ready" ? Theme.surfaceVariantText : Theme.warning
                     checked: SettingsData.enableU2f || root.primaryPamHasU2f
                     enabled: root.lockU2fToggleAvailable && !root.lockU2fControlledByPrimary

quickshell/Modules/Settings/MediaPlayerTab.qml

@@ -38,6 +38,8 @@ Item {
                 settingKey: "mediaPlayer"
 
                 SettingsToggleRow {
+                    settingKey: "mediaWaveProgress"
+                    tags: ["wave", "progress", "animated"]
                     text: I18n.tr("Wave Progress Bars")
                     description: I18n.tr("Use animated wave progress bars for media playback")
                     checked: SettingsData.waveProgressEnabled
@@ -45,6 +47,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "mediaScrollTitle"
+                    tags: ["scroll", "title", "marquee"]
                     text: I18n.tr("Scroll song title")
                     description: I18n.tr("Scroll title if it doesn't fit in widget")
                     checked: SettingsData.scrollTitleEnabled
@@ -52,6 +56,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "mediaVisualizer"
+                    tags: ["visualizer", "cava", "spectrum"]
                     text: I18n.tr("Audio Visualizer")
                     description: I18n.tr("Show cava audio visualizer in media widget")
                     checked: SettingsData.audioVisualizerEnabled
@@ -59,6 +65,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "mediaAdaptiveWidth"
+                    tags: ["adaptive", "width", "shrink"]
                     text: I18n.tr("Adaptive Media Width")
                     description: I18n.tr("Shrink the media widget to fit shorter song titles while still respecting the configured maximum size")
                     checked: SettingsData.mediaAdaptiveWidthEnabled
@@ -66,6 +74,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "mediaAlbumArtAccent"
+                    tags: ["album", "art", "accent", "colors"]
                     text: I18n.tr("Use album art accent")
                     description: I18n.tr("Use colors extracted from album art instead of system theme colors")
                     checked: SettingsData.mediaUseAlbumArtAccent
@@ -136,6 +146,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "mediaDeviceScrollVolume"
+                    tags: ["device", "scroll", "volume"]
                     text: I18n.tr("Device list scroll volume")
                     description: I18n.tr("Allow adjusting device volume by scrolling on the right half of items in the device list")
                     checked: SettingsData.audioDeviceScrollVolumeEnabled

quickshell/Modules/Settings/MuxTab.qml

@@ -81,6 +81,7 @@ Item {
             SettingsCard {
                 tab: "mux"
                 tags: ["mux", "session", "filter", "exclude", "hide"]
+                settingKey: "muxSessionFilter"
                 title: I18n.tr("Session Filter")
                 iconName: "filter_list"
 

quickshell/Modules/Settings/NetworkWifiTab.qml

@@ -55,12 +55,12 @@ Item {
                 }
 
                 function getPinnedWifiNetworks() {
-                    const pins = SettingsData.wifiNetworkPins || {};
+                    const pins = CacheData.wifiNetworkPins || {};
                     return normalizePinList(pins["preferredWifi"]);
                 }
 
                 function toggleWifiPin(ssid) {
-                    const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}));
+                    const pins = JSON.parse(JSON.stringify(CacheData.wifiNetworkPins || {}));
                     let pinnedList = normalizePinList(pins["preferredWifi"]);
                     const pinIndex = pinnedList.indexOf(ssid);
 
@@ -77,7 +77,7 @@ Item {
                     else
                         delete pins["preferredWifi"];
 
-                    SettingsData.set("wifiNetworkPins", pins);
+                    CacheData.set("wifiNetworkPins", pins);
                 }
 
                 property var forgetNetworkConfirm: ConfirmModal {}

quickshell/Modules/Settings/SystemUpdaterTab.qml

@@ -89,6 +89,8 @@ Item {
                 }
 
                 SettingsDropdownRow {
+                    settingKey: "systemUpdaterCheckInterval"
+                    tags: ["interval", "poll", "frequency"]
                     text: I18n.tr("Check interval")
                     description: I18n.tr("How often the server polls for new updates.")
                     options: root.intervalOptions.map(o => o.label).concat([root.customIntervalLabel])
@@ -157,6 +159,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "systemUpdaterCheckOnStart"
+                    tags: ["startup", "check", "boot"]
                     text: I18n.tr("Check on startup")
                     description: I18n.tr("When enabled, checks updates on startup. When disabled, only the interval above or a manual refresh runs a check.")
                     checked: SettingsData.updaterCheckOnStart
@@ -164,6 +168,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "systemUpdaterFlatpak"
+                    tags: ["flatpak", "include"]
                     text: I18n.tr("Include Flatpak updates")
                     description: I18n.tr("Apply Flatpak updates alongside system updates when running 'Update All'.")
                     visible: (SystemUpdateService.backends || []).some(b => b.repo === "flatpak")
@@ -172,6 +178,8 @@ Item {
                 }
 
                 SettingsToggleRow {
+                    settingKey: "systemUpdaterAUR"
+                    tags: ["aur", "paru", "yay"]
                     text: I18n.tr("Include AUR updates")
                     description: I18n.tr("Run paru/yay with AUR enabled when 'Update All' is clicked.")
                     visible: (SystemUpdateService.backends || []).some(b => b.id === "paru" || b.id === "yay")
@@ -328,6 +336,8 @@ Item {
                 settingKey: "systemUpdaterAdvanced"
 
                 SettingsToggleRow {
+                    settingKey: "systemUpdaterCustomCommand"
+                    tags: ["custom", "command", "terminal"]
                     text: I18n.tr("Use Custom Command")
                     description: I18n.tr("Open a terminal and run a custom command instead of the in-shell upgrade flow.")
                     checked: SettingsData.updaterUseCustomCommand

quickshell/Modules/Settings/ThemeColorsTab.qml

@@ -24,6 +24,8 @@ Item {
     property string matugenPreviewRequestKey: ""
     property var installedRegistryThemes: []
     property var templateDetection: []
+    readonly property var neovimDarkBaseThemes: ["aquarium", "ashes", "aylin", "ayu_dark", "bearded-arc", "carbonfox", "catppuccin", "chadracula", "chadracula-evondev", "chadtain", "chocolate", "darcula-dark", "dark_horizon", "decay", "default-dark", "doomchad", "eldritch", "embark", "everblush", "everforest", "falcon", "flexoki", "flouromachine", "gatekeeper", "github_dark", "gruvbox", "gruvchad", "hiberbee", "horizon", "jabuti", "jellybeans", "kanagawa", "kanagawa-dragon", "material-darker", "material-deep-ocean", "melange", "midnight_breeze", "mito-laser", "monekai", "monochrome", "mountain", "neofusion", "nightfox", "nightlamp", "nightowl", "nord", "obsidian-ember", "oceanic-next", "onedark", "onenord", "oxocarbon", "palenight", "pastelDark", "pastelbeans", "penumbra_dark", "poimandres", "radium", "rosepine", "rxyhn", "scaryforest", "seoul256_dark", "solarized_dark", "solarized_osaka", "starlight", "sweetpastel", "tokyodark", "tokyonight", "tomorrow_night", "tundra", "vesper", "vscode_dark", "wombat", "yoru", "zenburn"]
+    readonly property var neovimLightBaseThemes: ["ayu_light", "blossom_light", "catppuccin-latte", "default-light", "everforest_light", "flex-light", "flexoki-light", "github_light", "gruvbox_light", "material-lighter", "nano-light", "oceanic-light", "one_light", "onenord_light", "penumbra_light", "rosepine-dawn", "seoul256_light", "solarized_light", "sunrise_breeze", "vscode_light"]
     readonly property var matugenSchemeColorMap: {
         const map = {};
         const mode = SessionData.isLightMode ? "light" : "dark";
@@ -2666,7 +2668,7 @@ Item {
                     description: "Base to derive dark theme from"
                     visible: neovimThemeToggle.visible && neovimThemeToggle.checked
                     currentValue: SettingsData.matugenTemplateNeovimSettings?.dark?.baseTheme ?? "github_dark"
-                    options: ["aquarium", "ashes", "aylin", "ayu_dark", "bearded-arc", "carbonfox", "catppuccin", "chadracula", "chadracula-evondev", "chadtain", "chocolate", "darcula-dark", "dark_horizon", "decay", "default-dark", "doomchad", "eldritch", "embark", "everblush", "everforest", "falcon", "flexoki", "flouromachine", "gatekeeper", "github_dark", "gruvbox", "gruvchad", "hiberbee", "horizon", "jabuti", "jellybeans", "kanagawa", "kanagawa-dragon", "material-darker", "material-deep-ocean", "melange", "midnight_breeze", "mito-laser", "monekai", "monochrome", "mountain", "neofusion", "nightfox", "nightlamp", "nightowl", "nord", "obsidian-ember", "oceanic-next", "onedark", "onenord", "oxocarbon", "palenight", "pastelDark", "pastelbeans", "penumbra_dark", "poimandres", "radium", "rosepine", "rxyhn", "scaryforest", "seoul256_dark", "solarized_dark", "solarized_osaka", "starlight", "sweetpastel", "tokyodark", "tokyonight", "tomorrow_night", "tundra", "vesper", "vscode_dark", "wombat", "yoru", "zenburn"]
+                    options: themeColorsTab.neovimDarkBaseThemes.concat(themeColorsTab.neovimLightBaseThemes)
                     enableFuzzySearch: true
                     onValueChanged: value => {
                         const settings = SettingsData.matugenTemplateNeovimSettings;
@@ -2683,7 +2685,7 @@ Item {
                     description: "Base to derive light theme from"
                     visible: neovimThemeToggle.visible && neovimThemeToggle.checked
                     currentValue: SettingsData.matugenTemplateNeovimSettings?.light?.baseTheme ?? "github_light"
-                    options: ["ayu_light", "blossom_light", "catppuccin-latte", "default-light", "everforest_light", "flex-light", "flexoki-light", "github_light", "gruvbox_light", "material-lighter", "nano-light", "oceanic-light", "one_light", "onenord_light", "penumbra_light", "rosepine-dawn", "seoul256_light", "solarized_light", "sunrise_breeze", "vscode_light"]
+                    options: themeColorsTab.neovimLightBaseThemes.concat(themeColorsTab.neovimDarkBaseThemes)
                     enableFuzzySearch: true
                     onValueChanged: value => {
                         const settings = SettingsData.matugenTemplateNeovimSettings;

quickshell/Modules/Settings/WallpaperTab.qml

@@ -1199,16 +1199,18 @@ Item {
                         width: parent.width - Theme.spacingM * 2
                     }
 
-                    DankButtonGroup {
+                    DankFilterChips {
                         id: transitionGroup
                         width: parent.width - Theme.spacingM * 2
-                        selectionMode: "multi"
-                        model: SessionData.availableWallpaperTransitions.filter(t => t !== "none")
-                        initialSelection: SessionData.includedTransitions
-                        currentSelection: SessionData.includedTransitions
+                        multiSelect: true
+                        model: SessionData.availableWallpaperTransitions.filter(t => t !== "none").map(t => ({
+                                    "value": t,
+                                    "label": t.replace(/\b\w/g, c => c.toUpperCase())
+                                }))
+                        selectedValues: SessionData.includedTransitions
 
-                        onSelectionChanged: (index, selected) => {
-                            const transition = model[index];
+                        onSelectionToggled: (index, selected) => {
+                            const transition = model[index].value;
                             let newIncluded = SessionData.includedTransitions.slice();
 
                             if (selected && !newIncluded.includes(transition)) {

quickshell/Modules/Settings/Widgets/AppBrowserPopup.qml

@@ -167,7 +167,13 @@ FloatingWindow {
                         width: parent.width
                         height: parent.height - searchField.height - Theme.spacingM
                         spacing: Theme.spacingS
-                        model: root.filteredApps
+                        // Start with no model. It is (re)bound in show() so that each open
+                        // gets a fresh QQmlDelegateModel, avoiding a crash where a stale
+                        // incubation queue from a previous open races with a background
+                        // refreshApplications() replacing the underlying DesktopEntries
+                        // QObjectModel (SIGSEGV in QQmlIncubatorPrivate::incubate via
+                        // libQt6QmlModels). See hide()/onVisibleChanged() for the teardown.
+                        model: null
                         clip: true
 
                         delegate: Rectangle {
@@ -316,11 +322,21 @@ FloatingWindow {
 
     function show() {
         updateFilteredApps();
+        // Rebind the model reactively (search relies on filteredApps changes flowing
+        // through), and do it after populating so the ListView starts incubating from
+        // a fully-formed array rather than [].
+        appList.model = Qt.binding(() => root.filteredApps);
         visible = true;
         Qt.callLater(() => searchField.forceActiveFocus());
     }
 
     function hide() {
+        // Drop the model before clearing visible, so the ListView releases its
+        // QQmlDelegateModel (and any in-flight incubators) synchronously on this
+        // frame. This is the crux of the fix: a later show() will allocate a fresh
+        // DelegateModel instead of reusing one whose incubation queue may hold
+        // references invalidated by a concurrent refreshApplications().
+        appList.model = null;
         visible = false;
         searchQuery = "";
         filteredApps = [];
@@ -330,6 +346,9 @@ FloatingWindow {
 
     onVisibleChanged: {
         if (!visible) {
+            // Guard against visibility being cleared without going through hide()
+            // (e.g. window manager close, FloatingWindow.onClosed -> hide()).
+            appList.model = null;
             searchQuery = "";
             filteredApps = [];
             selectedIndex = -1;

quickshell/Modules/Settings/WidgetsTab.qml

@@ -557,20 +557,19 @@ Item {
         return sectionId === "left" ? leftSection : sectionId === "center" ? centerSection : sectionId === "right" ? rightSection : null;
     }
 
-    // Id-based reorder; rebuilds from authoritative objects so every prop (incl. hideWhenIdle) survives
+    // Id-based reorder; rebuilds from authoritative objects so every prop (incl. hideWhenIdle) survives.
+    // Consumes one entry per occurrence so duplicate ids (e.g. two spacers) don't collapse, and
+    // appends unconsumed entries so nothing is silently dropped from the config array.
     function reorderSection(sectionId, orderedIds) {
-        var current = getWidgetsForSection(sectionId);
-        var byId = {};
-        current.forEach(w => {
-            var id = (typeof w === "string" ? w : w.id);
-            byId[id] = w;
-        });
+        var remaining = getWidgetsForSection(sectionId).slice();
         var reordered = [];
         orderedIds.forEach(id => {
-            if (byId[id] !== undefined)
-                reordered.push(byId[id]);
+            var idx = remaining.findIndex(w => (typeof w === "string" ? w : w.id) === id);
+            if (idx < 0)
+                return;
+            reordered.push(remaining.splice(idx, 1)[0]);
         });
-        setWidgetsForSection(sectionId, reordered);
+        setWidgetsForSection(sectionId, reordered.concat(remaining));
     }
 
     // Move a widget across sections (or within); committed as one atomic bar-config save
@@ -979,8 +978,16 @@ Item {
             var isString = typeof widget === "string";
             var widgetId = isString ? widget : widget.id;
             var widgetDef = baseWidgetDefinitions.find(w => w.id === widgetId);
-            if (!widgetDef)
-                return;
+            if (!widgetDef) {
+                // Skipping entries would desync row indices from the config array (issue #2844)
+                widgetDef = {
+                    "id": widgetId,
+                    "text": widgetId || I18n.tr("Unknown"),
+                    "description": "",
+                    "icon": "extension",
+                    "warning": I18n.tr("Unavailable")
+                };
+            }
 
             var item = Object.assign({}, widgetDef);
             item.enabled = isString ? true : widget.enabled;

quickshell/Services/AudioService.qml

@@ -847,7 +847,7 @@ EOFCONFIG
 
         const maxVol = root.sinkMaxVolume;
         const clampedVolume = Math.max(0, Math.min(maxVol, percentage));
-        Quickshell.execDetached(["wpctl", "set-volume", "-l", String(maxVol / 100), "@DEFAULT_AUDIO_SINK@", String(clampedVolume / 100)]);
+        root.sink.audio.volume = clampedVolume / 100;
         return `Volume set to ${clampedVolume}%`;
     }
 
@@ -857,14 +857,16 @@ EOFCONFIG
     }
 
     function adjustDefaultSinkVolume(step, direction) {
+        const audio = root.sink.audio;
         const maxVol = root.sinkMaxVolume;
         const stepValue = outputVolumeStep(step);
-        const currentVolume = Math.round(root.sink.audio.volume * 100);
+        const currentVolume = Math.round(audio.volume * 100);
         const newVolume = Math.max(0, Math.min(maxVol, currentVolume + direction * stepValue));
-        const suffix = direction > 0 ? "+" : "-";
 
-        Quickshell.execDetached(["wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", "0"]);
-        Quickshell.execDetached(["wpctl", "set-volume", "-l", String(maxVol / 100), "@DEFAULT_AUDIO_SINK@", `${stepValue}%${suffix}`]);
+        if (audio.muted)
+            audio.muted = false;
+
+        audio.volume = newVolume / 100;
         return newVolume;
     }
 

quickshell/Services/BatteryService.qml

@@ -17,7 +17,22 @@ Singleton {
         interval: 500
         repeat: false
         running: true
-        onTriggered: root.suppressSound = false
+        onTriggered: {
+            root.suppressSound = false;
+            root.applyPowerProfile();
+        }
+    }
+
+    function applyPowerProfile() {
+        if (!batteryAvailable)
+            return;
+        const profileValue = isPluggedIn ? SettingsData.acProfileName : SettingsData.batteryProfileName;
+        if (profileValue === "")
+            return;
+        const targetProfile = parseInt(profileValue);
+        if (isNaN(targetProfile) || PowerProfiles.profile === targetProfile)
+            return;
+        PowerProfiles.profile = targetProfile;
     }
 
     readonly property string preferredBatteryOverride: Quickshell.env("DMS_PREFERRED_BATTERY")
@@ -206,14 +221,7 @@ Singleton {
             }
         }
 
-        const profileValue = BatteryService.isPluggedIn ? SettingsData.acProfileName : SettingsData.batteryProfileName;
-
-        if (profileValue !== "") {
-            const targetProfile = parseInt(profileValue);
-            if (!isNaN(targetProfile) && PowerProfiles.profile !== targetProfile) {
-                PowerProfiles.profile = targetProfile;
-            }
-        }
+        applyPowerProfile();
 
         previousPluggedState = isPluggedIn;
     }

quickshell/Services/CalendarDankBackend.qml

@@ -15,8 +15,10 @@ Item {
     property string socketPath: ""
     readonly property bool socketFound: socketPath.length > 0
     property bool connected: false
-    property bool binaryExists: false
+    readonly property bool binaryExists: launchKind.length > 0
     property bool binaryChecked: false
+    // "dcal" for a host install, "flatpak" for a sandboxed one, "" for neither.
+    property string launchKind: ""
 
     property var calendars: []
     property var events: []
@@ -55,18 +57,20 @@ Item {
 
     Process {
         id: binaryCheck
-        command: ["sh", "-c", "command -v dcal"]
+        command: ["sh", "-c", "if command -v dcal >/dev/null 2>&1; then echo dcal; elif command -v flatpak >/dev/null 2>&1 && flatpak info com.danklinux.dankcalendar >/dev/null 2>&1; then echo flatpak; fi"]
         running: false
-        onExited: code => {
-            root.binaryExists = (code === 0);
-            root.binaryChecked = true;
+        stdout: StdioCollector {
+            onStreamFinished: {
+                root.launchKind = text.trim();
+                root.binaryChecked = true;
+            }
         }
     }
 
     Process {
         id: discoverProcess
         running: false
-        command: ["sh", "-c", "s=\"${DANKCAL_SOCKET:-}\"; if [ -S \"$s\" ]; then echo \"$s\"; exit 0; fi; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/dankcal-*.sock /tmp/dankcal-*.sock; do [ -S \"$f\" ] || continue; p=$(basename \"$f\" .sock); p=${p#dankcal-}; if kill -0 \"$p\" 2>/dev/null; then echo \"$f\"; exit 0; fi; done"]
+        command: ["sh", "-c", "s=\"${DANKCAL_SOCKET:-}\"; if [ -S \"$s\" ]; then echo \"$s\"; exit 0; fi; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/app/com.danklinux.dankcalendar/dankcal-*.sock; do if [ -S \"$f\" ]; then echo \"$f\"; exit 0; fi; done; for f in \"${XDG_RUNTIME_DIR:-/tmp}\"/dankcal-*.sock /tmp/dankcal-*.sock; do [ -S \"$f\" ] || continue; p=$(basename \"$f\" .sock); p=${p#dankcal-}; if kill -0 \"$p\" 2>/dev/null; then echo \"$f\"; exit 0; fi; done"]
 
         stdout: StdioCollector {
             onStreamFinished: {
@@ -98,9 +102,16 @@ Item {
     }
 
     function launch() {
-        if (!binaryExists)
+        switch (launchKind) {
+        case "dcal":
+            Quickshell.execDetached(["dcal", "run", "-d", "--hidden"]);
+            break;
+        case "flatpak":
+            Quickshell.execDetached(["flatpak", "run", "com.danklinux.dankcalendar", "run", "-d", "--hidden"]);
+            break;
+        default:
             return;
-        Quickshell.execDetached(["dcal", "run", "-d", "--hidden"]);
+        }
         if (enabled && !connected)
             discoverProcess.running = true;
     }

quickshell/Services/CompositorService.qml

@@ -511,7 +511,7 @@ Singleton {
             return MangoService.filterCurrentDisplay(toplevels, screenName);
         if (isHyprland)
             return filterHyprlandCurrentDisplaySafe(toplevels, screenName);
-        return toplevels;
+        return toplevels.filter(t => _toplevelOnScreen(t, screenName));
     }
 
     function _screenName(screenOrName) {

quickshell/Services/DMSNetworkService.qml

@@ -56,7 +56,7 @@ Singleton {
         return "wifi_1_bar";
     }
 
-    property string userPreference: "auto"
+    readonly property string userPreference: SettingsData.networkPreference
     property bool isConnecting: false
     property string connectingSSID: ""
     property string connectionError: ""
@@ -187,7 +187,6 @@ Singleton {
     }
 
     Component.onCompleted: {
-        root.userPreference = SettingsData.networkPreference;
         lastConnectedVpnUuid = SessionData.vpnLastConnected || "";
         if (socketPath && socketPath.length > 0) {
             checkDMSCapabilities();
@@ -672,7 +671,6 @@ Singleton {
     function setNetworkPreference(preference) {
         if (!networkAvailable)
             return;
-        userPreference = preference;
         changingPreference = true;
         targetPreference = preference;
         SettingsData.set("networkPreference", preference);

quickshell/Services/DMSService.qml

@@ -11,7 +11,7 @@ Singleton {
     id: root
     readonly property var log: Log.scoped("DMSService")
 
-    property bool dmsAvailable: false
+    readonly property bool dmsAvailable: isConnected
     property var capabilities: []
     property int apiVersion: 0
     property string cliVersion: ""
@@ -21,7 +21,7 @@ Singleton {
     property var availableThemes: []
     property var installedThemes: []
     property bool isConnected: false
-    property bool isConnecting: false
+    readonly property bool isConnecting: requestSocket.connected && !requestSocket.linkUp
     property bool subscribeConnected: false
 
     readonly property string socketPath: Quickshell.env("DMS_SOCKET")
@@ -69,12 +69,13 @@ Singleton {
     property bool screensaverInhibited: false
     property var screensaverInhibitors: []
 
-    property var activeSubscriptions: ["network", "network.credentials", "loginctl", "freedesktop", "freedesktop.screensaver", "gamma", "theme.auto", "wallpaper", "bluetooth", "bluetooth.pairing", "brightness", "wlroutput", "evdev", "browser", "dbus", "clipboard", "location", "sysupdate"]
+    property var activeSubscriptions: ["network", "network.credentials", "loginctl", "freedesktop", "freedesktop.screensaver", "gamma", "theme.auto", "wallpaper", "bluetooth", "bluetooth.pairing", "brightness", "wlroutput", "evdev", "browser", "dbus", "clipboard", "sysupdate"]
 
     Component.onCompleted: {
-        if (socketPath && socketPath.length > 0) {
-            detectUpdateCommand();
-        }
+        if (!socketPath || socketPath.length === 0)
+            return;
+        detectUpdateCommand();
+        requestSocket.connected = true;
     }
 
     function detectUpdateCommand() {
@@ -82,12 +83,6 @@ Singleton {
         checkAurHelper.running = true;
     }
 
-    function startSocketConnection() {
-        if (socketPath && socketPath.length > 0) {
-            testProcess.running = true;
-        }
-    }
-
     Process {
         id: checkAurHelper
         command: ["sh", "-c", "command -v paru || command -v yay"]
@@ -105,7 +100,6 @@ Singleton {
                 } else {
                     updateCommand = "dms update";
                     checkingUpdateCommand = false;
-                    startSocketConnection();
                 }
             }
         }
@@ -114,7 +108,6 @@ Singleton {
             if (exitCode !== 0) {
                 updateCommand = "dms update";
                 checkingUpdateCommand = false;
-                startSocketConnection();
             }
         }
     }
@@ -135,7 +128,6 @@ Singleton {
                     updateCommand = "dms update";
                 }
                 checkingUpdateCommand = false;
-                startSocketConnection();
             }
         }
 
@@ -143,52 +135,27 @@ Singleton {
             if (exitCode !== 0) {
                 updateCommand = "dms update";
                 checkingUpdateCommand = false;
-                startSocketConnection();
             }
         }
     }
 
-    Process {
-        id: testProcess
-        command: ["test", "-S", root.socketPath]
-
-        onExited: exitCode => {
-            if (exitCode === 0) {
-                root.dmsAvailable = true;
-                connectSocket();
-            } else {
-                root.dmsAvailable = false;
-            }
-        }
-    }
-
-    function connectSocket() {
-        if (!dmsAvailable || isConnected || isConnecting) {
-            return;
-        }
-
-        isConnecting = true;
-        requestSocket.connected = true;
-    }
-
     DankSocket {
         id: requestSocket
         path: root.socketPath
         connected: false
 
         onConnectionStateChanged: {
-            if (connected) {
+            if (linkUp) {
                 root.isConnected = true;
-                root.isConnecting = false;
                 root.connectionStateChanged();
                 subscribeSocket.connected = true;
-            } else {
-                root.isConnected = false;
-                root.isConnecting = false;
-                root.apiVersion = 0;
-                root.capabilities = [];
-                root.connectionStateChanged();
+                return;
             }
+            root.isConnected = false;
+            root.apiVersion = 0;
+            root.capabilities = [];
+            root.failPendingRequests();
+            root.connectionStateChanged();
         }
 
         parser: SplitParser {
@@ -219,10 +186,10 @@ Singleton {
         connected: false
 
         onConnectionStateChanged: {
-            root.subscribeConnected = connected;
-            if (connected) {
-                sendSubscribeRequest();
-            }
+            root.subscribeConnected = linkUp;
+            if (!linkUp)
+                return;
+            sendSubscribeRequest();
         }
 
         parser: SplitParser {
@@ -335,6 +302,7 @@ Singleton {
         const data = response.result.data;
 
         if (service === "server") {
+            const prevCapabilities = capabilities;
             apiVersion = data.apiVersion || 0;
             cliVersion = data.cliVersion || "";
             capabilities = data.capabilities || [];
@@ -346,6 +314,12 @@ Singleton {
             }
 
             capabilitiesReceived();
+
+            const capabilitiesChanged = prevCapabilities.length !== capabilities.length || capabilities.some(c => !prevCapabilities.includes(c));
+            if (prevCapabilities.length > 0 && capabilitiesChanged) {
+                log.info("Capabilities changed, resubscribing");
+                subscribe(activeSubscriptions);
+            }
         } else if (service === "network") {
             networkStateUpdate(data);
         } else if (service === "network.credentials") {
@@ -439,10 +413,20 @@ Singleton {
 
     function handleResponse(response) {
         const callback = pendingRequests[response.id];
+        if (!callback)
+            return;
+        delete pendingRequests[response.id];
+        callback(response);
+    }
 
-        if (callback) {
-            delete pendingRequests[response.id];
-            callback(response);
+    function failPendingRequests() {
+        const pending = pendingRequests;
+        pendingRequests = {};
+        clipboardRequestIds = {};
+        for (const id in pending) {
+            pending[id]({
+                "error": "not connected to DMS socket"
+            });
         }
     }
 

quickshell/Services/DisplayService.qml

@@ -386,7 +386,7 @@ Singleton {
         if (!focusedScreen)
             return "";
 
-        const pins = SettingsData.brightnessDevicePins || {};
+        const pins = CacheData.brightnessDevicePins || {};
         const screenKey = SettingsData.getScreenDisplayName(focusedScreen);
         if (!screenKey)
             return "";

quickshell/Services/IdleService.qml

@@ -80,6 +80,8 @@ Singleton {
         respectInhibitors: root.respectInhibitors
         enabled: false
         onIsIdleChanged: {
+            if (!enabled)
+                return;
             if (isIdle) {
                 if (SettingsData.fadeToDpmsEnabled) {
                     root.fadeToDpmsRequested();
@@ -101,6 +103,8 @@ Singleton {
         respectInhibitors: root.respectInhibitors
         enabled: false
         onIsIdleChanged: {
+            if (!enabled)
+                return;
             if (isIdle) {
                 root.requestMonitorOff();
             } else {
@@ -115,6 +119,8 @@ Singleton {
         respectInhibitors: root.respectInhibitors
         enabled: false
         onIsIdleChanged: {
+            if (!enabled)
+                return;
             if (isIdle) {
                 if (SettingsData.fadeToLockEnabled) {
                     root.fadeToLockRequested();
@@ -135,6 +141,8 @@ Singleton {
         respectInhibitors: root.respectInhibitors
         enabled: false
         onIsIdleChanged: {
+            if (!enabled)
+                return;
             if (isIdle)
                 root.requestSuspend();
         }
@@ -149,6 +157,8 @@ Singleton {
         respectInhibitors: false
         enabled: root.enabled && root.isShellLocked && root.monitorsOff && (SettingsData.lockScreenPowerOffMonitorsOnLock || root.lockPowerOffRequested)
         onIsIdleChanged: {
+            if (!enabled)
+                return;
             if (!isIdle && root.monitorsOff)
                 root.requestMonitorOn();
         }

quickshell/Services/LocationService.qml

@@ -3,10 +3,13 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
+import qs.Common
+import qs.Services
 
 Singleton {
     id: root
 
+    readonly property bool wantsLocation: SettingsData.weatherEnabled && SettingsData.useAutoLocation
     readonly property bool locationAvailable: DMSService.isConnected && DMSService.capabilities.includes("location")
     readonly property bool valid: latitude !== 0 || longitude !== 0
 
@@ -15,19 +18,46 @@ Singleton {
 
     signal locationChanged(var data)
 
-    onLocationAvailableChanged: {
-        if (locationAvailable && !valid)
-            getState();
+    onWantsLocationChanged: {
+        if (wantsLocation) {
+            ensureSubscription();
+        } else if (DMSService.activeSubscriptions.includes("location")) {
+            DMSService.removeSubscription("location");
+        }
     }
 
+    onLocationAvailableChanged: ensureSubscription()
+
+    Component.onCompleted: ensureSubscription()
+
     Connections {
         target: DMSService
 
-        function onLocationStateUpdate(data) {
-            if (!locationAvailable)
-                return;
-            handleStateUpdate(data);
+        function onConnectionStateChanged() {
+            if (DMSService.isConnected)
+                root.ensureSubscription();
         }
+
+        function onLocationStateUpdate(data) {
+            if (!root.wantsLocation)
+                return;
+            root.handleStateUpdate(data);
+        }
+    }
+
+    function ensureSubscription() {
+        if (!wantsLocation)
+            return;
+        if (!locationAvailable)
+            return;
+        if (DMSService.activeSubscriptions.includes("location"))
+            return;
+        if (DMSService.activeSubscriptions.includes("all"))
+            return;
+
+        DMSService.addSubscription("location");
+        if (!valid)
+            getState();
     }
 
     function handleStateUpdate(data) {
@@ -42,6 +72,8 @@ Singleton {
     }
 
     function getState() {
+        if (!wantsLocation)
+            return;
         if (!locationAvailable)
             return;
 

quickshell/Services/MangoService.qml

@@ -467,7 +467,7 @@ Singleton {
         if (now - root._lastWatchedReloadAt < 700)
             return;
         root._lastWatchedReloadAt = now;
-        root.reloadConfig(true, false);
+        root.reloadConfig(false, false);
     }
 
     function reloadConfig(showToast, suppressWatch) {

quickshell/Services/NiriService.qml

@@ -1487,8 +1487,6 @@ window-rule {
 
             if (outputSettings.disabled) {
                 kdlContent += `    off\n`;
-                kdlContent += `}\n\n`;
-                continue;
             }
 
             if (output.configured_mode) {

quickshell/Services/PolkitAgentInstance.qml

@@ -0,0 +1,3 @@
+import Quickshell.Services.Polkit
+
+PolkitAgent {}

quickshell/Services/PolkitService.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell
-import Quickshell.Services.Polkit
 
 Singleton {
     id: root
@@ -12,10 +11,13 @@ Singleton {
     readonly property bool disablePolkitIntegration: Quickshell.env("DMS_DISABLE_POLKIT") === "1"
 
     readonly property bool polkitAvailable: !disablePolkitIntegration
-    readonly property alias agent: polkitAgentInstance
+    readonly property var agent: polkitAgentLoader.item
 
-    PolkitAgent {
-        id: polkitAgentInstance
+    Loader {
+        id: polkitAgentLoader
+        active: root.polkitAvailable
+        asynchronous: false
+        source: "PolkitAgentInstance.qml"
     }
 
     Component.onCompleted: {

quickshell/Services/PopoutService.qml

@@ -425,7 +425,7 @@ Singleton {
     }
 
     function closeSettings() {
-        settingsModal?.close();
+        settingsModal?.hide();
     }
 
     function toggleSettings() {

quickshell/Services/SessionService.qml

@@ -217,6 +217,64 @@ Singleton {
         return envObj;
     }
 
+    function splitShellArgs(str) {
+        const args = [];
+        let current = "";
+        let hasToken = false;
+        let quote = "";
+        let escaped = false;
+        for (const ch of str) {
+            if (escaped) {
+                current += ch;
+                escaped = false;
+                continue;
+            }
+            switch (quote) {
+            case "'":
+                if (ch === "'") {
+                    quote = "";
+                    continue;
+                }
+                current += ch;
+                continue;
+            case "\"":
+                switch (ch) {
+                case "\"":
+                    quote = "";
+                    continue;
+                case "\\":
+                    escaped = true;
+                    continue;
+                }
+                current += ch;
+                continue;
+            }
+            switch (ch) {
+            case "\\":
+                escaped = true;
+                continue;
+            case "'":
+            case "\"":
+                quote = ch;
+                hasToken = true;
+                continue;
+            case " ":
+            case "\t":
+            case "\n":
+                if (!hasToken && current.length === 0)
+                    continue;
+                args.push(current);
+                current = "";
+                hasToken = false;
+                continue;
+            }
+            current += ch;
+        }
+        if (current.length > 0 || hasToken)
+            args.push(current);
+        return args;
+    }
+
     function launchDesktopEntry(desktopEntry, useNvidia) {
         if (!desktopEntry || !desktopEntry.command)
             return;
@@ -230,8 +288,7 @@ Singleton {
             cmd = [nvidiaCommand].concat(cmd);
 
         if (override?.extraFlags) {
-            const extraArgs = override.extraFlags.trim().split(/\s+/).filter(arg => arg.length > 0);
-            cmd = cmd.concat(extraArgs);
+            cmd = cmd.concat(splitShellArgs(override.extraFlags));
         }
 
         const userPrefix = SettingsData.launchPrefix?.trim() || "";

quickshell/VERSION

@@ -1 +1 @@
-v1.5.1
+v1.5.3

quickshell/Widgets/DankFilterChips.qml

@@ -7,12 +7,15 @@ Flow {
 
     property var model: []
     property int currentIndex: 0
+    property bool multiSelect: false
+    property var selectedValues: []
     property int chipHeight: 32
     property int chipPadding: Theme.spacingM
     property bool showCheck: true
     property bool showCounts: true
 
     signal selectionChanged(int index)
+    signal selectionToggled(int index, bool selected)
 
     spacing: Theme.spacingS
     width: parent ? parent.width : 400
@@ -25,7 +28,8 @@ Flow {
             required property var modelData
             required property int index
 
-            property bool selected: index === root.currentIndex
+            property var value: typeof modelData === "string" ? modelData : (modelData.value !== undefined ? modelData.value : (modelData.label || ""))
+            property bool selected: root.multiSelect ? root.selectedValues.includes(value) : (index === root.currentIndex)
             property bool hovered: mouseArea.containsMouse
             property bool pressed: mouseArea.pressed
             property string label: typeof modelData === "string" ? modelData : (modelData.label || "")
@@ -99,6 +103,10 @@ Flow {
                 cursorShape: Qt.PointingHandCursor
                 onPressed: mouse => chipRipple.trigger(mouse.x, mouse.y)
                 onClicked: {
+                    if (root.multiSelect) {
+                        root.selectionToggled(chip.index, !chip.selected);
+                        return;
+                    }
                     root.currentIndex = chip.index;
                     root.selectionChanged(chip.index);
                 }

quickshell/Widgets/DankPopoutStandalone.qml

@@ -79,6 +79,9 @@ Item {
             "rightBar": 0
         })
     property var screen: null
+    // Output the surface binds to; retargeted only in open() while hidden. A live
+    // screen change on a mapped surface loses the popup blur on niri.
+    property var surfaceScreen: null
     readonly property bool frameGapStandaloneActive: CompositorService.frameConfiguredForScreen(screen) && !CompositorService.usesConnectedFrameChromeForScreen(screen)
     readonly property bool fluidStandaloneActive: Theme.isDirectionalEffect
     readonly property bool backgroundDismissWindowRequired: backgroundInteractive
@@ -133,8 +136,6 @@ Item {
     signal popoutClosed
     signal backgroundClicked
 
-    property var _lastOpenedScreen: null
-
     property int effectiveBarPosition: 0
     property real effectiveBarBottomGap: 0
     readonly property string autoBarShadowDirection: {
@@ -338,14 +339,14 @@ Item {
         _frozenMaskWidth = maskWidth;
         _frozenMaskHeight = maskHeight;
 
-        const screenChanged = _lastOpenedScreen !== null && _lastOpenedScreen !== screen;
+        const screenChanged = surfaceScreen !== null && surfaceScreen !== screen;
         if (screenChanged) {
-            // Hide on this tick so Qt actually tears down the wl_surface; the show
-            // gets deferred below so the unmap is processed before the remap.
+            // Unmap before retargeting so the surface is destroyed and recreated
+            // on the new output rather than live-migrated.
             contentWindow.visible = false;
             backgroundWindow.visible = false;
         }
-        _lastOpenedScreen = screen;
+        surfaceScreen = screen;
 
         if (contentContainer && !shouldBeVisible) {
             // Snap morph closed only on a fresh open; on screen-change re-open we stay at 1
@@ -559,7 +560,7 @@ Item {
 
     PanelWindow {
         id: backgroundWindow
-        screen: root.screen
+        screen: root.surfaceScreen
         visible: false
         color: "transparent"
         // Skip buffer updates when there's nothing to render. Briefly flipped
@@ -625,7 +626,7 @@ Item {
 
     PanelWindow {
         id: contentWindow
-        screen: root.screen
+        screen: root.surfaceScreen
         visible: false
         color: "transparent"
         readonly property bool closeVisualActive: root.shouldBeVisible || root.isClosing

quickshell/matugen/templates/gtk-light-colors.css

@@ -131,7 +131,6 @@
 @define-color content_view_bg @view_bg_color;
 @define-color text_view_bg @view_bg_color;
 * {
-  padding: 0;
   -GtkToolButton-icon-spacing: 4;
   -GtkTextView-error-underline-color: @error_bg_color;
   -GtkScrolledWindow-scrollbar-spacing: 0;

quickshell/matugen/templates/neovim-colors.lua

@@ -44,6 +44,10 @@ if mode ~= nil then
 	end
 end
 
+if settings.terminalsAlwaysDark then
+	vim.o.background = "dark"
+end
+
 local current_file_path = debug.getinfo(1, "S").source:sub(2)
 local theme_base = deepGet(settings, { "matugenTemplateNeovimSettings", vim.o.background, "baseTheme" })
 	or ("github_" .. vim.o.background)