Cleanup

core/cmd/dms/commands_colorpicker.go

@@ -19,12 +19,7 @@ var (
 var colorCmd = &cobra.Command{
 	Use:   "color",
 	Short: "Color utilities",
-	Long: `Color utilities including picking colors from the screen.
-
-This is the screen eyedropper CLI. To open the in-shell color modal, use:
-  dms ipc call color-picker toggle
-
-See: https://danklinux.com/docs/dankmaterialshell/keybinds-ipc`,
+	Long:  "Color utilities including picking colors from the screen",
 }
 
 var colorPickCmd = &cobra.Command{
@@ -34,9 +29,6 @@ var colorPickCmd = &cobra.Command{
 
 Click on any pixel to capture its color, or press Escape to cancel.
 
-This is the screen eyedropper CLI. To open the in-shell color modal, use:
-  dms ipc call color-picker toggle
-
 Output format flags (mutually exclusive, default: --hex):
   --hex  - Hexadecimal (#RRGGBB)
   --rgb  - RGB values (R G B)

core/cmd/dms/commands_common.go

@@ -77,15 +77,10 @@ var killCmd = &cobra.Command{
 }
 
 var ipcCmd = &cobra.Command{
-	Use:   "ipc",
+	Use:   "ipc [target] [function] [args...]",
 	Short: "Send IPC commands to running DMS shell",
-	Long: `Send IPC commands to the running DMS shell.
-
-  dms ipc call <target> <function> [args...]   invoke a command
-  dms ipc list                                 list all targets and functions
-
-Full reference: https://danklinux.com/docs/dankmaterialshell/keybinds-ipc`,
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		_ = findConfig(cmd, args)
 		return getShellIPCCompletions(args, toComplete), cobra.ShellCompDirectiveNoFileComp
 	},
 	Run: func(cmd *cobra.Command, args []string) {
@@ -93,17 +88,9 @@ Full reference: https://danklinux.com/docs/dankmaterialshell/keybinds-ipc`,
 	},
 }
 
-var ipcListCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List all IPC targets and functions",
-	Run: func(cmd *cobra.Command, args []string) {
-		printIPCHelp()
-	},
-}
-
 func init() {
-	ipcCmd.AddCommand(ipcListCmd)
 	ipcCmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+		_ = findConfig(cmd, args)
 		printIPCHelp()
 	})
 }

core/cmd/dms/shell.go

@@ -601,30 +601,12 @@ func parseTargetsFromIPCShowOutput(output string) ipcTargets {
 	return targets
 }
 
-func buildQsIPCBaseArgs() ([]string, error) {
-	cmdArgs := []string{"ipc"}
-	switch pid, ok := getFirstDMSPID(); {
-	case ok:
-		cmdArgs = append(cmdArgs, "--pid", strconv.Itoa(pid))
-	default:
-		if err := findConfig(nil, nil); err != nil {
-			return nil, err
-		}
-		if qsHasAnyDisplay() {
-			cmdArgs = append(cmdArgs, "--any-display")
-		}
-		cmdArgs = append(cmdArgs, "-p", configPath)
-	}
-	return cmdArgs, nil
-}
-
 func getShellIPCCompletions(args []string, _ string) []string {
-	baseArgs, err := buildQsIPCBaseArgs()
-	if err != nil {
-		log.Debugf("Error building IPC args for completions: %v", err)
-		return nil
+	cmdArgs := []string{"ipc"}
+	if qsHasAnyDisplay() {
+		cmdArgs = append(cmdArgs, "--any-display")
 	}
-	cmdArgs := append(baseArgs, "show")
+	cmdArgs = append(cmdArgs, "-p", configPath, "show")
 	cmd := exec.Command("qs", cmdArgs...)
 	var targets ipcTargets
 
@@ -641,7 +623,7 @@ func getShellIPCCompletions(args []string, _ string) []string {
 
 	if len(args) == 0 {
 		targetNames := make([]string, 0)
-		targetNames = append(targetNames, "call", "list")
+		targetNames = append(targetNames, "call")
 		for k := range targets {
 			targetNames = append(targetNames, k)
 		}
@@ -714,11 +696,23 @@ func runShellIPCCommand(args []string) {
 		args = append([]string{"call"}, args...)
 	}
 
-	baseArgs, err := buildQsIPCBaseArgs()
-	if err != nil {
-		log.Fatalf("Error finding config: %v", err)
+	cmdArgs := []string{"ipc"}
+
+	switch pid, ok := getFirstDMSPID(); {
+	case ok:
+		cmdArgs = append(cmdArgs, "--pid", strconv.Itoa(pid))
+	default:
+		if err := findConfig(nil, nil); err != nil {
+			log.Fatalf("Error finding config: %v", err)
+		}
+		// ! TODO - remove check when QS 0.3 is released
+		if qsHasAnyDisplay() {
+			cmdArgs = append(cmdArgs, "--any-display")
+		}
+		cmdArgs = append(cmdArgs, "-p", configPath)
 	}
-	cmdArgs := append(baseArgs, args...)
+
+	cmdArgs = append(cmdArgs, args...)
 	cmd := exec.Command("qs", cmdArgs...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
@@ -730,20 +724,19 @@ func runShellIPCCommand(args []string) {
 }
 
 func printIPCHelp() {
-	fmt.Println("Usage: dms ipc call <target> <function> [args...]")
+	fmt.Println("Usage: dms ipc <target> <function> [args...]")
 	fmt.Println()
 
-	baseArgs, err := buildQsIPCBaseArgs()
-	if err != nil {
-		printIPCHelpFailure(err)
-		return
+	cmdArgs := []string{"ipc"}
+	if qsHasAnyDisplay() {
+		cmdArgs = append(cmdArgs, "--any-display")
 	}
-	cmdArgs := append(baseArgs, "show")
+	cmdArgs = append(cmdArgs, "-p", configPath, "show")
 	cmd := exec.Command("qs", cmdArgs...)
 
 	output, err := cmd.Output()
 	if err != nil {
-		printIPCHelpFailure(err)
+		fmt.Println("Could not retrieve available IPC targets (is DMS running?)")
 		return
 	}
 
@@ -772,16 +765,6 @@ func printIPCHelp() {
 	}
 }
 
-func printIPCHelpFailure(err error) {
-	fmt.Println("Could not retrieve IPC targets.")
-	if err != nil {
-		fmt.Printf("  %v\n", err)
-	}
-	fmt.Println()
-	fmt.Println("  Full docs:  https://danklinux.com/docs/dankmaterialshell/keybinds-ipc")
-	fmt.Println("  Try:        dms ipc call <target> <function>")
-}
-
 // ensureFontCache rebuilds the fontconfig cache if user-configured fonts are missing while skipping defaults
 func ensureFontCache() {
 	if _, err := exec.LookPath("fc-list"); err != nil {

docs/IPC.md

@@ -6,18 +6,6 @@ DankMaterialShell provides comprehensive IPC (Inter-Process Communication) funct
 dms ipc call <target> <function> [parameters...]
 ```
 
-## Discovering IPC commands
-
-List all available targets and functions while DMS is running:
-
-```bash
-dms ipc list
-dms ipc          # same
-dms ipc --help   # same, plus usage text
-```
-
-Live listing requires DMS to be running. If listing fails, use this document or the [Keybinds & IPC docs](https://danklinux.com/docs/dankmaterialshell/keybinds-ipc) as an offline reference.
-
 ## Target: `audio`
 
 Audio system control and information.
@@ -719,7 +707,7 @@ File browser controls for selecting wallpapers and profile images.
   - Both browsers support common image formats (jpg, jpeg, png, bmp, gif, webp)
 
 ### Target: `color-picker`
-In-shell color picker modal for theme and settings color selection.
+Color picker modal control.
 
 **Functions:**
 - `open` - Show color picker modal
@@ -730,14 +718,6 @@ In-shell color picker modal for theme and settings color selection.
 - `toggle` - Toggle color picker modal visibility
 - `toggleInstant` - Toggle color picker modal visibility without animation on hide
 
-**Note:** This controls the in-shell modal. To pick a pixel from the screen via CLI, use `dms color pick` instead (see [Color Picker CLI](https://danklinux.com/docs/dankmaterialshell/cli-color-picker)).
-
-**Examples:**
-```bash
-dms ipc call color-picker toggle
-dms ipc call color-picker openColor "#3f51b5"
-```
-
 ### Target: `hypr`
 Hyprland-specific controls including keybinds cheatsheet and workspace overview (Hyprland only).
 

quickshell/Common/DankSocket.qml

@@ -7,31 +7,29 @@ Item {
     property alias path: socket.path
     property alias parser: socket.parser
     property bool connected: false
-    property bool linkUp: false
 
     property int reconnectBaseMs: 400
     property int reconnectMaxMs: 15000
 
     property int _reconnectAttempt: 0
 
-    signal connectionStateChanged
+    signal connectionStateChanged()
 
     onConnectedChanged: {
-        socket.connected = connected;
+        socket.connected = connected
     }
 
     Socket {
         id: socket
 
         onConnectionStateChanged: {
-            root.linkUp = connected;
-            root.connectionStateChanged();
+            root.connectionStateChanged()
             if (connected) {
-                root._reconnectAttempt = 0;
-                return;
+                root._reconnectAttempt = 0
+                return
             }
             if (root.connected) {
-                root._scheduleReconnect();
+                root._scheduleReconnect()
             }
         }
     }
@@ -41,24 +39,24 @@ Item {
         interval: 0
         repeat: false
         onTriggered: {
-            socket.connected = false;
-            Qt.callLater(() => socket.connected = true);
+            socket.connected = false
+            Qt.callLater(() => socket.connected = true)
         }
     }
 
     function send(data) {
-        const json = typeof data === "string" ? data : JSON.stringify(data);
-        const message = json.endsWith("\n") ? json : json + "\n";
-        socket.write(message);
-        socket.flush();
+        const json = typeof data === "string" ? data : JSON.stringify(data)
+        const message = json.endsWith("\n") ? json : json + "\n"
+        socket.write(message)
+        socket.flush()
     }
 
     function _scheduleReconnect() {
-        const pow = Math.min(_reconnectAttempt, 10);
-        const base = Math.min(reconnectBaseMs * Math.pow(2, pow), reconnectMaxMs);
-        const jitter = Math.floor(Math.random() * Math.floor(base / 4));
-        reconnectTimer.interval = base + jitter;
-        reconnectTimer.restart();
-        _reconnectAttempt++;
+        const pow = Math.min(_reconnectAttempt, 10)
+        const base = Math.min(reconnectBaseMs * Math.pow(2, pow), reconnectMaxMs)
+        const jitter = Math.floor(Math.random() * Math.floor(base / 4))
+        reconnectTimer.interval = base + jitter
+        reconnectTimer.restart()
+        _reconnectAttempt++
     }
 }

quickshell/Common/KeybindActions.js

@@ -56,9 +56,6 @@ const DMS_ACTIONS = [
     { id: "spawn dms ipc call dankdash wallpaper", label: "Wallpaper Browser" },
     { id: "spawn dms ipc call file browse wallpaper", label: "File: Browse Wallpaper" },
     { id: "spawn dms ipc call file browse profile", label: "File: Browse Profile" },
-    { id: "spawn dms ipc call color-picker toggle", label: "Color Picker: Toggle" },
-    { id: "spawn dms ipc call color-picker open", label: "Color Picker: Open" },
-    { id: "spawn dms ipc call color-picker close", label: "Color Picker: Close" },
     { id: "spawn dms ipc call keybinds toggle niri", label: "Keybinds Cheatsheet: Toggle", compositor: "niri" },
     { id: "spawn dms ipc call keybinds open niri", label: "Keybinds Cheatsheet: Open", compositor: "niri" },
     { id: "spawn dms ipc call keybinds close", label: "Keybinds Cheatsheet: Close" },

quickshell/Common/SettingsData.qml

@@ -108,7 +108,6 @@ Singleton {
     }
 
     property bool clipboardEnterToPaste: false
-    property var clipboardVisibleEntryActions: ["pin", "edit", "delete"]
 
     property var launcherPluginVisibility: ({})
 
@@ -182,7 +181,6 @@ Singleton {
 
     property int firstDayOfWeek: -1
     property bool showWeekNumber: false
-    property string calendarBackend: "auto"
     property bool use24HourClock: true
     property bool showSeconds: false
     property bool padHours12Hour: false
@@ -398,7 +396,6 @@ Singleton {
     property bool audioVisualizerEnabled: true
     property string audioScrollMode: "volume"
     property int audioWheelScrollAmount: 5
-    property bool audioDeviceScrollVolumeEnabled: false
     property bool clockCompactMode: false
     property int focusedWindowSize: 1
     property bool focusedWindowCompactMode: false
@@ -406,9 +403,6 @@ Singleton {
     property int barMaxVisibleApps: 0
     property int barMaxVisibleRunningApps: 0
     property bool barShowOverflowBadge: true
-    property bool trayAutoOverflow: true
-    property bool trayPopupSingleLine: true
-    property int trayMaxVisibleItems: 0
     property bool appsDockHideIndicators: false
     property bool appsDockColorizeActive: false
     property string appsDockActiveColorMode: "primary"
@@ -524,39 +518,13 @@ Singleton {
     property real notificationSummaryFontSize: Spec.SPEC.notificationSummaryFontSize.def
     property real notificationBodyFontSize: Spec.SPEC.notificationBodyFontSize.def
     property bool notepadShowLineNumbers: false
-    property bool notepadAutoSave: false
-    property string notepadSlideoutSide: "right"
-    property string notepadDefaultMode: "slideout"
     property real notepadTransparencyOverride: -1
     property real notepadLastCustomTransparency: 0.7
-    property bool notepadUseCompositorGap: false
-    property int notepadEdgeGap: 0
-
-    // Compositor layout gap when enabled and available, else the manual value.
-    readonly property int notepadEffectiveEdgeGap: {
-        if (notepadUseCompositorGap) {
-            var g = -1;
-            if (CompositorService.isNiri)
-                g = niriLayoutGapsOverride;
-            else if (CompositorService.isHyprland)
-                g = hyprlandLayoutGapsOverride;
-            else if (CompositorService.isMango)
-                g = mangoLayoutGapsOverride;
-            if (g >= 0)
-                return g;
-        }
-        return Math.max(0, notepadEdgeGap);
-    }
 
     onNotepadUseMonospaceChanged: saveSettings()
     onNotepadFontFamilyChanged: saveSettings()
     onNotepadFontSizeChanged: saveSettings()
     onNotepadShowLineNumbersChanged: saveSettings()
-    onNotepadAutoSaveChanged: saveSettings()
-    onNotepadSlideoutSideChanged: saveSettings()
-    onNotepadDefaultModeChanged: saveSettings()
-    onNotepadUseCompositorGapChanged: saveSettings()
-    onNotepadEdgeGapChanged: saveSettings()
     // onCenteringModeChanged: saveSettings()
     onNotepadTransparencyOverrideChanged: {
         if (notepadTransparencyOverride > 0) {
@@ -1682,15 +1650,6 @@ Singleton {
         };
     }
 
-    function effectiveBarConfigForRender(config, usesFrameBarChrome) {
-        if (!config || !connectedFrameModeActive || usesFrameBarChrome)
-            return config;
-        const backup = connectedFrameBarStyleBackups[config.id];
-        if (!backup)
-            return config;
-        return Object.assign({}, config, backup);
-    }
-
     // Single entry point for connected-mode settings state.
     //   !active → restore backups
     function _reconcileConnectedFrameBarStyles() {

quickshell/Common/settings/SettingsSpec.js

@@ -37,7 +37,6 @@ var SPEC = {
 
     firstDayOfWeek: { def: -1 },
     showWeekNumber: { def: false },
-    calendarBackend: { def: "auto" },
     use24HourClock: { def: true },
     showSeconds: { def: false },
     padHours12Hour: { def: false },
@@ -157,7 +156,6 @@ var SPEC = {
     audioVisualizerEnabled: { def: true },
     audioScrollMode: { def: "volume" },
     audioWheelScrollAmount: { def: 5 },
-    audioDeviceScrollVolumeEnabled: { def: false },
     clockCompactMode: { def: false },
     focusedWindowCompactMode: { def: false },
     focusedWindowSize: { def: 1 },
@@ -165,9 +163,6 @@ var SPEC = {
     barMaxVisibleApps: { def: 0 },
     barMaxVisibleRunningApps: { def: 0 },
     barShowOverflowBadge: { def: true },
-    trayAutoOverflow: { def: true },
-    trayPopupSingleLine: { def: true },
-    trayMaxVisibleItems: { def: 0 },
     appsDockHideIndicators: { def: false },
     appsDockColorizeActive: { def: false },
     appsDockActiveColorMode: { def: "primary" },
@@ -268,13 +263,8 @@ var SPEC = {
     notificationSummaryFontSize: { def: 0 },
     notificationBodyFontSize: { def: 0 },
     notepadShowLineNumbers: { def: false },
-    notepadAutoSave: { def: false },
-    notepadSlideoutSide: { def: "right" },
-    notepadDefaultMode: { def: "slideout" },
     notepadTransparencyOverride: { def: -1 },
     notepadLastCustomTransparency: { def: 0.7 },
-    notepadUseCompositorGap: { def: false },
-    notepadEdgeGap: { def: 0 },
 
     soundsEnabled: { def: true },
     useSystemSoundTheme: { def: false },
@@ -582,7 +572,6 @@ var SPEC = {
 
     builtInPluginSettings: { def: {} },
     clipboardEnterToPaste: { def: false },
-    clipboardVisibleEntryActions: { def: ["pin", "edit", "delete"] },
 
     launcherPluginVisibility: { def: {} },
     launcherPluginOrder: { def: [] },

quickshell/DMSShell.qml

@@ -64,15 +64,27 @@ Item {
         }
     }
 
+    property bool wallpaperSurfacesLoaded: true
+
     Loader {
         id: blurredWallpaperBackgroundLoader
-        active: SettingsData.blurredWallpaperLayer && CompositorService.isNiri
+        active: root.wallpaperSurfacesLoaded && SettingsData.blurredWallpaperLayer && CompositorService.isNiri
         asynchronous: false
 
         sourceComponent: BlurredWallpaperBackground {}
     }
 
-    WallpaperBackground {}
+    DeferredAction {
+        id: wallpaperSurfaceReloadAction
+        onTriggered: root.wallpaperSurfacesLoaded = true
+    }
+
+    Loader {
+        id: wallpaperBackgroundLoader
+        active: root.wallpaperSurfacesLoaded
+        asynchronous: false
+        sourceComponent: WallpaperBackground {}
+    }
 
     DesktopWidgetLayer {}
 
@@ -386,6 +398,11 @@ Item {
                 frameSurfaceReloadAction.schedule();
             }
 
+            if (root.wallpaperSurfacesLoaded) {
+                root.wallpaperSurfacesLoaded = false;
+                wallpaperSurfaceReloadAction.schedule();
+            }
+
             root.dockEnabled = false;
             Qt.callLater(() => {
                 root.dockEnabled = true;
@@ -1093,22 +1110,11 @@ Item {
             slideoutWidth: 480
             expandable: true
             expandedWidthValue: 960
-            edgeGap: SettingsData.notepadEffectiveEdgeGap
-            slideEdge: SettingsData.notepadSlideoutSide
-
-            onIsVisibleChanged: {
-                if (isVisible)
-                    PopoutService.notepadPopout?.hide();
-            }
 
             content: Component {
                 Notepad {
                     slideout: notepadSlideout
                     onHideRequested: notepadSlideout.hide()
-                    onPopoutRequested: {
-                        notepadSlideout.hide();
-                        PopoutService.openNotepadPopout();
-                    }
                 }
             }
 
@@ -1125,24 +1131,6 @@ Item {
         Component.onCompleted: PopoutService.notepadSlideouts = instances
     }
 
-    LazyLoader {
-        id: notepadPopoutLoader
-        active: false
-
-        Component.onCompleted: {
-            PopoutService.notepadPopoutLoader = notepadPopoutLoader;
-        }
-
-        onActiveChanged: {
-            if (active && item) {
-                PopoutService.notepadPopout = item;
-                PopoutService._onNotepadPopoutLoaded();
-            }
-        }
-
-        NotepadPopoutWindow {}
-    }
-
     LazyLoader {
         id: powerMenuModalLoader
 

quickshell/DMSShellIPC.qml

@@ -373,10 +373,6 @@ Item {
         }
 
         function open(): string {
-            if (SettingsData.notepadDefaultMode === "popout") {
-                PopoutService.openNotepadPopout();
-                return "NOTEPAD_OPEN_SUCCESS";
-            }
             var instance = getActiveNotepadInstance();
             if (instance) {
                 instance.show();
@@ -386,10 +382,6 @@ Item {
         }
 
         function close(): string {
-            if (SettingsData.notepadDefaultMode === "popout") {
-                PopoutService.notepadPopout?.hide();
-                return "NOTEPAD_CLOSE_SUCCESS";
-            }
             var instance = getActiveNotepadInstance();
             if (instance) {
                 instance.hide();
@@ -399,10 +391,6 @@ Item {
         }
 
         function toggle(): string {
-            if (SettingsData.notepadDefaultMode === "popout") {
-                PopoutService.toggleNotepadPopout();
-                return "NOTEPAD_TOGGLE_SUCCESS";
-            }
             var instance = getActiveNotepadInstance();
             if (instance) {
                 instance.toggle();
@@ -956,7 +944,7 @@ Item {
 
         function tabs(): string {
             if (!PopoutService.settingsModal)
-                return "wallpaper\ntheme\ntypography\ntime_weather\nsounds\ndankbar\ndankbar_settings\ndankbar_appearance\ndankbar_widgets\nframe\nworkspaces\ncompositor\nmedia_player\nnotifications\nosd\nrunning_apps\nupdater\ndock\nlauncher\nkeybinds\ndisplays\nnetwork\nnetwork_status\nnetwork_ethernet\nnetwork_wifi\nnetwork_vpn\nprinters\nlock_screen\npower_sleep\nplugins\nabout";
+                return "wallpaper\ntheme\ntypography\ntime_weather\nsounds\ndankbar\ndankbar_settings\ndankbar_appearance\ndankbar_widgets\nframe\nworkspaces\ncompositor\nmedia_player\nnotifications\nosd\nrunning_apps\nupdater\ndock\nlauncher\nkeybinds\ndisplays\nnetwork\nprinters\nlock_screen\npower_sleep\nplugins\nabout";
             var modal = PopoutService.settingsModal;
             var ids = [];
             var structure = modal.sidebar?.categoryStructure ?? [];

quickshell/Modals/Clipboard/ClipboardContent.qml

@@ -7,6 +7,7 @@ Item {
     id: clipboardContent
 
     required property var modal
+    required property var clearConfirmDialog
 
     property alias searchField: searchField
     property alias clipboardListView: clipboardListView
@@ -32,7 +33,14 @@ Item {
             pinnedCount: modal.pinnedCount
             onKeyboardHintsToggled: modal.showKeyboardHints = !modal.showKeyboardHints
             onTabChanged: tabName => modal.activeTab = tabName
-            onClearAllClicked: modal.confirmClearAll()
+            onClearAllClicked: {
+                const hasPinned = modal.pinnedCount > 0;
+                const message = hasPinned ? I18n.tr("This will delete all unpinned entries. %1 pinned entries will be kept.").arg(modal.pinnedCount) : I18n.tr("This will permanently delete all clipboard history.");
+                clearConfirmDialog.show(I18n.tr("Clear History?"), message, function () {
+                    modal.clearAll();
+                    modal.hide();
+                }, function () {});
+            }
             onCloseClicked: modal.hide()
         }
 

quickshell/Modals/Clipboard/ClipboardEntry.qml

@@ -22,14 +22,7 @@ Rectangle {
     readonly property string entryType: modal ? modal.getEntryType(entry) : "text"
     readonly property string entryPreview: modal ? modal.getEntryPreview(entry) : ""
     readonly property var pinnedDuplicateEntry: !entry.pinned ? ClipboardService.getPinnedEntryByHash(entry.hash) : null
-    readonly property bool hasPinnedDuplicate: pinnedDuplicateEntry !== null
-    readonly property bool effectivePinned: entry.pinned || hasPinnedDuplicate
-    readonly property var visibleEntryActions: SettingsData.clipboardVisibleEntryActions || ["pin", "edit", "delete"]
-    readonly property bool showPinAction: visibleEntryActions.includes("pin")
-    readonly property bool showEditAction: visibleEntryActions.includes("edit")
-    readonly property bool showDeleteAction: visibleEntryActions.includes("delete")
-    readonly property bool showPinnedIndicator: hasPinnedDuplicate && !showPinAction
-    readonly property bool showAnyAction: showPinAction || showEditAction || showDeleteAction || showPinnedIndicator
+    readonly property bool effectivePinned: entry.pinned || pinnedDuplicateEntry !== null
 
     radius: Theme.cornerRadius
     color: {
@@ -70,28 +63,12 @@ Rectangle {
         anchors.rightMargin: Theme.spacingS
         anchors.verticalCenter: parent.verticalCenter
         spacing: Theme.spacingXS
-        visible: root.showAnyAction
-
-        Item {
-            width: 40
-            height: 40
-            visible: root.showPinnedIndicator
-
-            // Status indicator only; the Pin action remains hidden.
-            DankIcon {
-                anchors.centerIn: parent
-                name: "push_pin"
-                size: Theme.iconSize - 6
-                color: Theme.primary
-            }
-        }
 
         DankActionButton {
             iconName: "push_pin"
             iconSize: Theme.iconSize - 6
-            iconColor: (entry.pinned || hasPinnedDuplicate) ? Theme.primary : Theme.surfaceText
-            backgroundColor: (entry.pinned || hasPinnedDuplicate) ? Theme.primarySelected : "transparent"
-            visible: root.showPinAction
+            iconColor: effectivePinned ? Theme.primary : Theme.surfaceText
+            backgroundColor: effectivePinned ? Theme.primarySelected : "transparent"
             onClicked: {
                 if (entry.pinned) {
                     unpinRequested(entry);
@@ -109,7 +86,6 @@ Rectangle {
             iconName: "edit"
             iconSize: Theme.iconSize - 6
             iconColor: Theme.surfaceText
-            visible: root.showEditAction
 
             onClicked: {
                 if (entryType === "image") {
@@ -123,7 +99,6 @@ Rectangle {
             iconName: "close"
             iconSize: Theme.iconSize - 6
             iconColor: Theme.surfaceText
-            visible: root.showDeleteAction
             onClicked: deleteRequested()
         }
     }
@@ -131,8 +106,8 @@ Rectangle {
     Item {
         anchors.left: indexBadge.right
         anchors.leftMargin: Theme.spacingM
-        anchors.right: root.showAnyAction ? actionButtons.left : parent.right
-        anchors.rightMargin: root.showAnyAction ? Theme.spacingM : Theme.spacingS
+        anchors.right: actionButtons.left
+        anchors.rightMargin: Theme.spacingM
         anchors.verticalCenter: parent.verticalCenter
         // height: contentColumn.implicitHeight
         height: ClipboardConstants.itemHeight
@@ -193,8 +168,8 @@ Rectangle {
     MouseArea {
         id: mouseArea
         anchors.left: parent.left
-        anchors.right: root.showAnyAction ? actionButtons.left : parent.right
-        anchors.rightMargin: root.showAnyAction ? Theme.spacingS : 0
+        anchors.right: actionButtons.left
+        anchors.rightMargin: Theme.spacingS
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         hoverEnabled: true

quickshell/Modals/Clipboard/ClipboardHistoryContent.qml

@@ -82,15 +82,6 @@ FocusScope {
         ClipboardService.clearAll();
     }
 
-    function confirmClearAll() {
-        const hasPinned = pinnedCount > 0;
-        const message = hasPinned ? I18n.tr("This will delete all unpinned entries. %1 pinned entries will be kept.").arg(pinnedCount) : I18n.tr("This will permanently delete all clipboard history.");
-        clearConfirmDialog.show(I18n.tr("Clear History?"), message, function () {
-            clearAll();
-            hide();
-        }, function () {});
-    }
-
     function getEntryPreview(entry) {
         return ClipboardService.getEntryPreview(entry);
     }
@@ -144,6 +135,7 @@ FocusScope {
             id: historyContent
             anchors.fill: parent
             modal: root
+            clearConfirmDialog: root.clearConfirmDialog
         }
     }
 

quickshell/Modals/Clipboard/ClipboardHistoryModal.qml

@@ -77,35 +77,22 @@ DankModal {
         id: clearConfirmDialog
         confirmButtonText: I18n.tr("Clear All")
         confirmButtonColor: Theme.primary
-        onShouldBeVisibleChanged: {
-            if (shouldBeVisible) {
+        onVisibleChanged: {
+            if (visible) {
                 clipboardHistoryModal.shouldHaveFocus = false;
-                selectedButton = 0;
-                keyboardNavigation = true;
                 return;
             }
             Qt.callLater(function () {
                 if (!clipboardHistoryModal.shouldBeVisible) {
                     return;
                 }
-                clipboardHistoryModal.shouldHaveFocus = Qt.binding(() => clipboardHistoryModal.shouldBeVisible);
+                clipboardHistoryModal.shouldHaveFocus = true;
                 clipboardHistoryModal.modalFocusScope.forceActiveFocus();
                 if (clipboardHistoryModal.contentLoader.item?.searchField) {
                     clipboardHistoryModal.contentLoader.item.searchField.forceActiveFocus();
                 }
             });
         }
-        Connections {
-            target: clearConfirmDialog.modalFocusScope.Keys
-            function onPressed(event) {
-                if (!clearConfirmDialog.shouldBeVisible || event.key !== Qt.Key_Backtab) {
-                    return;
-                }
-                clearConfirmDialog.selectedButton = clearConfirmDialog.selectedButton === -1 ? 1 : (clearConfirmDialog.selectedButton - 1 + 2) % 2;
-                clearConfirmDialog.keyboardNavigation = true;
-                event.accepted = true;
-            }
-        }
     }
 
     content: Component {

quickshell/Modals/Clipboard/ClipboardHistoryPopout.qml

@@ -1,7 +1,6 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import Quickshell.Wayland
 import qs.Common
 import qs.Modals.Clipboard
 import qs.Modals.Common
@@ -96,35 +95,6 @@ DankPopout {
         id: clearConfirmDialog
         confirmButtonText: I18n.tr("Clear All")
         confirmButtonColor: Theme.primary
-        onShouldBeVisibleChanged: {
-            if (shouldBeVisible) {
-                root.customKeyboardFocus = WlrKeyboardFocus.None;
-                selectedButton = 0;
-                keyboardNavigation = true;
-                return;
-            }
-            root.customKeyboardFocus = null;
-            Qt.callLater(function () {
-                if (!root.shouldBeVisible || !root.contentLoader.item) {
-                    return;
-                }
-                root.contentLoader.item.forceActiveFocus();
-                if (root.contentLoader.item.searchField) {
-                    root.contentLoader.item.searchField.forceActiveFocus();
-                }
-            });
-        }
-        Connections {
-            target: clearConfirmDialog.modalFocusScope.Keys
-            function onPressed(event) {
-                if (!clearConfirmDialog.shouldBeVisible || event.key !== Qt.Key_Backtab) {
-                    return;
-                }
-                clearConfirmDialog.selectedButton = clearConfirmDialog.selectedButton === -1 ? 1 : (clearConfirmDialog.selectedButton - 1 + 2) % 2;
-                clearConfirmDialog.keyboardNavigation = true;
-                event.accepted = true;
-            }
-        }
     }
 
     content: Component {

quickshell/Modals/Clipboard/ClipboardKeyboardController.qml

@@ -125,6 +125,8 @@ QtObject {
             if (!ClipboardService.keyboardNavigationActive) {
                 ClipboardService.keyboardNavigationActive = true;
                 ClipboardService.selectedIndex = 0;
+            } else if (ClipboardService.selectedIndex === 0) {
+                ClipboardService.keyboardNavigationActive = false;
             } else {
                 selectPrevious();
             }
@@ -153,6 +155,8 @@ QtObject {
                 if (!ClipboardService.keyboardNavigationActive) {
                     ClipboardService.keyboardNavigationActive = true;
                     ClipboardService.selectedIndex = 0;
+                } else if (ClipboardService.selectedIndex === 0) {
+                    ClipboardService.keyboardNavigationActive = false;
                 } else {
                     selectPrevious();
                 }
@@ -180,7 +184,8 @@ QtObject {
         if (event.modifiers & Qt.ShiftModifier) {
             switch (event.key) {
             case Qt.Key_Delete:
-                modal.confirmClearAll();
+                modal.clearAll();
+                modal.hide();
                 event.accepted = true;
                 return;
             case Qt.Key_Return:

quickshell/Modals/FileBrowser/FileBrowserContent.qml

@@ -201,21 +201,6 @@ FocusScope {
         keyboardSelectionRequested = true;
     }
 
-    function activateFile(path, name, isDir) {
-        if (isDir) {
-            navigateTo(path);
-            return;
-        }
-        if (saveMode) {
-            saveRow.fileName = name;
-            pendingFilePath = path;
-            showOverwriteConfirmation = true;
-        } else {
-            fileSelected(path);
-            closeRequested();
-        }
-    }
-
     function handleSaveFile(filePath) {
         var normalizedPath = filePath;
         if (!normalizedPath.startsWith("file://")) {
@@ -667,7 +652,6 @@ FocusScope {
 
             Row {
                 anchors.fill: parent
-                anchors.bottomMargin: root.saveMode ? 40 + Theme.spacingL * 2 : 0
                 spacing: 0
 
                 Row {
@@ -772,7 +756,12 @@ FocusScope {
                                 onItemClicked: (index, path, name, isDir) => {
                                     selectedIndex = index;
                                     setSelectedFileData(path, name, isDir);
-                                    root.activateFile(path, name, isDir);
+                                    if (isDir) {
+                                        navigateTo(path);
+                                    } else {
+                                        fileSelected(path);
+                                        root.closeRequested();
+                                    }
                                 }
                                 onItemSelected: (index, path, name, isDir) => {
                                     setSelectedFileData(path, name, isDir);
@@ -787,7 +776,12 @@ FocusScope {
                                             root.keyboardSelectionRequested = false;
                                             selectedIndex = index;
                                             setSelectedFileData(filePath, fileName, fileIsDir);
-                                            root.activateFile(filePath, fileName, fileIsDir);
+                                            if (fileIsDir) {
+                                                navigateTo(filePath);
+                                            } else {
+                                                fileSelected(filePath);
+                                                root.closeRequested();
+                                            }
                                         }
                                     }
 
@@ -823,7 +817,12 @@ FocusScope {
                                 onItemClicked: (index, path, name, isDir) => {
                                     selectedIndex = index;
                                     setSelectedFileData(path, name, isDir);
-                                    root.activateFile(path, name, isDir);
+                                    if (isDir) {
+                                        navigateTo(path);
+                                    } else {
+                                        fileSelected(path);
+                                        root.closeRequested();
+                                    }
                                 }
                                 onItemSelected: (index, path, name, isDir) => {
                                     setSelectedFileData(path, name, isDir);
@@ -838,7 +837,12 @@ FocusScope {
                                             root.keyboardSelectionRequested = false;
                                             selectedIndex = index;
                                             setSelectedFileData(filePath, fileName, fileIsDir);
-                                            root.activateFile(filePath, fileName, fileIsDir);
+                                            if (fileIsDir) {
+                                                navigateTo(filePath);
+                                            } else {
+                                                fileSelected(filePath);
+                                                root.closeRequested();
+                                            }
                                         }
                                     }
 
@@ -851,7 +855,6 @@ FocusScope {
             }
 
             FileBrowserSaveRow {
-                id: saveRow
                 anchors.bottom: parent.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -910,21 +913,21 @@ FocusScope {
                 }
             }
         }
-    }
 
-    FileBrowserOverwriteDialog {
-        anchors.fill: parent
-        showDialog: showOverwriteConfirmation
-        pendingFilePath: root.pendingFilePath
-        onConfirmed: filePath => {
-            showOverwriteConfirmation = false;
-            fileSelected(filePath);
-            pendingFilePath = "";
-            Qt.callLater(() => root.closeRequested());
-        }
-        onCancelled: {
-            showOverwriteConfirmation = false;
-            pendingFilePath = "";
+        FileBrowserOverwriteDialog {
+            anchors.fill: parent
+            showDialog: showOverwriteConfirmation
+            pendingFilePath: root.pendingFilePath
+            onConfirmed: filePath => {
+                showOverwriteConfirmation = false;
+                fileSelected(filePath);
+                pendingFilePath = "";
+                Qt.callLater(() => root.closeRequested());
+            }
+            onCancelled: {
+                showOverwriteConfirmation = false;
+                pendingFilePath = "";
+            }
         }
     }
 

quickshell/Modals/FileBrowser/FileBrowserOverwriteDialog.qml

@@ -74,7 +74,7 @@ Item {
                     width: 80
                     height: 36
                     radius: Theme.cornerRadius
-                    color: cancelArea.containsMouse ? Qt.lighter(Theme.surfaceVariant, 1.2) : Theme.surfaceVariant
+                    color: cancelArea.containsMouse ? Theme.surfaceVariantHover : Theme.surfaceVariant
                     border.color: Theme.outline
                     border.width: 1
 

quickshell/Modals/FileBrowser/FileBrowserSaveRow.qml

@@ -8,7 +8,6 @@ Row {
     property bool saveMode: false
     property string defaultFileName: ""
     property string currentPath: ""
-    property alias fileName: fileNameInput.text
 
     signal saveRequested(string filePath)
 

quickshell/Modals/Settings/SettingsContent.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import qs.Common
 import qs.Modules.Settings
-import qs.Services
 import qs.Widgets
 
 FocusScope {
@@ -233,52 +232,7 @@ FocusScope {
             visible: active
             focus: active
 
-            sourceComponent: NetworkStatusTab {}
-
-            onActiveChanged: {
-                if (active && item)
-                    Qt.callLater(() => item.forceActiveFocus());
-            }
-        }
-
-        Loader {
-            id: networkEthernetLoader
-            anchors.fill: parent
-            active: root.currentIndex === 39
-            visible: active
-            focus: active
-
-            sourceComponent: NetworkEthernetTab {}
-
-            onActiveChanged: {
-                if (active && item)
-                    Qt.callLater(() => item.forceActiveFocus());
-            }
-        }
-
-        Loader {
-            id: networkWifiLoader
-            anchors.fill: parent
-            active: root.currentIndex === 40
-            visible: active
-            focus: active
-
-            sourceComponent: NetworkWifiTab {}
-
-            onActiveChanged: {
-                if (active && item)
-                    Qt.callLater(() => item.forceActiveFocus());
-            }
-        }
-
-        Loader {
-            id: networkVpnLoader
-            anchors.fill: parent
-            active: root.currentIndex === 41
-            visible: active
-            focus: active
-
-            sourceComponent: NetworkVpnTab {}
+            sourceComponent: NetworkTab {}
 
             onActiveChanged: {
                 if (active && item)

quickshell/Modals/Settings/SettingsModal.qml

@@ -53,21 +53,20 @@ FloatingWindow {
         visible = !visible;
     }
 
-    function setTabIndex(tabIndex: int) {
-        if (tabIndex < 0)
-            return;
-        currentTabIndex = tabIndex;
-        sidebar.autoExpandForTab(tabIndex);
-    }
-
     function showWithTab(tabIndex: int) {
-        setTabIndex(tabIndex);
+        if (tabIndex >= 0) {
+            currentTabIndex = tabIndex;
+            sidebar.autoExpandForTab(tabIndex);
+        }
         visible = true;
     }
 
     function showWithTabName(tabName: string) {
         var idx = sidebar.resolveTabIndex(tabName);
-        setTabIndex(idx);
+        if (idx >= 0) {
+            currentTabIndex = idx;
+            sidebar.autoExpandForTab(idx);
+        }
         visible = true;
     }
 

quickshell/Modals/Settings/SettingsSidebar.qml

@@ -105,8 +105,8 @@ Rectangle {
                 },
                 {
                     "id": "compositor_layout",
-                    "text": CompositorService.isNiri ? "Niri" : (CompositorService.isHyprland ? "Hyprland" : "MangoWC"),
-                    "icon": "layers",
+                    "text": CompositorService.isNiri ? "niri" : (CompositorService.isHyprland ? "Hyprland" : "MangoWC"),
+                    "icon": "crop_square",
                     "tabIndex": 37,
                     "layoutCapable": true
                 }
@@ -117,18 +117,18 @@ Rectangle {
             "text": I18n.tr("Dank Bar"),
             "icon": "toolbar",
             "children": [
-                {
-                    "id": "dankbar_appearance",
-                    "text": I18n.tr("Appearance"),
-                    "icon": "palette",
-                    "tabIndex": 6
-                },
                 {
                     "id": "dankbar_settings",
                     "text": I18n.tr("Settings"),
                     "icon": "tune",
                     "tabIndex": 3
                 },
+                {
+                    "id": "dankbar_appearance",
+                    "text": I18n.tr("Appearance"),
+                    "icon": "palette",
+                    "tabIndex": 6
+                },
                 {
                     "id": "dankbar_widgets",
                     "text": I18n.tr("Widgets"),
@@ -238,33 +238,8 @@ Rectangle {
             "id": "network",
             "text": I18n.tr("Network"),
             "icon": "wifi",
-            "dmsOnly": true,
-            "children": [
-                {
-                    "id": "network_status",
-                    "text": I18n.tr("Status"),
-                    "icon": "lan",
-                    "tabIndex": 7
-                },
-                {
-                    "id": "network_ethernet",
-                    "text": I18n.tr("Ethernet"),
-                    "icon": "settings_ethernet",
-                    "tabIndex": 39
-                },
-                {
-                    "id": "network_wifi",
-                    "text": I18n.tr("WiFi"),
-                    "icon": "wifi",
-                    "tabIndex": 40
-                },
-                {
-                    "id": "network_vpn",
-                    "text": I18n.tr("VPN"),
-                    "icon": "vpn_key",
-                    "tabIndex": 41
-                }
-            ]
+            "tabIndex": 7,
+            "dmsOnly": true
         },
         {
             "id": "applications",

quickshell/Modules/BlurredWallpaperBackground.qml

@@ -7,7 +7,6 @@ import qs.Widgets
 import qs.Services
 
 Variants {
-    readonly property var log: Log.scoped("BlurredWallpaperBackground")
     model: {
         if (SessionData.isGreeterMode) {
             return Quickshell.screens;
@@ -33,8 +32,6 @@ Variants {
 
         color: "transparent"
 
-        updatesEnabled: root.renderActive || root._settleFrames > 0
-
         mask: Region {
             item: Item {}
         }
@@ -88,6 +85,7 @@ Variants {
             }
 
             Component.onCompleted: {
+                blurWallpaperWindow.updatesEnabled = Qt.binding(() => !root.source || root.effectActive || root._renderSettling || currentWallpaper.status === Image.Loading || nextWallpaper.status === Image.Loading);
                 isInitialized = true;
             }
 
@@ -95,67 +93,51 @@ Variants {
             property real transitionProgress: 0
             readonly property bool transitioning: transitionAnimation.running
             property bool effectActive: false
+            property bool _renderSettling: true
             property bool useNextForEffect: false
-            readonly property var backingWindow: Window.window
-            readonly property bool renderActive: !source || effectActive || currentWallpaper.status === Image.Loading || nextWallpaper.status === Image.Loading
-            property int _settleFrames: 3
-
-            function invalidate() {
-                _settleFrames = 3;
-                backingWindow?.update();
-            }
-
-            onRenderActiveChanged: invalidate()
-            onBackingWindowChanged: invalidate()
 
             Connections {
-                target: root.backingWindow
-                function onFrameSwapped() {
-                    if (root._settleFrames > 0)
-                        root._settleFrames--;
-                }
-                function onVisibleChanged() {
-                    root.invalidate();
+                target: currentWallpaper
+                function onStatusChanged() {
+                    if (currentWallpaper.status !== Image.Ready && currentWallpaper.status !== Image.Error)
+                        return;
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                 }
+            }
+
+            Connections {
+                target: blurWallpaperWindow
                 function onWidthChanged() {
-                    root.invalidate();
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                 }
                 function onHeightChanged() {
-                    root.invalidate();
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                 }
             }
 
             Connections {
                 target: Quickshell
                 function onScreensChanged() {
-                    root.invalidate();
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                 }
             }
 
             Connections {
                 target: SettingsData
                 function onWallpaperFillModeChanged() {
-                    root.invalidate();
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                 }
             }
 
-            Connections {
-                target: IdleService
-                function onIsShellLockedChanged() {
-                    if (IdleService.isShellLocked)
-                        return;
-                    root.invalidate();
-                }
-            }
-
-            function handleTransitionLoadError(failedSource) {
-                log.warn("failed to load candidate wallpaper for", modelData.name + ":", failedSource);
-                transitionDelayTimer.stop();
-                transitionAnimation.stop();
-                root.useNextForEffect = false;
-                root.effectActive = false;
-                root.transitionProgress = 0.0;
-                nextWallpaper.source = "";
+            Timer {
+                id: renderSettleTimer
+                interval: 1000
+                onTriggered: root._renderSettling = false
             }
 
             onSourceChanged: {
@@ -182,6 +164,8 @@ Variants {
                 transitionAnimation.stop();
                 root.transitionProgress = 0.0;
                 root.effectActive = false;
+                root._renderSettling = true;
+                renderSettleTimer.restart();
                 currentWallpaper.source = newSource;
                 nextWallpaper.source = "";
             }
@@ -210,6 +194,8 @@ Variants {
                     transitionAnimation.stop();
                     root.transitionProgress = 0;
                     root.effectActive = false;
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                     currentWallpaper.source = nextWallpaper.source;
                     nextWallpaper.source = "";
                 }
@@ -218,6 +204,9 @@ Variants {
                     return;
                 }
 
+                root._renderSettling = true;
+                renderSettleTimer.restart();
+
                 nextWallpaper.source = newPath;
 
                 if (nextWallpaper.status === Image.Ready)
@@ -226,7 +215,7 @@ Variants {
 
             Loader {
                 anchors.fill: parent
-                active: !root.source || root.isColorSource || currentWallpaper.status === Image.Error
+                active: !root.source || root.isColorSource
                 asynchronous: true
 
                 sourceComponent: DankBackdrop {
@@ -249,12 +238,6 @@ Variants {
                 cache: true
                 sourceSize: Qt.size(root.textureWidth, root.textureHeight)
                 fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SessionData.getMonitorWallpaperFillMode(modelData.name))
-
-                onStatusChanged: {
-                    if (status === Image.Error) {
-                        log.warn("failed to load active wallpaper for", modelData.name + ":", source);
-                    }
-                }
             }
 
             Image {
@@ -270,10 +253,6 @@ Variants {
                 fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SessionData.getMonitorWallpaperFillMode(modelData.name))
 
                 onStatusChanged: {
-                    if (status === Image.Error) {
-                        root.handleTransitionLoadError(source);
-                        return;
-                    }
                     if (status !== Image.Ready)
                         return;
                     if (!root.transitioning) {
@@ -350,6 +329,8 @@ Variants {
                     root.useNextForEffect = false;
                     nextWallpaper.source = "";
                     root.transitionProgress = 0.0;
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                     root.effectActive = false;
                 }
             }

quickshell/Modules/ControlCenter/Details/NetworkDetail.qml

@@ -151,7 +151,7 @@ Rectangle {
                 iconColor: Theme.surfaceVariantText
                 onClicked: {
                     PopoutService.closeControlCenter();
-                    PopoutService.openSettingsWithTab(currentPreferenceIndex === 0 ? "network_ethernet" : "network_wifi");
+                    PopoutService.openSettingsWithTab("network");
                 }
             }
         }

quickshell/Modules/DankBar/CenterSection.qml

@@ -15,7 +15,6 @@ Item {
     property real barSpacing: 4
     property var barConfig: null
     property var blurBarWindow: null
-    property real sectionAvailablePrimarySize: 0
     property bool overrideAxisLayout: false
     property bool forceVerticalLayout: false
 
@@ -360,7 +359,6 @@ Item {
                 barSpacing: root.barSpacing
                 barConfig: root.barConfig
                 blurBarWindow: root.blurBarWindow
-                sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                 isFirst: index === 0
                 isLast: index === centerRepeater.count - 1
                 sectionSpacing: parent.itemSpacing

quickshell/Modules/DankBar/DankBarContent.qml

@@ -497,7 +497,6 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
-                sectionAvailablePrimarySize: Math.max(1, hCenterSection.x > 0 ? hCenterSection.x : parent.width / 3)
             }
 
             Binding {
@@ -530,7 +529,6 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
-                sectionAvailablePrimarySize: Math.max(1, hCenterSection.x > 0 ? parent.width - (hCenterSection.x + hCenterSection.width) : parent.width / 3)
             }
 
             Binding {
@@ -563,7 +561,6 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
-                sectionAvailablePrimarySize: Math.max(1, hRightSection.x > 0 ? hRightSection.x - (hLeftSection.x + hLeftSection.width) : parent.width / 3)
             }
 
             Binding {
@@ -603,7 +600,6 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
-                sectionAvailablePrimarySize: Math.max(1, vCenterSection.y > 0 ? vCenterSection.y : parent.height / 3)
             }
 
             Binding {
@@ -637,7 +633,6 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
-                sectionAvailablePrimarySize: Math.max(1, vRightSection.y > 0 ? vRightSection.y - (vLeftSection.y + vLeftSection.height) : parent.height / 3)
             }
 
             Binding {
@@ -672,7 +667,6 @@ Item {
                 widgetThickness: barWindow.widgetThickness
                 barThickness: barWindow.effectiveBarThickness
                 barSpacing: barConfig?.spacing ?? 4
-                sectionAvailablePrimarySize: Math.max(1, vCenterSection.y > 0 ? parent.height - (vCenterSection.y + vCenterSection.height) : parent.height / 3)
             }
 
             Binding {

quickshell/Modules/DankBar/DankBarWindow.qml

@@ -286,6 +286,9 @@ PanelWindow {
 
     readonly property bool isVertical: axis.isVertical
 
+    property bool gothCornersEnabled: barConfig?.gothCornersEnabled ?? false
+    property real wingtipsRadius: barConfig?.gothCornerRadiusOverride ? (barConfig?.gothCornerRadiusValue ?? 12) : Theme.cornerRadius
+    readonly property real _wingR: Math.max(0, wingtipsRadius)
     readonly property color _surfaceContainer: Theme.surfaceContainer
     readonly property string _barId: barConfig?.id ?? "default"
     property real _backgroundAlpha: barConfig?.transparency ?? 1.0
@@ -297,30 +300,25 @@ PanelWindow {
     }
     readonly property real _dpr: CompositorService.getScreenScale(barWindow.screen)
 
-    property string screenName: modelData.name
-
-    readonly property bool usesConnectedFrameChrome: CompositorService.usesConnectedFrameChromeForScreen(screenName)
-    readonly property bool usesFrameBarChrome: CompositorService.frameWindowVisibleForScreen(screenName)
-    readonly property var renderBarConfig: SettingsData.effectiveBarConfigForRender(barConfig, usesFrameBarChrome)
-
-    property bool gothCornersEnabled: renderBarConfig?.gothCornersEnabled ?? false
-    property real wingtipsRadius: renderBarConfig?.gothCornerRadiusOverride ? (renderBarConfig?.gothCornerRadiusValue ?? 12) : Theme.cornerRadius
-    readonly property real _wingR: Math.max(0, wingtipsRadius)
-
     // Shadow buffer: extra window space for shadow to render beyond bar bounds
-    readonly property bool _shadowActive: (Theme.elevationEnabled && (typeof SettingsData !== "undefined" ? (SettingsData.barElevationEnabled ?? true) : false)) || (renderBarConfig?.shadowIntensity ?? 0) > 0
+    readonly property bool _shadowActive: (Theme.elevationEnabled && (typeof SettingsData !== "undefined" ? (SettingsData.barElevationEnabled ?? true) : false)) || (barConfig?.shadowIntensity ?? 0) > 0
     readonly property real _shadowBuffer: {
         if (!_shadowActive)
             return 0;
-        const hasOverride = (renderBarConfig?.shadowIntensity ?? 0) > 0;
+        const hasOverride = (barConfig?.shadowIntensity ?? 0) > 0;
         if (hasOverride) {
-            const blur = (renderBarConfig.shadowIntensity ?? 0) * 0.2;
+            const blur = (barConfig.shadowIntensity ?? 0) * 0.2;
             const offset = blur * 0.5;
             return Theme.snap(Math.max(16, blur + offset + 8), _dpr);
         }
         return Theme.snap(Theme.elevationRenderPadding(Theme.elevationLevel2, "top", 4, 8, 16), _dpr);
     }
 
+    property string screenName: modelData.name
+
+    readonly property bool usesConnectedFrameChrome: CompositorService.usesConnectedFrameChromeForScreen(screenName)
+    readonly property bool usesFrameBarChrome: CompositorService.frameWindowVisibleForScreen(screenName)
+
     // Flatten/spacing collapse for maximized windows is only for frame-integrated layout.
     // When the bar draws its own pill, keep rounded corners and spacing like the dock.
     readonly property bool flattenForMaximizedWindow: !SettingsData.frameEnabled || usesFrameBarChrome
@@ -556,8 +554,8 @@ PanelWindow {
     }
 
     screen: modelData
-    implicitHeight: !isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((renderBarConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
-    implicitWidth: isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((renderBarConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
+    implicitHeight: !isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((barConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
+    implicitWidth: isVertical ? Theme.px(effectiveBarThickness + effectiveSpacing + ((barConfig?.gothCornersEnabled ?? false) && !hasMaximizedToplevel ? _wingR : 0), _dpr) + _shadowBuffer : 0
     color: "transparent"
 
     Component.onCompleted: {
@@ -954,7 +952,7 @@ PanelWindow {
                         id: barBackground
                         barWindow: barWindow
                         axis: axis
-                        barConfig: barWindow.renderBarConfig
+                        barConfig: barWindow.barConfig
                     }
 
                     MouseArea {

quickshell/Modules/DankBar/LeftSection.qml

@@ -14,7 +14,6 @@ Item {
     property real barSpacing: 4
     property var barConfig: null
     property var blurBarWindow: null
-    property real sectionAvailablePrimarySize: 0
     property bool overrideAxisLayout: false
     property bool forceVerticalLayout: false
 
@@ -62,7 +61,6 @@ Item {
                         barSpacing: root.barSpacing
                         barConfig: root.barConfig
                         blurBarWindow: root.blurBarWindow
-                        sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                         isFirst: index === 0
                         isLast: index === rowRepeater.count - 1
                         sectionSpacing: parent.rowSpacing
@@ -108,7 +106,6 @@ Item {
                         barSpacing: root.barSpacing
                         barConfig: root.barConfig
                         blurBarWindow: root.blurBarWindow
-                        sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                         isFirst: index === 0
                         isLast: index === columnRepeater.count - 1
                         sectionSpacing: parent.columnSpacing

quickshell/Modules/DankBar/RightSection.qml

@@ -14,7 +14,6 @@ Item {
     property real barSpacing: 4
     property var barConfig: null
     property var blurBarWindow: null
-    property real sectionAvailablePrimarySize: 0
     property bool overrideAxisLayout: false
     property bool forceVerticalLayout: false
 
@@ -64,7 +63,6 @@ Item {
                         barSpacing: root.barSpacing
                         barConfig: root.barConfig
                         blurBarWindow: root.blurBarWindow
-                        sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                         isFirst: index === 0
                         isLast: index === rowRepeater.count - 1
                         sectionSpacing: parent.rowSpacing
@@ -110,7 +108,6 @@ Item {
                         barSpacing: root.barSpacing
                         barConfig: root.barConfig
                         blurBarWindow: root.blurBarWindow
-                        sectionAvailablePrimarySize: root.sectionAvailablePrimarySize
                         isFirst: index === 0
                         isLast: index === columnRepeater.count - 1
                         sectionSpacing: parent.columnSpacing

quickshell/Modules/DankBar/WidgetHost.qml

@@ -17,7 +17,6 @@ Loader {
     property real barSpacing: 4
     property var barConfig: null
     property var blurBarWindow: null
-    property real sectionAvailablePrimarySize: 0
     property bool isFirst: false
     property bool isLast: false
     property real sectionSpacing: 0
@@ -142,14 +141,6 @@ Loader {
         restoreMode: Binding.RestoreNone
     }
 
-    Binding {
-        target: root.item
-        when: root.item && "sectionAvailablePrimarySize" in root.item
-        property: "sectionAvailablePrimarySize"
-        value: root.sectionAvailablePrimarySize
-        restoreMode: Binding.RestoreNone
-    }
-
     Binding {
         target: root.item
         when: root.item && "isLeftBarEdge" in root.item

quickshell/Modules/DankBar/Widgets/NotepadButton.qml

@@ -32,20 +32,9 @@ BasePill {
     }
 
     readonly property var notepadInstance: resolveNotepadInstance()
-    readonly property bool popoutDefault: SettingsData.notepadDefaultMode === "popout"
-    readonly property bool isActive: popoutDefault ? (PopoutService.notepadPopout?.visible ?? false) : (notepadInstance?.isVisible ?? false)
+    readonly property bool isActive: notepadInstance?.isVisible ?? false
     property bool isAutoHideBar: false
 
-    function showActiveSurface() {
-        if (root.popoutDefault) {
-            PopoutService.openNotepadPopout();
-            return;
-        }
-        const instance = prepareNotepadInstance(root.notepadInstance);
-        if (instance && typeof instance.show === "function")
-            instance.show();
-    }
-
     function prepareNotepadInstance(instance) {
         if (instance)
             instance.triggerUsesOverlayLayer = root.barUsesOverlayLayer;
@@ -86,14 +75,20 @@ BasePill {
     function openTabByIndex(tabIndex) {
         if (tabIndex < 0)
             return;
-        showActiveSurface();
+        const instance = prepareNotepadInstance(root.notepadInstance);
+        if (instance && typeof instance.show === "function") {
+            instance.show();
+        }
         Qt.callLater(() => {
             NotepadStorageService.switchToTab(tabIndex);
         });
     }
 
     function openNewNote() {
-        showActiveSurface();
+        const instance = prepareNotepadInstance(root.notepadInstance);
+        if (instance && typeof instance.show === "function") {
+            instance.show();
+        }
         Qt.callLater(() => {
             NotepadStorageService.createNewTab();
         });
@@ -152,10 +147,6 @@ BasePill {
                 openContextMenu();
                 return;
             }
-            if (root.popoutDefault) {
-                PopoutService.toggleNotepadPopout();
-                return;
-            }
             const inst = prepareNotepadInstance(root.notepadInstance);
             if (inst) {
                 inst.toggle();

quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -22,10 +22,6 @@ BasePill {
     property bool isAtBottom: false
     property bool isAutoHideBar: false
     property bool useOverflowPopup: !widgetData?.trayUseInlineExpansion
-    property bool useSingleLineOverflowPopup: widgetData?.trayPopupSingleLine ?? SettingsData.trayPopupSingleLine
-    property bool useAutomaticOverflow: widgetData?.trayAutoOverflow ?? SettingsData.trayAutoOverflow
-    property int configuredMaxVisibleItems: widgetData?.trayMaxVisibleItems ?? SettingsData.trayMaxVisibleItems
-    property real sectionAvailablePrimarySize: 0
     readonly property var hiddenTrayIds: {
         const envValue = Quickshell.env("DMS_HIDE_TRAYIDS") || "";
         return envValue ? envValue.split(",").map(id => id.trim().toLowerCase()) : [];
@@ -150,32 +146,12 @@ BasePill {
 
     readonly property var allSortedTrayItems: sortByPreferredOrder(allTrayItems, _trayOrderTrigger)
     readonly property var allSortedTrayItemKeys: allSortedTrayItems.map(item => getTrayItemKey(item))
-    readonly property var visibleSortedTrayItems: allSortedTrayItems.filter(item => !SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
-    readonly property int automaticVisibleItemLimit: {
-        if (!root.useAutomaticOverflow)
-            return root.visibleSortedTrayItems.length;
-
-        const explicitLimit = Number(root.configuredMaxVisibleItems || 0);
-        if (explicitLimit > 0)
-            return Math.max(1, Math.min(root.visibleSortedTrayItems.length, explicitLimit));
-
-        const scale = (typeof CompositorService !== "undefined" && CompositorService.getScreenScale) ? Math.max(1, CompositorService.getScreenScale(root.parentScreen)) : 1;
-        const sectionPrimary = root.sectionAvailablePrimarySize > 0 ? root.sectionAvailablePrimarySize : (root.isVerticalOrientation ? (root.parentScreen?.height || 0) : (root.parentScreen?.width || 0));
-        const logicalPrimary = sectionPrimary > 0 ? (sectionPrimary / scale) : 640;
-        const maxTrayShare = root.isVerticalOrientation ? 0.55 : 0.50;
-        const itemSize = Math.max(1, root.trayItemSize);
-        const slots = Math.floor((logicalPrimary * maxTrayShare) / itemSize);
-        return Math.max(2, Math.min(10, Math.min(root.visibleSortedTrayItems.length, slots)));
-    }
-    readonly property var mainBarItemsRaw: visibleSortedTrayItems.slice(0, automaticVisibleItemLimit)
+    readonly property var mainBarItemsRaw: allSortedTrayItems.filter(item => !SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
     readonly property var mainBarItems: mainBarItemsRaw.map((item, idx) => ({
                 key: getTrayItemKey(item),
                 item: item
             }))
-    readonly property var autoOverflowBarItems: visibleSortedTrayItems.slice(automaticVisibleItemLimit)
-    readonly property var manualHiddenBarItems: allSortedTrayItems.filter(item => SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
-    readonly property var hiddenBarItemKeys: manualHiddenBarItems.concat(autoOverflowBarItems).map(item => root.getTrayItemKey(item))
-    readonly property var hiddenBarItems: allSortedTrayItems.filter(item => hiddenBarItemKeys.indexOf(root.getTrayItemKey(item)) !== -1)
+    readonly property var hiddenBarItems: allSortedTrayItems.filter(item => SessionData.isHiddenTrayId(root.getTrayItemKey(item)))
     readonly property string trayIconTintMode: {
         const configuredMode = SettingsData.systemTrayIconTintMode || "none";
         switch (configuredMode) {
@@ -243,10 +219,6 @@ BasePill {
 
         const fromKey = mainBarItems[visibleFromIndex]?.key ?? null;
         const toKey = mainBarItems[visibleToIndex]?.key ?? null;
-        moveTrayItemKeyInFullOrder(fromKey, toKey);
-    }
-
-    function moveTrayItemKeyInFullOrder(fromKey, toKey) {
         if (!fromKey || !toKey)
             return;
 
@@ -261,103 +233,10 @@ BasePill {
         SessionData.setTrayItemOrder(fullOrder);
     }
 
-    function promoteTrayItemToBar(item) {
-        const itemKey = getTrayItemKey(item);
-        if (!itemKey)
-            return;
-        if (SessionData.isHiddenTrayId(itemKey)) {
-            SessionData.showTrayId(itemKey);
-            return;
-        }
-
-        const fullOrder = [...allSortedTrayItemKeys];
-        const fromIndex = fullOrder.indexOf(itemKey);
-        if (fromIndex < 0)
-            return;
-        const movedKey = fullOrder.splice(fromIndex, 1)[0];
-        const targetIndex = Math.max(0, Math.min(root.automaticVisibleItemLimit - 1, fullOrder.length));
-        fullOrder.splice(targetIndex, 0, movedKey);
-        SessionData.setTrayItemOrder(fullOrder);
-    }
-
-    function isManualHiddenTrayItem(item) {
-        return SessionData.isHiddenTrayId(getTrayItemKey(item));
-    }
-
-    function isAutoOverflowTrayItem(item) {
-        const key = getTrayItemKey(item);
-        return key && !isManualHiddenTrayItem(item) && root.autoOverflowBarItems.some(overflowItem => getTrayItemKey(overflowItem) === key);
-    }
-
-    function dragShiftOffset(index, draggedIndex, dropTargetIndex, shiftAmount) {
-        if (draggedIndex < 0 || index === draggedIndex || dropTargetIndex < 0)
-            return 0;
-        if (draggedIndex < dropTargetIndex && index > draggedIndex && index <= dropTargetIndex)
-            return -shiftAmount;
-        if (draggedIndex > dropTargetIndex && index >= dropTargetIndex && index < draggedIndex)
-            return shiftAmount;
-        return 0;
-    }
-
-    function beginMainDrag(visualIndex, reversed) {
-        root.draggedIndex = reversed ? (root.mainBarItems.length - 1 - visualIndex) : visualIndex;
-        root.dropTargetIndex = root.draggedIndex;
-    }
-
-    function updateMainDrag(axisOffset, visualIndex, reversed) {
-        const itemSize = root.trayItemSize;
-        const slotOffset = Math.round(axisOffset / itemSize);
-        const visualTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, visualIndex + slotOffset));
-        const newTargetIndex = reversed ? (root.mainBarItems.length - 1 - visualTargetIndex) : visualTargetIndex;
-        if (newTargetIndex !== root.dropTargetIndex)
-            root.dropTargetIndex = newTargetIndex;
-    }
-
-    function finishMainDrag() {
-        const didReorder = root.dropTargetIndex >= 0 && root.dropTargetIndex !== root.draggedIndex;
-        if (didReorder) {
-            root.suppressShiftAnimation = true;
-            root.moveTrayItemInFullOrder(root.draggedIndex, root.dropTargetIndex);
-            Qt.callLater(() => root.suppressShiftAnimation = false);
-        }
-        root.draggedIndex = -1;
-        root.dropTargetIndex = -1;
-        return didReorder;
-    }
-
-    function beginPopupDrag(index) {
-        root.popupDraggedIndex = index;
-        root.popupDropTargetIndex = index;
-    }
-
-    function updatePopupDrag(axisOffset, index) {
-        const itemSize = root.trayItemSize + 6;
-        const slotOffset = Math.round(axisOffset / itemSize);
-        const newTargetIndex = Math.max(0, Math.min(root.hiddenBarItems.length - 1, index + slotOffset));
-        if (newTargetIndex !== root.popupDropTargetIndex)
-            root.popupDropTargetIndex = newTargetIndex;
-    }
-
-    function finishPopupDrag() {
-        const didReorder = root.popupDropTargetIndex >= 0 && root.popupDropTargetIndex !== root.popupDraggedIndex;
-        if (didReorder) {
-            const fromItem = root.hiddenBarItems[root.popupDraggedIndex];
-            const toItem = root.hiddenBarItems[root.popupDropTargetIndex];
-            root.suppressShiftAnimation = true;
-            root.moveTrayItemKeyInFullOrder(root.getTrayItemKey(fromItem), root.getTrayItemKey(toItem));
-            Qt.callLater(() => root.suppressShiftAnimation = false);
-        }
-        root.popupDraggedIndex = -1;
-        root.popupDropTargetIndex = -1;
-        return didReorder;
-    }
-
     property int draggedIndex: -1
     property int dropTargetIndex: -1
-    property int popupDraggedIndex: -1
-    property int popupDropTargetIndex: -1
     property bool suppressShiftAnimation: false
-    readonly property bool hasHiddenItems: hiddenBarItems.length > 0
+    readonly property bool hasHiddenItems: allTrayItems.length > mainBarItems.length
     readonly property bool inlineExpanded: hasHiddenItems && !useOverflowPopup && menuOpen
     visible: allTrayItems.length > 0
     opacity: allTrayItems.length > 0 ? 1 : 0
@@ -472,7 +351,22 @@ BasePill {
                     height: root.barThickness
                     z: dragHandler.dragging ? 100 : 0
 
-                    property real shiftOffset: root.dragShiftOffset(index, root.draggedIndex, root.dropTargetIndex, root.trayItemSize)
+                    property real shiftOffset: {
+                        if (root.draggedIndex < 0)
+                            return 0;
+                        if (index === root.draggedIndex)
+                            return 0;
+                        const dragIdx = root.draggedIndex;
+                        const dropIdx = root.dropTargetIndex;
+                        const shiftAmount = root.trayItemSize;
+                        if (dropIdx < 0)
+                            return 0;
+                        if (dragIdx < dropIdx && index > dragIdx && index <= dropIdx)
+                            return -shiftAmount;
+                        if (dragIdx > dropIdx && index >= dropIdx && index < dragIdx)
+                            return shiftAmount;
+                        return 0;
+                    }
 
                     transform: Translate {
                         x: delegateRoot.shiftOffset
@@ -572,12 +466,19 @@ BasePill {
                         onReleased: mouse => {
                             longPressTimer.stop();
                             const wasDragging = dragHandler.dragging;
-                            if (wasDragging)
-                                root.finishMainDrag();
+                            const didReorder = wasDragging && root.dropTargetIndex >= 0 && root.dropTargetIndex !== root.draggedIndex;
+
+                            if (didReorder) {
+                                root.suppressShiftAnimation = true;
+                                root.moveTrayItemInFullOrder(root.draggedIndex, root.dropTargetIndex);
+                                Qt.callLater(() => root.suppressShiftAnimation = false);
+                            }
 
                             dragHandler.longPressing = false;
                             dragHandler.dragging = false;
                             dragHandler.dragAxisOffset = 0;
+                            root.draggedIndex = -1;
+                            root.dropTargetIndex = -1;
 
                             if (wasDragging || mouse.button !== Qt.LeftButton)
                                 return;
@@ -600,7 +501,8 @@ BasePill {
                                 const distance = Math.abs(mouse.x - dragHandler.dragStartPos.x);
                                 if (distance > 5) {
                                     dragHandler.dragging = true;
-                                    root.beginMainDrag(index, root.reverseInlineHorizontal);
+                                    root.draggedIndex = root.reverseInlineHorizontal ? (root.mainBarItems.length - 1 - index) : index;
+                                    root.dropTargetIndex = root.draggedIndex;
                                 }
                             }
                             if (!dragHandler.dragging)
@@ -608,7 +510,13 @@ BasePill {
 
                             const axisOffset = mouse.x - dragHandler.dragStartPos.x;
                             dragHandler.dragAxisOffset = axisOffset;
-                            root.updateMainDrag(axisOffset, index, root.reverseInlineHorizontal);
+                            const itemSize = root.trayItemSize;
+                            const slotOffset = Math.round(axisOffset / itemSize);
+                            const visualTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, index + slotOffset));
+                            const newTargetIndex = root.reverseInlineHorizontal ? (root.mainBarItems.length - 1 - visualTargetIndex) : visualTargetIndex;
+                            if (newTargetIndex !== root.dropTargetIndex) {
+                                root.dropTargetIndex = newTargetIndex;
+                            }
                         }
 
                         onClicked: mouse => {
@@ -798,7 +706,22 @@ BasePill {
             height: root.trayItemSize
             z: dragHandler.dragging ? 100 : 0
 
-            property real shiftOffset: root.dragShiftOffset(index, root.draggedIndex, root.dropTargetIndex, root.trayItemSize)
+            property real shiftOffset: {
+                if (root.draggedIndex < 0)
+                    return 0;
+                if (index === root.draggedIndex)
+                    return 0;
+                const dragIdx = root.draggedIndex;
+                const dropIdx = root.dropTargetIndex;
+                const shiftAmount = root.trayItemSize;
+                if (dropIdx < 0)
+                    return 0;
+                if (dragIdx < dropIdx && index > dragIdx && index <= dropIdx)
+                    return -shiftAmount;
+                if (dragIdx > dropIdx && index >= dropIdx && index < dragIdx)
+                    return shiftAmount;
+                return 0;
+            }
 
             transform: Translate {
                 y: shiftOffset
@@ -898,12 +821,19 @@ BasePill {
                 onReleased: mouse => {
                     longPressTimer.stop();
                     const wasDragging = dragHandler.dragging;
-                    if (wasDragging)
-                        root.finishMainDrag();
+                    const didReorder = wasDragging && root.dropTargetIndex >= 0 && root.dropTargetIndex !== root.draggedIndex;
+
+                    if (didReorder) {
+                        root.suppressShiftAnimation = true;
+                        root.moveTrayItemInFullOrder(root.draggedIndex, root.dropTargetIndex);
+                        Qt.callLater(() => root.suppressShiftAnimation = false);
+                    }
 
                     dragHandler.longPressing = false;
                     dragHandler.dragging = false;
                     dragHandler.dragAxisOffset = 0;
+                    root.draggedIndex = -1;
+                    root.dropTargetIndex = -1;
 
                     if (wasDragging || mouse.button !== Qt.LeftButton)
                         return;
@@ -926,7 +856,8 @@ BasePill {
                         const distance = Math.abs(mouse.y - dragHandler.dragStartPos.y);
                         if (distance > 5) {
                             dragHandler.dragging = true;
-                            root.beginMainDrag(index, false);
+                            root.draggedIndex = index;
+                            root.dropTargetIndex = root.draggedIndex;
                         }
                     }
                     if (!dragHandler.dragging)
@@ -934,7 +865,12 @@ BasePill {
 
                     const axisOffset = mouse.y - dragHandler.dragStartPos.y;
                     dragHandler.dragAxisOffset = axisOffset;
-                    root.updateMainDrag(axisOffset, index, false);
+                    const itemSize = root.trayItemSize;
+                    const slotOffset = Math.round(axisOffset / itemSize);
+                    const newTargetIndex = Math.max(0, Math.min(root.mainBarItems.length - 1, index + slotOffset));
+                    if (newTargetIndex !== root.dropTargetIndex) {
+                        root.dropTargetIndex = newTargetIndex;
+                    }
                 }
 
                 onClicked: mouse => {
@@ -1179,12 +1115,11 @@ BasePill {
         }
 
         function updatePosition() {
-            // Window-local maps directly to screen-local because the bar window spans the
-            // full screen edge; this avoids mixing mapToGlobal with a separately-tracked
-            // screen.x/.y origin, which desync on non-primary monitors and after DPMS/hotplug.
-            const localPos = root.mapToItem(null, 0, 0);
-            const relativeX = localPos.x;
-            const relativeY = localPos.y;
+            const globalPos = root.mapToGlobal(0, 0);
+            const screenX = screen.x || 0;
+            const screenY = screen.y || 0;
+            const relativeX = globalPos.x - screenX;
+            const relativeY = globalPos.y - screenY;
 
             if (root.isVerticalOrientation) {
                 const edge = root.axis?.edge;
@@ -1201,38 +1136,20 @@ BasePill {
             id: menuContainer
             objectName: "overflowMenuContainer"
 
-            readonly property bool popupUsesVerticalLine: root.useSingleLineOverflowPopup && root.isVerticalOrientation
-            readonly property real popupPadding: Theme.spacingS + (popupUsesVerticalLine ? 3 : 0)
-
             readonly property real rawWidth: {
                 const itemCount = root.hiddenBarItems.length;
-                if (itemCount === 0)
-                    return 0;
-                if (popupUsesVerticalLine)
-                    return root.trayItemSize + 4 + popupPadding * 2;
-                const cols = root.useSingleLineOverflowPopup ? itemCount : Math.min(5, itemCount);
+                const cols = Math.min(5, itemCount);
                 const itemSize = root.trayItemSize + 4;
                 const spacing = 2;
-                const desiredWidth = cols * itemSize + (cols - 1) * spacing + popupPadding * 2;
-                if (!root.useSingleLineOverflowPopup)
-                    return desiredWidth;
-                const maxWidth = Math.max(itemSize + popupPadding * 2, overflowMenu.maskWidth - 20);
-                return Math.min(desiredWidth, maxWidth);
+                return cols * itemSize + (cols - 1) * spacing + Theme.spacingS * 2;
             }
             readonly property real rawHeight: {
                 const itemCount = root.hiddenBarItems.length;
-                if (itemCount === 0)
-                    return 0;
+                const cols = Math.min(5, itemCount);
+                const rows = Math.ceil(itemCount / cols);
                 const itemSize = root.trayItemSize + 4;
                 const spacing = 2;
-                if (popupUsesVerticalLine) {
-                    const desiredHeight = itemCount * itemSize + (itemCount - 1) * spacing + popupPadding * 2;
-                    const maxHeight = Math.max(itemSize + popupPadding * 2, overflowMenu.maskHeight - 20);
-                    return Math.min(desiredHeight, maxHeight);
-                }
-                const cols = root.useSingleLineOverflowPopup ? itemCount : Math.min(5, itemCount);
-                const rows = Math.ceil(itemCount / cols);
-                return rows * itemSize + (rows - 1) * spacing + popupPadding * 2;
+                return rows * itemSize + (rows - 1) * spacing + Theme.spacingS * 2;
             }
 
             readonly property real alignedWidth: Theme.px(rawWidth, overflowMenu.dpr)
@@ -1313,161 +1230,76 @@ BasePill {
                 z: 100
             }
 
-            Flickable {
+            Grid {
+                id: menuGrid
                 anchors.centerIn: parent
-                width: parent.width - menuContainer.popupPadding * 2
-                height: parent.height - menuContainer.popupPadding * 2
-                contentWidth: menuGrid.implicitWidth
-                contentHeight: menuGrid.implicitHeight
-                boundsBehavior: Flickable.StopAtBounds
-                clip: true
-                interactive: root.useSingleLineOverflowPopup && (menuContainer.popupUsesVerticalLine ? contentHeight > height : contentWidth > width)
+                columns: Math.min(5, root.hiddenBarItems.length)
+                spacing: 2
+                rowSpacing: 2
 
-                Grid {
-                    id: menuGrid
-                    anchors.verticalCenter: menuContainer.popupUsesVerticalLine ? undefined : parent.verticalCenter
-                    anchors.horizontalCenter: menuContainer.popupUsesVerticalLine ? parent.horizontalCenter : undefined
-                    columns: menuContainer.popupUsesVerticalLine ? 1 : (root.useSingleLineOverflowPopup ? root.hiddenBarItems.length : Math.min(5, root.hiddenBarItems.length))
-                    spacing: 2
-                    rowSpacing: 2
+                Repeater {
+                    model: root.hiddenBarItems
 
-                    Repeater {
-                        model: root.hiddenBarItems
+                    delegate: Rectangle {
+                        property var trayItem: modelData
+                        property string iconSource: root.trayIconSourceFor(trayItem)
 
-                        delegate: Rectangle {
-                            id: overflowItemRoot
-                            property var trayItem: modelData
-                            property string itemKey: root.getTrayItemKey(trayItem)
-                            property string iconSource: root.trayIconSourceFor(trayItem)
+                        width: root.trayItemSize + 4
+                        height: root.trayItemSize + 4
+                        radius: Theme.cornerRadius
+                        color: itemArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : Theme.withAlpha(Theme.surfaceContainer, 0)
 
-                            width: root.trayItemSize + 4
-                            height: root.trayItemSize + 4
-                            z: popupDragHandler.dragging ? 100 : 0
-                            radius: Theme.cornerRadius
-                            color: itemArea.containsMouse ? BlurService.hoverColor(Theme.widgetBaseHoverColor) : Theme.withAlpha(Theme.surfaceContainer, 0)
-                            border.width: popupDragHandler.dragging ? 2 : 0
-                            border.color: Theme.primary
-                            opacity: popupDragHandler.dragging ? 0.8 : 1.0
-
-                            property real shiftOffset: root.dragShiftOffset(index, root.popupDraggedIndex, root.popupDropTargetIndex, root.trayItemSize + 6)
-
-                            transform: Translate {
-                                x: !menuContainer.popupUsesVerticalLine ? overflowItemRoot.shiftOffset + (popupDragHandler.dragging ? popupDragHandler.dragAxisOffset : 0) : 0
-                                y: menuContainer.popupUsesVerticalLine ? overflowItemRoot.shiftOffset + (popupDragHandler.dragging ? popupDragHandler.dragAxisOffset : 0) : 0
-                                Behavior on x {
-                                    enabled: !root.suppressShiftAnimation && !menuContainer.popupUsesVerticalLine
-                                    NumberAnimation {
-                                        duration: 150
-                                        easing.type: Easing.OutCubic
-                                    }
-                                }
-                                Behavior on y {
-                                    enabled: !root.suppressShiftAnimation && menuContainer.popupUsesVerticalLine
-                                    NumberAnimation {
-                                        duration: 150
-                                        easing.type: Easing.OutCubic
-                                    }
-                                }
+                        IconImage {
+                            id: menuIconImg
+                            anchors.centerIn: parent
+                            width: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                            height: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
+                            source: parent.iconSource
+                            asynchronous: true
+                            smooth: true
+                            mipmap: true
+                            visible: status === Image.Ready
+                            layer.enabled: root.trayIconTintEnabled
+                            layer.effect: MultiEffect {
+                                saturation: root.trayIconSaturation
+                                colorization: root.trayIconColorization
+                                colorizationColor: root.trayIconTintColor
                             }
+                        }
 
-                            Item {
-                                id: popupDragHandler
-                                anchors.fill: parent
-                                property bool dragging: false
-                                property point dragStartPos: Qt.point(0, 0)
-                                property real dragAxisOffset: 0
-                                property bool longPressing: false
-
-                                Timer {
-                                    id: popupLongPressTimer
-                                    interval: 400
-                                    repeat: false
-                                    onTriggered: popupDragHandler.longPressing = true
-                                }
+                        StyledText {
+                            anchors.centerIn: parent
+                            visible: !menuIconImg.visible
+                            text: {
+                                const itemId = trayItem?.id || "";
+                                if (!itemId)
+                                    return "?";
+                                return itemId.charAt(0).toUpperCase();
                             }
+                            font.pixelSize: 10
+                            color: Theme.widgetTextColor
+                        }
 
-                            IconImage {
-                                id: menuIconImg
-                                anchors.centerIn: parent
-                                width: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
-                                height: Theme.barIconSize(root.barThickness, undefined, root.barConfig?.maximizeWidgetIcons, root.barConfig?.iconScale)
-                                source: parent.iconSource
-                                asynchronous: true
-                                smooth: true
-                                mipmap: true
-                                visible: status === Image.Ready
-                                layer.enabled: root.trayIconTintEnabled
-                                layer.effect: MultiEffect {
-                                    saturation: root.trayIconSaturation
-                                    colorization: root.trayIconColorization
-                                    colorizationColor: root.trayIconTintColor
+                        MouseArea {
+                            id: itemArea
+                            anchors.fill: parent
+                            hoverEnabled: true
+                            acceptedButtons: Qt.LeftButton | Qt.RightButton
+                            cursorShape: Qt.PointingHandCursor
+                            onClicked: mouse => {
+                                if (!trayItem)
+                                    return;
+                                if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
+                                    trayItem.activate();
+                                    root.menuOpen = false;
+                                    return;
                                 }
-                            }
-
-                            StyledText {
-                                anchors.centerIn: parent
-                                visible: !menuIconImg.visible
-                                text: {
-                                    const itemId = trayItem?.id || "";
-                                    if (!itemId)
-                                        return "?";
-                                    return itemId.charAt(0).toUpperCase();
-                                }
-                                font.pixelSize: 10
-                                color: Theme.widgetTextColor
-                            }
-
-                            MouseArea {
-                                id: itemArea
-                                anchors.fill: parent
-                                hoverEnabled: true
-                                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                                cursorShape: popupDragHandler.longPressing ? Qt.DragMoveCursor : Qt.PointingHandCursor
-                                onPressed: mouse => {
-                                    if (mouse.button === Qt.LeftButton) {
-                                        popupDragHandler.dragStartPos = Qt.point(mouse.x, mouse.y);
-                                        popupLongPressTimer.start();
-                                    }
-                                }
-                                onReleased: mouse => {
-                                    popupLongPressTimer.stop();
-                                    const wasDragging = popupDragHandler.dragging;
-                                    if (wasDragging)
-                                        root.finishPopupDrag();
-
-                                    popupDragHandler.longPressing = false;
-                                    popupDragHandler.dragging = false;
-                                    popupDragHandler.dragAxisOffset = 0;
-                                }
-                                onPositionChanged: mouse => {
-                                    const axisDelta = menuContainer.popupUsesVerticalLine ? (mouse.y - popupDragHandler.dragStartPos.y) : (mouse.x - popupDragHandler.dragStartPos.x);
-                                    if (popupDragHandler.longPressing && !popupDragHandler.dragging && Math.abs(axisDelta) > 5) {
-                                        popupDragHandler.dragging = true;
-                                        root.beginPopupDrag(index);
-                                    }
-                                    if (!popupDragHandler.dragging)
-                                        return;
-
-                                    popupDragHandler.dragAxisOffset = axisDelta;
-                                    root.updatePopupDrag(axisDelta, index);
-                                }
-                                onClicked: mouse => {
-                                    if (popupDragHandler.dragging)
-                                        return;
-                                    if (!trayItem)
-                                        return;
-                                    if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
-                                        trayItem.activate();
-                                        root.menuOpen = false;
-                                        return;
-                                    }
-                                    if (!trayItem.hasMenu) {
-                                        const gp = itemArea.mapToGlobal(mouse.x, mouse.y);
-                                        root.callContextMenuFallback(trayItem.id, Math.round(gp.x), Math.round(gp.y));
-                                        return;
-                                    }
-                                    root.showForTrayItem(trayItem, menuContainer, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
+                                if (!trayItem.hasMenu) {
+                                    const gp = itemArea.mapToGlobal(mouse.x, mouse.y);
+                                    root.callContextMenuFallback(trayItem.id, Math.round(gp.x), Math.round(gp.y));
+                                    return;
                                 }
+                                root.showForTrayItem(trayItem, menuContainer, parentScreen, root.isAtBottom, root.isVerticalOrientation, root.axis);
                             }
                         }
                     }
@@ -1723,13 +1555,11 @@ BasePill {
                             anchorPos = Qt.point(targetX, targetY);
                         }
                     } else {
-                        // Window-local maps directly to screen-local because the bar window spans
-                        // the full screen edge; this avoids mixing mapToGlobal with a separately-
-                        // tracked screen.x/.y origin, which desync on non-primary monitors and after
-                        // DPMS/hotplug.
-                        const localPos = targetItem.mapToItem(null, 0, 0);
-                        const relativeX = localPos.x;
-                        const relativeY = localPos.y;
+                        const globalPos = targetItem.mapToGlobal(0, 0);
+                        const screenX = screen.x || 0;
+                        const screenY = screen.y || 0;
+                        const relativeX = globalPos.x - screenX;
+                        const relativeY = globalPos.y - screenY;
 
                         if (menuRoot.isVertical) {
                             const edge = menuRoot.axis?.edge;
@@ -1865,12 +1695,7 @@ BasePill {
                                 anchors.left: parent.left
                                 anchors.leftMargin: Theme.spacingS
                                 anchors.verticalCenter: parent.verticalCenter
-                                text: {
-                                    const itemId = menuRoot.trayItem?.id || "Unknown";
-                                    if (root.isAutoOverflowTrayItem(menuRoot.trayItem))
-                                        return itemId + " · " + I18n.tr("Keep in Bar");
-                                    return itemId;
-                                }
+                                text: menuRoot.trayItem?.id || "Unknown"
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Theme.surfaceTextMedium
                                 elide: Text.ElideMiddle
@@ -1881,11 +1706,7 @@ BasePill {
                                 anchors.right: parent.right
                                 anchors.rightMargin: Theme.spacingS
                                 anchors.verticalCenter: parent.verticalCenter
-                                name: {
-                                    if (root.isAutoOverflowTrayItem(menuRoot.trayItem))
-                                        return "push_pin";
-                                    return root.isManualHiddenTrayItem(menuRoot.trayItem) ? "visibility" : "visibility_off";
-                                }
+                                name: SessionData.isHiddenTrayId(root.getTrayItemKey(menuRoot.trayItem)) ? "visibility" : "visibility_off"
                                 size: 16
                                 color: Theme.widgetTextColor
                             }
@@ -1899,9 +1720,7 @@ BasePill {
                                     const itemKey = root.getTrayItemKey(menuRoot.trayItem);
                                     if (!itemKey)
                                         return;
-                                    if (root.isAutoOverflowTrayItem(menuRoot.trayItem)) {
-                                        root.promoteTrayItemToBar(menuRoot.trayItem);
-                                    } else if (root.isManualHiddenTrayItem(menuRoot.trayItem)) {
+                                    if (SessionData.isHiddenTrayId(itemKey)) {
                                         SessionData.showTrayId(itemKey);
                                     } else {
                                         SessionData.hideTrayId(itemKey);

quickshell/Modules/DankDash/DankDashPopout.qml

@@ -108,6 +108,9 @@ DankPopout {
                 MprisController.setActivePlayer(player);
                 root.__hideDropdowns();
             }
+            onDeviceSelected: device => {
+                root.__hideDropdowns();
+            }
         }
     }
 
@@ -227,13 +230,6 @@ DankPopout {
                     return;
                 }
 
-                if (root.currentTabIndex === 0 && overviewLoader.item?.handleKeyEvent) {
-                    if (overviewLoader.item.handleKeyEvent(event)) {
-                        event.accepted = true;
-                        return;
-                    }
-                }
-
                 if (root.currentTabIndex === 1 && mediaLoader.item?.handleKeyEvent) {
                     if (mediaLoader.item.handleKeyEvent(event)) {
                         event.accepted = true;
@@ -363,7 +359,6 @@ DankPopout {
                         sourceComponent: Component {
                             OverviewTab {
                                 onCloseDash: root.dashVisible = false
-                                onNavFocusRequested: mainContainer.forceActiveFocus()
                                 onSwitchToWeatherTab: {
                                     if (SettingsData.weatherEnabled) {
                                         root.currentTabIndex = 3;

quickshell/Modules/DankDash/MediaDropdownOverlay.qml

@@ -383,27 +383,7 @@ Item {
                                 anchors.fill: parent
                                 hoverEnabled: true
                                 cursorShape: Qt.PointingHandCursor
-                                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                                onPressed: mouse => {
-                                    if (mouse.button === Qt.RightButton) {
-                                        mouse.accepted = true;
-                                    }
-                                }
-                                onWheel: wheelEvent => {
-                                    if (SettingsData.audioDeviceScrollVolumeEnabled && wheelEvent.x >= deviceMouseArea.width / 2) {
-                                        AudioService.handleNodeVolumeWheel(modelData, wheelEvent);
-                                    } else {
-                                        wheelEvent.accepted = false;
-                                    }
-                                }
-                                onClicked: mouse => {
-                                    if (mouse.button === Qt.RightButton) {
-                                        if (modelData && modelData.audio) {
-                                            SessionData.suppressOSDTemporarily();
-                                            modelData.audio.muted = !modelData.audio.muted;
-                                        }
-                                        return;
-                                    }
+                                onClicked: {
                                     if (modelData && modelData.name) {
                                         AudioService.setDefaultSinkByName(modelData.name);
                                         root.deviceSelected(modelData);

quickshell/Modules/DankDash/MediaPlayerTab.qml

@@ -866,27 +866,7 @@ Item {
             anchors.fill: parent
             hoverEnabled: true
             cursorShape: Qt.PointingHandCursor
-            acceptedButtons: Qt.LeftButton | Qt.RightButton
-            onPressed: mouse => {
-                if (mouse.button === Qt.RightButton) {
-                    mouse.accepted = true;
-                }
-            }
-            onWheel: wheelEvent => {
-                const delta = wheelEvent.angleDelta.y;
-                if (delta !== 0) {
-                    AudioService.cycleAudioOutputDirection(delta < 0);
-                    wheelEvent.accepted = true;
-                }
-            }
-            onClicked: mouse => {
-                if (mouse.button === Qt.RightButton) {
-                    if (AudioService.sink?.audio) {
-                        SessionData.suppressOSDTemporarily();
-                        AudioService.sink.audio.muted = !AudioService.sink.audio.muted;
-                    }
-                    return;
-                }
+            onClicked: {
                 if (devicesExpanded) {
                     const sinks = AudioService.getAvailableSinks();
                     if (sinks && sinks.length > 1) {

quickshell/Modules/DankDash/Overview/CalendarEventDetail.qml

@@ -1,311 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    property var eventData: null
-    property bool canEdit: false
-
-    signal editRequested
-    signal deleteRequested
-    signal closeRequested
-
-    readonly property bool _descriptionIsHtml: /<[a-z][^>]*>/i.test((eventData && eventData.description) || "")
-
-    function _styleAnchors(html) {
-        return html.replace(/<a\s([^>]*)>/gi, (m, attrs) => {
-            const cleaned = attrs.replace(/style="[^"]*"/gi, "");
-            return "<a style=\"text-decoration:none; color:" + Theme.primary + ";\" " + cleaned + ">";
-        });
-    }
-
-    function _inlineMarkdown(line) {
-        let out = line.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        out = out.replace(/\\([\\`*_{}[\]()#+\-.!~>])/g, "$1");
-        out = out.replace(/(?:https?:\/\/|www\.)[^\s<>)\]]*[^\s<>)\].,;:!?"']/g, (m, offset, s) => {
-            const prev = offset > 0 ? s[offset - 1] : "";
-            if (prev === "(" || prev === "[" || prev === "\"" || prev === "'")
-                return m;
-            const href = m.startsWith("www.") ? "https://" + m : m;
-            return "<a href=\"" + href + "\">" + m + "</a>";
-        });
-        out = out.replace(/\[([^\]]+)\]\(([^()\s]+)\)/g, "<a href=\"$2\">$1</a>");
-        out = out.replace(/\*\*([^*]+)\*\*/g, "<b>$1</b>");
-        out = out.replace(/(^|[^*])\*([^*\s][^*]*)\*/g, "$1<i>$2</i>");
-        return out;
-    }
-
-    // Descriptions arrive as HTML (Google) or markdown/plain text; both render
-    // as RichText so links become clickable anchors recolored to the theme.
-    function _descriptionRichText() {
-        const raw = ((eventData && eventData.description) || "").trim();
-        if (raw === "")
-            return "";
-        if (_descriptionIsHtml)
-            return _styleAnchors(raw);
-
-        const parts = [];
-        let list = "";
-        const closeList = () => {
-            if (list === "")
-                return;
-            parts.push("</" + list + ">");
-            list = "";
-        };
-
-        const lines = raw.split("\n");
-        for (let i = 0; i < lines.length; i++) {
-            const ul = lines[i].match(/^\s*[-*+]\s+(.+)$/);
-            const ol = lines[i].match(/^\s*\d+[.)]\s+(.+)$/);
-            if (ul || ol) {
-                const tag = ul ? "ul" : "ol";
-                if (list !== tag) {
-                    closeList();
-                    parts.push("<" + tag + ">");
-                    list = tag;
-                }
-                parts.push("<li>" + _inlineMarkdown((ul || ol)[1]) + "</li>");
-                continue;
-            }
-            closeList();
-            parts.push(_inlineMarkdown(lines[i]) + "<br/>");
-        }
-        closeList();
-        return _styleAnchors(parts.join("").replace(/<br\/>$/, ""));
-    }
-
-    function _timeText() {
-        if (!eventData)
-            return "";
-        const dateStr = Qt.formatDate(eventData.start, "ddd, MMM d");
-        if (eventData.allDay)
-            return I18n.tr("All day") + " · " + dateStr;
-        const fmt = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
-        const startStr = Qt.formatTime(eventData.start, fmt);
-        if (eventData.start.getTime() === eventData.end.getTime())
-            return dateStr + " · " + startStr;
-        return dateStr + " · " + startStr + " – " + Qt.formatTime(eventData.end, fmt);
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Qt.rgba(0, 0, 0, 0.45)
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: root.closeRequested()
-        }
-    }
-
-    Rectangle {
-        anchors.centerIn: parent
-        width: Math.min(parent.width - Theme.spacingL * 2, 380)
-        height: Math.min(parent.height - Theme.spacingM * 2, body.implicitHeight + Theme.spacingL * 2)
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainerHigh
-        border.color: Theme.outlineMedium
-        border.width: 1
-        clip: true
-
-        MouseArea {
-            anchors.fill: parent
-        }
-
-        DankActionButton {
-            id: closeButton
-            anchors.top: parent.top
-            anchors.right: parent.right
-            anchors.margins: Theme.spacingXS
-            circular: false
-            iconName: "close"
-            iconSize: 16
-            z: 1
-            onClicked: root.closeRequested()
-        }
-
-        DankFlickable {
-            anchors.fill: parent
-            anchors.margins: Theme.spacingL
-            anchors.topMargin: Theme.spacingL
-            contentWidth: width
-            contentHeight: body.implicitHeight
-            clip: true
-
-            Column {
-                id: body
-                width: parent.width
-                spacing: Theme.spacingS
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    Rectangle {
-                        width: 4
-                        height: titleText.implicitHeight
-                        radius: 2
-                        anchors.top: parent.top
-                        color: (root.eventData && root.eventData.color) ? root.eventData.color : Theme.primary
-                    }
-
-                    StyledText {
-                        id: titleText
-                        width: parent.width - 4 - Theme.spacingS - closeButton.width
-                        text: root.eventData ? root.eventData.title : ""
-                        font.pixelSize: Theme.fontSizeLarge
-                        font.weight: Font.Medium
-                        color: Theme.surfaceText
-                        horizontalAlignment: Text.AlignLeft
-                        wrapMode: Text.Wrap
-                        maximumLineCount: 3
-                        elide: Text.ElideRight
-                    }
-                }
-
-                StyledText {
-                    width: parent.width
-                    text: root._timeText()
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceVariantText
-                    wrapMode: Text.Wrap
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingXS
-                    visible: root.eventData && root.eventData.calendar
-
-                    DankIcon {
-                        name: "calendar_month"
-                        size: 14
-                        color: Theme.surfaceVariantText
-                        anchors.top: parent.top
-                        anchors.topMargin: 2
-                    }
-
-                    StyledText {
-                        width: parent.width - 14 - Theme.spacingXS
-                        text: {
-                            if (!root.eventData)
-                                return "";
-                            const acc = root.eventData.account || "";
-                            return root.eventData.calendar + (acc ? " · " + acc : "");
-                        }
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        wrapMode: Text.Wrap
-                        maximumLineCount: 2
-                        elide: Text.ElideRight
-                    }
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingXS
-                    visible: root.eventData && root.eventData.location
-
-                    DankIcon {
-                        name: "place"
-                        size: 14
-                        color: Theme.surfaceVariantText
-                        anchors.top: parent.top
-                        anchors.topMargin: 2
-                    }
-
-                    StyledText {
-                        width: parent.width - 14 - Theme.spacingXS
-                        text: root.eventData ? root.eventData.location : ""
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        wrapMode: Text.Wrap
-                        maximumLineCount: 2
-                        elide: Text.ElideRight
-                    }
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingXS
-                    visible: root.eventData && root.eventData.url
-
-                    DankIcon {
-                        name: "link"
-                        size: 14
-                        color: Theme.primary
-                        anchors.top: parent.top
-                        anchors.topMargin: 2
-                    }
-
-                    StyledText {
-                        width: parent.width - 14 - Theme.spacingXS
-                        text: root.eventData ? root.eventData.url : ""
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.primary
-                        wrapMode: Text.WrapAnywhere
-                        maximumLineCount: 2
-                        elide: Text.ElideRight
-
-                        MouseArea {
-                            anchors.fill: parent
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: {
-                                if (root.eventData && root.eventData.url)
-                                    Qt.openUrlExternally(root.eventData.url);
-                            }
-                        }
-                    }
-                }
-
-                StyledText {
-                    id: descriptionText
-                    width: parent.width
-                    text: root._descriptionRichText()
-                    visible: root.eventData && root.eventData.description
-                    textFormat: Text.RichText
-                    linkColor: Theme.primary
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    horizontalAlignment: Text.AlignLeft
-                    wrapMode: Text.Wrap
-                    onLinkActivated: link => Qt.openUrlExternally(link)
-
-                    MouseArea {
-                        anchors.fill: parent
-                        acceptedButtons: Qt.NoButton
-                        cursorShape: descriptionText.hoveredLink !== "" ? Qt.PointingHandCursor : Qt.ArrowCursor
-                    }
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingS
-                    visible: root.canEdit
-                    topPadding: Theme.spacingXS
-
-                    DankButton {
-                        text: I18n.tr("Edit")
-                        iconName: "edit"
-                        buttonHeight: 32
-                        onClicked: root.editRequested()
-                    }
-
-                    DankButton {
-                        text: I18n.tr("Delete")
-                        iconName: "delete"
-                        buttonHeight: 32
-                        backgroundColor: Theme.withAlpha(Theme.error, 0.15)
-                        textColor: Theme.error
-                        onClicked: root.deleteRequested()
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/DankDash/Overview/CalendarEventEditor.qml

@@ -1,350 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: root
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    property var eventData: null
-    property date initialDate: new Date()
-
-    signal saved
-    signal closeRequested
-
-    property string fTitle: ""
-    property bool fAllDay: false
-    property date fDate: initialDate
-    property string fStart: "10:00"
-    property string fEnd: "11:00"
-    property string fLocation: ""
-    property string fDescription: ""
-    property string fCalendarId: ""
-    property int fReminder: -1
-    property string errorText: ""
-    property bool saving: false
-
-    readonly property var _cals: CalendarService.writableCalendars()
-    readonly property var _remLabels: [I18n.tr("No reminder"), I18n.tr("At start"), I18n.tr("5 min before"), I18n.tr("10 min before"), I18n.tr("15 min before"), I18n.tr("30 min before"), I18n.tr("1 hour before"), I18n.tr("1 day before")]
-    readonly property var _remMins: [-1, 0, 5, 10, 15, 30, 60, 1440]
-
-    function _parseTime(value) {
-        const m = value.trim().match(/^(\d{1,2}):(\d{2})$/);
-        if (!m)
-            return null;
-        const h = parseInt(m[1]);
-        const min = parseInt(m[2]);
-        if (h > 23 || min > 59)
-            return null;
-        return {
-            "h": h,
-            "m": min
-        };
-    }
-
-    function _isoFromDateTime(dateObj, h, m) {
-        const d = new Date(dateObj);
-        d.setHours(h, m, 0, 0);
-        return d.toISOString();
-    }
-
-    function _allDayIso(dateObj, dayOffset) {
-        return new Date(Date.UTC(dateObj.getFullYear(), dateObj.getMonth(), dateObj.getDate() + dayOffset)).toISOString();
-    }
-
-    function _calendarName(id) {
-        for (let i = 0; i < _cals.length; i++) {
-            if (_cals[i].id === id)
-                return _cals[i].name;
-        }
-        return _cals.length > 0 ? _cals[0].name : "";
-    }
-
-    function save() {
-        const title = fTitle.trim();
-        if (!title) {
-            errorText = I18n.tr("Title is required");
-            return;
-        }
-        let calId = fCalendarId;
-        if (!calId) {
-            const def = CalendarService.defaultCalendar();
-            calId = def ? def.id : "";
-        }
-        if (!calId) {
-            errorText = I18n.tr("No writable calendar available");
-            return;
-        }
-        let startIso, endIso;
-        if (fAllDay) {
-            startIso = _allDayIso(fDate, 0);
-            endIso = _allDayIso(fDate, 1);
-        } else {
-            const s = _parseTime(fStart);
-            const e = _parseTime(fEnd);
-            if (!s || !e) {
-                errorText = I18n.tr("Use HH:MM time format");
-                return;
-            }
-            startIso = _isoFromDateTime(fDate, s.h, s.m);
-            endIso = _isoFromDateTime(fDate, e.h, e.m);
-            if (new Date(endIso).getTime() <= new Date(startIso).getTime()) {
-                errorText = I18n.tr("End must be after start");
-                return;
-            }
-        }
-        const fields = {
-            "calendarId": calId,
-            "summary": title,
-            "description": fDescription,
-            "location": fLocation,
-            "start": startIso,
-            "end": endIso,
-            "allDay": fAllDay,
-            "reminders": fReminder >= 0 ? [
-                {
-                    "method": "popup",
-                    "minutes": fReminder
-                }
-            ] : []
-        };
-        saving = true;
-        errorText = "";
-        const cb = response => {
-            saving = false;
-            if (response.error) {
-                errorText = response.error;
-                return;
-            }
-            root.saved();
-        };
-        if (eventData && eventData.id)
-            CalendarService.updateEvent(eventData.id, fields, cb);
-        else
-            CalendarService.createEvent(fields, cb);
-    }
-
-    Component.onCompleted: {
-        if (!eventData) {
-            fCalendarId = CalendarService.defaultCalendar() ? CalendarService.defaultCalendar().id : "";
-            return;
-        }
-        fTitle = eventData.title || "";
-        fAllDay = !!eventData.allDay;
-        fDate = eventData.start;
-        const fmt = "HH:mm";
-        fStart = Qt.formatTime(eventData.start, fmt);
-        fEnd = Qt.formatTime(eventData.end, fmt);
-        fLocation = eventData.location || "";
-        fDescription = eventData.description || "";
-        fCalendarId = eventData.calendarId || "";
-        if (eventData.reminders && eventData.reminders.length > 0)
-            fReminder = eventData.reminders[0].minutes;
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Qt.rgba(0, 0, 0, 0.45)
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: root.closeRequested()
-        }
-    }
-
-    Rectangle {
-        anchors.centerIn: parent
-        width: Math.min(parent.width - Theme.spacingL * 2, 400)
-        height: Math.min(parent.height - Theme.spacingM, 300)
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainerHigh
-        border.color: Theme.outlineMedium
-        border.width: 1
-
-        MouseArea {
-            anchors.fill: parent
-        }
-
-        DankFlickable {
-            anchors.fill: parent
-            anchors.margins: Theme.spacingM
-            contentWidth: width
-            contentHeight: form.implicitHeight
-            clip: true
-
-            Column {
-                id: form
-                width: parent.width
-                spacing: Theme.spacingS
-
-                StyledText {
-                    width: parent.width
-                    text: root.eventData ? I18n.tr("Edit event") : I18n.tr("New event")
-                    font.pixelSize: Theme.fontSizeMedium
-                    font.weight: Font.Medium
-                    color: Theme.surfaceText
-                    horizontalAlignment: Text.AlignLeft
-                }
-
-                DankTextField {
-                    width: parent.width
-                    labelText: I18n.tr("Title")
-                    leftIconName: "title"
-                    leftIconSize: Theme.iconSize - 6
-                    placeholderText: I18n.tr("Event title")
-                    text: root.fTitle
-                    onTextChanged: root.fTitle = text
-                }
-
-                DankToggle {
-                    width: parent.width
-                    text: I18n.tr("All day")
-                    checked: root.fAllDay
-                    onToggled: checked => root.fAllDay = checked
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingXS
-
-                    DankActionButton {
-                        circular: false
-                        iconName: "chevron_left"
-                        iconSize: 16
-                        onClicked: {
-                            let d = new Date(root.fDate);
-                            d.setDate(d.getDate() - 1);
-                            root.fDate = d;
-                        }
-                    }
-
-                    StyledText {
-                        width: parent.width - 72
-                        text: Qt.formatDate(root.fDate, "ddd, MMM d yyyy")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceText
-                        horizontalAlignment: Text.AlignHCenter
-                        verticalAlignment: Text.AlignVCenter
-                        height: 32
-                    }
-
-                    DankActionButton {
-                        circular: false
-                        iconName: "chevron_right"
-                        iconSize: 16
-                        onClicked: {
-                            let d = new Date(root.fDate);
-                            d.setDate(d.getDate() + 1);
-                            root.fDate = d;
-                        }
-                    }
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingS
-                    visible: !root.fAllDay
-
-                    DankTextField {
-                        width: (parent.width - Theme.spacingS) / 2
-                        labelText: I18n.tr("Start")
-                        leftIconName: "schedule"
-                        leftIconSize: Theme.iconSize - 6
-                        placeholderText: "HH:MM"
-                        text: root.fStart
-                        onTextChanged: root.fStart = text
-                    }
-
-                    DankTextField {
-                        width: (parent.width - Theme.spacingS) / 2
-                        labelText: I18n.tr("End")
-                        placeholderText: "HH:MM"
-                        text: root.fEnd
-                        onTextChanged: root.fEnd = text
-                    }
-                }
-
-                DankDropdown {
-                    width: parent.width
-                    text: I18n.tr("Calendar")
-                    options: root._cals.map(c => c.name)
-                    currentValue: root._calendarName(root.fCalendarId)
-                    onValueChanged: value => {
-                        for (let i = 0; i < root._cals.length; i++) {
-                            if (root._cals[i].name === value) {
-                                root.fCalendarId = root._cals[i].id;
-                                return;
-                            }
-                        }
-                    }
-                }
-
-                DankDropdown {
-                    width: parent.width
-                    text: I18n.tr("Reminder")
-                    options: root._remLabels
-                    currentValue: root._remLabels[Math.max(0, root._remMins.indexOf(root.fReminder))]
-                    onValueChanged: value => {
-                        const idx = root._remLabels.indexOf(value);
-                        if (idx >= 0)
-                            root.fReminder = root._remMins[idx];
-                    }
-                }
-
-                DankTextField {
-                    width: parent.width
-                    labelText: I18n.tr("Location")
-                    leftIconName: "place"
-                    leftIconSize: Theme.iconSize - 6
-                    placeholderText: I18n.tr("Add location")
-                    text: root.fLocation
-                    onTextChanged: root.fLocation = text
-                }
-
-                DankTextField {
-                    width: parent.width
-                    labelText: I18n.tr("Notes")
-                    leftIconName: "notes"
-                    leftIconSize: Theme.iconSize - 6
-                    placeholderText: I18n.tr("Add notes")
-                    text: root.fDescription
-                    onTextChanged: root.fDescription = text
-                }
-
-                StyledText {
-                    width: parent.width
-                    text: root.errorText
-                    visible: root.errorText !== ""
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.error
-                    wrapMode: Text.WordWrap
-                }
-
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingS
-
-                    DankButton {
-                        text: root.saving ? I18n.tr("Saving…") : I18n.tr("Save")
-                        iconName: "check"
-                        buttonHeight: 32
-                        backgroundColor: Theme.primary
-                        textColor: Theme.primaryText
-                        enabled: !root.saving
-                        onClicked: root.save()
-                    }
-
-                    DankButton {
-                        text: I18n.tr("Cancel")
-                        buttonHeight: 32
-                        onClicked: root.closeRequested()
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/DankDash/Overview/CalendarOverviewCard.qml

@@ -8,21 +8,14 @@ Rectangle {
     id: root
     readonly property var log: Log.scoped("CalendarOverviewCard")
 
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
     implicitWidth: SettingsData.showWeekNumber ? 736 : 700
 
     property bool showEventDetails: false
     property date selectedDate: systemClock.date
     property var selectedDateEvents: []
     property bool hasEvents: selectedDateEvents && selectedDateEvents.length > 0
-    property var detailEvent: null
-    property bool showEditor: false
-    property var editorEvent: null
 
     signal closeDash
-    signal navFocusRequested
 
     function weekStartQt() {
         if (SettingsData.firstDayOfWeek >= 7 || SettingsData.firstDayOfWeek < 0) {
@@ -86,7 +79,7 @@ Rectangle {
     }
 
     function updateSelectedDateEvents() {
-        if (CalendarService && CalendarService.calendarAvailable) {
+        if (CalendarService && CalendarService.khalAvailable) {
             const events = CalendarService.getEventsForDate(selectedDate);
             selectedDateEvents = events;
         } else {
@@ -95,7 +88,7 @@ Rectangle {
     }
 
     function loadEventsForMonth() {
-        if (!CalendarService || !CalendarService.calendarAvailable) {
+        if (!CalendarService || !CalendarService.khalAvailable) {
             return;
         }
 
@@ -111,83 +104,11 @@ Rectangle {
         CalendarService.loadEvents(startDate, endDate);
     }
 
-    function goToToday() {
-        const now = systemClock.date;
-        calendarGrid.selectedDate = now;
-        calendarGrid.displayDate = now;
-        root.selectedDate = now;
-        loadEventsForMonth();
-    }
-
-    function moveSelection(days) {
-        let d = new Date(calendarGrid.selectedDate);
-        d.setDate(d.getDate() + days);
-        calendarGrid.selectedDate = d;
-        root.selectedDate = d;
-        if (d.getMonth() !== calendarGrid.displayDate.getMonth() || d.getFullYear() !== calendarGrid.displayDate.getFullYear()) {
-            calendarGrid.displayDate = d;
-            loadEventsForMonth();
-        }
-    }
-
-    function shiftMonth(delta) {
-        let d = new Date(calendarGrid.displayDate);
-        d.setMonth(d.getMonth() + delta);
-        calendarGrid.displayDate = d;
-        loadEventsForMonth();
-    }
-
-    function handleKeyEvent(event) {
-        if (showEventDetails) {
-            if (event.key === Qt.Key_Escape) {
-                showEventDetails = false;
-                return true;
-            }
-            return false;
-        }
-        switch (event.key) {
-        case Qt.Key_Left:
-        case Qt.Key_H:
-            moveSelection(I18n.isRtl ? 1 : -1);
-            return true;
-        case Qt.Key_Right:
-        case Qt.Key_L:
-            moveSelection(I18n.isRtl ? -1 : 1);
-            return true;
-        case Qt.Key_Up:
-        case Qt.Key_K:
-            moveSelection(-7);
-            return true;
-        case Qt.Key_Down:
-        case Qt.Key_J:
-            moveSelection(7);
-            return true;
-        case Qt.Key_PageUp:
-            shiftMonth(-1);
-            return true;
-        case Qt.Key_PageDown:
-            shiftMonth(1);
-            return true;
-        case Qt.Key_T:
-            goToToday();
-            return true;
-        case Qt.Key_Return:
-        case Qt.Key_Enter:
-        case Qt.Key_Space:
-            root.selectedDate = calendarGrid.selectedDate;
-            showEventDetails = true;
-            return true;
-        }
-        return false;
-    }
-
     onSelectedDateChanged: updateSelectedDateEvents()
 
     onShowEventDetailsChanged: {
         if (showEventDetails) {
             taskInput.forceActiveFocus();
-        } else {
-            navFocusRequested();
         }
     }
 
@@ -201,8 +122,8 @@ Rectangle {
             updateSelectedDateEvents();
         }
 
-        function onCalendarAvailableChanged() {
-            if (CalendarService && CalendarService.calendarAvailable) {
+        function onKhalAvailableChanged() {
+            if (CalendarService && CalendarService.khalAvailable) {
                 loadEventsForMonth();
             }
             updateSelectedDateEvents();
@@ -222,55 +143,6 @@ Rectangle {
         anchors.margins: Theme.spacingM
         spacing: Theme.spacingS
 
-        Rectangle {
-            id: dankWarning
-            width: parent.width
-            visible: CalendarService && CalendarService.dankNeedsLaunch
-            height: visible ? Math.max(28, warningRow.implicitHeight) + Theme.spacingS : 0
-            radius: Theme.cornerRadius
-            color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12)
-            border.color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.35)
-            border.width: 1
-
-            Row {
-                id: warningRow
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.leftMargin: Theme.spacingS
-                anchors.rightMargin: Theme.spacingS
-                spacing: Theme.spacingS
-
-                DankIcon {
-                    name: "warning"
-                    size: 16
-                    color: Theme.warning
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                StyledText {
-                    width: parent.width - 16 - Theme.spacingS - (launchButton.visible ? launchButton.width + Theme.spacingS : 0)
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: (CalendarService && CalendarService.dankBinaryExists) ? I18n.tr("DankCalendar isn't running") : I18n.tr("DankCalendar isn't installed")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    horizontalAlignment: Text.AlignLeft
-                    wrapMode: Text.Wrap
-                }
-
-                DankButton {
-                    id: launchButton
-                    anchors.verticalCenter: parent.verticalCenter
-                    visible: CalendarService && CalendarService.dankBinaryExists
-                    text: I18n.tr("Launch")
-                    buttonHeight: 26
-                    backgroundColor: Theme.primary
-                    textColor: Theme.primaryText
-                    onClicked: CalendarService.launchDankCalendar()
-                }
-            }
-        }
-
         Item {
             width: parent.width
             height: 40
@@ -301,40 +173,11 @@ Rectangle {
                 }
             }
 
-            Rectangle {
-                width: 32
-                height: 32
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.right: parent.right
-                anchors.rightMargin: Theme.spacingS
-                radius: Theme.cornerRadius
-                visible: CalendarService && CalendarService.canCreateEvents
-                color: addEventArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "event"
-                    size: 16
-                    color: Theme.primary
-                }
-
-                MouseArea {
-                    id: addEventArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        root.editorEvent = null;
-                        root.showEditor = true;
-                    }
-                }
-            }
-
             StyledText {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 32 + Theme.spacingS * 2
-                anchors.rightMargin: (CalendarService && CalendarService.canCreateEvents) ? 32 + Theme.spacingS * 2 : Theme.spacingS
+                anchors.rightMargin: Theme.spacingS
                 height: 40
                 anchors.verticalCenter: parent.verticalCenter
                 text: {
@@ -386,7 +229,7 @@ Rectangle {
             }
 
             StyledText {
-                width: parent.width - 84
+                width: parent.width - 56
                 height: 28
                 text: calendarGrid.displayDate.toLocaleDateString(I18n.locale(), "MMMM yyyy")
                 font.pixelSize: Theme.fontSizeMedium
@@ -396,28 +239,6 @@ Rectangle {
                 verticalAlignment: Text.AlignVCenter
             }
 
-            Rectangle {
-                width: 28
-                height: 28
-                radius: Theme.cornerRadius
-                color: todayArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "today"
-                    size: 14
-                    color: Theme.primary
-                }
-
-                MouseArea {
-                    id: todayArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: root.goToToday()
-                }
-            }
-
             Rectangle {
                 width: 28
                 height: 28
@@ -567,8 +388,6 @@ Rectangle {
                                 height: width
                                 color: isToday ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : dayArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
                                 radius: Theme.cornerRadius
-                                border.color: (isSelected && !isToday) ? Theme.primary : "transparent"
-                                border.width: (isSelected && !isToday) ? 1 : 0
 
                                 StyledText {
                                     anchors.centerIn: parent
@@ -578,31 +397,21 @@ Rectangle {
                                     font.weight: isToday ? Font.Medium : Font.Normal
                                 }
 
-                                Row {
+                                Rectangle {
                                     anchors.bottom: parent.bottom
                                     anchors.horizontalCenter: parent.horizontalCenter
-                                    anchors.bottomMargin: 3
-                                    spacing: 2
-                                    visible: CalendarService && CalendarService.calendarAvailable && CalendarService.hasEventsForDate(dayDate)
+                                    anchors.bottomMargin: 4
+                                    width: 12
+                                    height: 2
+                                    radius: Theme.cornerRadius
+                                    visible: CalendarService && CalendarService.khalAvailable && CalendarService.hasEventsForDate(dayDate)
+                                    color: isToday ? Qt.lighter(Theme.primary, 1.3) : Theme.primary
+                                    opacity: isToday ? 0.9 : 0.7
 
-                                    Repeater {
-                                        model: {
-                                            const evs = CalendarService.getEventsForDate(dayDate);
-                                            const seen = [];
-                                            for (let i = 0; i < evs.length && seen.length < 3; i++) {
-                                                const c = (evs[i].color && evs[i].color.length) ? evs[i].color : "primary";
-                                                if (seen.indexOf(c) === -1)
-                                                    seen.push(c);
-                                            }
-                                            return seen;
-                                        }
-
-                                        Rectangle {
-                                            width: 5
-                                            height: 5
-                                            radius: 2.5
-                                            color: modelData === "primary" ? (isToday ? Qt.lighter(Theme.primary, 1.3) : Theme.primary) : modelData
-                                            opacity: isToday ? 0.95 : 0.8
+                                    Behavior on opacity {
+                                        NumberAnimation {
+                                            duration: Theme.shortDuration
+                                            easing.type: Theme.standardEasing
                                         }
                                     }
                                 }
@@ -614,7 +423,6 @@ Rectangle {
                                 hoverEnabled: true
                                 cursorShape: Qt.PointingHandCursor
                                 onClicked: {
-                                    calendarGrid.selectedDate = dayDate;
                                     root.selectedDate = dayDate;
                                     root.showEventDetails = true;
                                 }
@@ -814,15 +622,7 @@ Rectangle {
                             }
                         }
 
-                        readonly property bool isTask: modelData && modelData.id && modelData.id.startsWith("task_")
-                        readonly property color accentColor: {
-                            if (isTask)
-                                return modelData.completed ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Theme.primary;
-                            return (modelData && modelData.color && modelData.color.length) ? modelData.color : Theme.primary;
-                        }
-                        readonly property color surfaceColor: isDragging ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : Theme.nestedSurface)
-
-                        color: surfaceColor
+                        color: isDragging ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) : Theme.nestedSurface)
                         border.color: isDragging ? Theme.primary : (eventMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : Theme.outlineMedium)
                         border.width: (isDragging || eventMouseArea.containsMouse) ? 1 : Theme.layerOutlineWidth
 
@@ -860,22 +660,15 @@ Rectangle {
                             }
                         }
 
-                        Item {
-                            id: accentClip
-                            width: 4
-                            clip: true
-                            anchors.top: parent.top
-                            anchors.bottom: parent.bottom
+                        Rectangle {
+                            width: 3
+                            height: parent.height - 6
                             anchors.left: parent.left
-
-                            Rectangle {
-                                width: taskItem.width
-                                height: taskItem.height
-                                radius: taskItem.radius
-                                color: taskItem.accentColor
-                                anchors.top: parent.top
-                                anchors.left: parent.left
-                            }
+                            anchors.leftMargin: 3
+                            anchors.verticalCenter: parent.verticalCenter
+                            radius: Theme.cornerRadius
+                            color: (modelData && modelData.id && modelData.id.startsWith("task_")) ? (modelData.completed ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Theme.primary) : Theme.primary
+                            opacity: 0.8
                         }
 
                         // Drag Handle
@@ -974,7 +767,6 @@ Rectangle {
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: (modelData && modelData.id && modelData.id.startsWith("task_") && modelData.completed) ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5) : Theme.surfaceText
                                 font.weight: Font.Medium
-                                horizontalAlignment: Text.AlignLeft
                                 elide: Text.ElideRight
                                 maximumLineCount: 1
                             }
@@ -982,24 +774,21 @@ Rectangle {
                             StyledText {
                                 width: parent.width
                                 text: {
-                                    if (!modelData)
-                                        return "";
-                                    const cal = (modelData.calendar && modelData.calendar.length) ? " · " + modelData.calendar : "";
-                                    if (modelData.allDay)
-                                        return I18n.tr("All day", "calendar task with no specific time") + cal;
-                                    if (modelData.start && modelData.end) {
+                                    if (!modelData || modelData.allDay) {
+                                        return I18n.tr("All day", "calendar task with no specific time");
+                                    } else if (modelData.start && modelData.end) {
                                         const timeFormat = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
                                         const startTime = Qt.formatTime(modelData.start, timeFormat);
-                                        if (modelData.start.toDateString() !== modelData.end.toDateString() || modelData.start.getTime() !== modelData.end.getTime())
-                                            return startTime + " – " + Qt.formatTime(modelData.end, timeFormat) + cal;
-                                        return startTime + cal;
+                                        if (modelData.start.toDateString() !== modelData.end.toDateString() || modelData.start.getTime() !== modelData.end.getTime()) {
+                                            return startTime + " – " + Qt.formatTime(modelData.end, timeFormat);
+                                        }
+                                        return startTime;
                                     }
                                     return "";
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)
                                 font.weight: Font.Normal
-                                horizontalAlignment: Text.AlignLeft
                                 visible: text !== "" && modelData && modelData.id && !modelData.id.startsWith("task_")
                             }
                         }
@@ -1035,9 +824,8 @@ Rectangle {
                                     taskItem.isEditing = false;
                                 }
 
-                                Keys.onEscapePressed: event => {
+                                Keys.onEscapePressed: {
                                     taskItem.isEditing = false;
-                                    event.accepted = true;
                                 }
                             }
                         }
@@ -1050,15 +838,18 @@ Rectangle {
                             anchors.leftMargin: (modelData && modelData.id && modelData.id.startsWith("task_")) ? 32 : 6
                             anchors.rightMargin: (modelData && modelData.id && modelData.id.startsWith("task_")) ? 64 : 0
                             hoverEnabled: true
-                            cursorShape: modelData ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            enabled: modelData && !taskItem.isEditing
+                            cursorShape: (modelData && (modelData.url || (modelData.id && modelData.id.startsWith("task_")))) ? Qt.PointingHandCursor : Qt.ArrowCursor
+                            enabled: modelData && (modelData.url !== "" || (modelData.id && modelData.id.startsWith("task_"))) && !taskItem.isEditing
                             onClicked: {
                                 if (modelData && modelData.id && modelData.id.startsWith("task_")) {
                                     CalendarService.toggleTask(modelData.id);
-                                    return;
+                                } else if (modelData && modelData.url && modelData.url !== "") {
+                                    if (Qt.openUrlExternally(modelData.url) === false) {
+                                        log.warn("Failed to open URL: " + modelData.url);
+                                    } else {
+                                        root.closeDash();
+                                    }
                                 }
-                                if (modelData)
-                                    root.detailEvent = modelData;
                             }
                         }
 
@@ -1162,7 +953,7 @@ Rectangle {
                 Text {
                     text: I18n.tr("Add a task...", "placeholder in the new-task input field")
                     color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.4)
-                    visible: taskInput.text.length === 0
+                    visible: !taskInput.text && !taskInput.activeFocus
                     font.pixelSize: Theme.fontSizeSmall
                     anchors.verticalCenter: parent.verticalCenter
                 }
@@ -1174,52 +965,6 @@ Rectangle {
                         text = "";
                     }
                 }
-
-                Keys.onEscapePressed: event => {
-                    root.showEventDetails = false;
-                    event.accepted = true;
-                }
-            }
-        }
-    }
-
-    Loader {
-        anchors.fill: parent
-        z: 1000
-        active: root.detailEvent !== null
-
-        sourceComponent: CalendarEventDetail {
-            eventData: root.detailEvent
-            canEdit: CalendarService && CalendarService.canCreateEvents && root.detailEvent && !root.detailEvent.readOnly && !(root.detailEvent.id && root.detailEvent.id.startsWith("task_"))
-            onCloseRequested: root.detailEvent = null
-            onEditRequested: {
-                root.editorEvent = root.detailEvent;
-                root.detailEvent = null;
-                root.showEditor = true;
-            }
-            onDeleteRequested: {
-                if (root.detailEvent && root.detailEvent.id)
-                    CalendarService.deleteEvent(root.detailEvent.id, null);
-                root.detailEvent = null;
-            }
-        }
-    }
-
-    Loader {
-        anchors.fill: parent
-        z: 1000
-        active: root.showEditor
-
-        sourceComponent: CalendarEventEditor {
-            eventData: root.editorEvent
-            initialDate: root.selectedDate
-            onCloseRequested: {
-                root.showEditor = false;
-                root.editorEvent = null;
-            }
-            onSaved: {
-                root.showEditor = false;
-                root.editorEvent = null;
             }
         }
     }

quickshell/Modules/DankDash/OverviewTab.qml

@@ -14,11 +14,6 @@ Item {
     signal switchToWeatherTab
     signal switchToMediaTab
     signal closeDash
-    signal navFocusRequested
-
-    function handleKeyEvent(event) {
-        return calendarCard.handleKeyEvent(event);
-    }
 
     Item {
         anchors.fill: parent
@@ -59,14 +54,12 @@ Item {
 
         // Calendar - bottom middle (wider and taller)
         CalendarOverviewCard {
-            id: calendarCard
             x: parent.width * 0.2 - Theme.spacingM
             y: 100 + Theme.spacingM
             width: parent.width * 0.6
             height: 300
 
             onCloseDash: root.closeDash()
-            onNavFocusRequested: root.navFocusRequested()
         }
 
         // Media - bottom right (narrow and taller)

quickshell/Modules/Notepad/Notepad.qml

@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 import QtQuick
-import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 import qs.Common
@@ -22,71 +21,21 @@ Item {
     property var currentTab: NotepadStorageService.tabs.length > NotepadStorageService.currentTabIndex ? NotepadStorageService.tabs[NotepadStorageService.currentTabIndex] : null
     property bool showSettingsMenu: false
     property string pendingSaveContent: ""
-    readonly property bool conflictBannerVisible: currentTab !== null && NotepadStorageService.conflictTabId === currentTab.id
     property var slideout: null
-    property bool inPopout: false
-    property bool surfaceVisible: slideout ? slideout.isVisible : true
 
     signal hideRequested
-    signal popoutRequested
-    signal dockRequested
     signal previewRequested(string content)
 
-    function externalSync() {
-        textEditor.syncFromDisk();
-    }
-
-    function flushAutoSave() {
-        textEditor.autoSaveToSession();
-    }
-
     Ref {
         service: NotepadStorageService
     }
 
-    // In connected frame mode the slideout sits on the Overlay layer
-    onFileDialogOpenChanged: {
-        if (slideout)
-            slideout.suppressOverlayLayer = fileDialogOpen;
-    }
-
     Connections {
         target: slideout
         enabled: slideout !== null
         function onAboutToHide() {
             textEditor.autoSaveToSession();
         }
-        function onRevealed() {
-            textEditor.syncFromDisk();
-        }
-    }
-
-    function showConflictBanner(diskContent) {
-        if (!currentTab)
-            return;
-        NotepadStorageService.flagConflict(currentTab.id, diskContent);
-    }
-
-    function resolveConflictKeepEdits() {
-        if (!root.conflictBannerVisible)
-            return;
-        NotepadStorageService.clearConflict();
-        if (currentTab && currentTab.filePath && !currentTab.isTemporary) {
-            root.saveToFile("file://" + currentTab.filePath);
-        }
-    }
-
-    function resolveConflictReload() {
-        if (!root.conflictBannerVisible)
-            return;
-        const diskContent = NotepadStorageService.conflictDiskContent;
-        NotepadStorageService.clearConflict();
-        textEditor.reloadFromDisk(diskContent);
-    }
-
-    function dismissConflictBanner() {
-        if (root.conflictBannerVisible)
-            NotepadStorageService.clearConflict();
     }
 
     function hasUnsavedChanges() {
@@ -102,14 +51,10 @@ Item {
     }
 
     function performCreateNewTab() {
-        textEditor.commitLiveBuffer();
         NotepadStorageService.createNewTab();
-        textEditor.applyingShared = true;
         textEditor.text = "";
         textEditor.lastSavedContent = "";
-        textEditor.loadedTabId = -1;
         textEditor.contentLoaded = true;
-        textEditor.applyingShared = false;
         textEditor.textArea.forceActiveFocus();
     }
 
@@ -141,6 +86,7 @@ Item {
 
         NotepadStorageService.switchToTab(tabIndex);
         Qt.callLater(() => {
+            textEditor.loadCurrentTabContent();
             if (currentTab) {
                 root.currentFileName = currentTab.fileName || "";
                 root.currentFileUrl = currentTab.fileUrl || "";
@@ -154,7 +100,6 @@ Item {
         var content = textEditor.text;
         var filePath = fileUrl.toString().replace(/^file:\/\//, '');
 
-        textEditor.externalWatchPaused = true;
         saveFileView.path = "";
         pendingSaveContent = content;
         saveFileView.path = filePath;
@@ -164,53 +109,6 @@ Item {
         });
     }
 
-    function saveExternalWithFreshnessCheck() {
-        if (!currentTab || currentTab.isTemporary || !currentTab.filePath)
-            return;
-        const filePath = currentTab.filePath;
-        loadFileView.path = "";
-        loadFileView.path = filePath;
-
-        if (!loadFileView.waitForJob()) {
-            saveToFile("file://" + filePath);
-            return;
-        }
-        Qt.callLater(() => {
-            if (!currentTab || currentTab.isTemporary || currentTab.filePath !== filePath)
-                return;
-            const diskContent = loadFileView.text();
-            if (diskContent !== undefined && diskContent !== null && diskContent !== textEditor.text && diskContent !== textEditor.lastSavedContent) {
-                root.showConflictBanner(diskContent);
-                return;
-            }
-            saveToFile("file://" + filePath);
-        });
-    }
-
-    function autoSaveExternal() {
-        if (!SettingsData.notepadAutoSave)
-            return;
-        if (!currentTab || currentTab.isTemporary || !currentTab.filePath)
-            return;
-        if (!textEditor.hasUnsavedChanges())
-            return;
-        const filePath = currentTab.filePath;
-        loadFileView.path = "";
-        loadFileView.path = filePath;
-        if (!loadFileView.waitForJob())
-            return;
-        Qt.callLater(() => {
-            if (!currentTab || currentTab.isTemporary || currentTab.filePath !== filePath)
-                return;
-            const diskContent = loadFileView.text();
-            if (diskContent === undefined || diskContent === null)
-                return;
-            if (diskContent !== textEditor.lastSavedContent)
-                return;
-            saveToFile("file://" + filePath);
-        });
-    }
-
     function loadFromFile(fileUrl) {
         if (hasUnsavedTemporaryContent()) {
             root.pendingFileUrl = fileUrl;
@@ -248,155 +146,14 @@ Item {
 
                     root.currentFileName = fileName;
                     root.currentFileUrl = fileUrl;
-                    textEditor.loadedTabId = currentTab.id;
-                    NotepadStorageService.clearSessionBuffer(currentTab.id);
-                    if (root.conflictBannerVisible)
-                        NotepadStorageService.clearConflict();
+                    textEditor.saveCurrentTabContent();
                 }
             });
         }
     }
 
-    Item {
-        id: conflictBanner
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: root.conflictBannerVisible ? bannerRect.implicitHeight : 0
-        visible: height > 0
-        clip: true
-        z: 5
-
-        Behavior on height {
-            NumberAnimation {
-                duration: Theme.shortDuration
-                easing.type: Theme.standardEasing
-            }
-        }
-
-        StyledRect {
-            id: bannerRect
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: parent.top
-            implicitHeight: bannerLayout.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.withAlpha(Theme.warning, 0.12)
-            border.color: Theme.withAlpha(Theme.warning, 0.5)
-            border.width: 1
-
-            ColumnLayout {
-                id: bannerLayout
-                anchors.fill: parent
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingS
-
-                RowLayout {
-                    Layout.fillWidth: true
-                    spacing: Theme.spacingM
-
-                    DankIcon {
-                        Layout.alignment: Qt.AlignVCenter
-                        name: "sync_problem"
-                        size: Theme.iconSize - 2
-                        color: Theme.warning
-                    }
-
-                    StyledText {
-                        Layout.fillWidth: true
-                        Layout.alignment: Qt.AlignVCenter
-                        text: I18n.tr("File changed on disk")
-                        font.pixelSize: Theme.fontSizeMedium
-                        font.weight: Font.Medium
-                        color: Theme.surfaceText
-                        wrapMode: Text.NoWrap
-                        elide: Text.ElideRight
-                    }
-
-                    DankActionButton {
-                        Layout.alignment: Qt.AlignVCenter
-                        iconName: "close"
-                        iconSize: Theme.iconSizeSmall
-                        iconColor: Theme.surfaceText
-                        buttonSize: 28
-                        onClicked: root.dismissConflictBanner()
-                    }
-                }
-
-                Item {
-                    Layout.fillWidth: true
-                    Layout.preferredHeight: 32
-
-                    Row {
-                        id: bannerActions
-                        anchors.right: parent.right
-                        spacing: Theme.spacingS
-
-                        readonly property real available: parent.width
-
-                        StyledRect {
-                            width: Math.min(keepText.implicitWidth + Theme.spacingM * 2, Math.max(104, (bannerActions.available - bannerActions.spacing) / 2))
-                            height: 32
-                            radius: Theme.cornerRadius
-                            color: "transparent"
-                            border.color: Theme.outlineMedium
-                            border.width: 1
-
-                            StateLayer {
-                                anchors.fill: parent
-                                cornerRadius: parent.radius
-                                stateColor: Theme.surfaceText
-                                onClicked: root.resolveConflictKeepEdits()
-                            }
-
-                            StyledText {
-                                id: keepText
-                                anchors.centerIn: parent
-                                width: parent.width - Theme.spacingM
-                                text: I18n.tr("Keep My Edits")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceText
-                                horizontalAlignment: Text.AlignHCenter
-                                elide: Text.ElideRight
-                            }
-                        }
-
-                        StyledRect {
-                            width: Math.min(reloadText.implicitWidth + Theme.spacingM * 2, Math.max(116, (bannerActions.available - bannerActions.spacing) / 2))
-                            height: 32
-                            radius: Theme.cornerRadius
-                            color: Theme.primary
-
-                            StateLayer {
-                                anchors.fill: parent
-                                cornerRadius: parent.radius
-                                stateColor: Theme.background
-                                onClicked: root.resolveConflictReload()
-                            }
-
-                            StyledText {
-                                id: reloadText
-                                anchors.centerIn: parent
-                                width: parent.width - Theme.spacingM
-                                text: I18n.tr("Reload From Disk")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.background
-                                horizontalAlignment: Text.AlignHCenter
-                                elide: Text.ElideRight
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     Column {
-        anchors.top: conflictBanner.bottom
-        anchors.topMargin: root.conflictBannerVisible ? Theme.spacingM : 0
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
+        anchors.fill: parent
         spacing: Theme.spacingM
 
         NotepadTabs {
@@ -421,12 +178,11 @@ Item {
             id: textEditor
             width: parent.width
             height: parent.height - tabBar.height - Theme.spacingM * 2
-            inPopout: root.inPopout
-            surfaceVisible: root.surfaceVisible
 
             onSaveRequested: {
                 if (currentTab && !currentTab.isTemporary && currentTab.filePath) {
-                    root.saveExternalWithFreshnessCheck();
+                    var fileUrl = "file://" + currentTab.filePath;
+                    saveToFile(fileUrl);
                 } else {
                     root.fileDialogOpen = true;
                     saveBrowserLoader.active = true;
@@ -458,28 +214,12 @@ Item {
 
             onEscapePressed: {
                 textEditor.autoSaveToSession();
-                if (showSettingsMenu) {
-                    showSettingsMenu = false;
-                    return;
-                }
-                if (!root.inPopout) {
-                    root.hideRequested();
-                }
+                root.hideRequested();
             }
 
             onSettingsRequested: {
                 showSettingsMenu = !showSettingsMenu;
             }
-
-            onPopoutRequested: root.popoutRequested()
-
-            onDockRequested: root.dockRequested()
-
-            onConflictDetected: diskContent => {
-                root.showConflictBanner(diskContent);
-            }
-
-            onAutoSaveRequested: root.autoSaveExternal()
         }
     }
 
@@ -502,24 +242,17 @@ Item {
         printErrors: true
 
         onSaved: {
-            if (currentTab && saveFileView.path) {
+            if (currentTab && saveFileView.path && pendingSaveContent) {
                 NotepadStorageService.updateTabMetadata(NotepadStorageService.currentTabIndex, {
                     hasUnsavedChanges: false,
                     lastSavedContent: pendingSaveContent
                 });
                 root.lastSavedFileContent = pendingSaveContent;
-                textEditor.lastSavedContent = pendingSaveContent;
-                textEditor.ignoreNextExternalChange = true;
-                textEditor.commitLiveBuffer();
-                if (root.conflictBannerVisible)
-                    NotepadStorageService.clearConflict();
+                pendingSaveContent = "";
             }
-            textEditor.externalWatchPaused = false;
-            pendingSaveContent = "";
         }
 
         onSaveFailed: error => {
-            textEditor.externalWatchPaused = false;
             pendingSaveContent = "";
         }
     }
@@ -565,7 +298,6 @@ Item {
 
                 root.currentFileName = fileName;
                 root.currentFileUrl = fileUrl;
-                textEditor.externalWatchPaused = true;
 
                 if (currentTab) {
                     NotepadStorageService.saveTabAs(NotepadStorageService.currentTabIndex, cleanPath);
@@ -611,7 +343,7 @@ Item {
             browserTitle: I18n.tr("Open Notepad File")
             browserIcon: "folder_open"
             browserType: "notepad_load"
-            fileExtensions: ["*"]
+            fileExtensions: ["*.txt", "*.md", "*.*"]
             allowStacking: true
 
             onFileSelected: path => {
@@ -644,7 +376,6 @@ Item {
             modalHeight: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 180
             shouldBeVisible: false
             allowStacking: true
-            useOverlayLayer: true
 
             onBackgroundClicked: {
                 close();

quickshell/Modules/Notepad/NotepadPopoutWindow.qml

@@ -1,137 +0,0 @@
-import QtQuick
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.Notepad
-
-FloatingWindow {
-    id: win
-
-    property alias shouldBeVisible: win.visible
-
-    function show() {
-        visible = true;
-    }
-
-    function hide() {
-        visible = false;
-    }
-
-    function toggle() {
-        visible = !visible;
-    }
-
-    title: I18n.tr("Notepad")
-    minimumSize: Qt.size(360, 320)
-    implicitWidth: 640
-    implicitHeight: 760
-    color: Theme.surfaceContainer
-    visible: false
-
-    onVisibleChanged: {
-        if (visible) {
-            Qt.callLater(notepad.externalSync);
-        } else {
-            notepad.flushAutoSave();
-        }
-    }
-
-    // A compositor close (e.g. niri close-window)
-    onClosed: win.visible = false
-
-    Item {
-        anchors.fill: parent
-
-        Item {
-            id: titleBar
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: 44
-            z: 10
-
-            MouseArea {
-                anchors.fill: parent
-                onPressed: windowControls.tryStartMove()
-                onDoubleClicked: windowControls.tryToggleMaximize()
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                color: Theme.surfaceContainerHigh
-                opacity: 0.5
-            }
-
-            Row {
-                anchors.left: parent.left
-                anchors.leftMargin: Theme.spacingM
-                anchors.verticalCenter: parent.verticalCenter
-                spacing: Theme.spacingS
-
-                DankIcon {
-                    name: "edit_note"
-                    size: Theme.iconSize - 2
-                    color: Theme.primary
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                StyledText {
-                    text: I18n.tr("Notepad")
-                    font.pixelSize: Theme.fontSizeLarge
-                    font.weight: Font.Medium
-                    color: Theme.surfaceText
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-            }
-
-            Row {
-                anchors.right: parent.right
-                anchors.rightMargin: Theme.spacingS
-                anchors.verticalCenter: parent.verticalCenter
-                spacing: Theme.spacingXS
-
-                DankActionButton {
-                    visible: windowControls.canMaximize
-                    circular: false
-                    iconName: win.maximized ? "fullscreen_exit" : "fullscreen"
-                    iconSize: Theme.iconSize - 4
-                    iconColor: Theme.surfaceText
-                    onClicked: windowControls.tryToggleMaximize()
-                }
-
-                DankActionButton {
-                    circular: false
-                    iconName: "close"
-                    iconSize: Theme.iconSize - 4
-                    iconColor: Theme.surfaceText
-                    onClicked: win.hide()
-                }
-            }
-        }
-
-        Notepad {
-            id: notepad
-            anchors.top: titleBar.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            anchors.topMargin: Theme.spacingM
-            anchors.leftMargin: Theme.spacingM
-            anchors.rightMargin: Theme.spacingM
-            anchors.bottomMargin: Theme.spacingM
-            inPopout: true
-            surfaceVisible: win.visible
-            onHideRequested: win.hide()
-            onDockRequested: {
-                win.hide();
-                PopoutService.openNotepadSlideout();
-            }
-        }
-    }
-
-    FloatingWindowControls {
-        id: windowControls
-        targetWindow: win
-    }
-}

quickshell/Modules/Notepad/NotepadSettings.qml

@@ -10,7 +10,6 @@ Item {
     property var cachedFontFamilies: []
     property var cachedMonoFamilies: []
     property bool fontsEnumerated: false
-    property bool shortcutsExpanded: false
 
     signal settingsRequested
     signal findRequested
@@ -63,23 +62,11 @@ Item {
         }
     }
 
-    Rectangle {
+    MouseArea {
         anchors.fill: parent
         visible: root.isVisible
+        onClicked: root.settingsRequested()
         z: 50
-        color: Qt.rgba(Theme.surface.r, Theme.surface.g, Theme.surface.b, 0.85)
-
-        WheelHandler {
-            // Hold scroll so the editor beneath doesn't move while settings are open.
-            onWheel: event => {
-                event.accepted = true;
-            }
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: root.settingsRequested()
-        }
     }
 
     Rectangle {
@@ -87,8 +74,8 @@ Item {
         visible: root.isVisible
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
-        width: Math.min(360, root.width - Theme.spacingL * 2)
-        height: Math.min(settingsColumn.implicitHeight + Theme.spacingXL * 2, root.height - Theme.spacingL * 2)
+        width: 360
+        height: settingsColumn.implicitHeight + Theme.spacingXL * 2
         radius: Theme.cornerRadius
         color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, Theme.notepadTransparency)
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
@@ -106,459 +93,275 @@ Item {
             z: parent.z - 1
         }
 
-        DankFlickable {
-            id: settingsFlickable
-            anchors.fill: parent
-            clip: true
-            contentWidth: width
-            contentHeight: settingsColumn.implicitHeight + Theme.spacingXL * 2
+        Column {
+            id: settingsColumn
+            width: parent.width - Theme.spacingXL * 2
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.top: parent.top
+            anchors.topMargin: Theme.spacingXL
+            spacing: Theme.spacingS
 
-            Column {
-                id: settingsColumn
-                x: Theme.spacingXL
-                y: Theme.spacingXL
-                width: settingsFlickable.width - Theme.spacingXL * 2
-                spacing: Theme.spacingS
-
-                Rectangle {
-                    width: parent.width
-                    height: 36
-                    color: "transparent"
-
-                    StyledText {
-                        anchors.left: parent.left
-                        anchors.leftMargin: -Theme.spacingXS
-                        anchors.verticalCenter: parent.verticalCenter
-                        text: I18n.tr("Notepad Settings")
-                        font.pixelSize: Theme.fontSizeMedium
-                        font.weight: Font.Medium
-                        color: Theme.surfaceText
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 1
-                    color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                }
-
-                DankToggle {
-                    anchors.left: parent.left
-                    anchors.leftMargin: -Theme.spacingM
-                    width: parent.width + Theme.spacingM
-                    text: I18n.tr("Use Monospace Font")
-                    description: I18n.tr("Toggle fonts")
-                    checked: SettingsData.notepadUseMonospace
-                    onToggled: checked => {
-                        SettingsData.notepadUseMonospace = checked;
-                    }
-                }
-
-                DankToggle {
-                    anchors.left: parent.left
-                    anchors.leftMargin: -Theme.spacingM
-                    width: parent.width + Theme.spacingM
-                    text: I18n.tr("Show Line Numbers")
-                    description: I18n.tr("Display line numbers in editor")
-                    checked: SettingsData.notepadShowLineNumbers
-                    onToggled: checked => {
-                        SettingsData.notepadShowLineNumbers = checked;
-                    }
-                }
-
-                DankToggle {
-                    anchors.left: parent.left
-                    anchors.leftMargin: -Theme.spacingM
-                    width: parent.width + Theme.spacingM
-                    text: I18n.tr("Auto-save to disk")
-                    description: I18n.tr("Automatically save changes to opened files as you type")
-                    checked: SettingsData.notepadAutoSave
-                    onToggled: checked => {
-                        SettingsData.notepadAutoSave = checked;
-                    }
-                }
-
-                StyledRect {
-                    width: parent.width
-                    height: 60
-                    radius: Theme.cornerRadius
-                    color: "transparent"
-
-                    StateLayer {
-                        anchors.fill: parent
-                        anchors.leftMargin: -Theme.spacingM
-                        width: parent.width + Theme.spacingM
-                        stateColor: Theme.primary
-                        cornerRadius: parent.radius
-                        onClicked: root.findRequested()
-                    }
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: -Theme.spacingM
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingM
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "search"
-                            size: Theme.iconSize - 2
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("Find in Text")
-                                font.pixelSize: Theme.fontSizeMedium
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Open search bar to find text")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                            }
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: visible ? (fontDropdown.height + Theme.spacingS) : 0
-                    color: "transparent"
-                    visible: !SettingsData.notepadUseMonospace
-
-                    DankDropdown {
-                        id: fontDropdown
-                        anchors.left: parent.left
-                        anchors.leftMargin: -Theme.spacingM
-                        width: parent.width + Theme.spacingM
-                        text: I18n.tr("Font Family")
-                        options: cachedFontFamilies
-                        currentValue: {
-                            if (!SettingsData.notepadFontFamily || SettingsData.notepadFontFamily === "")
-                                return I18n.tr("Default (Global)");
-                            else
-                                return SettingsData.notepadFontFamily;
-                        }
-                        enableFuzzySearch: true
-                        onValueChanged: value => {
-                            if (value && (value.startsWith("Default") || value === "Default (Global)")) {
-                                SettingsData.notepadFontFamily = "";
-                            } else {
-                                SettingsData.notepadFontFamily = value;
-                            }
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: fontSizeRow.height + Theme.spacingS
-                    color: "transparent"
-
-                    Row {
-                        id: fontSizeRow
-                        width: parent.width
-                        spacing: Theme.spacingS
-
-                        Column {
-                            width: parent.width - fontSizeControls.width - Theme.spacingM
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("Font Size")
-                                font.pixelSize: Theme.fontSizeSmall
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: SettingsData.notepadFontSize + "px"
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                width: parent.width
-                            }
-                        }
-
-                        Row {
-                            id: fontSizeControls
-                            spacing: Theme.spacingS
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            DankActionButton {
-                                buttonSize: 32
-                                iconName: "remove"
-                                iconSize: Theme.iconSizeSmall
-                                enabled: SettingsData.notepadFontSize > 8
-                                backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
-                                iconColor: Theme.surfaceText
-                                onClicked: {
-                                    var newSize = Math.max(8, SettingsData.notepadFontSize - 1);
-                                    SettingsData.notepadFontSize = newSize;
-                                }
-                            }
-
-                            Rectangle {
-                                width: 60
-                                height: 32
-                                radius: Theme.cornerRadius
-                                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
-                                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                                border.width: 1
-
-                                StyledText {
-                                    anchors.centerIn: parent
-                                    text: SettingsData.notepadFontSize + "px"
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    font.weight: Font.Medium
-                                    color: Theme.surfaceText
-                                }
-                            }
-
-                            DankActionButton {
-                                buttonSize: 32
-                                iconName: "add"
-                                iconSize: Theme.iconSizeSmall
-                                enabled: SettingsData.notepadFontSize < 48
-                                backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
-                                iconColor: Theme.surfaceText
-                                onClicked: {
-                                    var newSize = Math.min(48, SettingsData.notepadFontSize + 1);
-                                    SettingsData.notepadFontSize = newSize;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: transparencySliderColumn.height + Theme.spacingS
-                    color: "transparent"
-
-                    Column {
-                        id: transparencySliderColumn
-                        width: parent.width
-                        spacing: Theme.spacingS
-
-                        DankToggle {
-                            anchors.left: parent.left
-                            anchors.leftMargin: -Theme.spacingM
-                            width: parent.width + Theme.spacingM
-                            text: I18n.tr("Surface Opacity")
-                            description: I18n.tr("Override global transparency for Notepad")
-                            checked: SettingsData.notepadTransparencyOverride >= 0
-                            onToggled: checked => {
-                                if (checked) {
-                                    SettingsData.notepadTransparencyOverride = SettingsData.notepadLastCustomTransparency;
-                                } else {
-                                    SettingsData.notepadTransparencyOverride = -1;
-                                }
-                            }
-                        }
-
-                        DankSlider {
-                            anchors.left: parent.left
-                            anchors.leftMargin: -Theme.spacingM
-                            width: parent.width + Theme.spacingM
-                            height: 24
-                            visible: SettingsData.notepadTransparencyOverride >= 0
-                            value: Math.round((SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : SettingsData.popupTransparency) * 100)
-                            minimum: 0
-                            maximum: 100
-                            unit: ""
-                            showValue: true
-                            wheelEnabled: false
-                            onSliderValueChanged: newValue => {
-                                if (SettingsData.notepadTransparencyOverride >= 0) {
-                                    SettingsData.notepadTransparencyOverride = newValue / 100;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: gapColumn.height + Theme.spacingS
-                    color: "transparent"
-
-                    Column {
-                        id: gapColumn
-                        width: parent.width
-                        spacing: Theme.spacingS
-
-                        Column {
-                            width: parent.width
-                            spacing: Theme.spacingXS
-
-                            StyledText {
-                                text: I18n.tr("Default Mode")
-                                font.pixelSize: Theme.fontSizeSmall
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            DankButtonGroup {
-                                model: [I18n.tr("Slideout"), I18n.tr("Popout")]
-                                size: "small"
-                                currentIndex: SettingsData.notepadDefaultMode === "popout" ? 1 : 0
-                                onSelectionChanged: (index, selected) => {
-                                    if (!selected)
-                                        return;
-                                    SettingsData.notepadDefaultMode = index === 1 ? "popout" : "slideout";
-                                }
-                            }
-                        }
-
-                        Column {
-                            width: parent.width
-                            spacing: Theme.spacingXS
-                            visible: SettingsData.notepadDefaultMode !== "popout"
-
-                            StyledText {
-                                text: I18n.tr("Open From")
-                                font.pixelSize: Theme.fontSizeSmall
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            DankButtonGroup {
-                                model: [I18n.tr("Right"), I18n.tr("Left")]
-                                size: "small"
-                                currentIndex: SettingsData.notepadSlideoutSide === "left" ? 1 : 0
-                                onSelectionChanged: (index, selected) => {
-                                    if (!selected)
-                                        return;
-                                    SettingsData.notepadSlideoutSide = index === 1 ? "left" : "right";
-                                }
-                            }
-                        }
-
-                        DankToggle {
-                            anchors.left: parent.left
-                            anchors.leftMargin: -Theme.spacingM
-                            width: parent.width + Theme.spacingM
-                            text: I18n.tr("Auto Compositor Gaps")
-                            description: I18n.tr("Inset the Notepad from screen edges using the compositor's configured gaps")
-                            checked: SettingsData.notepadUseCompositorGap
-                            onToggled: checked => {
-                                SettingsData.notepadUseCompositorGap = checked;
-                            }
-                        }
-
-                        StyledText {
-                            visible: !SettingsData.notepadUseCompositorGap
-                            text: I18n.tr("Manual Gaps")
-                            font.pixelSize: Theme.fontSizeSmall
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                        }
-
-                        DankSlider {
-                            anchors.left: parent.left
-                            anchors.leftMargin: Theme.spacingXS
-                            width: parent.width - Theme.spacingXS * 2
-                            height: 24
-                            visible: !SettingsData.notepadUseCompositorGap
-                            value: SettingsData.notepadEdgeGap
-                            minimum: 0
-                            maximum: 64
-                            unit: "px"
-                            showValue: true
-                            wheelEnabled: false
-                            onSliderValueChanged: newValue => {
-                                SettingsData.notepadEdgeGap = newValue;
-                            }
-                        }
-                    }
-                }
+            Rectangle {
+                width: parent.width
+                height: 36
+                color: "transparent"
 
                 StyledText {
-                    width: parent.width
-                    text: SettingsData.notepadUseMonospace ? I18n.tr("Using global monospace font from Settings → Personalization") : I18n.tr("Global fonts can be configured in Settings → Personalization")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceTextMedium
-                    wrapMode: Text.WordWrap
-                    opacity: 0.8
+                    anchors.left: parent.left
+                    anchors.leftMargin: -Theme.spacingXS
+                    anchors.verticalCenter: parent.verticalCenter
+                    text: I18n.tr("Notepad Font Settings")
+                    font.pixelSize: Theme.fontSizeMedium
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                }
+            }
+
+            Rectangle {
+                width: parent.width
+                height: 1
+                color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
+            }
+
+            DankToggle {
+                anchors.left: parent.left
+                anchors.leftMargin: -Theme.spacingM
+                width: parent.width + Theme.spacingM
+                text: I18n.tr("Use Monospace Font")
+                description: I18n.tr("Toggle fonts")
+                checked: SettingsData.notepadUseMonospace
+                onToggled: checked => {
+                    SettingsData.notepadUseMonospace = checked;
+                }
+            }
+
+            DankToggle {
+                anchors.left: parent.left
+                anchors.leftMargin: -Theme.spacingM
+                width: parent.width + Theme.spacingM
+                text: I18n.tr("Show Line Numbers")
+                description: I18n.tr("Display line numbers in editor")
+                checked: SettingsData.notepadShowLineNumbers
+                onToggled: checked => {
+                    SettingsData.notepadShowLineNumbers = checked;
+                }
+            }
+
+            StyledRect {
+                width: parent.width
+                height: 60
+                radius: Theme.cornerRadius
+                color: "transparent"
+
+                StateLayer {
+                    anchors.fill: parent
+                    anchors.leftMargin: -Theme.spacingM
+                    width: parent.width + Theme.spacingM
+                    stateColor: Theme.primary
+                    cornerRadius: parent.radius
+                    onClicked: root.findRequested()
                 }
 
-                StyledRect {
-                    width: parent.width
-                    implicitHeight: shortcutsHeader.height + (root.shortcutsExpanded ? shortcutsColumn.implicitHeight + Theme.spacingM : 0)
-                    radius: Theme.cornerRadius
-                    color: root.shortcutsExpanded ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : "transparent"
-                    border.color: root.shortcutsExpanded ? Theme.primary : Theme.outlineMedium
-                    border.width: root.shortcutsExpanded ? 2 : 1
+                Row {
+                    anchors.left: parent.left
+                    anchors.leftMargin: -Theme.spacingM
+                    anchors.right: parent.right
+                    anchors.rightMargin: Theme.spacingM
+                    anchors.verticalCenter: parent.verticalCenter
+                    spacing: Theme.spacingM
 
-                    StateLayer {
-                        anchors.fill: parent
-                        stateColor: Theme.primary
-                        cornerRadius: parent.radius
-                        onClicked: root.shortcutsExpanded = !root.shortcutsExpanded
-                    }
-
-                    Row {
-                        id: shortcutsHeader
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.leftMargin: Theme.spacingM
-                        anchors.rightMargin: Theme.spacingS
-                        height: 36
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: root.shortcutsExpanded ? "expand_less" : "expand_more"
-                            size: Theme.iconSizeSmall
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Keyboard Shortcuts")
-                            font.pixelSize: Theme.fontSizeSmall
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
+                    DankIcon {
+                        name: "search"
+                        size: Theme.iconSize - 2
+                        color: Theme.primary
+                        anchors.verticalCenter: parent.verticalCenter
                     }
 
                     Column {
-                        id: shortcutsColumn
-                        visible: root.shortcutsExpanded
-                        width: parent.width - Theme.spacingL * 2
-                        anchors.top: shortcutsHeader.bottom
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        spacing: 2
+                        anchors.verticalCenter: parent.verticalCenter
+                        spacing: Theme.spacingXS
 
                         StyledText {
-                            width: parent.width
-                            text: I18n.tr("Ctrl+S: Save • Ctrl+O: Open • Ctrl+N: New • Ctrl+F: Find")
-                            font.pixelSize: Theme.fontSizeSmall
+                            text: I18n.tr("Find in Text")
+                            font.pixelSize: Theme.fontSizeMedium
+                            font.weight: Font.Medium
                             color: Theme.surfaceText
-                            wrapMode: Text.WordWrap
-                            horizontalAlignment: Text.AlignHCenter
                         }
 
                         StyledText {
-                            width: parent.width
-                            text: I18n.tr("Ctrl+A: Select All • Ctrl+P: Preview • Enter/Shift+Enter: Find Next/Previous • Esc: Close")
+                            text: I18n.tr("Open search bar to find text")
                             font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            wrapMode: Text.WordWrap
-                            horizontalAlignment: Text.AlignHCenter
+                            color: Theme.surfaceVariantText
                         }
                     }
                 }
             }
+
+            Rectangle {
+                width: parent.width
+                height: visible ? (fontDropdown.height + Theme.spacingS) : 0
+                color: "transparent"
+                visible: !SettingsData.notepadUseMonospace
+
+                DankDropdown {
+                    id: fontDropdown
+                    anchors.left: parent.left
+                    anchors.leftMargin: -Theme.spacingM
+                    width: parent.width + Theme.spacingM
+                    text: I18n.tr("Font Family")
+                    options: cachedFontFamilies
+                    currentValue: {
+                        if (!SettingsData.notepadFontFamily || SettingsData.notepadFontFamily === "")
+                            return I18n.tr("Default (Global)");
+                        else
+                            return SettingsData.notepadFontFamily;
+                    }
+                    enableFuzzySearch: true
+                    onValueChanged: value => {
+                        if (value && (value.startsWith("Default") || value === "Default (Global)")) {
+                            SettingsData.notepadFontFamily = "";
+                        } else {
+                            SettingsData.notepadFontFamily = value;
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                width: parent.width
+                height: fontSizeRow.height + Theme.spacingS
+                color: "transparent"
+
+                Row {
+                    id: fontSizeRow
+                    width: parent.width
+                    spacing: Theme.spacingS
+
+                    Column {
+                        width: parent.width - fontSizeControls.width - Theme.spacingM
+                        spacing: Theme.spacingXS
+
+                        StyledText {
+                            text: I18n.tr("Font Size")
+                            font.pixelSize: Theme.fontSizeSmall
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                        }
+
+                        StyledText {
+                            text: SettingsData.notepadFontSize + "px"
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                            width: parent.width
+                        }
+                    }
+
+                    Row {
+                        id: fontSizeControls
+                        spacing: Theme.spacingS
+                        anchors.verticalCenter: parent.verticalCenter
+
+                        DankActionButton {
+                            buttonSize: 32
+                            iconName: "remove"
+                            iconSize: Theme.iconSizeSmall
+                            enabled: SettingsData.notepadFontSize > 8
+                            backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
+                            iconColor: Theme.surfaceText
+                            onClicked: {
+                                var newSize = Math.max(8, SettingsData.notepadFontSize - 1);
+                                SettingsData.notepadFontSize = newSize;
+                            }
+                        }
+
+                        Rectangle {
+                            width: 60
+                            height: 32
+                            radius: Theme.cornerRadius
+                            color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
+                            border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
+                            border.width: 1
+
+                            StyledText {
+                                anchors.centerIn: parent
+                                text: SettingsData.notepadFontSize + "px"
+                                font.pixelSize: Theme.fontSizeSmall
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                            }
+                        }
+
+                        DankActionButton {
+                            buttonSize: 32
+                            iconName: "add"
+                            iconSize: Theme.iconSizeSmall
+                            enabled: SettingsData.notepadFontSize < 48
+                            backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
+                            iconColor: Theme.surfaceText
+                            onClicked: {
+                                var newSize = Math.min(48, SettingsData.notepadFontSize + 1);
+                                SettingsData.notepadFontSize = newSize;
+                            }
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                width: parent.width
+                height: transparencySliderColumn.height + Theme.spacingS
+                color: "transparent"
+
+                Column {
+                    id: transparencySliderColumn
+                    width: parent.width
+                    spacing: Theme.spacingS
+
+                    DankToggle {
+                        anchors.left: parent.left
+                        anchors.leftMargin: -Theme.spacingM
+                        width: parent.width + Theme.spacingM
+                        text: I18n.tr("Custom Transparency")
+                        description: I18n.tr("Override global transparency for Notepad")
+                        checked: SettingsData.notepadTransparencyOverride >= 0
+                        onToggled: checked => {
+                            if (checked) {
+                                SettingsData.notepadTransparencyOverride = SettingsData.notepadLastCustomTransparency;
+                            } else {
+                                SettingsData.notepadTransparencyOverride = -1;
+                            }
+                        }
+                    }
+
+                    DankSlider {
+                        anchors.left: parent.left
+                        anchors.leftMargin: -Theme.spacingM
+                        width: parent.width + Theme.spacingM
+                        height: 24
+                        visible: SettingsData.notepadTransparencyOverride >= 0
+                        value: Math.round((SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : SettingsData.popupTransparency) * 100)
+                        minimum: 0
+                        maximum: 100
+                        unit: ""
+                        showValue: true
+                        wheelEnabled: false
+                        onSliderValueChanged: newValue => {
+                            if (SettingsData.notepadTransparencyOverride >= 0) {
+                                SettingsData.notepadTransparencyOverride = newValue / 100;
+                            }
+                        }
+                    }
+                }
+            }
+
+            StyledText {
+                width: parent.width
+                text: SettingsData.notepadUseMonospace ? I18n.tr("Using global monospace font from Settings → Personalization") : I18n.tr("Global fonts can be configured in Settings → Personalization")
+                font.pixelSize: Theme.fontSizeSmall
+                color: Theme.surfaceTextMedium
+                wrapMode: Text.WordWrap
+                opacity: 0.8
+            }
         }
     }
 }

quickshell/Modules/Notepad/NotepadTextEditor.qml

@@ -32,23 +32,6 @@ Column {
     property string pluginHighlightedHtml: ""
     property string lastPluginContent: ""
     property int loadRequestId: 0
-    property bool ignoreNextExternalChange: false
-    property bool watcherReloadPending: false
-    property bool externalWatchPaused: false
-    property bool inPopout: false
-    property bool surfaceVisible: true
-    // Tab ids are Date.now() timestamps (~1.78e12) which overflow a 32-bit `int`,
-    // corrupting the value (e.g. -946062153) and breaking buffer keying. `var`
-    // holds the full JS-safe integer.
-    property var loadedTabId: -1
-    property bool applyingShared: false
-    property bool showPathInfo: false
-
-    function currentFilePath() {
-        if (!currentTab)
-            return "";
-        return currentTab.isTemporary ? (NotepadStorageService.baseDir + "/" + currentTab.filePath) : currentTab.filePath;
-    }
 
     signal saveRequested
     signal openRequested
@@ -57,10 +40,6 @@ Column {
     signal escapePressed
     signal contentChanged
     signal settingsRequested
-    signal popoutRequested
-    signal dockRequested
-    signal conflictDetected(string diskContent)
-    signal autoSaveRequested
 
     function hasUnsavedChanges() {
         if (!currentTab || !contentLoaded) {
@@ -73,12 +52,6 @@ Column {
         return textArea.text !== lastSavedContent;
     }
 
-    function commitLiveBuffer() {
-        if (loadedTabId < 0 || !contentLoaded)
-            return;
-        NotepadStorageService.setSessionBuffer(loadedTabId, textArea.text, lastSavedContent);
-    }
-
     function loadCurrentTabContent() {
         if (!currentTab)
             return;
@@ -89,25 +62,8 @@ Column {
             const activeTab = NotepadStorageService.tabs.length > NotepadStorageService.currentTabIndex ? NotepadStorageService.tabs[NotepadStorageService.currentTabIndex] : null;
             if (requestId !== loadRequestId || !activeTab || activeTab.id !== requestedTabId)
                 return;
-
-            const buffer = NotepadStorageService.getSessionBuffer(requestedTabId);
-            if (buffer !== undefined) {
-                applyingShared = true;
-                lastSavedContent = buffer.baseline;
-                textArea.text = buffer.content;
-                applyingShared = false;
-                loadedTabId = requestedTabId;
-                contentLoaded = true;
-                syncContentToPlugin();
-                applyDiskContent(content);
-                return;
-            }
-
-            applyingShared = true;
             lastSavedContent = content;
             textArea.text = content;
-            applyingShared = false;
-            loadedTabId = requestedTabId;
             contentLoaded = true;
             syncContentToPlugin();
         });
@@ -116,56 +72,14 @@ Column {
     function saveCurrentTabContent() {
         if (!currentTab || !contentLoaded)
             return;
-        if (!currentTab.isTemporary)
-            return;
         NotepadStorageService.saveTabContent(NotepadStorageService.currentTabIndex, textArea.text);
         lastSavedContent = textArea.text;
-        NotepadStorageService.clearSessionBuffer(loadedTabId);
     }
 
     function autoSaveToSession() {
-        commitLiveBuffer();
         if (!currentTab || !contentLoaded)
             return;
-        if (currentTab.isTemporary) {
-            saveCurrentTabContent();
-        } else if (SettingsData.notepadAutoSave) {
-            root.autoSaveRequested();
-        }
-    }
-
-    function syncFromDisk() {
-        if (!currentTab)
-            return;
-        loadCurrentTabContent();
-    }
-
-    function applyDiskContent(diskContent) {
-        if (diskContent === undefined || diskContent === null)
-            return;
-        if (diskContent === textArea.text) {
-            lastSavedContent = diskContent;
-            return;
-        }
-        if (diskContent === lastSavedContent) {
-            return;
-        }
-        if (textArea.text === lastSavedContent) {
-            reloadFromDisk(diskContent);
-        } else if (surfaceVisible) {
-            conflictDetected(diskContent);
-        }
-    }
-
-    function reloadFromDisk(diskContent) {
-        applyingShared = true;
-        contentLoaded = false;
-        textArea.text = diskContent;
-        lastSavedContent = diskContent;
-        contentLoaded = true;
-        applyingShared = false;
-        NotepadStorageService.clearSessionBuffer(loadedTabId);
-        syncContentToPlugin();
+        saveCurrentTabContent();
     }
 
     function setTextDocumentLineHeight() {
@@ -288,8 +202,7 @@ Column {
         if (!currentTab)
             return;
         const filePath = currentTab?.filePath || "";
-        const baseName = filePath.split('/').pop();
-        const ext = baseName.includes('.') ? baseName.split('.').pop().toLowerCase() : "";
+        const ext = filePath.split('.').pop().toLowerCase();
         const content = textArea.text;
 
         if (content === lastPluginContent && SettingsData.getBuiltInPluginSetting("dankNotepadModule", "previewActive", false) === inlinePreviewVisible) {
@@ -637,7 +550,6 @@ Column {
                         Connections {
                             target: NotepadStorageService
                             function onCurrentTabIndexChanged() {
-                                root.commitLiveBuffer();
                                 loadCurrentTabContent();
                                 Qt.callLater(() => {
                                     textArea.forceActiveFocus();
@@ -658,9 +570,7 @@ Column {
                         }
 
                         onTextChanged: {
-                            // Debounced flush to the shared buffer (+ optional disk
-                            // autosave) for every loaded tab, not just scratch notes.
-                            if (contentLoaded && !applyingShared) {
+                            if (contentLoaded && text !== lastSavedContent) {
                                 autoSaveTimer.restart();
                             }
                             root.contentChanged();
@@ -834,7 +744,6 @@ Column {
         spacing: Theme.spacingS
 
         Item {
-            id: buttonBarItem
             width: parent.width
             height: 32
 
@@ -911,98 +820,17 @@ Column {
                 }
             }
 
-            Row {
-                id: rightButtonRow
+            DankActionButton {
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
-                spacing: Theme.spacingS
-
-                DankActionButton {
-                    visible: !root.inPopout
-                    iconName: "open_in_new"
-                    iconSize: Theme.iconSize - 2
-                    iconColor: Theme.surfaceText
-                    onClicked: root.popoutRequested()
-                }
-
-                DankActionButton {
-                    visible: root.inPopout
-                    iconName: "dock_to_right"
-                    iconSize: Theme.iconSize - 2
-                    iconColor: Theme.surfaceText
-                    onClicked: root.dockRequested()
-                }
-
-                DankActionButton {
-                    iconName: "more_horiz"
-                    iconSize: Theme.iconSize - 2
-                    iconColor: Theme.surfaceText
-                    onClicked: root.settingsRequested()
-                }
-            }
-
-            StyledRect {
-                id: pathInfoPopup
-                visible: root.showPathInfo
-                anchors.right: parent.right
-                anchors.bottom: parent.top
-                anchors.bottomMargin: Theme.spacingS
-                width: Math.min(root.width, 360)
-                height: pathInfoRow.implicitHeight + Theme.spacingS * 2
-                radius: Theme.cornerRadius
-                color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
-                border.color: Theme.outlineMedium
-                border.width: 1
-                z: 10
-
-                Row {
-                    id: pathInfoRow
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.leftMargin: Theme.spacingM
-                    anchors.rightMargin: Theme.spacingM
-                    spacing: Theme.spacingS
-
-                    DankIcon {
-                        name: currentTab && currentTab.isTemporary ? "draft" : "description"
-                        size: Theme.iconSize - 4
-                        color: Theme.surfaceVariantText
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StyledText {
-                        width: pathInfoRow.width - (Theme.iconSize - 4) - copyPathButton.width - Theme.spacingS * 2
-                        text: root.currentFilePath()
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceText
-                        elide: Text.ElideMiddle
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    DankActionButton {
-                        id: copyPathButton
-                        iconName: "content_copy"
-                        iconSize: Theme.iconSize - 6
-                        iconColor: Theme.surfaceTextMedium
-                        anchors.verticalCenter: parent.verticalCenter
-                        onClicked: {
-                            const proc = clipboardCopyProcComp.createObject(root, {
-                                content: root.currentFilePath(),
-                                running: true
-                            });
-                            proc.exited.connect(() => {
-                                ToastService.showInfo(I18n.tr("Path copied to clipboard"));
-                                proc.destroy();
-                            });
-                        }
-                    }
-                }
+                iconName: "more_horiz"
+                iconSize: Theme.iconSize - 2
+                iconColor: Theme.surfaceText
+                onClicked: root.settingsRequested()
             }
         }
 
         Row {
-            id: statusRow
             width: parent.width
             spacing: Theme.spacingL
 
@@ -1025,46 +853,35 @@ Column {
                 opacity: 1.0
             }
 
-            Row {
-                visible: textArea.text.length > 0
-                spacing: Theme.spacingXS
-
-                StyledText {
-                    anchors.verticalCenter: parent.verticalCenter
-                    readonly property bool savingToDisk: autoSaveTimer.running && currentTab && (currentTab.isTemporary || SettingsData.notepadAutoSave)
-                    text: {
-                        if (savingToDisk) {
-                            return I18n.tr("Saving...");
-                        }
-
-                        if (currentTab && currentTab.isTemporary) {
-                            return I18n.tr("Auto saved");
-                        }
-
-                        return hasUnsavedChanges() ? I18n.tr("Unsaved changes") : I18n.tr("Saved");
+            StyledText {
+                text: {
+                    if (autoSaveTimer.running) {
+                        return I18n.tr("Auto-saving...");
                     }
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: {
-                        if (savingToDisk) {
-                            return Theme.primary;
-                        }
 
+                    if (hasUnsavedChanges()) {
                         if (currentTab && currentTab.isTemporary) {
-                            return Theme.success;
+                            return I18n.tr("Unsaved note...");
+                        } else {
+                            return I18n.tr("Unsaved changes");
                         }
-
-                        return hasUnsavedChanges() ? Theme.warning : Theme.success;
+                    } else {
+                        return I18n.tr("Saved");
                     }
                 }
+                font.pixelSize: Theme.fontSizeSmall
+                color: {
+                    if (autoSaveTimer.running) {
+                        return Theme.primary;
+                    }
 
-                DankActionButton {
-                    anchors.verticalCenter: parent.verticalCenter
-                    iconName: "info"
-                    iconSize: Theme.iconSizeSmall
-                    iconColor: root.showPathInfo ? Theme.primary : Theme.surfaceTextMedium
-                    buttonSize: 20
-                    onClicked: root.showPathInfo = !root.showPathInfo
+                    if (hasUnsavedChanges()) {
+                        return Theme.warning;
+                    } else {
+                        return Theme.success;
+                    }
                 }
+                opacity: textArea.text.length > 0 ? 1.0 : 0.0
             }
         }
     }
@@ -1085,38 +902,6 @@ Column {
         onTriggered: syncContentToPlugin()
     }
 
-    FileView {
-        id: externalWatch
-        path: (!root.externalWatchPaused && currentTab && !currentTab.isTemporary && currentTab.filePath) ? currentTab.filePath : ""
-        blockLoading: true
-        preload: true
-        watchChanges: true
-
-        onFileChanged: {
-            root.watcherReloadPending = true;
-            reload();
-        }
-
-        onLoaded: {
-            if (root.ignoreNextExternalChange) {
-                root.ignoreNextExternalChange = false;
-                root.lastSavedContent = externalWatch.text();
-                root.watcherReloadPending = false;
-                return;
-            }
-            if (!root.watcherReloadPending)
-                return;
-            root.watcherReloadPending = false;
-            if (!root.contentLoaded || !root.currentTab || root.currentTab.isTemporary)
-                return;
-            if (!root.surfaceVisible)
-                return;
-            root.applyDiskContent(externalWatch.text());
-        }
-
-        onLoadFailed: error => {}
-    }
-
     Connections {
         target: SettingsData
         function onBuiltInPluginSettingsChanged() {
@@ -1125,24 +910,4 @@ Column {
             }
         }
     }
-
-    Connections {
-        target: NotepadStorageService
-        function onSessionBufferRevisionChanged() {
-            if (applyingShared || !contentLoaded || loadedTabId < 0)
-                return;
-            if (textArea.activeFocus)
-                return;
-            var buffer = NotepadStorageService.getSessionBuffer(loadedTabId);
-            if (buffer === undefined || buffer.content === textArea.text)
-                return;
-            if (textArea.text === lastSavedContent) {
-                applyingShared = true;
-                lastSavedContent = buffer.baseline;
-                textArea.text = buffer.content;
-                applyingShared = false;
-                syncContentToPlugin();
-            }
-        }
-    }
 }

quickshell/Modules/Settings/ClipboardTab.qml

@@ -152,9 +152,6 @@ Item {
         }
     ]
 
-    readonly property var entryActionKeys: ["pin", "edit", "delete"]
-    readonly property var entryActionLabels: [I18n.tr("Pin"), I18n.tr("Edit"), I18n.tr("Delete")]
-
     function getMaxHistoryText(value) {
         if (value <= 0)
             return "∞";
@@ -190,29 +187,6 @@ Item {
         return value.toString();
     }
 
-    function visibleEntryActionKeys() {
-        return SettingsData.clipboardVisibleEntryActions || ["pin", "edit", "delete"];
-    }
-
-    function visibleEntryActionLabels() {
-        const visibleKeys = visibleEntryActionKeys();
-        return entryActionKeys.map((key, index) => visibleKeys.includes(key) ? entryActionLabels[index] : null).filter(label => label !== null);
-    }
-
-    function setVisibleEntryAction(index, selected) {
-        const actionKey = entryActionKeys[index];
-        if (!actionKey)
-            return;
-
-        let actions = visibleEntryActionKeys().slice();
-        if (selected && !actions.includes(actionKey)) {
-            actions.push(actionKey);
-        } else if (!selected && actions.includes(actionKey)) {
-            actions = actions.filter(action => action !== actionKey);
-        }
-        SettingsData.set("clipboardVisibleEntryActions", actions);
-    }
-
     function loadConfig() {
         configLoaded = false;
         configError = false;
@@ -463,24 +437,6 @@ Item {
                     checked: SettingsData.clipboardEnterToPaste
                     onToggled: checked => SettingsData.set("clipboardEnterToPaste", checked)
                 }
-
-                SettingsButtonGroupRow {
-                    tab: "clipboard"
-                    tags: ["clipboard", "actions", "buttons", "hide", "density", "pin", "edit", "delete"]
-                    settingKey: "clipboardVisibleEntryActions"
-                    text: I18n.tr("Visible Entry Actions")
-                    description: I18n.tr("Choose which action buttons appear on clipboard entries")
-                    selectionMode: "multi"
-                    model: root.entryActionLabels
-                    currentSelection: root.visibleEntryActionLabels()
-                    checkEnabled: false
-                    buttonHeight: 28
-                    minButtonWidth: 56
-                    buttonPadding: Theme.spacingS
-                    textSize: Theme.fontSizeSmall
-                    spacing: 1
-                    onSelectionChanged: (index, selected) => root.setVisibleEntryAction(index, selected)
-                }
             }
 
             SettingsCard {

quickshell/Modules/Settings/CompositorLayoutTab.qml

@@ -23,9 +23,9 @@ Item {
             SettingsCard {
                 width: parent.width
                 tags: ["niri", "layout", "gaps", "radius", "window", "border"]
-                title: I18n.tr("Niri Layout Overrides")
+                title: I18n.tr("Niri Layout Overrides").replace("Niri", "niri")
                 settingKey: "niriLayout"
-                iconName: "layers"
+                iconName: "crop_square"
                 visible: CompositorService.isNiri
 
                 SettingsToggleRow {

quickshell/Modules/Settings/DankBarTab.qml

@@ -796,81 +796,18 @@ Item {
                 }
             }
 
-            SettingsCard {
-                tab: "appearance"
-                iconName: "opacity"
-                title: I18n.tr("Opacity")
-                settingKey: "barTransparency"
-                visible: dankBarTab.appearanceOnly && selectedBarConfig?.enabled
-
-                SettingsSliderRow {
-                    id: barTransparencySlider
-                    visible: !SettingsData.frameEnabled
-                    text: I18n.tr("Bar Opacity")
-                    description: I18n.tr("Controls opacity of the bar background")
-                    value: (selectedBarConfig?.transparency ?? 1.0) * 100
-                    minimum: 0
-                    maximum: 100
-                    unit: "%"
-                    defaultValue: 100
-                    onSliderDragFinished: finalValue => {
-                        SettingsData.updateBarConfig(selectedBarId, {
-                            transparency: finalValue / 100
-                        });
-                    }
-
-                    Binding {
-                        target: barTransparencySlider
-                        property: "value"
-                        value: (selectedBarConfig?.transparency ?? 1.0) * 100
-                        restoreMode: Binding.RestoreBinding
-                    }
-                }
-
-                SettingsSliderRow {
-                    id: widgetTransparencySlider
-                    text: I18n.tr("Widget Opacity")
-                    description: I18n.tr("Controls opacity of widget backgrounds")
-                    value: (selectedBarConfig?.widgetTransparency ?? 1.0) * 100
-                    minimum: 0
-                    maximum: 100
-                    unit: "%"
-                    defaultValue: 100
-                    onSliderDragFinished: finalValue => {
-                        SettingsData.updateBarConfig(selectedBarId, {
-                            widgetTransparency: finalValue / 100
-                        });
-                    }
-
-                    Binding {
-                        target: widgetTransparencySlider
-                        property: "value"
-                        value: (selectedBarConfig?.widgetTransparency ?? 1.0) * 100
-                        restoreMode: Binding.RestoreBinding
-                    }
-                }
-
-                SettingsControlledByFrame {
-                    visible: SettingsData.frameEnabled
-                    parentModal: dankBarTab.parentModal
-                    settingLabel: I18n.tr("Bar Opacity")
-                    reason: I18n.tr("Managed by Frame")
-                }
-            }
-
             SettingsControlledByFrame {
-                visible: dankBarTab.appearanceOnly && SettingsData.frameEnabled
+                visible: !dankBarTab.appearanceOnly && SettingsData.frameEnabled
                 parentModal: dankBarTab.parentModal
                 settingLabel: I18n.tr("Bar spacing and size")
                 reason: I18n.tr("Managed by Frame")
             }
 
             SettingsCard {
-                tab: "appearance"
                 iconName: "space_bar"
                 title: I18n.tr("Spacing")
                 settingKey: "barSpacing"
-                visible: dankBarTab.appearanceOnly && (selectedBarConfig?.enabled ?? false) && !SettingsData.frameEnabled
+                visible: !dankBarTab.appearanceOnly && (selectedBarConfig?.enabled ?? false) && !SettingsData.frameEnabled
 
                 SettingsSliderRow {
                     id: edgeSpacingSlider
@@ -1019,6 +956,68 @@ Item {
                 }
             }
 
+            SettingsCard {
+                tab: "appearance"
+                iconName: "opacity"
+                title: I18n.tr("Transparency")
+                settingKey: "barTransparency"
+                visible: dankBarTab.appearanceOnly && selectedBarConfig?.enabled
+
+                SettingsSliderRow {
+                    id: barTransparencySlider
+                    visible: !SettingsData.frameEnabled
+                    text: I18n.tr("Bar Transparency")
+                    description: I18n.tr("Opacity of the bar background")
+                    value: (selectedBarConfig?.transparency ?? 1.0) * 100
+                    minimum: 0
+                    maximum: 100
+                    unit: "%"
+                    defaultValue: 100
+                    onSliderDragFinished: finalValue => {
+                        SettingsData.updateBarConfig(selectedBarId, {
+                            transparency: finalValue / 100
+                        });
+                    }
+
+                    Binding {
+                        target: barTransparencySlider
+                        property: "value"
+                        value: (selectedBarConfig?.transparency ?? 1.0) * 100
+                        restoreMode: Binding.RestoreBinding
+                    }
+                }
+
+                SettingsSliderRow {
+                    id: widgetTransparencySlider
+                    text: I18n.tr("Widget Transparency")
+                    description: I18n.tr("Opacity of widget backgrounds")
+                    value: (selectedBarConfig?.widgetTransparency ?? 1.0) * 100
+                    minimum: 0
+                    maximum: 100
+                    unit: "%"
+                    defaultValue: 100
+                    onSliderDragFinished: finalValue => {
+                        SettingsData.updateBarConfig(selectedBarId, {
+                            widgetTransparency: finalValue / 100
+                        });
+                    }
+
+                    Binding {
+                        target: widgetTransparencySlider
+                        property: "value"
+                        value: (selectedBarConfig?.widgetTransparency ?? 1.0) * 100
+                        restoreMode: Binding.RestoreBinding
+                    }
+                }
+
+                SettingsControlledByFrame {
+                    visible: SettingsData.frameEnabled
+                    parentModal: dankBarTab.parentModal
+                    settingLabel: I18n.tr("Bar Transparency")
+                    reason: I18n.tr("Managed by Frame")
+                }
+            }
+
             SettingsSliderCard {
                 id: fontScaleSliderCard
                 tab: "appearance"
@@ -1359,7 +1358,7 @@ Item {
                 SettingsSliderRow {
                     id: borderOpacitySlider
                     text: I18n.tr("Opacity")
-                    description: I18n.tr("Controls opacity of the border")
+                    description: I18n.tr("Transparency of the border")
                     value: (selectedBarConfig?.borderOpacity ?? 1.0) * 100
                     minimum: 0
                     maximum: 100
@@ -1454,7 +1453,7 @@ Item {
                 SettingsSliderRow {
                     id: widgetOutlineOpacitySlider
                     text: I18n.tr("Opacity")
-                    description: I18n.tr("Controls opacity of the widget outline")
+                    description: I18n.tr("Transparency of the widget outline")
                     value: (selectedBarConfig?.widgetOutlineOpacity ?? 1.0) * 100
                     minimum: 0
                     maximum: 100
@@ -1563,7 +1562,7 @@ Item {
                 SettingsSliderRow {
                     visible: shadowCard.shadowActive
                     text: I18n.tr("Opacity")
-                    description: I18n.tr("Controls opacity of the shadow layer")
+                    description: I18n.tr("Transparency of the shadow layer")
                     minimum: 10
                     maximum: 100
                     unit: "%"

quickshell/Modules/Settings/DockTab.qml

@@ -643,19 +643,19 @@ Item {
             SettingsControlledByFrame {
                 visible: root.connectedFrameModeActive
                 parentModal: root.parentModal
-                settingLabel: I18n.tr("Dock margin, opacity, and border")
+                settingLabel: I18n.tr("Dock margin, transparency, and border")
                 reason: I18n.tr("Managed by Frame in Connected Mode")
             }
 
             SettingsCard {
                 width: parent.width
                 iconName: "opacity"
-                title: I18n.tr("Opacity")
+                title: I18n.tr("Transparency")
                 settingKey: "dockTransparency"
                 visible: !root.connectedFrameModeActive
 
                 SettingsSliderRow {
-                    text: I18n.tr("Dock Opacity")
+                    text: I18n.tr("Dock Transparency")
                     value: Math.round(SettingsData.dockTransparency * 100)
                     minimum: 0
                     maximum: 100

quickshell/Modules/Settings/MediaPlayerTab.qml

@@ -113,13 +113,6 @@ Item {
                         }
                     }
                 }
-
-                SettingsToggleRow {
-                    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
-                    onToggled: checked => SettingsData.set("audioDeviceScrollVolumeEnabled", checked)
-                }
             }
         }
     }

quickshell/Modules/Settings/NetworkEthernetTab.qml

@@ -1,462 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Common
-import qs.Modules.Settings.Widgets
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: networkEthernetTab
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    Component.onCompleted: {
-        NetworkService.addRef();
-    }
-
-    Component.onDestruction: {
-        NetworkService.removeRef();
-    }
-
-    DankFlickable {
-        anchors.fill: parent
-        clip: true
-        contentHeight: mainColumn.height + Theme.spacingXL
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-
-            topPadding: 4
-            width: Math.min(600, parent.width - Theme.spacingL * 2)
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: Theme.spacingL
-
-            SettingsCard {
-                id: root
-
-                property string expandedEthDevice: ""
-
-                title: I18n.tr("Ethernet")
-                iconName: "settings_ethernet"
-                settingKey: "networkEthernet"
-                tags: ["ethernet", "wired", "network", "adapters", "connection"]
-
-                width: parent.width
-
-                Column {
-                    id: ethernetSection
-
-                    width: parent.width
-                    spacing: Theme.spacingM
-
-                    StyledText {
-                        text: {
-                            const devices = NetworkService.ethernetDevices;
-                            const connected = devices.filter(d => d.connected).length;
-                            if (devices.length === 0)
-                                return I18n.tr("No adapters");
-                            if (connected === 0)
-                                return devices.length === 1 ? I18n.tr("%1 adapter, none connected").arg(devices.length) : I18n.tr("%1 adapters, none connected").arg(devices.length);
-                            return I18n.tr("%1 connected").arg(connected);
-                        }
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: NetworkService.ethernetConnected ? Theme.primary : Theme.surfaceVariantText
-                        width: parent.width
-                        horizontalAlignment: Text.AlignLeft
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 1
-                        color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: 4
-                        visible: NetworkService.ethernetDevices.length > 0
-
-                        StyledText {
-                            text: I18n.tr("Adapters")
-                            font.pixelSize: Theme.fontSizeMedium
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            width: parent.width
-                            horizontalAlignment: Text.AlignLeft
-                        }
-
-                        Repeater {
-                            model: NetworkService.ethernetDevices
-
-                            delegate: Rectangle {
-                                id: ethDeviceDelegate
-                                required property var modelData
-                                required property int index
-
-                                readonly property bool isConnected: modelData.connected || false
-                                readonly property bool isExpanded: root.expandedEthDevice === modelData.name
-
-                                width: parent.width
-                                height: isExpanded ? 56 + ethExpandedContent.height : 56
-                                radius: Theme.cornerRadius
-                                color: ethDeviceMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
-                                border.width: isConnected ? 2 : 0
-                                border.color: Theme.primary
-                                clip: true
-
-                                Behavior on height {
-                                    NumberAnimation {
-                                        duration: 150
-                                        easing.type: Easing.OutQuad
-                                    }
-                                }
-
-                                Column {
-                                    anchors.fill: parent
-                                    spacing: 0
-
-                                    Item {
-                                        width: parent.width
-                                        height: 56
-
-                                        Row {
-                                            anchors.left: parent.left
-                                            anchors.leftMargin: Theme.spacingM
-                                            anchors.verticalCenter: parent.verticalCenter
-                                            anchors.right: ethDeviceActions.left
-                                            anchors.rightMargin: Theme.spacingS
-                                            spacing: Theme.spacingS
-
-                                            DankIcon {
-                                                name: "lan"
-                                                size: 20
-                                                color: isConnected ? Theme.primary : Theme.surfaceText
-                                                anchors.verticalCenter: parent.verticalCenter
-                                            }
-
-                                            Column {
-                                                anchors.verticalCenter: parent.verticalCenter
-                                                spacing: 2
-                                                width: parent.width - 20 - Theme.spacingS
-
-                                                StyledText {
-                                                    text: modelData.name || I18n.tr("Unknown")
-                                                    font.pixelSize: Theme.fontSizeMedium
-                                                    color: isConnected ? Theme.primary : Theme.surfaceText
-                                                    font.weight: isConnected ? Font.Medium : Font.Normal
-                                                    elide: Text.ElideRight
-                                                    width: parent.width
-                                                    horizontalAlignment: Text.AlignLeft
-                                                }
-
-                                                Row {
-                                                    anchors.left: parent.left
-                                                    spacing: Theme.spacingXS
-
-                                                    StyledText {
-                                                        text: {
-                                                            switch (modelData.state) {
-                                                            case "activated":
-                                                                return I18n.tr("Connected");
-                                                            case "disconnected":
-                                                                return I18n.tr("Disconnected");
-                                                            case "unavailable":
-                                                                return I18n.tr("Unavailable");
-                                                            default:
-                                                                return modelData.state || I18n.tr("Unknown");
-                                                            }
-                                                        }
-                                                        font.pixelSize: Theme.fontSizeSmall
-                                                        color: isConnected ? Theme.primary : Theme.surfaceVariantText
-                                                    }
-
-                                                    StyledText {
-                                                        text: "•"
-                                                        font.pixelSize: Theme.fontSizeSmall
-                                                        color: Theme.surfaceVariantText
-                                                        visible: (modelData.ip || "").length > 0
-                                                    }
-
-                                                    StyledText {
-                                                        text: modelData.ip || ""
-                                                        font.pixelSize: Theme.fontSizeSmall
-                                                        color: Theme.surfaceVariantText
-                                                        visible: (modelData.ip || "").length > 0
-                                                    }
-                                                }
-                                            }
-                                        }
-
-                                        Row {
-                                            id: ethDeviceActions
-                                            anchors.right: parent.right
-                                            anchors.rightMargin: Theme.spacingS
-                                            anchors.verticalCenter: parent.verticalCenter
-                                            spacing: Theme.spacingXS
-
-                                            Rectangle {
-                                                width: 28
-                                                height: 28
-                                                radius: 14
-                                                color: ethExpandBtn.containsMouse ? Theme.surfacePressed : "transparent"
-                                                visible: isConnected
-
-                                                DankIcon {
-                                                    anchors.centerIn: parent
-                                                    name: isExpanded ? "expand_less" : "expand_more"
-                                                    size: 18
-                                                    color: Theme.surfaceText
-                                                }
-
-                                                MouseArea {
-                                                    id: ethExpandBtn
-                                                    anchors.fill: parent
-                                                    hoverEnabled: true
-                                                    cursorShape: Qt.PointingHandCursor
-                                                    onClicked: {
-                                                        if (isExpanded) {
-                                                            root.expandedEthDevice = "";
-                                                        } else {
-                                                            root.expandedEthDevice = modelData.name;
-                                                            NetworkService.fetchWiredNetworkInfo(NetworkService.ethernetConnectionUuid);
-                                                        }
-                                                    }
-                                                }
-                                            }
-
-                                            Rectangle {
-                                                width: 28
-                                                height: 28
-                                                radius: 14
-                                                color: ethDisconnectBtn.containsMouse ? Theme.errorHover : "transparent"
-                                                visible: isConnected
-
-                                                DankIcon {
-                                                    anchors.centerIn: parent
-                                                    name: "link_off"
-                                                    size: 18
-                                                    color: ethDisconnectBtn.containsMouse ? Theme.error : Theme.surfaceVariantText
-                                                }
-
-                                                MouseArea {
-                                                    id: ethDisconnectBtn
-                                                    anchors.fill: parent
-                                                    hoverEnabled: true
-                                                    cursorShape: Qt.PointingHandCursor
-                                                    onClicked: NetworkService.disconnectEthernetDevice(modelData.name)
-                                                }
-                                            }
-                                        }
-
-                                        MouseArea {
-                                            id: ethDeviceMouseArea
-                                            anchors.fill: parent
-                                            anchors.rightMargin: ethDeviceActions.width + Theme.spacingM
-                                            hoverEnabled: true
-                                        }
-                                    }
-
-                                    Column {
-                                        id: ethExpandedContent
-                                        width: parent.width
-                                        visible: isExpanded
-
-                                        Rectangle {
-                                            width: parent.width - Theme.spacingM * 2
-                                            height: 1
-                                            x: Theme.spacingM
-                                            color: Theme.outlineLight
-                                        }
-
-                                        Item {
-                                            width: parent.width
-                                            height: ethDetailsColumn.implicitHeight + Theme.spacingM * 2
-
-                                            Column {
-                                                id: ethDetailsColumn
-                                                anchors.fill: parent
-                                                anchors.margins: Theme.spacingM
-                                                spacing: Theme.spacingS
-
-                                                Flow {
-                                                    width: parent.width
-                                                    spacing: Theme.spacingXS
-
-                                                    Repeater {
-                                                        model: {
-                                                            const fields = [];
-                                                            const dev = modelData;
-                                                            if (!dev)
-                                                                return fields;
-
-                                                            if (dev.ip)
-                                                                fields.push({
-                                                                    label: I18n.tr("IP"),
-                                                                    value: dev.ip
-                                                                });
-                                                            if (dev.speed && dev.speed > 0)
-                                                                fields.push({
-                                                                    label: I18n.tr("Speed"),
-                                                                    value: dev.speed + " Mbps"
-                                                                });
-                                                            if (dev.hwAddress)
-                                                                fields.push({
-                                                                    label: I18n.tr("MAC"),
-                                                                    value: dev.hwAddress
-                                                                });
-                                                            if (dev.driver)
-                                                                fields.push({
-                                                                    label: I18n.tr("Driver"),
-                                                                    value: dev.driver
-                                                                });
-                                                            fields.push({
-                                                                label: I18n.tr("State"),
-                                                                value: dev.state || I18n.tr("Unknown")
-                                                            });
-
-                                                            return fields;
-                                                        }
-
-                                                        delegate: Rectangle {
-                                                            required property var modelData
-                                                            required property int index
-
-                                                            width: ethFieldContent.width + Theme.spacingM * 2
-                                                            height: 32
-                                                            radius: Theme.cornerRadius - 2
-                                                            color: Theme.surfaceContainerHigh
-                                                            border.width: 1
-                                                            border.color: Theme.outlineLight
-
-                                                            Row {
-                                                                id: ethFieldContent
-                                                                anchors.centerIn: parent
-                                                                spacing: Theme.spacingXS
-
-                                                                StyledText {
-                                                                    text: modelData.label + ":"
-                                                                    font.pixelSize: Theme.fontSizeSmall
-                                                                    color: Theme.surfaceVariantText
-                                                                    anchors.verticalCenter: parent.verticalCenter
-                                                                }
-
-                                                                StyledText {
-                                                                    text: modelData.value
-                                                                    font.pixelSize: Theme.fontSizeSmall
-                                                                    color: Theme.surfaceText
-                                                                    font.weight: Font.Medium
-                                                                    anchors.verticalCenter: parent.verticalCenter
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-
-                                                Item {
-                                                    width: parent.width
-                                                    height: NetworkService.networkWiredInfoLoading ? 40 : 0
-                                                    visible: NetworkService.networkWiredInfoLoading
-
-                                                    DankSpinner {
-                                                        anchors.centerIn: parent
-                                                        size: 20
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingS
-                        visible: NetworkService.wiredConnections.length > 0
-
-                        Rectangle {
-                            width: parent.width
-                            height: 1
-                            color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Saved Configurations")
-                            font.pixelSize: Theme.fontSizeMedium
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            width: parent.width
-                            horizontalAlignment: Text.AlignLeft
-                        }
-
-                        Repeater {
-                            model: NetworkService.wiredConnections
-
-                            delegate: Rectangle {
-                                required property var modelData
-                                required property int index
-
-                                width: parent.width
-                                height: 48
-                                radius: Theme.cornerRadius
-                                color: wiredMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
-                                border.width: modelData.isActive ? 2 : 0
-                                border.color: Theme.primary
-
-                                Row {
-                                    anchors.left: parent.left
-                                    anchors.leftMargin: Theme.spacingM
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    spacing: Theme.spacingS
-
-                                    DankIcon {
-                                        name: "lan"
-                                        size: 20
-                                        color: modelData.isActive ? Theme.primary : Theme.surfaceText
-                                        anchors.verticalCenter: parent.verticalCenter
-                                    }
-
-                                    Column {
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        spacing: 2
-
-                                        StyledText {
-                                            text: modelData.id || I18n.tr("Unknown")
-                                            font.pixelSize: Theme.fontSizeMedium
-                                            color: modelData.isActive ? Theme.primary : Theme.surfaceText
-                                            font.weight: modelData.isActive ? Font.Medium : Font.Normal
-                                        }
-
-                                        StyledText {
-                                            text: modelData.isActive ? I18n.tr("Active") : ""
-                                            font.pixelSize: Theme.fontSizeSmall
-                                            color: Theme.primary
-                                            visible: modelData.isActive
-                                        }
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: wiredMouseArea
-
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-                                    onClicked: {
-                                        if (!modelData.isActive) {
-                                            NetworkService.connectToSpecificWiredConfig(modelData.uuid);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/Settings/NetworkStatusTab.qml

@@ -1,202 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Common
-import qs.Modules.Settings.Widgets
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: networkStatusTab
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    Component.onCompleted: {
-        NetworkService.addRef();
-    }
-
-    Component.onDestruction: {
-        NetworkService.removeRef();
-    }
-
-    DankFlickable {
-        anchors.fill: parent
-        clip: true
-        contentHeight: mainColumn.height + Theme.spacingXL
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-
-            topPadding: 4
-            width: Math.min(600, parent.width - Theme.spacingL * 2)
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: Theme.spacingL
-
-            SettingsCard {
-                id: root
-
-                title: I18n.tr("Network Status")
-                iconName: "lan"
-                settingKey: "networkStatus"
-                tags: ["status", "network", "connectivity", "internet"]
-
-                width: parent.width
-
-                Column {
-                    id: overviewSection
-
-                    width: parent.width
-                    spacing: Theme.spacingM
-
-                    StyledText {
-                        text: I18n.tr("Overview of your network connections")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        width: parent.width
-                        horizontalAlignment: Text.AlignLeft
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 1
-                        color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                    }
-
-                    Grid {
-                        columns: 2
-                        columnSpacing: Theme.spacingL
-                        rowSpacing: Theme.spacingS
-                        width: parent.width
-
-                        StyledText {
-                            text: I18n.tr("Backend")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceVariantText
-                        }
-                        StyledText {
-                            text: NetworkService.backend || I18n.tr("Unknown")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            font.weight: Font.Medium
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Status")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceVariantText
-                        }
-                        Row {
-                            spacing: Theme.spacingS
-
-                            Rectangle {
-                                width: 8
-                                height: 8
-                                radius: 4
-                                anchors.verticalCenter: parent.verticalCenter
-                                color: {
-                                    switch (NetworkService.networkStatus) {
-                                    case "ethernet":
-                                    case "wifi":
-                                        return Theme.success;
-                                    case "disconnected":
-                                        return Theme.error;
-                                    default:
-                                        return Theme.warning;
-                                    }
-                                }
-                            }
-
-                            StyledText {
-                                text: {
-                                    switch (NetworkService.networkStatus) {
-                                    case "ethernet":
-                                        return I18n.tr("Ethernet");
-                                    case "wifi":
-                                        return I18n.tr("WiFi");
-                                    case "disconnected":
-                                        return I18n.tr("Disconnected");
-                                    default:
-                                        return NetworkService.networkStatus || I18n.tr("Unknown");
-                                    }
-                                }
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceText
-                                font.weight: Font.Medium
-                            }
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Primary")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceVariantText
-                            visible: NetworkService.primaryConnection.length > 0
-                        }
-                        StyledText {
-                            text: NetworkService.primaryConnection || "-"
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceText
-                            elide: Text.ElideRight
-                            visible: NetworkService.primaryConnection.length > 0
-                        }
-                    }
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-                        visible: NetworkService.backend === "networkmanager" && NetworkService.ethernetConnected && NetworkService.wifiConnected
-
-                        StyledText {
-                            text: I18n.tr("Preference")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceVariantText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Item {
-                            width: parent.width - preferenceLabel.width - preferenceButtons.width - Theme.spacingM * 2
-                            height: 1
-                        }
-
-                        DankButtonGroup {
-                            id: preferenceButtons
-                            model: [I18n.tr("Auto"), I18n.tr("Ethernet"), I18n.tr("WiFi")]
-                            currentIndex: {
-                                switch (NetworkService.userPreference) {
-                                case "ethernet":
-                                    return 1;
-                                case "wifi":
-                                    return 2;
-                                default:
-                                    return 0;
-                                }
-                            }
-                            onSelectionChanged: (index, selected) => {
-                                if (!selected)
-                                    return;
-                                switch (index) {
-                                case 0:
-                                    NetworkService.setNetworkPreference("auto");
-                                    break;
-                                case 1:
-                                    NetworkService.setNetworkPreference("ethernet");
-                                    break;
-                                case 2:
-                                    NetworkService.setNetworkPreference("wifi");
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    StyledText {
-                        id: preferenceLabel
-                        visible: false
-                        text: I18n.tr("Preference")
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/Settings/NetworkVpnTab.qml

@@ -1,516 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import qs.Common
-import qs.Modules.Settings.Widgets
-import qs.Modals.Common
-import qs.Modals.FileBrowser
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: networkVpnTab
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    Component.onCompleted: {
-        NetworkService.addRef();
-    }
-
-    Component.onDestruction: {
-        NetworkService.removeRef();
-    }
-
-    DankFlickable {
-        anchors.fill: parent
-        clip: true
-        contentHeight: mainColumn.height + Theme.spacingXL
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-
-            topPadding: 4
-            width: Math.min(600, parent.width - Theme.spacingL * 2)
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: Theme.spacingL
-
-            SettingsCard {
-                id: root
-
-                property string expandedVpnUuid: ""
-
-                title: I18n.tr("VPN")
-                iconName: "vpn_key"
-                settingKey: "networkVpn"
-                tags: ["vpn", "network", "profiles", "import", "openvpn", "wireguard"]
-
-                function openVpnFileBrowser() {
-                    vpnFileBrowserLoader.active = true;
-                    if (vpnFileBrowserLoader.item)
-                        vpnFileBrowserLoader.item.open();
-                }
-
-                property var vpnFileBrowserLoader: LazyLoader {
-                    active: false
-
-                    FileBrowserModal {
-                        browserTitle: I18n.tr("Import VPN")
-                        browserIcon: "vpn_key"
-                        browserType: "vpn"
-                        fileExtensions: VPNService.getFileFilter()
-
-                        onFileSelected: path => {
-                            VPNService.importVpn(path.replace("file://", ""));
-                        }
-                    }
-                }
-
-                property var deleteVpnConfirm: ConfirmModal {}
-
-                width: parent.width
-
-                Column {
-                    id: vpnSection
-
-                    width: parent.width
-                    spacing: Theme.spacingM
-
-                    StyledText {
-                        text: I18n.tr("Unavailable")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                        width: parent.width
-                        horizontalAlignment: Text.AlignLeft
-                        visible: !DMSNetworkService.vpnAvailable
-                    }
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-                        visible: DMSNetworkService.vpnAvailable
-
-                        StyledText {
-                            text: {
-                                if (!DMSNetworkService.connected)
-                                    return I18n.tr("Disconnected");
-                                const names = DMSNetworkService.activeNames || [];
-                                if (names.length <= 1)
-                                    return names[0] || I18n.tr("Connected");
-                                return names[0] + " +" + (names.length - 1);
-                            }
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: DMSNetworkService.connected ? Theme.primary : Theme.surfaceVariantText
-                            width: parent.width - vpnHeaderControls.width - Theme.spacingM
-                            horizontalAlignment: Text.AlignLeft
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Row {
-                            id: vpnHeaderControls
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingS
-
-                            Rectangle {
-                                height: 28
-                                radius: 14
-                                width: importVpnRow.width + Theme.spacingM * 2
-                                color: importVpnArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
-                                opacity: VPNService.importing ? 0.5 : 1.0
-
-                                Row {
-                                    id: importVpnRow
-                                    anchors.centerIn: parent
-                                    spacing: Theme.spacingXS
-
-                                    DankIcon {
-                                        name: VPNService.importing ? "sync" : "add"
-                                        size: Theme.fontSizeSmall
-                                        color: Theme.primary
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("Import")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.primary
-                                        font.weight: Font.Medium
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: importVpnArea
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: VPNService.importing ? Qt.BusyCursor : Qt.PointingHandCursor
-                                    enabled: !VPNService.importing
-                                    onClicked: root.openVpnFileBrowser()
-                                }
-                            }
-
-                            Rectangle {
-                                height: 28
-                                radius: 14
-                                width: disconnectAllRow.width + Theme.spacingM * 2
-                                color: disconnectAllArea.containsMouse ? Theme.errorHover : Theme.surfaceLight
-                                visible: DMSNetworkService.connected
-                                opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
-
-                                Row {
-                                    id: disconnectAllRow
-                                    anchors.centerIn: parent
-                                    spacing: Theme.spacingXS
-
-                                    DankIcon {
-                                        name: "link_off"
-                                        size: Theme.fontSizeSmall
-                                        color: Theme.surfaceText
-                                    }
-
-                                    StyledText {
-                                        text: I18n.tr("Disconnect")
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceText
-                                        font.weight: Font.Medium
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: disconnectAllArea
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
-                                    enabled: !DMSNetworkService.isBusy
-                                    onClicked: DMSNetworkService.disconnectAllActive()
-                                }
-                            }
-                        }
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 1
-                        color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                        visible: DMSNetworkService.vpnAvailable
-                    }
-
-                    Item {
-                        width: parent.width
-                        height: 100
-                        visible: DMSNetworkService.vpnAvailable && DMSNetworkService.profiles.length === 0
-
-                        Column {
-                            anchors.centerIn: parent
-                            spacing: Theme.spacingS
-
-                            DankIcon {
-                                name: "vpn_key_off"
-                                size: 36
-                                color: Theme.surfaceVariantText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("No VPN profiles")
-                                font.pixelSize: Theme.fontSizeMedium
-                                color: Theme.surfaceVariantText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Click Import to add a .ovpn or .conf")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                anchors.horizontalCenter: parent.horizontalCenter
-                            }
-                        }
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: 4
-                        visible: DMSNetworkService.vpnAvailable && DMSNetworkService.profiles.length > 0
-
-                        Repeater {
-                            model: DMSNetworkService.profiles
-
-                            delegate: Rectangle {
-                                id: vpnProfileRow
-                                required property var modelData
-                                required property int index
-
-                                readonly property bool isActive: DMSNetworkService.isActiveUuid(modelData.uuid)
-                                readonly property bool isTransient: !!modelData.transient
-                                readonly property bool canExpand: modelData.canExpand !== false
-                                readonly property bool canDelete: modelData.canDelete !== false
-                                readonly property bool isExpanded: root.expandedVpnUuid === modelData.uuid
-                                readonly property var configData: (!isTransient && isExpanded) ? VPNService.editConfig : null
-
-                                width: parent.width
-                                height: isExpanded ? 56 + vpnExpandedContent.height : 56
-                                radius: Theme.cornerRadius
-                                color: vpnRowArea.containsMouse ? Theme.primaryHoverLight : (isActive ? Theme.primaryPressed : Theme.surfaceLight)
-                                border.width: isActive ? 2 : 0
-                                border.color: Theme.primary
-                                opacity: DMSNetworkService.isBusy ? 0.6 : 1.0
-                                clip: true
-
-                                Behavior on height {
-                                    NumberAnimation {
-                                        duration: 150
-                                        easing.type: Easing.OutQuad
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: vpnRowArea
-                                    anchors.fill: parent
-                                    hoverEnabled: true
-                                    cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
-                                    enabled: !DMSNetworkService.isBusy
-                                    onClicked: DMSNetworkService.toggle(modelData.uuid)
-                                }
-
-                                Column {
-                                    anchors.fill: parent
-                                    anchors.margins: Theme.spacingS
-                                    spacing: Theme.spacingS
-
-                                    Row {
-                                        width: parent.width
-                                        height: 56 - Theme.spacingS * 2
-                                        spacing: Theme.spacingS
-
-                                        DankIcon {
-                                            name: isActive ? "vpn_lock" : "vpn_key_off"
-                                            size: 20
-                                            color: isActive ? Theme.primary : Theme.surfaceText
-                                            anchors.verticalCenter: parent.verticalCenter
-                                        }
-
-                                        Column {
-                                            spacing: 2
-                                            anchors.verticalCenter: parent.verticalCenter
-                                            width: parent.width - 20 - ((canExpand ? 28 : 0) + (canDelete ? 28 : 0)) - Theme.spacingS * 4
-
-                                            StyledText {
-                                                text: modelData.name
-                                                font.pixelSize: Theme.fontSizeMedium
-                                                color: isActive ? Theme.primary : Theme.surfaceText
-                                                elide: Text.ElideRight
-                                                width: parent.width
-                                                horizontalAlignment: Text.AlignLeft
-                                            }
-
-                                            StyledText {
-                                                text: VPNService.getVpnTypeFromProfile(modelData)
-                                                font.pixelSize: Theme.fontSizeSmall
-                                                color: Theme.surfaceVariantText
-                                                anchors.left: parent.left
-                                            }
-                                        }
-
-                                        Item {
-                                            width: Theme.spacingXS
-                                            height: 1
-                                        }
-
-                                        Rectangle {
-                                            width: 28
-                                            height: 28
-                                            radius: 14
-                                            color: vpnExpandBtn.containsMouse ? Theme.surfacePressed : "transparent"
-                                            anchors.verticalCenter: parent.verticalCenter
-                                            visible: canExpand
-
-                                            DankIcon {
-                                                anchors.centerIn: parent
-                                                name: isExpanded ? "expand_less" : "expand_more"
-                                                size: 18
-                                                color: Theme.surfaceText
-                                            }
-
-                                            MouseArea {
-                                                id: vpnExpandBtn
-                                                anchors.fill: parent
-                                                hoverEnabled: true
-                                                cursorShape: Qt.PointingHandCursor
-                                                onClicked: {
-                                                    if (isExpanded) {
-                                                        root.expandedVpnUuid = "";
-                                                    } else {
-                                                        root.expandedVpnUuid = modelData.uuid;
-                                                        VPNService.getConfig(modelData.uuid);
-                                                    }
-                                                }
-                                            }
-                                        }
-
-                                        Rectangle {
-                                            width: 28
-                                            height: 28
-                                            radius: 14
-                                            color: vpnDeleteBtn.containsMouse ? Theme.errorHover : "transparent"
-                                            anchors.verticalCenter: parent.verticalCenter
-                                            visible: canDelete
-
-                                            DankIcon {
-                                                anchors.centerIn: parent
-                                                name: "delete"
-                                                size: 18
-                                                color: vpnDeleteBtn.containsMouse ? Theme.error : Theme.surfaceVariantText
-                                            }
-
-                                            MouseArea {
-                                                id: vpnDeleteBtn
-                                                anchors.fill: parent
-                                                hoverEnabled: true
-                                                cursorShape: Qt.PointingHandCursor
-                                                onClicked: {
-                                                    deleteVpnConfirm.showWithOptions({
-                                                        title: I18n.tr("Delete VPN"),
-                                                        message: I18n.tr("Delete \"%1\"?").arg(modelData.name),
-                                                        confirmText: I18n.tr("Delete"),
-                                                        confirmColor: Theme.error,
-                                                        onConfirm: () => VPNService.deleteVpn(modelData.uuid)
-                                                    });
-                                                }
-                                            }
-                                        }
-                                    }
-
-                                    Column {
-                                        id: vpnExpandedContent
-                                        width: parent.width
-                                        spacing: Theme.spacingXS
-                                        visible: !isTransient && isExpanded
-
-                                        Rectangle {
-                                            width: parent.width
-                                            height: 1
-                                            color: Theme.outlineLight
-                                        }
-
-                                        Item {
-                                            width: parent.width
-                                            height: VPNService.configLoading ? 40 : 0
-                                            visible: VPNService.configLoading
-
-                                            DankSpinner {
-                                                anchors.centerIn: parent
-                                                size: 20
-                                            }
-                                        }
-
-                                        Flow {
-                                            width: parent.width
-                                            spacing: Theme.spacingXS
-                                            visible: !VPNService.configLoading && configData
-
-                                            Repeater {
-                                                model: {
-                                                    if (!configData)
-                                                        return [];
-                                                    const fields = [];
-                                                    const data = configData.data || {};
-
-                                                    if (data.remote)
-                                                        fields.push({
-                                                            label: I18n.tr("Server"),
-                                                            value: data.remote
-                                                        });
-                                                    if (configData.username || data.username)
-                                                        fields.push({
-                                                            label: I18n.tr("Username"),
-                                                            value: configData.username || data.username
-                                                        });
-                                                    if (data.cipher)
-                                                        fields.push({
-                                                            label: I18n.tr("Cipher"),
-                                                            value: data.cipher
-                                                        });
-                                                    if (data.auth)
-                                                        fields.push({
-                                                            label: I18n.tr("Auth"),
-                                                            value: data.auth
-                                                        });
-                                                    if (data["proto-tcp"] === "yes" || data["proto-tcp"] === "no")
-                                                        fields.push({
-                                                            label: I18n.tr("Protocol"),
-                                                            value: data["proto-tcp"] === "yes" ? "TCP" : "UDP"
-                                                        });
-                                                    if (data["tunnel-mtu"])
-                                                        fields.push({
-                                                            label: I18n.tr("MTU"),
-                                                            value: data["tunnel-mtu"]
-                                                        });
-                                                    if (data["connection-type"])
-                                                        fields.push({
-                                                            label: I18n.tr("Auth Type"),
-                                                            value: data["connection-type"]
-                                                        });
-                                                    return fields;
-                                                }
-
-                                                delegate: Rectangle {
-                                                    required property var modelData
-                                                    required property int index
-
-                                                    width: vpnFieldContent.width + Theme.spacingM * 2
-                                                    height: 32
-                                                    radius: Theme.cornerRadius - 2
-                                                    color: Theme.surfaceContainerHigh
-                                                    border.width: 1
-                                                    border.color: Theme.outlineLight
-
-                                                    Row {
-                                                        id: vpnFieldContent
-                                                        anchors.centerIn: parent
-                                                        spacing: Theme.spacingXS
-
-                                                        StyledText {
-                                                            text: modelData.label + ":"
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: Theme.surfaceVariantText
-                                                            anchors.verticalCenter: parent.verticalCenter
-                                                        }
-
-                                                        StyledText {
-                                                            text: modelData.value
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: Theme.surfaceText
-                                                            font.weight: Font.Medium
-                                                            anchors.verticalCenter: parent.verticalCenter
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-
-                                        DankToggle {
-                                            width: parent.width
-                                            text: I18n.tr("Autoconnect")
-                                            checked: configData ? (configData.autoconnect || false) : false
-                                            visible: !VPNService.configLoading && configData !== null
-                                            onToggled: checked => {
-                                                VPNService.updateConfig(modelData.uuid, {
-                                                    autoconnect: checked
-                                                });
-                                            }
-                                        }
-
-                                        Item {
-                                            width: 1
-                                            height: Theme.spacingXS
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/Settings/NetworkWifiTab.qml

@@ -1,761 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Layouts
-import qs.Common
-import qs.Modules.Settings.Widgets
-import qs.Modals.Common
-import qs.Services
-import qs.Widgets
-
-Item {
-    id: networkWifiTab
-
-    LayoutMirroring.enabled: I18n.isRtl
-    LayoutMirroring.childrenInherit: true
-
-    Component.onCompleted: {
-        NetworkService.addRef();
-    }
-
-    Component.onDestruction: {
-        NetworkService.removeRef();
-    }
-
-    DankFlickable {
-        anchors.fill: parent
-        clip: true
-        contentHeight: mainColumn.height + Theme.spacingXL
-        contentWidth: width
-
-        Column {
-            id: mainColumn
-
-            topPadding: 4
-            width: Math.min(600, parent.width - Theme.spacingL * 2)
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: Theme.spacingL
-
-            SettingsCard {
-                id: root
-
-                property string expandedWifiSsid: ""
-                property int maxPinnedWifiNetworks: 3
-
-                function normalizePinList(value) {
-                    if (Array.isArray(value))
-                        return value.filter(v => v);
-                    if (typeof value === "string" && value.length > 0)
-                        return [value];
-                    return [];
-                }
-
-                function getPinnedWifiNetworks() {
-                    const pins = SettingsData.wifiNetworkPins || {};
-                    return normalizePinList(pins["preferredWifi"]);
-                }
-
-                function toggleWifiPin(ssid) {
-                    const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}));
-                    let pinnedList = normalizePinList(pins["preferredWifi"]);
-                    const pinIndex = pinnedList.indexOf(ssid);
-
-                    if (pinIndex !== -1) {
-                        pinnedList.splice(pinIndex, 1);
-                    } else {
-                        pinnedList.unshift(ssid);
-                        if (pinnedList.length > maxPinnedWifiNetworks)
-                            pinnedList = pinnedList.slice(0, maxPinnedWifiNetworks);
-                    }
-
-                    if (pinnedList.length > 0)
-                        pins["preferredWifi"] = pinnedList;
-                    else
-                        delete pins["preferredWifi"];
-
-                    SettingsData.set("wifiNetworkPins", pins);
-                }
-
-                property var forgetNetworkConfirm: ConfirmModal {}
-
-                width: parent.width
-                title: I18n.tr("WiFi")
-                iconName: "wifi"
-                settingKey: "networkWifi"
-                tags: ["wifi", "wi-fi", "wireless", "network", "ssid", "adapter", "radio"]
-
-                Column {
-                    id: wifiSection
-
-                    width: parent.width
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        StyledText {
-                            text: {
-                                if (NetworkService.wifiToggling)
-                                    return I18n.tr("Toggling...");
-                                if (!NetworkService.wifiEnabled)
-                                    return I18n.tr("Disabled");
-                                if (NetworkService.wifiConnected)
-                                    return NetworkService.currentWifiSSID;
-                                return I18n.tr("Not connected");
-                            }
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: NetworkService.wifiConnected ? Theme.primary : Theme.surfaceVariantText
-                            width: parent.width - wifiControls.width - Theme.spacingM
-                            horizontalAlignment: Text.AlignLeft
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Row {
-                            id: wifiControls
-                            anchors.verticalCenter: parent.verticalCenter
-                            spacing: Theme.spacingS
-
-                            DankActionButton {
-                                iconName: "wifi_find"
-                                buttonSize: 32
-                                visible: NetworkService.backend === "networkmanager" && NetworkService.wifiEnabled && !NetworkService.wifiToggling
-                                onClicked: PopoutService.showHiddenNetworkModal()
-                            }
-
-                            DankActionButton {
-                                iconName: "refresh"
-                                buttonSize: 32
-                                visible: NetworkService.wifiEnabled && !NetworkService.wifiToggling && !NetworkService.isScanning
-                                onClicked: NetworkService.scanWifi()
-                            }
-
-                            DankToggle {
-                                checked: NetworkService.wifiEnabled
-                                enabled: !NetworkService.wifiToggling
-                                onToggled: NetworkService.toggleWifiRadio()
-                            }
-                        }
-                    }
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-                        visible: NetworkService.wifiEnabled && (NetworkService.wifiDevices?.length ?? 0) > 1
-
-                        StyledText {
-                            text: I18n.tr("WiFi Device")
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceVariantText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Item {
-                            width: parent.width - wifiDeviceLabel.width - wifiDeviceDropdown.width - Theme.spacingM * 2
-                            height: 1
-                        }
-
-                        DankDropdown {
-                            id: wifiDeviceDropdown
-                            dropdownWidth: 150
-                            popupWidth: 180
-                            currentValue: NetworkService.wifiDeviceOverride || I18n.tr("Auto")
-                            options: {
-                                const devices = NetworkService.wifiDevices;
-                                if (!devices || devices.length === 0)
-                                    return [I18n.tr("Auto")];
-                                return [I18n.tr("Auto")].concat(devices.map(d => d.name));
-                            }
-                            onValueChanged: value => {
-                                const deviceName = value === I18n.tr("Auto") ? "" : value;
-                                NetworkService.setWifiDeviceOverride(deviceName);
-                            }
-                        }
-                    }
-
-                    StyledText {
-                        id: wifiDeviceLabel
-                        visible: false
-                        text: I18n.tr("WiFi Device")
-                    }
-
-                    Rectangle {
-                        width: parent.width
-                        height: 1
-                        color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
-                        visible: NetworkService.wifiEnabled
-                    }
-
-                    Column {
-                        width: parent.width
-                        spacing: Theme.spacingS
-                        visible: NetworkService.wifiEnabled && !NetworkService.wifiToggling
-
-                        Column {
-                            width: parent.width
-                            spacing: Theme.spacingS
-                            visible: NetworkService.wifiInterface.length > 0
-
-                            Row {
-                                width: parent.width
-                                height: 24
-
-                                StyledText {
-                                    text: I18n.tr("Interface:")
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    color: Theme.surfaceVariantText
-                                    width: 100
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-                                StyledText {
-                                    text: NetworkService.wifiInterface || "-"
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    color: Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-                            }
-
-                            Row {
-                                width: parent.width
-                                height: 24
-                                visible: NetworkService.wifiIP.length > 0
-
-                                StyledText {
-                                    text: I18n.tr("IP Address:")
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    color: Theme.surfaceVariantText
-                                    width: 100
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-                                StyledText {
-                                    text: NetworkService.wifiIP || "-"
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    color: Theme.surfaceText
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-                            }
-
-                            Row {
-                                width: parent.width
-                                height: 24
-                                visible: NetworkService.wifiConnected
-
-                                StyledText {
-                                    text: I18n.tr("Signal:")
-                                    font.pixelSize: Theme.fontSizeMedium
-                                    color: Theme.surfaceVariantText
-                                    width: 100
-                                    anchors.verticalCenter: parent.verticalCenter
-                                }
-
-                                Row {
-                                    spacing: Theme.spacingXS
-                                    anchors.verticalCenter: parent.verticalCenter
-
-                                    DankIcon {
-                                        name: {
-                                            const s = NetworkService.wifiSignalStrength;
-                                            if (s >= 50)
-                                                return "wifi";
-                                            if (s >= 25)
-                                                return "wifi_2_bar";
-                                            return "wifi_1_bar";
-                                        }
-                                        size: 18
-                                        color: Theme.surfaceText
-                                        anchors.verticalCenter: parent.verticalCenter
-                                    }
-
-                                    StyledText {
-                                        text: NetworkService.wifiSignalStrength + "%"
-                                        font.pixelSize: Theme.fontSizeMedium
-                                        color: Theme.surfaceText
-                                    }
-                                }
-                            }
-                        }
-
-                        Item {
-                            width: parent.width
-                            height: Theme.spacingS
-                        }
-
-                        Row {
-                            width: parent.width
-                            spacing: Theme.spacingM
-
-                            StyledText {
-                                text: I18n.tr("Available Networks")
-                                font.pixelSize: Theme.fontSizeMedium
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-
-                            Item {
-                                width: 1
-                                height: 1
-                                Layout.fillWidth: true
-                            }
-
-                            StyledText {
-                                text: NetworkService.wifiNetworks?.length ?? 0
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                anchors.verticalCenter: parent.verticalCenter
-                            }
-                        }
-
-                        Item {
-                            width: parent.width
-                            height: 80
-                            visible: NetworkService.isScanning && (NetworkService.wifiNetworks?.length ?? 0) === 0
-
-                            Column {
-                                anchors.centerIn: parent
-                                spacing: Theme.spacingS
-
-                                DankIcon {
-                                    id: scanningIcon
-                                    name: "wifi_find"
-                                    size: 32
-                                    color: Theme.surfaceVariantText
-                                    anchors.horizontalCenter: parent.horizontalCenter
-
-                                    SequentialAnimation {
-                                        running: NetworkService.isScanning
-                                        loops: Animation.Infinite
-                                        OpacityAnimator {
-                                            target: scanningIcon
-                                            to: 0.3
-                                            duration: 400
-                                            easing.type: Easing.InOutQuad
-                                        }
-                                        OpacityAnimator {
-                                            target: scanningIcon
-                                            to: 1.0
-                                            duration: 400
-                                            easing.type: Easing.InOutQuad
-                                        }
-                                        onRunningChanged: if (!running)
-                                            scanningIcon.opacity = 1.0
-                                    }
-                                }
-
-                                StyledText {
-                                    text: I18n.tr("Scanning...")
-                                    font.pixelSize: Theme.fontSizeSmall
-                                    color: Theme.surfaceVariantText
-                                    anchors.horizontalCenter: parent.horizontalCenter
-                                }
-                            }
-                        }
-
-                        Column {
-                            width: parent.width
-                            spacing: 4
-                            visible: (NetworkService.wifiNetworks?.length ?? 0) > 0
-
-                            Repeater {
-                                model: {
-                                    const ssid = NetworkService.currentWifiSSID;
-                                    const networks = NetworkService.wifiNetworks || [];
-                                    const pinnedList = root.getPinnedWifiNetworks();
-
-                                    let sorted = [...networks];
-                                    sorted.sort((a, b) => {
-                                        const aPinnedIndex = pinnedList.indexOf(a.ssid);
-                                        const bPinnedIndex = pinnedList.indexOf(b.ssid);
-                                        if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
-                                            if (aPinnedIndex === -1)
-                                                return 1;
-                                            if (bPinnedIndex === -1)
-                                                return -1;
-                                            return aPinnedIndex - bPinnedIndex;
-                                        }
-                                        if (a.ssid === ssid)
-                                            return -1;
-                                        if (b.ssid === ssid)
-                                            return 1;
-                                        return b.signal - a.signal;
-                                    });
-                                    return sorted;
-                                }
-
-                                delegate: Rectangle {
-                                    id: wifiNetworkDelegate
-                                    required property var modelData
-                                    required property int index
-
-                                    readonly property bool isConnected: modelData.ssid === NetworkService.currentWifiSSID
-                                    readonly property bool isPinned: root.getPinnedWifiNetworks().includes(modelData.ssid)
-                                    readonly property bool isExpanded: root.expandedWifiSsid === modelData.ssid
-
-                                    width: parent.width
-                                    height: isExpanded ? 56 + wifiExpandedContent.height : 56
-                                    radius: Theme.cornerRadius
-                                    color: wifiNetworkMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceLight
-                                    border.width: isConnected ? 2 : 0
-                                    border.color: Theme.primary
-                                    clip: true
-
-                                    Behavior on height {
-                                        NumberAnimation {
-                                            duration: 150
-                                            easing.type: Easing.OutQuad
-                                        }
-                                    }
-
-                                    Column {
-                                        anchors.fill: parent
-                                        spacing: 0
-
-                                        Item {
-                                            width: parent.width
-                                            height: 56
-
-                                            Row {
-                                                anchors.left: parent.left
-                                                anchors.leftMargin: Theme.spacingM
-                                                anchors.verticalCenter: parent.verticalCenter
-                                                anchors.right: wifiNetworkActions.left
-                                                anchors.rightMargin: Theme.spacingS
-                                                spacing: Theme.spacingS
-
-                                                DankIcon {
-                                                    name: {
-                                                        const s = modelData.signal || 0;
-                                                        if (s >= 50)
-                                                            return "wifi";
-                                                        if (s >= 25)
-                                                            return "wifi_2_bar";
-                                                        return "wifi_1_bar";
-                                                    }
-                                                    size: 20
-                                                    color: isConnected ? Theme.primary : Theme.surfaceText
-                                                    anchors.verticalCenter: parent.verticalCenter
-                                                }
-
-                                                Column {
-                                                    anchors.verticalCenter: parent.verticalCenter
-                                                    spacing: 2
-                                                    width: parent.width - 20 - Theme.spacingS
-
-                                                    Row {
-                                                        anchors.left: parent.left
-                                                        spacing: Theme.spacingXS
-
-                                                        StyledText {
-                                                            text: modelData.ssid || I18n.tr("Unknown")
-                                                            font.pixelSize: Theme.fontSizeMedium
-                                                            color: isConnected ? Theme.primary : Theme.surfaceText
-                                                            font.weight: isConnected ? Font.Medium : Font.Normal
-                                                            elide: Text.ElideRight
-                                                        }
-
-                                                        DankIcon {
-                                                            name: "push_pin"
-                                                            size: 14
-                                                            color: Theme.primary
-                                                            visible: isPinned
-                                                            anchors.verticalCenter: parent.verticalCenter
-                                                        }
-
-                                                        DankIcon {
-                                                            name: "visibility_off"
-                                                            size: 14
-                                                            color: Theme.surfaceVariantText
-                                                            visible: modelData.hidden || false
-                                                            anchors.verticalCenter: parent.verticalCenter
-                                                        }
-                                                    }
-
-                                                    Row {
-                                                        anchors.left: parent.left
-                                                        spacing: Theme.spacingXS
-
-                                                        StyledText {
-                                                            text: isConnected ? I18n.tr("Connected") : (modelData.secured ? I18n.tr("Secured") : I18n.tr("Open"))
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: isConnected ? Theme.primary : Theme.surfaceVariantText
-                                                        }
-
-                                                        StyledText {
-                                                            text: "•"
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: Theme.surfaceVariantText
-                                                            visible: modelData.saved
-                                                        }
-
-                                                        StyledText {
-                                                            text: I18n.tr("Saved")
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: Theme.primary
-                                                            visible: modelData.saved
-                                                        }
-
-                                                        StyledText {
-                                                            text: "•"
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: Theme.surfaceVariantText
-                                                            visible: modelData.hidden || false
-                                                        }
-
-                                                        StyledText {
-                                                            text: I18n.tr("Hidden")
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: Theme.surfaceVariantText
-                                                            visible: modelData.hidden || false
-                                                        }
-
-                                                        StyledText {
-                                                            text: "•"
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: Theme.surfaceVariantText
-                                                        }
-
-                                                        StyledText {
-                                                            text: modelData.signal + "%"
-                                                            font.pixelSize: Theme.fontSizeSmall
-                                                            color: Theme.surfaceVariantText
-                                                        }
-                                                    }
-                                                }
-                                            }
-
-                                            Row {
-                                                id: wifiNetworkActions
-                                                anchors.right: parent.right
-                                                anchors.rightMargin: Theme.spacingS
-                                                anchors.verticalCenter: parent.verticalCenter
-                                                spacing: Theme.spacingXS
-
-                                                Rectangle {
-                                                    width: 28
-                                                    height: 28
-                                                    radius: 14
-                                                    color: wifiExpandBtn.containsMouse ? Theme.surfacePressed : "transparent"
-                                                    visible: isConnected || modelData.saved
-
-                                                    DankIcon {
-                                                        anchors.centerIn: parent
-                                                        name: isExpanded ? "expand_less" : "expand_more"
-                                                        size: 18
-                                                        color: Theme.surfaceText
-                                                    }
-
-                                                    MouseArea {
-                                                        id: wifiExpandBtn
-                                                        anchors.fill: parent
-                                                        hoverEnabled: true
-                                                        cursorShape: Qt.PointingHandCursor
-                                                        onClicked: {
-                                                            if (isExpanded) {
-                                                                root.expandedWifiSsid = "";
-                                                            } else {
-                                                                root.expandedWifiSsid = modelData.ssid;
-                                                                NetworkService.fetchNetworkInfo(modelData.ssid);
-                                                            }
-                                                        }
-                                                    }
-                                                }
-
-                                                DankActionButton {
-                                                    iconName: "qr_code"
-                                                    buttonSize: 28
-                                                    visible: modelData.secured && modelData.saved
-                                                    onClicked: {
-                                                        PopoutService.showWifiQRCodeModal(modelData.ssid);
-                                                    }
-                                                }
-
-                                                DankActionButton {
-                                                    iconName: isPinned ? "push_pin" : "push_pin"
-                                                    buttonSize: 28
-                                                    iconColor: isPinned ? Theme.primary : Theme.surfaceVariantText
-                                                    onClicked: {
-                                                        root.toggleWifiPin(modelData.ssid);
-                                                    }
-                                                }
-
-                                                DankActionButton {
-                                                    iconName: "delete"
-                                                    buttonSize: 28
-                                                    iconColor: Theme.error
-                                                    visible: modelData.saved || isConnected
-                                                    onClicked: {
-                                                        forgetNetworkConfirm.showWithOptions({
-                                                            title: I18n.tr("Forget Network"),
-                                                            message: I18n.tr("Forget \"%1\"?").arg(modelData.ssid),
-                                                            confirmText: I18n.tr("Forget"),
-                                                            confirmColor: Theme.error,
-                                                            onConfirm: () => NetworkService.forgetWifiNetwork(modelData.ssid)
-                                                        });
-                                                    }
-                                                }
-                                            }
-
-                                            MouseArea {
-                                                id: wifiNetworkMouseArea
-
-                                                anchors.fill: parent
-                                                anchors.rightMargin: wifiNetworkActions.width + Theme.spacingM
-                                                hoverEnabled: true
-                                                cursorShape: Qt.PointingHandCursor
-                                                onClicked: {
-                                                    if (isConnected) {
-                                                        NetworkService.disconnectWifi();
-                                                        return;
-                                                    }
-                                                    if (modelData.secured && !modelData.saved && (DMSService.apiVersion < 7 || modelData.enterprise)) {
-                                                        PopoutService.showWifiPasswordModal(modelData.ssid);
-                                                        return;
-                                                    }
-                                                    NetworkService.connectToWifi(modelData.ssid);
-                                                }
-                                            }
-                                        }
-
-                                        Column {
-                                            id: wifiExpandedContent
-                                            width: parent.width
-                                            visible: isExpanded
-
-                                            Rectangle {
-                                                width: parent.width - Theme.spacingM * 2
-                                                height: 1
-                                                x: Theme.spacingM
-                                                color: Theme.outlineLight
-                                            }
-
-                                            Item {
-                                                width: parent.width
-                                                height: wifiDetailsColumn.implicitHeight + Theme.spacingM * 2
-
-                                                Column {
-                                                    id: wifiDetailsColumn
-                                                    anchors.fill: parent
-                                                    anchors.margins: Theme.spacingM
-                                                    spacing: Theme.spacingS
-
-                                                    Item {
-                                                        width: parent.width
-                                                        height: NetworkService.networkInfoLoading ? 40 : 0
-                                                        visible: NetworkService.networkInfoLoading
-
-                                                        DankSpinner {
-                                                            anchors.centerIn: parent
-                                                            size: 20
-                                                        }
-                                                    }
-
-                                                    Flow {
-                                                        width: parent.width
-                                                        spacing: Theme.spacingXS
-                                                        visible: !NetworkService.networkInfoLoading
-
-                                                        Repeater {
-                                                            model: {
-                                                                const fields = [];
-                                                                const net = modelData;
-                                                                if (!net)
-                                                                    return fields;
-
-                                                                fields.push({
-                                                                    label: I18n.tr("Signal"),
-                                                                    value: net.signal + "%"
-                                                                });
-                                                                if (net.frequency)
-                                                                    fields.push({
-                                                                        label: I18n.tr("Frequency"),
-                                                                        value: (net.frequency / 1000).toFixed(1) + " GHz"
-                                                                    });
-                                                                if (net.channel)
-                                                                    fields.push({
-                                                                        label: I18n.tr("Channel"),
-                                                                        value: String(net.channel)
-                                                                    });
-                                                                if (net.rate)
-                                                                    fields.push({
-                                                                        label: I18n.tr("Rate"),
-                                                                        value: net.rate + " Mbps"
-                                                                    });
-                                                                if (net.mode)
-                                                                    fields.push({
-                                                                        label: I18n.tr("Mode"),
-                                                                        value: net.mode
-                                                                    });
-                                                                if (net.bssid)
-                                                                    fields.push({
-                                                                        label: I18n.tr("BSSID"),
-                                                                        value: net.bssid
-                                                                    });
-                                                                fields.push({
-                                                                    label: I18n.tr("Security"),
-                                                                    value: net.secured ? (net.enterprise ? I18n.tr("Enterprise") : I18n.tr("WPA/WPA2")) : I18n.tr("Open")
-                                                                });
-
-                                                                return fields;
-                                                            }
-
-                                                            delegate: Rectangle {
-                                                                required property var modelData
-                                                                required property int index
-
-                                                                width: wifiFieldContent.width + Theme.spacingM * 2
-                                                                height: 32
-                                                                radius: Theme.cornerRadius - 2
-                                                                color: Theme.surfaceContainerHigh
-                                                                border.width: 1
-                                                                border.color: Theme.outlineLight
-
-                                                                Row {
-                                                                    id: wifiFieldContent
-                                                                    anchors.centerIn: parent
-                                                                    spacing: Theme.spacingXS
-
-                                                                    StyledText {
-                                                                        text: modelData.label + ":"
-                                                                        font.pixelSize: Theme.fontSizeSmall
-                                                                        color: Theme.surfaceVariantText
-                                                                        anchors.verticalCenter: parent.verticalCenter
-                                                                    }
-
-                                                                    StyledText {
-                                                                        text: modelData.value
-                                                                        font.pixelSize: Theme.fontSizeSmall
-                                                                        color: Theme.surfaceText
-                                                                        font.weight: Font.Medium
-                                                                        anchors.verticalCenter: parent.verticalCenter
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-
-                                                    Row {
-                                                        spacing: Theme.spacingS
-                                                        visible: (modelData.saved || isConnected) && DMSService.apiVersion > 13
-
-                                                        DankToggle {
-                                                            id: autoconnectToggle
-                                                            text: I18n.tr("Autoconnect")
-                                                            checked: modelData.autoconnect || false
-                                                            onToggled: checked => {
-                                                                NetworkService.setWifiAutoconnect(modelData.ssid, checked);
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

quickshell/Modules/Settings/ThemeColorsTab.qml

@@ -1639,7 +1639,7 @@ Item {
                 SettingsControlledByFrame {
                     visible: themeColorsTab.connectedFrameModeActive
                     parentModal: themeColorsTab.parentModal
-                    settingLabel: I18n.tr("Surface Opacity")
+                    settingLabel: I18n.tr("Transparency")
                     reason: I18n.tr("Managed by Frame in Connected Mode")
                 }
 
@@ -1647,8 +1647,8 @@ Item {
                     tab: "theme"
                     tags: ["surface", "popup", "transparency", "opacity", "modal"]
                     settingKey: "popupTransparency"
-                    text: I18n.tr("Surface Opacity")
-                    description: I18n.tr("Controls opacity of shell surfaces, popouts, and modals")
+                    text: I18n.tr("Transparency")
+                    description: I18n.tr("Controls opacity of all popouts, modals, and their content layers")
                     visible: !themeColorsTab.connectedFrameModeActive
                     value: Math.round(SettingsData.popupTransparency * 100)
                     minimum: 0
@@ -1671,113 +1671,6 @@ Item {
                     defaultValue: 12
                     onSliderValueChanged: newValue => SettingsData.setCornerRadius(newValue)
                 }
-            }
-
-            SettingsCard {
-                tab: "theme"
-                tags: ["blur", "background", "transparency", "glass", "frosted"]
-                title: I18n.tr("Background Blur")
-                settingKey: "blurEnabled"
-                iconName: "blur_on"
-
-                SettingsToggleRow {
-                    tab: "theme"
-                    tags: ["blur", "background", "transparency", "glass", "frosted"]
-                    settingKey: "blurEnabled"
-                    text: I18n.tr("Background Blur")
-                    description: !BlurService.available ? I18n.tr("Your compositor does not support background blur (ext-background-effect-v1)") : I18n.tr("Blur the background behind bars, popouts, modals, and notifications. Requires compositor support. Adjust Opacity accordingly.")
-                    checked: SettingsData.blurEnabled ?? false
-                    enabled: BlurService.available
-                    onToggled: checked => SettingsData.set("blurEnabled", checked)
-                }
-
-                SettingsToggleRow {
-                    tab: "theme"
-                    tags: ["blur", "foreground", "layers", "contrast", "glass", "frosted"]
-                    settingKey: "blurForegroundLayers"
-                    text: I18n.tr("Foreground Layers")
-                    description: I18n.tr("Show foreground surfaces on blurred panels for stronger contrast")
-                    checked: SettingsData.blurForegroundLayers ?? true
-                    visible: BlurService.available && (SettingsData.blurEnabled ?? false)
-                    enabled: BlurService.available
-                    onToggled: checked => SettingsData.set("blurForegroundLayers", checked)
-                }
-
-                SettingsSliderRow {
-                    tab: "theme"
-                    tags: ["blur", "foreground", "layers", "outline", "border", "cards", "widgets", "notifications", "control center"]
-                    settingKey: "blurLayerOutlineOpacity"
-                    text: I18n.tr("Layer Outline Opacity")
-                    description: I18n.tr("Controls outlines around blurred foreground cards, pills, and notification cards")
-                    visible: BlurService.available && (SettingsData.blurEnabled ?? false)
-                    value: Math.round((SettingsData.blurLayerOutlineOpacity ?? 0.12) * 100)
-                    minimum: 0
-                    maximum: 40
-                    unit: "%"
-                    defaultValue: 12
-                    onSliderValueChanged: newValue => SettingsData.set("blurLayerOutlineOpacity", newValue / 100)
-                }
-
-                SettingsDropdownRow {
-                    tab: "theme"
-                    tags: ["blur", "border", "outline", "edge"]
-                    settingKey: "blurBorderColor"
-                    text: I18n.tr("Blur Border Color")
-                    description: I18n.tr("Border color around blurred surfaces")
-                    visible: SettingsData.blurEnabled
-                    options: [I18n.tr("Outline", "blur border color"), I18n.tr("Primary", "blur border color"), I18n.tr("Secondary", "blur border color"), I18n.tr("Text Color", "blur border color"), I18n.tr("Custom", "blur border color")]
-                    currentValue: {
-                        switch (SettingsData.blurBorderColor) {
-                        case "primary":
-                            return I18n.tr("Primary", "blur border color");
-                        case "secondary":
-                            return I18n.tr("Secondary", "blur border color");
-                        case "surfaceText":
-                            return I18n.tr("Text Color", "blur border color");
-                        case "custom":
-                            return I18n.tr("Custom", "blur border color");
-                        default:
-                            return I18n.tr("Outline", "blur border color");
-                        }
-                    }
-                    onValueChanged: value => {
-                        if (value === I18n.tr("Primary", "blur border color")) {
-                            SettingsData.set("blurBorderColor", "primary");
-                        } else if (value === I18n.tr("Secondary", "blur border color")) {
-                            SettingsData.set("blurBorderColor", "secondary");
-                        } else if (value === I18n.tr("Text Color", "blur border color")) {
-                            SettingsData.set("blurBorderColor", "surfaceText");
-                        } else if (value === I18n.tr("Custom", "blur border color")) {
-                            SettingsData.set("blurBorderColor", "custom");
-                            openBlurBorderColorPicker();
-                        } else {
-                            SettingsData.set("blurBorderColor", "outline");
-                        }
-                    }
-                }
-
-                SettingsSliderRow {
-                    tab: "theme"
-                    tags: ["blur", "border", "opacity"]
-                    settingKey: "blurBorderOpacity"
-                    text: I18n.tr("Blur Border Opacity")
-                    description: I18n.tr("Controls the outer edge of protocol-blurred windows")
-                    visible: SettingsData.blurEnabled
-                    value: Math.round((SettingsData.blurBorderOpacity ?? 0.35) * 100)
-                    minimum: 0
-                    maximum: 100
-                    unit: "%"
-                    defaultValue: 35
-                    onSliderValueChanged: newValue => SettingsData.set("blurBorderOpacity", newValue / 100)
-                }
-            }
-
-            SettingsCard {
-                tab: "theme"
-                tags: ["elevation", "shadow", "lift", "m3", "material"]
-                title: I18n.tr("Shadows")
-                settingKey: "m3ElevationEnabled"
-                iconName: "layers"
 
                 SettingsToggleRow {
                     tab: "theme"
@@ -1809,7 +1702,7 @@ Item {
                     tags: ["elevation", "shadow", "opacity", "transparency", "m3"]
                     settingKey: "m3ElevationOpacity"
                     text: I18n.tr("Shadow Opacity")
-                    description: I18n.tr("Controls the opacity of the shadow")
+                    description: I18n.tr("Controls the transparency of the shadow")
                     value: SettingsData.m3ElevationOpacity ?? 30
                     minimum: 0
                     maximum: 100
@@ -1963,6 +1856,105 @@ Item {
                 }
             }
 
+            SettingsCard {
+                tab: "theme"
+                tags: ["blur", "background", "transparency", "glass", "frosted"]
+                title: I18n.tr("Background Blur")
+                settingKey: "blurEnabled"
+                iconName: "blur_on"
+
+                SettingsToggleRow {
+                    tab: "theme"
+                    tags: ["blur", "background", "transparency", "glass", "frosted"]
+                    settingKey: "blurEnabled"
+                    text: I18n.tr("Background Blur")
+                    description: !BlurService.available ? I18n.tr("Your compositor does not support background blur (ext-background-effect-v1)") : I18n.tr("Blur the background behind bars, popouts, modals, and notifications. Requires compositor support and configuration.")
+                    checked: SettingsData.blurEnabled ?? false
+                    enabled: BlurService.available
+                    onToggled: checked => SettingsData.set("blurEnabled", checked)
+                }
+
+                SettingsToggleRow {
+                    tab: "theme"
+                    tags: ["blur", "foreground", "layers", "contrast", "glass", "frosted"]
+                    settingKey: "blurForegroundLayers"
+                    text: I18n.tr("Foreground Layers")
+                    description: I18n.tr("Show foreground surfaces on blurred panels for stronger contrast")
+                    checked: SettingsData.blurForegroundLayers ?? true
+                    visible: BlurService.available && (SettingsData.blurEnabled ?? false)
+                    enabled: BlurService.available
+                    onToggled: checked => SettingsData.set("blurForegroundLayers", checked)
+                }
+
+                SettingsSliderRow {
+                    tab: "theme"
+                    tags: ["blur", "foreground", "layers", "outline", "border", "cards", "widgets", "notifications", "control center"]
+                    settingKey: "blurLayerOutlineOpacity"
+                    text: I18n.tr("Layer Outline Opacity")
+                    description: I18n.tr("Controls outlines around blurred foreground cards, pills, and notification cards")
+                    visible: BlurService.available && (SettingsData.blurEnabled ?? false)
+                    value: Math.round((SettingsData.blurLayerOutlineOpacity ?? 0.12) * 100)
+                    minimum: 0
+                    maximum: 40
+                    unit: "%"
+                    defaultValue: 12
+                    onSliderValueChanged: newValue => SettingsData.set("blurLayerOutlineOpacity", newValue / 100)
+                }
+
+                SettingsDropdownRow {
+                    tab: "theme"
+                    tags: ["blur", "border", "outline", "edge"]
+                    settingKey: "blurBorderColor"
+                    text: I18n.tr("Blur Border Color")
+                    description: I18n.tr("Border color around blurred surfaces")
+                    visible: SettingsData.blurEnabled
+                    options: [I18n.tr("Outline", "blur border color"), I18n.tr("Primary", "blur border color"), I18n.tr("Secondary", "blur border color"), I18n.tr("Text Color", "blur border color"), I18n.tr("Custom", "blur border color")]
+                    currentValue: {
+                        switch (SettingsData.blurBorderColor) {
+                        case "primary":
+                            return I18n.tr("Primary", "blur border color");
+                        case "secondary":
+                            return I18n.tr("Secondary", "blur border color");
+                        case "surfaceText":
+                            return I18n.tr("Text Color", "blur border color");
+                        case "custom":
+                            return I18n.tr("Custom", "blur border color");
+                        default:
+                            return I18n.tr("Outline", "blur border color");
+                        }
+                    }
+                    onValueChanged: value => {
+                        if (value === I18n.tr("Primary", "blur border color")) {
+                            SettingsData.set("blurBorderColor", "primary");
+                        } else if (value === I18n.tr("Secondary", "blur border color")) {
+                            SettingsData.set("blurBorderColor", "secondary");
+                        } else if (value === I18n.tr("Text Color", "blur border color")) {
+                            SettingsData.set("blurBorderColor", "surfaceText");
+                        } else if (value === I18n.tr("Custom", "blur border color")) {
+                            SettingsData.set("blurBorderColor", "custom");
+                            openBlurBorderColorPicker();
+                        } else {
+                            SettingsData.set("blurBorderColor", "outline");
+                        }
+                    }
+                }
+
+                SettingsSliderRow {
+                    tab: "theme"
+                    tags: ["blur", "border", "opacity"]
+                    settingKey: "blurBorderOpacity"
+                    text: I18n.tr("Blur Border Opacity")
+                    description: I18n.tr("Controls the outer edge of protocol-blurred windows")
+                    visible: SettingsData.blurEnabled
+                    value: Math.round((SettingsData.blurBorderOpacity ?? 0.35) * 100)
+                    minimum: 0
+                    maximum: 100
+                    unit: "%"
+                    defaultValue: 35
+                    onSliderValueChanged: newValue => SettingsData.set("blurBorderOpacity", newValue / 100)
+                }
+            }
+
             SettingsCard {
                 tab: "theme"
                 tags: ["modal", "darken", "background", "overlay"]

quickshell/Modules/Settings/TimeWeatherTab.qml

@@ -115,43 +115,6 @@ Item {
                     }
                 }
 
-                SettingsDropdownRow {
-                    tab: "time"
-                    tags: ["calendar", "backend", "daemon", "khal", "dankcalendar", "events"]
-                    settingKey: "calendarBackend"
-                    text: I18n.tr("Calendar Backend")
-                    description: {
-                        const resolved = CalendarService.activeBackend;
-                        switch (resolved) {
-                        case "dankcal":
-                            return I18n.tr("Using DankCalendar%1", "calendar backend status").arg(CalendarService.isDankActive && CalendarService.calendars.length > 0 ? "" : " (connecting…)");
-                        case "khal":
-                            return I18n.tr("Using khal", "calendar backend status");
-                        default:
-                            return I18n.tr("No calendar source available", "calendar backend status");
-                        }
-                    }
-                    readonly property var _backendValues: ["auto", "khal", "dankcal"]
-                    readonly property var _backendLabels: [I18n.tr("Auto", "calendar backend option"), I18n.tr("khal", "calendar backend option"), I18n.tr("DankCalendar", "calendar backend option")]
-                    options: _backendLabels
-                    currentValue: _backendLabels[Math.max(0, _backendValues.indexOf(SettingsData.calendarBackend))]
-                    onValueChanged: value => {
-                        const idx = _backendLabels.indexOf(value);
-                        if (idx < 0)
-                            return;
-                        SettingsData.set("calendarBackend", _backendValues[idx]);
-                    }
-                }
-
-                DankButton {
-                    text: I18n.tr("Launch DankCalendar")
-                    iconName: "calendar_month"
-                    backgroundColor: Theme.primary
-                    textColor: Theme.primaryText
-                    visible: CalendarService.dankNeedsLaunch && CalendarService.dankBinaryExists
-                    onClicked: CalendarService.launchDankCalendar()
-                }
-
                 Rectangle {
                     width: parent.width
                     height: 1

quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml

@@ -64,8 +64,6 @@ Item {
 
     property alias model: buttonGroup.model
     property alias currentIndex: buttonGroup.currentIndex
-    property alias initialSelection: buttonGroup.initialSelection
-    property alias currentSelection: buttonGroup.currentSelection
     property alias selectionMode: buttonGroup.selectionMode
     property alias buttonHeight: buttonGroup.buttonHeight
     property alias minButtonWidth: buttonGroup.minButtonWidth

quickshell/Modules/Settings/WidgetsTab.qml

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

quickshell/Modules/Settings/WidgetsTabSection.qml

@@ -43,7 +43,7 @@ Column {
             "id": widget.id,
             "enabled": widget.enabled
         };
-        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "diskUsageMode", "minimumWidth", "showSwap", "showInGb", "mediaSize", "clockCompactMode", "focusedWindowSize", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "keyboardLayoutNameShowIcon", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "showIdleInhibitorIcon", "showDoNotDisturbIcon", "controlCenterGroupOrder", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge", "trayUseInlineExpansion", "trayPopupSingleLine", "trayAutoOverflow", "trayMaxVisibleItems"];
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "diskUsageMode", "minimumWidth", "showSwap", "showInGb", "mediaSize", "clockCompactMode", "focusedWindowSize", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "keyboardLayoutNameShowIcon", "runningAppsGroupByApp", "runningAppsCurrentWorkspace", "runningAppsCurrentMonitor", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon", "showIdleInhibitorIcon", "showDoNotDisturbIcon", "controlCenterGroupOrder", "barMaxVisibleApps", "barMaxVisibleRunningApps", "barShowOverflowBadge", "trayUseInlineExpansion"];
         for (var i = 0; i < keys.length; i++) {
             if (widget[keys[i]] !== undefined)
                 result[keys[i]] = widget[keys[i]];
@@ -1126,188 +1126,6 @@ Column {
                         }
                     }
                 }
-
-                Rectangle {
-                    width: parent.width
-                    height: 32
-                    radius: Theme.cornerRadius
-                    color: trayPopupLineArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-                    opacity: (trayContextMenu.currentWidgetData?.trayUseInlineExpansion ?? false) ? 0.55 : 1
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "view_week"
-                            size: 16
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Single-Line Popup")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Normal
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        id: trayPopupLineToggle
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: 40
-                        height: 20
-                        checked: trayContextMenu.currentWidgetData?.trayPopupSingleLine ?? SettingsData.trayPopupSingleLine
-                        enabled: !(trayContextMenu.currentWidgetData?.trayUseInlineExpansion ?? false)
-                    }
-
-                    MouseArea {
-                        id: trayPopupLineArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: (trayContextMenu.currentWidgetData?.trayUseInlineExpansion ?? false) ? Qt.ArrowCursor : Qt.PointingHandCursor
-                        onClicked: {
-                            if (trayContextMenu.currentWidgetData?.trayUseInlineExpansion ?? false)
-                                return;
-                            const newValue = !(trayContextMenu.currentWidgetData?.trayPopupSingleLine ?? SettingsData.trayPopupSingleLine);
-                            root.overflowSettingChanged(trayContextMenu.sectionId, trayContextMenu.widgetIndex, "trayPopupSingleLine", newValue);
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 32
-                    radius: Theme.cornerRadius
-                    color: trayAutoOverflowArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "responsive_layout"
-                            size: 16
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Auto Overflow")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Normal
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    DankToggle {
-                        id: trayAutoOverflowToggle
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        width: 40
-                        height: 20
-                        checked: trayContextMenu.currentWidgetData?.trayAutoOverflow ?? SettingsData.trayAutoOverflow
-                    }
-
-                    MouseArea {
-                        id: trayAutoOverflowArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            const newValue = !(trayContextMenu.currentWidgetData?.trayAutoOverflow ?? SettingsData.trayAutoOverflow);
-                            root.overflowSettingChanged(trayContextMenu.sectionId, trayContextMenu.widgetIndex, "trayAutoOverflow", newValue);
-                        }
-                    }
-                }
-
-                Rectangle {
-                    width: parent.width
-                    height: 36
-                    radius: Theme.cornerRadius
-                    color: trayMaxVisibleArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
-                    opacity: (trayContextMenu.currentWidgetData?.trayAutoOverflow ?? SettingsData.trayAutoOverflow) ? 1 : 0.55
-
-                    Row {
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.spacingS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: Theme.spacingS
-
-                        DankIcon {
-                            name: "low_priority"
-                            size: 16
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Max Visible")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceText
-                            font.weight: Font.Normal
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: {
-                                const value = trayContextMenu.currentWidgetData?.trayMaxVisibleItems ?? SettingsData.trayMaxVisibleItems;
-                                return value > 0 ? String(value) : I18n.tr("Auto");
-                            }
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceTextMedium
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    Row {
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.spacingXS
-                        anchors.verticalCenter: parent.verticalCenter
-                        spacing: 2
-
-                        DankActionButton {
-                            buttonSize: 28
-                            iconName: "remove"
-                            iconSize: 16
-                            iconColor: Theme.surfaceText
-                            enabled: trayContextMenu.currentWidgetData?.trayAutoOverflow ?? SettingsData.trayAutoOverflow
-                            onClicked: {
-                                const current = trayContextMenu.currentWidgetData?.trayMaxVisibleItems ?? SettingsData.trayMaxVisibleItems;
-                                root.overflowSettingChanged(trayContextMenu.sectionId, trayContextMenu.widgetIndex, "trayMaxVisibleItems", Math.max(0, current - 1));
-                            }
-                        }
-
-                        DankActionButton {
-                            buttonSize: 28
-                            iconName: "add"
-                            iconSize: 16
-                            iconColor: Theme.surfaceText
-                            enabled: trayContextMenu.currentWidgetData?.trayAutoOverflow ?? SettingsData.trayAutoOverflow
-                            onClicked: {
-                                const current = trayContextMenu.currentWidgetData?.trayMaxVisibleItems ?? SettingsData.trayMaxVisibleItems;
-                                root.overflowSettingChanged(trayContextMenu.sectionId, trayContextMenu.widgetIndex, "trayMaxVisibleItems", Math.min(20, current + 1));
-                            }
-                        }
-                    }
-
-                    MouseArea {
-                        id: trayMaxVisibleArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        acceptedButtons: Qt.NoButton
-                    }
-                }
             }
         }
     }

quickshell/Modules/WallpaperBackground.qml

@@ -32,8 +32,6 @@ Variants {
 
         color: "transparent"
 
-        updatesEnabled: root.renderActive || root._settleFrames > 0
-
         mask: Region {
             item: Item {}
         }
@@ -86,59 +84,20 @@ Variants {
 
             readonly property bool transitioning: transitionAnimation.running
             property bool effectActive: false
+            property bool _renderSettling: true
+            property bool _overviewBlurSettling: false
             property bool useNextForEffect: false
             property string pendingWallpaper: ""
             property string _deferredSource: ""
             readonly property bool overviewBlurActive: CompositorService.isNiri && SettingsData.blurWallpaperOnOverview && NiriService.inOverview && currentWallpaper.source !== ""
-            readonly property var backingWindow: Window.window
-            readonly property bool renderActive: !source || effectActive || overviewBlurActive || pendingWallpaper !== "" || _deferredSource !== "" || currentWallpaper.status === Image.Loading || nextWallpaper.status === Image.Loading
-            property int _settleFrames: 3
-
-            function invalidate() {
-                _settleFrames = 3;
-                backingWindow?.update();
-            }
-
-            onRenderActiveChanged: invalidate()
-            onBackingWindowChanged: invalidate()
 
             Connections {
-                target: root.backingWindow
-                function onFrameSwapped() {
-                    if (root._settleFrames > 0)
-                        root._settleFrames--;
-                }
-                function onVisibleChanged() {
-                    root.invalidate();
-                }
-                function onWidthChanged() {
-                    root.invalidate();
-                }
-                function onHeightChanged() {
-                    root.invalidate();
-                }
-            }
-
-            Connections {
-                target: Quickshell
-                function onScreensChanged() {
-                    root.invalidate();
-                }
-            }
-
-            Connections {
-                target: SettingsData
-                function onWallpaperFillModeChanged() {
-                    root.invalidate();
-                }
-            }
-
-            Connections {
-                target: IdleService
-                function onIsShellLockedChanged() {
-                    if (IdleService.isShellLocked)
+                target: currentWallpaper
+                function onStatusChanged() {
+                    if (currentWallpaper.status !== Image.Ready && currentWallpaper.status !== Image.Error)
                         return;
-                    root.invalidate();
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                 }
             }
 
@@ -150,11 +109,32 @@ Variants {
                 }
             }
 
+            Connections {
+                target: wallpaperWindow
+                function onWidthChanged() {
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
+                }
+                function onHeightChanged() {
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
+                }
+            }
+
+            Connections {
+                target: Quickshell
+                function onScreensChanged() {
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
+                }
+            }
+
             Connections {
                 target: NiriService
                 function onDisplayScalesChanged() {
                     root._recheckScreenScale();
-                    root.invalidate();
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                 }
             }
 
@@ -162,7 +142,29 @@ Variants {
                 target: WlrOutputService
                 function onWlrOutputAvailableChanged() {
                     root._recheckScreenScale();
-                    root.invalidate();
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
+                }
+            }
+
+            Connections {
+                target: NiriService
+                function onInOverviewChanged() {
+                    root._overviewBlurSettling = true;
+                    overviewBlurSettleTimer.restart();
+                }
+            }
+
+            Connections {
+                target: SettingsData
+                function onBlurWallpaperOnOverviewChanged() {
+                    root._overviewBlurSettling = true;
+                    overviewBlurSettleTimer.restart();
+                }
+
+                function onWallpaperFillModeChanged() {
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                 }
             }
 
@@ -179,22 +181,26 @@ Variants {
                 }
             }
 
-            function handleTransitionLoadError(failedSource) {
-                log.warn("failed to load candidate wallpaper for", modelData.name + ":", failedSource);
-                transitionDelayTimer.stop();
-                transitionAnimation.stop();
-                root.useNextForEffect = false;
-                root.effectActive = false;
-                root.transitionProgress = 0.0;
-                currentWallpaper.layer.enabled = false;
-                nextWallpaper.layer.enabled = false;
-                nextWallpaper.source = "";
+            Connections {
+                target: IdleService
+                function onIsShellLockedChanged() {
+                    if (!IdleService.isShellLocked) {
+                        root._renderSettling = true;
+                        renderSettleTimer.restart();
+                    }
+                }
+            }
 
-                if (!root.pendingWallpaper)
-                    return;
-                const pending = root.pendingWallpaper;
-                root.pendingWallpaper = "";
-                Qt.callLater(() => root.changeWallpaper(pending, true));
+            Timer {
+                id: renderSettleTimer
+                interval: 1000
+                onTriggered: root._renderSettling = false
+            }
+
+            Timer {
+                id: overviewBlurSettleTimer
+                interval: 150
+                onTriggered: root._overviewBlurSettling = false
             }
 
             function getFillMode(modeName) {
@@ -221,6 +227,11 @@ Variants {
             }
 
             Component.onCompleted: {
+                wallpaperWindow.updatesEnabled = Qt.binding(() => !root.source || root.effectActive || root._renderSettling || root.overviewBlurActive || root._overviewBlurSettling || root.pendingWallpaper !== "" || root._deferredSource !== "" || currentWallpaper.status === Image.Loading || nextWallpaper.status === Image.Loading);
+
+                if (!source) {
+                    root._renderSettling = false;
+                }
                 isInitialized = true;
             }
 
@@ -251,6 +262,8 @@ Variants {
                 transitionAnimation.stop();
                 root.transitionProgress = 0.0;
                 root.effectActive = false;
+                root._renderSettling = true;
+                renderSettleTimer.restart();
                 root.screenScale = CompositorService.getScreenScale(modelData);
                 currentWallpaper.source = newSource;
                 nextWallpaper.source = "";
@@ -315,6 +328,9 @@ Variants {
                     break;
                 }
 
+                root._renderSettling = true;
+                renderSettleTimer.restart();
+
                 nextWallpaper.source = newPath;
 
                 if (nextWallpaper.status === Image.Ready)
@@ -323,7 +339,7 @@ Variants {
 
             Loader {
                 anchors.fill: parent
-                active: !root.source || root.isColorSource || currentWallpaper.status === Image.Error
+                active: !root.source || root.isColorSource
                 asynchronous: true
 
                 sourceComponent: DankBackdrop {
@@ -348,12 +364,6 @@ Variants {
                 cache: true
                 sourceSize: Qt.size(root.textureWidth, root.textureHeight)
                 fillMode: root.getFillMode(SessionData.getMonitorWallpaperFillMode(modelData.name))
-
-                onStatusChanged: {
-                    if (status === Image.Error) {
-                        log.warn("failed to load active wallpaper for", modelData.name + ":", source);
-                    }
-                }
             }
 
             Image {
@@ -370,13 +380,11 @@ Variants {
                 fillMode: root.getFillMode(SessionData.getMonitorWallpaperFillMode(modelData.name))
 
                 onStatusChanged: {
-                    if (status === Image.Error) {
-                        root.handleTransitionLoadError(source);
-                        return;
-                    }
                     if (status !== Image.Ready)
                         return;
                     if (root.actualTransitionType === "none") {
+                        root._renderSettling = true;
+                        renderSettleTimer.restart();
                         currentWallpaper.source = source;
                         nextWallpaper.source = "";
                         root.transitionProgress = 0.0;
@@ -624,6 +632,8 @@ Variants {
                     root.transitionProgress = 0.0;
                     currentWallpaper.layer.enabled = false;
                     nextWallpaper.layer.enabled = false;
+                    root._renderSettling = true;
+                    renderSettleTimer.restart();
                     root.effectActive = false;
 
                     if (!root.pendingWallpaper)

quickshell/Services/AudioService.qml

@@ -58,8 +58,6 @@ Singleton {
         return SessionData.deviceMaxVolumes[name] ?? 100;
     }
 
-    readonly property int wheelVolumeStep: SettingsData.audioWheelScrollAmount
-
     signal micMuteChanged
     signal audioOutputCycled(string deviceName, string deviceIcon)
     signal deviceAliasChanged(string nodeName, string newAlias)
@@ -158,19 +156,14 @@ Singleton {
         return false;
     }
 
-    function cycleAudioOutputDirection(forward) {
+    function cycleAudioOutput() {
         const sinks = getAvailableSinks();
         if (sinks.length < 2)
             return null;
 
         const currentName = root.sink?.name ?? "";
         const currentIndex = sinks.findIndex(s => s.name === currentName);
-        let nextIndex;
-        if (forward) {
-            nextIndex = (currentIndex + 1) % sinks.length;
-        } else {
-            nextIndex = (currentIndex - 1 + sinks.length) % sinks.length;
-        }
+        const nextIndex = (currentIndex + 1) % sinks.length;
         const nextSink = sinks[nextIndex];
         setDefaultSinkByName(nextSink.name);
         const name = displayName(nextSink);
@@ -178,10 +171,6 @@ Singleton {
         return name;
     }
 
-    function cycleAudioOutput() {
-        return cycleAudioOutputDirection(true);
-    }
-
     function getDeviceAlias(nodeName) {
         if (!nodeName)
             return null;
@@ -844,28 +833,6 @@ EOFCONFIG
         return root.sink.audio.muted ? "Audio muted" : "Audio unmuted";
     }
 
-    function handleNodeVolumeWheel(node, wheelEvent) {
-        if (!node?.audio)
-            return;
-
-        SessionData.suppressOSDTemporarily();
-        const delta = wheelEvent.angleDelta.y;
-        if (delta === 0)
-            return;
-
-        const current = Math.round(node.audio.volume * 100);
-        const maxVol = getMaxVolumePercent(node);
-        const newVolume = delta > 0 ? Math.min(maxVol, current + root.wheelVolumeStep) : Math.max(0, current - root.wheelVolumeStep);
-
-        node.audio.muted = false;
-        node.audio.volume = newVolume / 100;
-
-        if (node === sink) {
-            playVolumeChangeSoundIfEnabled();
-        }
-        wheelEvent.accepted = true;
-    }
-
     function setMicVolume(percentage) {
         if (!root.source?.audio) {
             return "No audio source available";

quickshell/Services/CalendarDankBackend.qml

@@ -1,478 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-    readonly property var log: Log.scoped("CalendarDankBackend")
-
-    property bool enabled: false
-
-    property string socketPath: ""
-    readonly property bool socketFound: socketPath.length > 0
-    property bool connected: false
-    property bool binaryExists: false
-    property bool binaryChecked: false
-
-    property var calendars: []
-    property var events: []
-    property var eventsByDate: ({})
-    property string lastError: ""
-    property date focusDate: new Date()
-    property var _loadedFrom: null
-    property var _loadedTo: null
-
-    property var pendingRequests: ({})
-    property int requestCounter: 0
-
-    readonly property var fallbackPalette: ["#7287fd", "#f38ba8", "#a6e3a1", "#fab387", "#cba6f7", "#94e2d5", "#f9e2af", "#89dceb"]
-
-    signal eventsUpdated
-
-    onEnabledChanged: {
-        if (enabled) {
-            if (!connected)
-                discoverProcess.running = true;
-            return;
-        }
-        requestSocket.connected = false;
-        subscribeSocket.connected = false;
-        socketPath = "";
-        connected = false;
-    }
-
-    Component.onCompleted: {
-        binaryCheck.running = true;
-        discoverProcess.running = true;
-    }
-
-    Process {
-        id: binaryCheck
-        command: ["sh", "-c", "command -v dcal"]
-        running: false
-        onExited: code => {
-            root.binaryExists = (code === 0);
-            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"]
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const path = text.trim().split('\n')[0] || "";
-                if (path.length > 0) {
-                    root._applySocketPath(path);
-                    return;
-                }
-                if (!root.connected) {
-                    if (root.socketPath !== "")
-                        root.log.info("dankcal socket gone, waiting for daemon");
-                    requestSocket.connected = false;
-                    subscribeSocket.connected = false;
-                    root.socketPath = "";
-                }
-            }
-        }
-    }
-
-    Timer {
-        id: rediscoverTimer
-        interval: 3000
-        repeat: true
-        running: root.enabled && !root.connected
-        onTriggered: {
-            if (!discoverProcess.running)
-                discoverProcess.running = true;
-        }
-    }
-
-    function launch() {
-        if (!binaryExists)
-            return;
-        Quickshell.execDetached(["dcal", "run", "-d", "--hidden"]);
-        if (enabled && !connected)
-            discoverProcess.running = true;
-    }
-
-    function _applySocketPath(path) {
-        if (path === socketPath) {
-            if (socketFound && !connected)
-                requestSocket.connected = true;
-            return;
-        }
-        log.info("dankcal socket discovered:", path);
-        requestSocket.connected = false;
-        subscribeSocket.connected = false;
-        socketPath = path;
-        Qt.callLater(() => requestSocket.connected = true);
-    }
-
-    DankSocket {
-        id: requestSocket
-        path: root.socketPath
-        connected: false
-
-        onConnectionStateChanged: {
-            if (linkUp) {
-                root.connected = true;
-                subscribeSocket.connected = true;
-                root.log.info("connected to dankcal:", root.socketPath);
-                root.refreshCalendars();
-                root.reloadEvents();
-                return;
-            }
-            if (!root.connected && !root.socketFound)
-                return;
-            root.connected = false;
-            root._flushPending();
-            requestSocket.connected = false;
-            subscribeSocket.connected = false;
-            root.log.info("dankcal disconnected, rediscovering");
-            if (root.enabled)
-                discoverProcess.running = true;
-        }
-
-        parser: SplitParser {
-            onRead: line => {
-                if (!line || line.length === 0)
-                    return;
-                let response;
-                try {
-                    response = JSON.parse(line);
-                } catch (e) {
-                    return;
-                }
-                root._handleResponse(response);
-            }
-        }
-    }
-
-    DankSocket {
-        id: subscribeSocket
-        path: root.socketPath
-        connected: false
-
-        onConnectionStateChanged: {
-            if (linkUp)
-                root._sendSubscribe();
-        }
-
-        parser: SplitParser {
-            onRead: line => {
-                if (!line || line.length === 0)
-                    return;
-                let event;
-                try {
-                    event = JSON.parse(line);
-                } catch (e) {
-                    return;
-                }
-                root._handleEvent(event);
-            }
-        }
-    }
-
-    Timer {
-        id: refreshDebounce
-        interval: 400
-        repeat: false
-        onTriggered: {
-            root.refreshCalendars();
-            root.reloadEvents();
-        }
-    }
-
-    function _sendSubscribe() {
-        subscribeSocket.send({
-            "id": _nextId(),
-            "method": "subscribe",
-            "params": {
-                "topics": ["accounts", "calendars", "events", "sync"]
-            }
-        });
-    }
-
-    function _nextId() {
-        requestCounter++;
-        return Date.now() + requestCounter;
-    }
-
-    function _flushPending() {
-        const ids = Object.keys(pendingRequests);
-        for (const id of ids) {
-            const cb = pendingRequests[id];
-            delete pendingRequests[id];
-            if (cb)
-                cb({
-                    "error": "disconnected"
-                });
-        }
-    }
-
-    function _handleResponse(response) {
-        if (response.event) {
-            _handleEvent(response);
-            return;
-        }
-        const id = response.id;
-        if (!id)
-            return;
-        const cb = pendingRequests[id];
-        if (cb) {
-            delete pendingRequests[id];
-            cb(response);
-        }
-    }
-
-    function _handleEvent(event) {
-        switch (event.event) {
-        case "accounts":
-        case "calendars":
-            refreshCalendars();
-            refreshDebounce.restart();
-            break;
-        case "events":
-        case "sync":
-            refreshDebounce.restart();
-            break;
-        }
-    }
-
-    function sendRequest(method, params, callback) {
-        if (!connected) {
-            if (callback)
-                callback({
-                    "error": "not connected to dankcal socket"
-                });
-            return;
-        }
-        const id = _nextId();
-        const req = {
-            "id": id,
-            "method": method
-        };
-        if (params)
-            req.params = params;
-        if (callback)
-            pendingRequests[id] = callback;
-        requestSocket.send(req);
-    }
-
-    function refreshCalendars() {
-        sendRequest("calendars.list", null, response => {
-            if (response.error) {
-                lastError = response.error;
-                return;
-            }
-            const list = response.result || [];
-            for (let i = 0; i < list.length; i++) {
-                if (!list[i].color)
-                    list[i].color = fallbackPalette[i % fallbackPalette.length];
-            }
-            calendars = list;
-            _rebuildEventsByDate();
-        });
-    }
-
-    function calendarById(id) {
-        for (let i = 0; i < calendars.length; i++) {
-            if (calendars[i].id === id)
-                return calendars[i];
-        }
-        return null;
-    }
-
-    function writableCalendars() {
-        return calendars.filter(c => !c.readOnly);
-    }
-
-    function defaultCalendar() {
-        const writable = writableCalendars().filter(c => !c.hidden);
-        return writable.length > 0 ? writable[0] : null;
-    }
-
-    function loadEvents(startDate, endDate) {
-        const mid = new Date((startDate.getTime() + endDate.getTime()) / 2);
-        focusDate = mid;
-        _ensureWindow();
-    }
-
-    function _ensureWindow() {
-        if (!connected)
-            return;
-        if (!_loadedFrom || !_loadedTo) {
-            reloadEvents();
-            return;
-        }
-        const margin = 14 * 86400000;
-        const t = focusDate.getTime();
-        if (t < _loadedFrom.getTime() + margin || t > _loadedTo.getTime() - margin)
-            reloadEvents();
-        else
-            _rebuildEventsByDate();
-    }
-
-    function reloadEvents() {
-        if (!connected)
-            return;
-        const from = new Date(focusDate.getTime() - 60 * 86400000);
-        const to = new Date(focusDate.getTime() + 90 * 86400000);
-        sendRequest("events.list", {
-            "from": from.toISOString(),
-            "to": to.toISOString(),
-            "limit": 5000
-        }, response => {
-            if (response.error) {
-                lastError = response.error;
-                return;
-            }
-            _loadedFrom = from;
-            _loadedTo = to;
-            const raw = (response.result || {}).events || [];
-            events = raw.map(e => _normalizeEvent(e));
-            _rebuildEventsByDate();
-        });
-    }
-
-    function _dayBoundary(iso) {
-        const d = new Date(iso);
-        return new Date(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());
-    }
-
-    function _normalizeEvent(e) {
-        const allDay = !!e.allDay;
-        const id = e.id || "";
-        if (id.startsWith("task_"))
-            log.warn("daemon event id collides with task prefix:", id);
-        return {
-            "id": id,
-            "calendarId": e.calendarId || "",
-            "title": e.summary || "(untitled)",
-            "description": e.description || "",
-            "location": e.location || "",
-            "url": e.url || "",
-            "start": allDay ? _dayBoundary(e.start) : new Date(e.start),
-            "end": allDay ? _dayBoundary(e.end) : new Date(e.end),
-            "allDay": allDay,
-            "status": e.status || "confirmed",
-            "recurringId": e.recurringId || "",
-            "attendees": e.attendees || [],
-            "organizer": e.organizer || null,
-            "reminders": e.reminders || []
-        };
-    }
-
-    function decorateEvent(ev) {
-        const cal = calendarById(ev.calendarId);
-        const out = Object.assign({}, ev);
-        out.color = cal ? cal.color : fallbackPalette[0];
-        out.calendar = cal ? cal.name : "";
-        out.account = cal ? (cal.accountName || cal.accountId || "") : "";
-        out.readOnly = cal ? !!cal.readOnly : false;
-        out.isMultiDay = ev.start.toDateString() !== ev.end.toDateString();
-        return out;
-    }
-
-    function _hiddenCalendarIds() {
-        const hidden = {};
-        for (let i = 0; i < calendars.length; i++) {
-            if (calendars[i].hidden)
-                hidden[calendars[i].id] = true;
-        }
-        return hidden;
-    }
-
-    function _clampForDay(ev, cur, endDay) {
-        const out = Object.assign({}, ev);
-        const dayStart = new Date(cur.getFullYear(), cur.getMonth(), cur.getDate());
-        const startDay = new Date(ev.start.getFullYear(), ev.start.getMonth(), ev.start.getDate());
-        if (dayStart.getTime() === startDay.getTime()) {
-            out.start = new Date(ev.start);
-        } else {
-            out.start = new Date(dayStart);
-            if (!ev.allDay)
-                out.start.setHours(0, 0, 0, 0);
-        }
-        if (dayStart.getTime() === endDay.getTime()) {
-            out.end = new Date(ev.end);
-        } else {
-            out.end = new Date(dayStart);
-            if (!ev.allDay)
-                out.end.setHours(23, 59, 59, 999);
-        }
-        return out;
-    }
-
-    function _rebuildEventsByDate() {
-        const hidden = _hiddenCalendarIds();
-        const map = {};
-        for (const raw of events) {
-            if (raw.status === "cancelled")
-                continue;
-            if (hidden[raw.calendarId])
-                continue;
-            const ev = decorateEvent(raw);
-            const lastInstant = ev.allDay ? new Date(ev.end.getTime() - 1) : ev.end;
-            let cur = new Date(ev.start.getFullYear(), ev.start.getMonth(), ev.start.getDate());
-            let endDay = new Date(lastInstant.getFullYear(), lastInstant.getMonth(), lastInstant.getDate());
-            if (endDay < cur)
-                endDay = new Date(cur);
-            while (cur <= endDay) {
-                const key = Qt.formatDate(cur, "yyyy-MM-dd");
-                if (!map[key])
-                    map[key] = [];
-                if (!map[key].some(e => e.id === ev.id))
-                    map[key].push(_clampForDay(ev, cur, endDay));
-                cur.setDate(cur.getDate() + 1);
-            }
-        }
-        eventsByDate = map;
-        eventsUpdated();
-    }
-
-    function createEvent(fields, callback) {
-        sendRequest("events.create", fields, response => {
-            if (response.error)
-                lastError = response.error;
-            else
-                reloadEvents();
-            if (callback)
-                callback(response);
-        });
-    }
-
-    function updateEvent(id, fields, callback) {
-        const params = Object.assign({
-            "id": id
-        }, fields);
-        sendRequest("events.update", params, response => {
-            if (response.error)
-                lastError = response.error;
-            else
-                reloadEvents();
-            if (callback)
-                callback(response);
-        });
-    }
-
-    function deleteEvent(id, callback) {
-        sendRequest("events.delete", {
-            "id": id
-        }, response => {
-            if (response.error)
-                lastError = response.error;
-            else
-                reloadEvents();
-            if (callback)
-                callback(response);
-        });
-    }
-}

quickshell/Services/CalendarKhalBackend.qml

@@ -1,237 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import Quickshell.Io
-import qs.Common
-import qs.Services
-
-Item {
-    id: root
-    readonly property var log: Log.scoped("CalendarKhalBackend")
-
-    property bool installed: false
-    property var eventsByDate: ({})
-    property bool isLoading: false
-    property string lastError: ""
-    property date lastStartDate
-    property date lastEndDate
-    property string dateFormat: "MM/dd/yyyy"
-
-    function checkAvailability() {
-        if (!formatProcess.running)
-            formatProcess.running = true;
-    }
-
-    function loadCurrentMonth() {
-        let today = new Date();
-        let firstDay = new Date(today.getFullYear(), today.getMonth(), 1);
-        let lastDay = new Date(today.getFullYear(), today.getMonth() + 1, 0);
-        let startDate = new Date(firstDay);
-        startDate.setDate(startDate.getDate() - firstDay.getDay() - 7);
-        let endDate = new Date(lastDay);
-        endDate.setDate(endDate.getDate() + (6 - lastDay.getDay()) + 7);
-        loadEvents(startDate, endDate);
-    }
-
-    function loadEvents(startDate, endDate) {
-        if (!installed)
-            return;
-        if (eventsProcess.running)
-            return;
-        root.lastStartDate = startDate;
-        root.lastEndDate = endDate;
-        root.isLoading = true;
-        let startDateStr = Qt.formatDate(startDate, root.dateFormat);
-        let endDateStr = Qt.formatDate(endDate, root.dateFormat);
-        eventsProcess.requestStartDate = startDate;
-        eventsProcess.requestEndDate = endDate;
-        eventsProcess.command = ["khal", "list", "--json", "title", "--json", "description", "--json", "start-date", "--json", "start-time", "--json", "end-date", "--json", "end-time", "--json", "all-day", "--json", "location", "--json", "url", startDateStr, endDateStr];
-        eventsProcess.running = true;
-    }
-
-    function _parseDateFormat(formatExample) {
-        return formatExample.replace("12", "MM").replace("21", "dd").replace("2013", "yyyy");
-    }
-
-    Component.onCompleted: checkAvailability()
-
-    Process {
-        id: formatProcess
-
-        command: ["khal", "printformats"]
-        running: false
-        onExited: exitCode => {
-            if (exitCode !== 0)
-                checkProcess.running = true;
-        }
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                let lines = text.split('\n');
-                for (let line of lines) {
-                    if (!line.startsWith('dateformat:'))
-                        continue;
-                    let formatExample = line.substring(line.indexOf(':') + 1).trim();
-                    root.dateFormat = root._parseDateFormat(formatExample);
-                    break;
-                }
-                checkProcess.running = true;
-            }
-        }
-    }
-
-    Process {
-        id: checkProcess
-
-        command: ["khal", "list", "today"]
-        running: false
-        onExited: exitCode => {
-            root.installed = (exitCode === 0);
-            if (root.installed)
-                root.loadCurrentMonth();
-        }
-    }
-
-    Process {
-        id: eventsProcess
-
-        property date requestStartDate
-        property date requestEndDate
-        property string rawOutput: ""
-
-        running: false
-        onExited: exitCode => {
-            root.isLoading = false;
-            if (exitCode !== 0) {
-                root.lastError = "Failed to load events (exit code: " + exitCode + ")";
-                return;
-            }
-            try {
-                let newEventsByDate = {};
-                let lines = eventsProcess.rawOutput.split('\n');
-                for (let line of lines) {
-                    line = line.trim();
-                    if (!line || line === "[]")
-                        continue;
-
-                    let dayEvents = JSON.parse(line);
-                    for (let event of dayEvents) {
-                        if (!event.title)
-                            continue;
-
-                        let startDate, endDate;
-                        if (event['start-date'])
-                            startDate = Date.fromLocaleString(I18n.locale(), event['start-date'], root.dateFormat);
-                        else
-                            startDate = new Date();
-                        if (event['end-date'])
-                            endDate = Date.fromLocaleString(I18n.locale(), event['end-date'], root.dateFormat);
-                        else
-                            endDate = new Date(startDate);
-
-                        let startTime = new Date(startDate);
-                        let endTime = new Date(endDate);
-                        if (event['start-time'] && event['all-day'] !== "True") {
-                            let timeStr = event['start-time'];
-                            if (timeStr) {
-                                let timeParts = timeStr.match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i);
-                                if (timeParts) {
-                                    let hours = parseInt(timeParts[1]);
-                                    let minutes = parseInt(timeParts[2]);
-                                    if (timeParts[3]) {
-                                        let period = timeParts[3].toUpperCase();
-                                        if (period === 'PM' && hours !== 12)
-                                            hours += 12;
-                                        else if (period === 'AM' && hours === 12)
-                                            hours = 0;
-                                    }
-                                    startTime.setHours(hours, minutes);
-                                    if (event['end-time']) {
-                                        let endTimeParts = event['end-time'].match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i);
-                                        if (endTimeParts) {
-                                            let endHours = parseInt(endTimeParts[1]);
-                                            let endMinutes = parseInt(endTimeParts[2]);
-                                            if (endTimeParts[3]) {
-                                                let endPeriod = endTimeParts[3].toUpperCase();
-                                                if (endPeriod === 'PM' && endHours !== 12)
-                                                    endHours += 12;
-                                                else if (endPeriod === 'AM' && endHours === 12)
-                                                    endHours = 0;
-                                            }
-                                            endTime.setHours(endHours, endMinutes);
-                                        }
-                                    } else {
-                                        endTime = new Date(startTime);
-                                        endTime.setHours(startTime.getHours() + 1);
-                                    }
-                                }
-                            }
-                        }
-                        let eventId = event.title + "_" + event['start-date'] + "_" + (event['start-time'] || 'allday');
-                        let extractedUrl = "";
-                        if (!event.url && event.description) {
-                            let urlMatch = event.description.match(/https?:\/\/[^\s]+/);
-                            if (urlMatch)
-                                extractedUrl = urlMatch[0];
-                        }
-                        let eventTemplate = {
-                            "id": eventId,
-                            "title": event.title || "Untitled Event",
-                            "start": startTime,
-                            "end": endTime,
-                            "location": event.location || "",
-                            "description": event.description || "",
-                            "url": event.url || extractedUrl,
-                            "calendar": "",
-                            "color": "",
-                            "allDay": event['all-day'] === "True",
-                            "isMultiDay": startDate.toDateString() !== endDate.toDateString()
-                        };
-                        let currentDate = new Date(startDate);
-                        while (currentDate <= endDate) {
-                            let dateKey = Qt.formatDate(currentDate, "yyyy-MM-dd");
-                            if (!newEventsByDate[dateKey])
-                                newEventsByDate[dateKey] = [];
-
-                            let existingEvent = newEventsByDate[dateKey].find(e => e.id === eventId);
-                            if (existingEvent) {
-                                currentDate.setDate(currentDate.getDate() + 1);
-                                continue;
-                            }
-                            let dayEvent = Object.assign({}, eventTemplate);
-                            if (currentDate.getTime() === startDate.getTime()) {
-                                dayEvent.start = new Date(startTime);
-                            } else {
-                                dayEvent.start = new Date(currentDate);
-                                if (!dayEvent.allDay)
-                                    dayEvent.start.setHours(0, 0, 0, 0);
-                            }
-                            if (currentDate.getTime() === endDate.getTime()) {
-                                dayEvent.end = new Date(endTime);
-                            } else {
-                                dayEvent.end = new Date(currentDate);
-                                if (!dayEvent.allDay)
-                                    dayEvent.end.setHours(23, 59, 59, 999);
-                            }
-                            newEventsByDate[dateKey].push(dayEvent);
-                            currentDate.setDate(currentDate.getDate() + 1);
-                        }
-                    }
-                }
-                root.eventsByDate = newEventsByDate;
-                root.lastError = "";
-            } catch (error) {
-                root.lastError = "Failed to parse events JSON: " + error.toString();
-                root.eventsByDate = {};
-            }
-            eventsProcess.rawOutput = "";
-        }
-
-        stdout: SplitParser {
-            splitMarker: "\n"
-            onRead: data => {
-                eventsProcess.rawOutput += data + "\n";
-            }
-        }
-    }
-}

quickshell/Services/CalendarService.qml

@@ -11,87 +11,71 @@ Singleton {
     id: root
     readonly property var log: Log.scoped("CalendarService")
 
-    readonly property string backendPref: SettingsData.calendarBackend
-    readonly property string activeBackend: {
-        switch (backendPref) {
-        case "khal":
-            return "khal";
-        case "dankcal":
-            return "dankcal";
-        default:
-            if (dankBackend.connected)
-                return "dankcal";
-            if (khalBackend.installed)
-                return "khal";
-            return "none";
-        }
-    }
-
-    readonly property bool calendarAvailable: activeBackend !== "none"
-    readonly property bool isDankActive: activeBackend === "dankcal"
-    readonly property bool canCreateEvents: isDankActive && dankBackend.connected
-    property bool khalAvailable: true // compatibility alias - calendar card UI gate
-
-    readonly property bool dankConnected: dankBackend.connected
-    readonly property bool dankBinaryExists: dankBackend.binaryExists
-    readonly property bool dankNeedsLaunch: backendPref === "dankcal" && !dankBackend.connected
-
-    property var calendars: dankBackend.calendars
+    property bool khalAvailable: true // Always true to enable DMS calendar card UI
+    property bool khalInstalled: false // Tracks if khal is actually on the system
     property var eventsByDate: ({})
+    property var khalEventsByDate: ({})
     property var taskEventsByDate: ({})
     property var localTasks: ({})
-    property bool isLoading: khalBackend.isLoading
+    property bool isLoading: false
     property string lastError: ""
-
-    property bool _rangeSet: false
     property date lastStartDate
     property date lastEndDate
+    property string khalDateFormat: "MM/dd/yyyy"
 
+    onKhalEventsByDateChanged: mergeEvents()
     onTaskEventsByDateChanged: mergeEvents()
-    onActiveBackendChanged: {
-        mergeEvents();
-        if (_rangeSet)
-            loadEvents(lastStartDate, lastEndDate);
+
+    function checkKhalAvailability() {
+        if (!khalCheckProcess.running)
+            khalCheckProcess.running = true;
     }
 
-    CalendarKhalBackend {
-        id: khalBackend
-        onEventsByDateChanged: root.mergeEvents()
+    function detectKhalDateFormat() {
+        if (!khalFormatProcess.running)
+            khalFormatProcess.running = true;
     }
 
-    CalendarDankBackend {
-        id: dankBackend
-        enabled: root.backendPref === "dankcal" || root.backendPref === "auto"
-        onEventsByDateChanged: root.mergeEvents()
-        onConnectedChanged: {
-            if (connected && root._rangeSet)
-                root.loadEvents(root.lastStartDate, root.lastEndDate);
-        }
+    function parseKhalDateFormat(formatExample) {
+        let qtFormat = formatExample.replace("12", "MM").replace("21", "dd").replace("2013", "yyyy");
+        return {
+            format: qtFormat,
+            parser: null
+        };
+    }
+
+    function loadCurrentMonth() {
+        if (!root.khalAvailable)
+            return;
+        let today = new Date();
+        let firstDay = new Date(today.getFullYear(), today.getMonth(), 1);
+        let lastDay = new Date(today.getFullYear(), today.getMonth() + 1, 0);
+        // Add padding
+        let startDate = new Date(firstDay);
+        startDate.setDate(startDate.getDate() - firstDay.getDay() - 7);
+        let endDate = new Date(lastDay);
+        endDate.setDate(endDate.getDate() + (6 - lastDay.getDay()) + 7);
+        loadEvents(startDate, endDate);
     }
 
     function loadEvents(startDate, endDate) {
+        if (!root.khalInstalled) {
+            return;
+        }
+        if (eventsProcess.running) {
+            return;
+        }
+        // Store last requested date range for refresh timer
         root.lastStartDate = startDate;
         root.lastEndDate = endDate;
-        root._rangeSet = true;
-        switch (activeBackend) {
-        case "dankcal":
-            dankBackend.loadEvents(startDate, endDate);
-            break;
-        case "khal":
-            khalBackend.loadEvents(startDate, endDate);
-            break;
-        }
-    }
-
-    function _activeBackendEventsByDate() {
-        switch (activeBackend) {
-        case "dankcal":
-            return dankBackend.eventsByDate;
-        case "khal":
-            return khalBackend.eventsByDate;
-        default:
-            return {};
-        }
+        root.isLoading = true;
+        // Format dates for khal using detected format
+        let startDateStr = Qt.formatDate(startDate, root.khalDateFormat);
+        let endDateStr = Qt.formatDate(endDate, root.khalDateFormat);
+        eventsProcess.requestStartDate = startDate;
+        eventsProcess.requestEndDate = endDate;
+        eventsProcess.command = ["khal", "list", "--json", "title", "--json", "description", "--json", "start-date", "--json", "start-time", "--json", "end-date", "--json", "end-time", "--json", "all-day", "--json", "location", "--json", "url", startDateStr, endDateStr];
+        eventsProcess.running = true;
     }
 
     function getEventsForDate(date) {
@@ -100,54 +84,11 @@ Singleton {
     }
 
     function hasEventsForDate(date) {
-        return getEventsForDate(date).length > 0;
-    }
-
-    function writableCalendars() {
-        return isDankActive ? dankBackend.writableCalendars() : [];
-    }
-
-    function defaultCalendar() {
-        return isDankActive ? dankBackend.defaultCalendar() : null;
-    }
-
-    function launchDankCalendar() {
-        dankBackend.launch();
-    }
-
-    function createEvent(fields, callback) {
-        if (isDankActive) {
-            dankBackend.createEvent(fields, callback);
-            return;
-        }
-        if (callback)
-            callback({
-                "error": "read-only backend"
-            });
-    }
-
-    function updateEvent(id, fields, callback) {
-        if (isDankActive) {
-            dankBackend.updateEvent(id, fields, callback);
-            return;
-        }
-        if (callback)
-            callback({
-                "error": "read-only backend"
-            });
-    }
-
-    function deleteEvent(id, callback) {
-        if (isDankActive) {
-            dankBackend.deleteEvent(id, callback);
-            return;
-        }
-        if (callback)
-            callback({
-                "error": "read-only backend"
-            });
+        let events = getEventsForDate(date);
+        return events.length > 0;
     }
 
+    // In-memory Task CRUD methods
     function loadTasks(text) {
         if (!text || text.trim() === "") {
             root.localTasks = {};
@@ -188,7 +129,8 @@ Singleton {
                     "description": "Task from your Planner",
                     "url": "",
                     "calendar": "Todo Planner",
-                    "color": "#10B981",
+                    "color": "#10B981" // Pastel Green
+                    ,
                     "allDay": true,
                     "isMultiDay": false
                 });
@@ -200,8 +142,9 @@ Singleton {
     function addTaskForDate(date, text) {
         let dateKey = Qt.formatDate(date, "yyyy-MM-dd");
         let tasks = Object.assign({}, root.localTasks);
-        if (!tasks[dateKey])
+        if (!tasks[dateKey]) {
             tasks[dateKey] = [];
+        }
         let taskId = (new Date().getTime()) + "-dms";
         tasks[dateKey].push({
             "id": taskId,
@@ -244,10 +187,11 @@ Singleton {
             let list = tasks[dateKey];
             let filtered = list.filter(item => item.id !== cleanId);
             if (filtered.length !== list.length) {
-                if (filtered.length === 0)
+                if (filtered.length === 0) {
                     delete tasks[dateKey];
-                else
+                } else {
                     tasks[dateKey] = filtered;
+                }
                 updated = true;
                 break;
             }
@@ -264,17 +208,20 @@ Singleton {
         let tasks = Object.assign({}, root.localTasks);
         let v = tasks[dateKey] || [];
         let idToItem = {};
-        for (let item of v)
+        for (let item of v) {
             idToItem[item.id] = item;
+        }
         let newV = [];
         for (let tid of orderedIds) {
-            if (idToItem[tid])
+            if (idToItem[tid]) {
                 newV.push(idToItem[tid]);
+            }
         }
         let orderedSet = new Set(orderedIds);
         for (let item of v) {
-            if (!orderedSet.has(item.id))
+            if (!orderedSet.has(item.id)) {
                 newV.push(item);
+            }
         }
         tasks[dateKey] = newV;
         root.localTasks = tasks;
@@ -307,24 +254,30 @@ Singleton {
 
     function mergeEvents() {
         let merged = {};
-        let backendEvents = _activeBackendEventsByDate();
 
-        for (let dateKey in backendEvents)
-            merged[dateKey] = [].concat(backendEvents[dateKey]);
+        // Merge khal events
+        for (let dateKey in root.khalEventsByDate) {
+            merged[dateKey] = [].concat(root.khalEventsByDate[dateKey]);
+        }
 
+        // Merge task events
         for (let dateKey in root.taskEventsByDate) {
-            if (!merged[dateKey])
+            if (!merged[dateKey]) {
                 merged[dateKey] = [];
+            }
             for (let event of root.taskEventsByDate[dateKey]) {
-                if (!merged[dateKey].some(e => e.id === event.id))
+                if (!merged[dateKey].some(e => e.id === event.id)) {
                     merged[dateKey].push(event);
+                }
             }
         }
 
+        // Sort events within each date
         for (let dateKey in merged) {
             let list = merged[dateKey];
-            for (let idx = 0; idx < list.length; idx++)
+            for (let idx = 0; idx < list.length; idx++) {
                 list[idx]._origIdx = idx;
+            }
             list.sort((a, b) => {
                 let diff = a.start.getTime() - b.start.getTime();
                 if (diff !== 0)
@@ -336,6 +289,12 @@ Singleton {
         root.eventsByDate = merged;
     }
 
+    // Initialize on component completion
+    Component.onCompleted: {
+        detectKhalDateFormat();
+    }
+
+    // Atomic file view for tasks
     FileView {
         id: tasksFileView
         path: Quickshell.env("HOME") + "/.config/niri-calendar-todo/tasks.json"
@@ -345,11 +304,233 @@ Singleton {
         watchChanges: true
         printErrors: false
 
-        onLoaded: loadTasks(tasksFileView.text())
+        onLoaded: {
+            loadTasks(tasksFileView.text());
+        }
 
         onLoadFailed: {
             root.localTasks = {};
             root.taskEventsByDate = {};
         }
     }
+
+    // Process for detecting khal date format
+    Process {
+        id: khalFormatProcess
+
+        command: ["khal", "printformats"]
+        running: false
+        onExited: exitCode => {
+            if (exitCode !== 0) {
+                checkKhalAvailability();
+            }
+        }
+
+        stdout: StdioCollector {
+            onStreamFinished: {
+                let lines = text.split('\n');
+                for (let line of lines) {
+                    if (line.startsWith('dateformat:')) {
+                        let formatExample = line.substring(line.indexOf(':') + 1).trim();
+                        let formatInfo = parseKhalDateFormat(formatExample);
+                        root.khalDateFormat = formatInfo.format;
+                        break;
+                    }
+                }
+                checkKhalAvailability();
+            }
+        }
+    }
+
+    // Process for checking khal configuration
+    Process {
+        id: khalCheckProcess
+
+        command: ["khal", "list", "today"]
+        running: false
+        onExited: exitCode => {
+            root.khalInstalled = (exitCode === 0);
+            if (root.khalInstalled) {
+                loadCurrentMonth();
+            } else {
+                loadEvents(root.lastStartDate || new Date(), root.lastEndDate || new Date());
+            }
+        }
+    }
+
+    // Process for loading events
+    Process {
+        id: eventsProcess
+
+        property date requestStartDate
+        property date requestEndDate
+        property string rawOutput: ""
+
+        running: false
+        onExited: exitCode => {
+            root.isLoading = false;
+            if (exitCode !== 0) {
+                root.lastError = "Failed to load events (exit code: " + exitCode + ")";
+                return;
+            }
+            try {
+                let newEventsByDate = {};
+                let lines = eventsProcess.rawOutput.split('\n');
+                for (let line of lines) {
+                    line = line.trim();
+                    if (!line || line === "[]")
+                        continue;
+
+                    // Parse JSON line
+                    let dayEvents = JSON.parse(line);
+                    // Process each event in this day's array
+                    for (let event of dayEvents) {
+                        if (!event.title)
+                            continue;
+
+                        // Parse start and end dates using detected format
+                        let startDate, endDate;
+                        if (event['start-date']) {
+                            startDate = Date.fromLocaleString(I18n.locale(), event['start-date'], root.khalDateFormat);
+                        } else {
+                            startDate = new Date();
+                        }
+                        if (event['end-date']) {
+                            endDate = Date.fromLocaleString(I18n.locale(), event['end-date'], root.khalDateFormat);
+                        } else {
+                            endDate = new Date(startDate);
+                        }
+                        // Create start/end times
+                        let startTime = new Date(startDate);
+                        let endTime = new Date(endDate);
+                        if (event['start-time'] && event['all-day'] !== "True") {
+                            // Parse time if available and not all-day
+                            let timeStr = event['start-time'];
+                            if (timeStr) {
+                                // Match time with optional seconds and AM/PM
+                                let timeParts = timeStr.match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i);
+                                if (timeParts) {
+                                    let hours = parseInt(timeParts[1]);
+                                    let minutes = parseInt(timeParts[2]);
+
+                                    // Handle AM/PM conversion if present
+                                    if (timeParts[3]) {
+                                        let period = timeParts[3].toUpperCase();
+                                        if (period === 'PM' && hours !== 12) {
+                                            hours += 12;
+                                        } else if (period === 'AM' && hours === 12) {
+                                            hours = 0;
+                                        }
+                                    }
+
+                                    startTime.setHours(hours, minutes);
+                                    if (event['end-time']) {
+                                        let endTimeParts = event['end-time'].match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i);
+                                        if (endTimeParts) {
+                                            let endHours = parseInt(endTimeParts[1]);
+                                            let endMinutes = parseInt(endTimeParts[2]);
+
+                                            // Handle AM/PM conversion if present
+                                            if (endTimeParts[3]) {
+                                                let endPeriod = endTimeParts[3].toUpperCase();
+                                                if (endPeriod === 'PM' && endHours !== 12) {
+                                                    endHours += 12;
+                                                } else if (endPeriod === 'AM' && endHours === 12) {
+                                                    endHours = 0;
+                                                }
+                                            }
+
+                                            endTime.setHours(endHours, endMinutes);
+                                        }
+                                    } else {
+                                        // Default to 1 hour duration on same day
+                                        endTime = new Date(startTime);
+                                        endTime.setHours(startTime.getHours() + 1);
+                                    }
+                                }
+                            }
+                        }
+                        // Create unique ID for this event (to track multi-day events)
+                        let eventId = event.title + "_" + event['start-date'] + "_" + (event['start-time'] || 'allday');
+                        // Create event object template
+                        let extractedUrl = "";
+                        if (!event.url && event.description) {
+                            let urlMatch = event.description.match(/https?:\/\/[^\s]+/);
+                            if (urlMatch) {
+                                extractedUrl = urlMatch[0];
+                            }
+                        }
+                        let eventTemplate = {
+                            "id": eventId,
+                            "title": event.title || "Untitled Event",
+                            "start": startTime,
+                            "end": endTime,
+                            "location": event.location || "",
+                            "description": event.description || "",
+                            "url": event.url || extractedUrl,
+                            "calendar": "",
+                            "color": "",
+                            "allDay": event['all-day'] === "True",
+                            "isMultiDay": startDate.toDateString() !== endDate.toDateString()
+                        };
+                        // Add event to each day it spans
+                        let currentDate = new Date(startDate);
+                        while (currentDate <= endDate) {
+                            let dateKey = Qt.formatDate(currentDate, "yyyy-MM-dd");
+                            if (!newEventsByDate[dateKey])
+                                newEventsByDate[dateKey] = [];
+
+                            // Check if this exact event is already added to this date (prevent duplicates)
+                            let existingEvent = newEventsByDate[dateKey].find(e => {
+                                return e.id === eventId;
+                            });
+                            if (existingEvent) {
+                                // Move to next day without adding duplicate
+                                currentDate.setDate(currentDate.getDate() + 1);
+                                continue;
+                            }
+                            // Create a copy of the event for this date
+                            let dayEvent = Object.assign({}, eventTemplate);
+                            // For multi-day events, adjust the display time for this specific day
+                            if (currentDate.getTime() === startDate.getTime()) {
+                                // First day - use original start time
+                                dayEvent.start = new Date(startTime);
+                            } else {
+                                // Subsequent days - start at beginning of day for all-day events
+                                dayEvent.start = new Date(currentDate);
+                                if (!dayEvent.allDay)
+                                    dayEvent.start.setHours(0, 0, 0, 0);
+                            }
+                            if (currentDate.getTime() === endDate.getTime()) {
+                                // Last day - use original end time
+                                dayEvent.end = new Date(endTime);
+                            } else {
+                                // Earlier days - end at end of day for all-day events
+                                dayEvent.end = new Date(currentDate);
+                                if (!dayEvent.allDay)
+                                    dayEvent.end.setHours(23, 59, 59, 999);
+                            }
+                            newEventsByDate[dateKey].push(dayEvent);
+                            // Move to next day
+                            currentDate.setDate(currentDate.getDate() + 1);
+                        }
+                    }
+                }
+                root.khalEventsByDate = newEventsByDate;
+                root.lastError = "";
+            } catch (error) {
+                root.lastError = "Failed to parse events JSON: " + error.toString();
+                root.khalEventsByDate = {};
+            }
+            // Reset for next run
+            eventsProcess.rawOutput = "";
+        }
+
+        stdout: SplitParser {
+            splitMarker: "\n"
+            onRead: data => {
+                eventsProcess.rawOutput += data + "\n";
+            }
+        }
+    }
 }

quickshell/Services/NotepadStorageService.qml

@@ -23,49 +23,6 @@ Singleton {
     property var tabsBeingCreated: ({})
     property bool metadataLoaded: false
 
-    // Shared live edit state across slideout and popout surfaces.
-    property var sessionBuffers: ({})
-    property int sessionBufferRevision: 0
-
-    function setSessionBuffer(tabId, content, baseline) {
-        if (tabId === undefined || tabId === null || tabId < 0)
-            return
-        var next = Object.assign({}, sessionBuffers)
-        if (content !== baseline) {
-            next[tabId] = { content: content, baseline: baseline }
-        } else {
-            delete next[tabId]
-        }
-        sessionBuffers = next
-        sessionBufferRevision++
-    }
-
-    function getSessionBuffer(tabId) {
-        return sessionBuffers[tabId]
-    }
-
-    function clearSessionBuffer(tabId) {
-        if (sessionBuffers[tabId] === undefined)
-            return
-        var next = Object.assign({}, sessionBuffers)
-        delete next[tabId]
-        sessionBuffers = next
-        sessionBufferRevision++
-    }
-
-    property var conflictTabId: -1
-    property string conflictDiskContent: ""
-
-    function flagConflict(tabId, diskContent) {
-        conflictDiskContent = diskContent
-        conflictTabId = tabId
-    }
-
-    function clearConflict() {
-        conflictTabId = -1
-        conflictDiskContent = ""
-    }
-
     Component.onCompleted: {
         ensureDirectories()
     }
@@ -252,10 +209,6 @@ Singleton {
         if (tabIndex < 0 || tabIndex >= tabs.length) return
 
         var newTabs = tabs.slice()
-        var closedTabId = newTabs[tabIndex] ? newTabs[tabIndex].id : -1
-        clearSessionBuffer(closedTabId)
-        if (conflictTabId === closedTabId)
-            clearConflict()
 
         if (newTabs.length <= 1) {
             var id = Date.now()

quickshell/Services/PopoutService.qml

@@ -392,7 +392,8 @@ Singleton {
     function toggleSettingsWithTab(tabName: string) {
         if (settingsModal) {
             var idx = settingsModal.resolveTabIndex(tabName);
-            settingsModal.setTabIndex(idx);
+            if (idx >= 0)
+                settingsModal.currentTabIndex = idx;
             settingsModal.toggle();
             return;
         }
@@ -432,7 +433,8 @@ Singleton {
                     return;
                 }
                 var idx = settingsModal.resolveTabIndex(tabName);
-                settingsModal.setTabIndex(idx);
+                if (idx >= 0)
+                    settingsModal.currentTabIndex = idx;
                 toplevel.activate();
                 return;
             }
@@ -464,11 +466,12 @@ Singleton {
         if (_settingsWantsToggle) {
             _settingsWantsToggle = false;
             if (_settingsPendingTabIndex >= 0) {
-                settingsModal?.setTabIndex(_settingsPendingTabIndex);
+                settingsModal.currentTabIndex = _settingsPendingTabIndex;
                 _settingsPendingTabIndex = -1;
             } else if (_settingsPendingTab) {
                 var idx = settingsModal?.resolveTabIndex(_settingsPendingTab) ?? -1;
-                settingsModal?.setTabIndex(idx);
+                if (idx >= 0)
+                    settingsModal.currentTabIndex = idx;
                 _settingsPendingTab = "";
             }
             settingsModal?.toggle();
@@ -786,97 +789,21 @@ Singleton {
         networkInfoModal?.close();
     }
 
-    function closeNotepadSlideouts() {
-        for (var i = 0; i < notepadSlideouts.length; i++) {
-            if (notepadSlideouts[i] && notepadSlideouts[i].isVisible)
-                notepadSlideouts[i].hide();
-        }
-    }
-
-    function openNotepadSlideout() {
-        notepadPopout?.hide();
+    function openNotepad() {
         if (notepadSlideouts.length > 0) {
             notepadSlideouts[0]?.show();
         }
     }
 
-    // Keep the notepad in a single presentation for default modes
-    Connections {
-        target: SettingsData
-        function onNotepadDefaultModeChanged() {
-            if (SettingsData.notepadDefaultMode === "popout") {
-                var hadSlideout = false;
-                for (var i = 0; i < root.notepadSlideouts.length; i++) {
-                    if (root.notepadSlideouts[i] && root.notepadSlideouts[i].isVisible) {
-                        hadSlideout = true;
-                        root.notepadSlideouts[i].hide();
-                    }
-                }
-                if (hadSlideout)
-                    root.openNotepadPopout();
-            } else if (root.notepadPopout && root.notepadPopout.visible) {
-                root.notepadPopout.hide();
-                root.openNotepadSlideout();
-            }
-        }
-    }
-
-    function openNotepad() {
-        if (SettingsData.notepadDefaultMode === "popout") {
-            openNotepadPopout();
-            return;
-        }
-        openNotepadSlideout();
-    }
-
     function closeNotepad() {
-        if (SettingsData.notepadDefaultMode === "popout") {
-            notepadPopout?.hide();
-            return;
-        }
         if (notepadSlideouts.length > 0) {
             notepadSlideouts[0]?.hide();
         }
     }
 
     function toggleNotepad() {
-        if (SettingsData.notepadDefaultMode === "popout") {
-            toggleNotepadPopout();
-            return;
-        }
         if (notepadSlideouts.length > 0) {
             notepadSlideouts[0]?.toggle();
         }
     }
-
-    property var notepadPopout: null
-    property var notepadPopoutLoader: null
-    property bool _notepadPopoutWantsOpen: false
-
-    function openNotepadPopout() {
-        closeNotepadSlideouts();
-        if (notepadPopout) {
-            notepadPopout.show();
-        } else if (notepadPopoutLoader) {
-            _notepadPopoutWantsOpen = true;
-            notepadPopoutLoader.active = true;
-        }
-    }
-
-    function _onNotepadPopoutLoaded() {
-        if (_notepadPopoutWantsOpen && notepadPopout) {
-            _notepadPopoutWantsOpen = false;
-            notepadPopout.show();
-        }
-    }
-
-    function toggleNotepadPopout() {
-        if (notepadPopout) {
-            if (!notepadPopout.visible)
-                closeNotepadSlideouts();
-            notepadPopout.toggle();
-        } else {
-            openNotepadPopout();
-        }
-    }
 }

quickshell/Widgets/DankButtonGroup.qml

@@ -13,12 +13,11 @@ Row {
     property var initialSelection: []
     property var currentSelection: initialSelection
     property bool checkEnabled: true
-    property string size: "medium"
-    property int buttonHeight: size === "small" ? 32 : 40
-    property int minButtonWidth: size === "small" ? 56 : 64
-    property int buttonPadding: size === "small" ? Theme.spacingM : Theme.spacingL
-    property int checkIconSize: size === "small" ? Theme.iconSizeSmall - 2 : Theme.iconSizeSmall
-    property int textSize: size === "small" ? Theme.fontSizeSmall : Theme.fontSizeMedium
+    property int buttonHeight: 40
+    property int minButtonWidth: 64
+    property int buttonPadding: Theme.spacingL
+    property int checkIconSize: Theme.iconSizeSmall
+    property int textSize: Theme.fontSizeMedium
     property bool userInteracted: false
 
     signal selectionChanged(int index, bool selected)

quickshell/Widgets/DankSlideout.qml

@@ -16,28 +16,21 @@ PanelWindow {
     property var targetScreen: null
     property var modelData: null
     property bool triggerUsesOverlayLayer: false
-    // Drop off the Overlay layer (back to Top) while an overlay modal
-    property bool suppressOverlayLayer: false
     property real slideoutWidth: 480
     property bool expandable: false
     property bool expandedWidth: false
     property real expandedWidthValue: 960
-    property real edgeGap: 0
-    property string slideEdge: "right"
-    readonly property bool slideFromLeft: slideEdge === "left"
     property Component content: null
     property string title: ""
     property alias container: contentContainer
     property real customTransparency: -1
     property bool mappedVisible: false
     signal aboutToHide
-    signal revealed
 
     function show() {
         mappedVisible = true;
         Qt.callLater(() => {
             isVisible = true;
-            revealed();
         });
     }
 
@@ -59,9 +52,9 @@ PanelWindow {
 
     anchors.top: true
     anchors.bottom: true
-    anchors.right: !root.slideFromLeft
-    anchors.left: root.slideFromLeft
+    anchors.right: true
 
+    // Expandable: fixed max surface width; strip width is slideContainer only (keeps blur/mask aligned).
     implicitWidth: expandable ? expandedWidthValue : slideoutWidth
     implicitHeight: modelData ? modelData.height : 800
 
@@ -69,22 +62,21 @@ PanelWindow {
 
     readonly property bool slideoutBlurActive: root.visible && BlurService.enabled && Theme.connectedSurfaceBlurEnabled
 
-    WlrLayershell.layer: (!suppressOverlayLayer && (triggerUsesOverlayLayer || CompositorService.framePeerSurfacesUseOverlayForScreen(modelData))) ? WlrLayershell.Overlay : WlrLayershell.Top
+    WlrLayershell.layer: (triggerUsesOverlayLayer || CompositorService.framePeerSurfacesUseOverlayForScreen(modelData)) ? WlrLayershell.Overlay : WlrLayershell.Top
     WlrLayershell.exclusiveZone: 0
     WlrLayershell.keyboardFocus: isVisible ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 
     readonly property real dpr: CompositorService.getScreenScale(root.screen)
     readonly property real alignedWidth: Theme.px(expandable && expandedWidth ? expandedWidthValue : slideoutWidth, dpr)
     readonly property real alignedHeight: Theme.px(modelData ? modelData.height : 800, dpr)
-    readonly property real alignedEdgeGap: Theme.px(edgeGap, dpr)
     readonly property real slideoutSlideSnapX: Theme.snap(slideContainer.slideOffset, dpr)
 
     mask: Region {
         item: Rectangle {
-            x: root.slideFromLeft ? root.alignedEdgeGap : (root.width - slideContainer.width - root.alignedEdgeGap)
-            y: root.alignedEdgeGap
+            x: root.width - slideContainer.width
+            y: 0
             width: slideContainer.width
-            height: root.height - root.alignedEdgeGap * 2
+            height: root.height
         }
     }
 
@@ -92,21 +84,16 @@ PanelWindow {
         id: slideContainer
         anchors.top: parent.top
         anchors.bottom: parent.bottom
-        anchors.right: root.slideFromLeft ? undefined : parent.right
-        anchors.left: root.slideFromLeft ? parent.left : undefined
-        anchors.topMargin: root.alignedEdgeGap
-        anchors.bottomMargin: root.alignedEdgeGap
-        anchors.rightMargin: root.alignedEdgeGap
-        anchors.leftMargin: root.alignedEdgeGap
+        anchors.right: parent.right
         width: root.alignedWidth
-        height: root.alignedHeight - root.alignedEdgeGap * 2
+        height: root.alignedHeight
 
-        property real slideOffset: root.slideFromLeft ? -root.alignedWidth : root.alignedWidth
+        property real slideOffset: root.alignedWidth
 
         Connections {
             target: root
             function onIsVisibleChanged() {
-                slideContainer.slideOffset = root.isVisible ? 0 : (root.slideFromLeft ? -slideContainer.width : slideContainer.width);
+                slideContainer.slideOffset = root.isVisible ? 0 : slideContainer.width;
             }
         }
 
@@ -124,6 +111,7 @@ PanelWindow {
             }
         }
 
+        // Expandable only; mask/blur bind to slideContainer geometry so they track this animation.
         Behavior on width {
             enabled: root.expandable
             NumberAnimation {
@@ -229,6 +217,7 @@ PanelWindow {
         }
     }
 
+    // Blur region from slideContainer (not layered contentRect); position uses x + slideoutSlideSnapX, not mapToItem(root).
     WindowBlur {
         targetWindow: root
         blurX: root.slideoutBlurActive ? slideContainer.x + root.slideoutSlideSnapX : 0

quickshell/Widgets/DankTextField.qml

@@ -23,7 +23,6 @@ StyledRect {
 
     property alias text: textInput.text
     property string placeholderText: ""
-    property string labelText: ""
     property alias font: textInput.font
     property alias textColor: textInput.color
     property alias echoMode: textInput.echoMode
@@ -86,10 +85,8 @@ StyledRect {
         textInput.insert(textInput.cursorPosition, str);
     }
 
-    readonly property real labelBandHeight: Math.round(Theme.fontSizeSmall * 1.4) + Theme.spacingXS * 2
-
     width: 200
-    height: labelText !== "" ? Math.round(Theme.fontSizeMedium * 3) + labelBandHeight : Math.round(Theme.fontSizeMedium * 3)
+    height: Math.round(Theme.fontSizeMedium * 3)
     radius: cornerRadius
     color: backgroundColor
     border.color: textInput.activeFocus ? focusedBorderColor : normalBorderColor
@@ -100,27 +97,13 @@ StyledRect {
 
         anchors.left: parent.left
         anchors.leftMargin: Theme.spacingM
-        anchors.verticalCenter: textInput.verticalCenter
+        anchors.verticalCenter: parent.verticalCenter
         name: leftIconName
         size: leftIconSize
         color: textInput.activeFocus ? leftIconFocusedColor : leftIconColor
         visible: leftIconName !== ""
     }
 
-    StyledText {
-        id: fieldLabel
-
-        anchors.left: textInput.left
-        anchors.right: textInput.right
-        anchors.top: parent.top
-        anchors.topMargin: Theme.spacingXS
-        text: root.labelText
-        visible: root.labelText !== ""
-        font.pixelSize: Theme.fontSizeSmall
-        color: textInput.activeFocus ? Theme.primary : Theme.surfaceVariantText
-        elide: Text.ElideRight
-    }
-
     TextInput {
         id: textInput
 
@@ -129,7 +112,7 @@ StyledRect {
         anchors.right: rightButtonsRow.left
         anchors.rightMargin: rightButtonsRow.visible ? Theme.spacingS : Theme.spacingM
         anchors.top: parent.top
-        anchors.topMargin: root.labelText !== "" ? root.labelBandHeight : root.topPadding
+        anchors.topMargin: root.topPadding
         anchors.bottom: parent.bottom
         anchors.bottomMargin: root.bottomPadding
         font.pixelSize: Theme.fontSizeMedium

quickshell/Widgets/VpnDetailContent.qml

@@ -148,7 +148,7 @@ Rectangle {
                 iconColor: Theme.surfaceVariantText
                 onClicked: {
                     PopoutService.closeControlCenter();
-                    PopoutService.openSettingsWithTab("network_vpn");
+                    PopoutService.openSettingsWithTab("network");
                 }
             }
         }

quickshell/translations/extract_settings_index.py

@@ -102,10 +102,7 @@ TAB_INDEX_MAP = {
     "DockTab.qml": 5,
     "DankBarAppearanceTab.qml": 6,
     "WorkspaceAppearanceCard.qml": 6,
-    "NetworkStatusTab.qml": 7,
-    "NetworkEthernetTab.qml": 39,
-    "NetworkWifiTab.qml": 40,
-    "NetworkVpnTab.qml": 41,
+    "NetworkTab.qml": 7,
     "PrinterTab.qml": 8,
     "LauncherTab.qml": 9,
     "ThemeColorsTab.qml": 10,
@@ -175,9 +172,6 @@ TAB_CATEGORY_MAP = {
     36: "Autostart",
     37: "Personalization",
     38: "Applications",
-    39: "Network",
-    40: "Network",
-    41: "Network",
 }
 
 SEARCHABLE_COMPONENTS = [
@@ -552,7 +546,6 @@ def main():
     output_path = script_dir / "settings_search_index.json"
     with open(output_path, "w", encoding="utf-8") as f:
         json.dump(all_entries, f, indent=2, ensure_ascii=False)
-        f.write("\n")
 
     print(f"Found {len(settings_entries)} searchable settings")
     print(f"Found {len(tab_entries)} tab entries")

quickshell/translations/settings_search_index.json

@@ -58,7 +58,6 @@
       "targetable",
       "wallpaper"
     ],
-    "icon": "blur_on",
     "description": "Enable compositor-targetable blur layer (namespace: dms:blurwallpaper). Requires manual niri configuration.",
     "conditionKey": "isNiri"
   },
@@ -728,6 +727,21 @@
     ],
     "icon": "dashboard"
   },
+  {
+    "section": "_tab_3",
+    "label": "Dank Bar",
+    "tabIndex": 3,
+    "category": "Dank Bar",
+    "keywords": [
+      "bar",
+      "dank",
+      "panel",
+      "statusbar",
+      "taskbar",
+      "topbar"
+    ],
+    "icon": "toolbar"
+  },
   {
     "section": "barDisplay",
     "label": "Display Assignment",
@@ -763,19 +777,30 @@
     "icon": "vertical_align_center"
   },
   {
-    "section": "_tab_3",
-    "label": "Settings",
+    "section": "barSpacing",
+    "label": "Spacing",
     "tabIndex": 3,
     "category": "Dank Bar",
     "keywords": [
       "bar",
+      "between",
       "dank",
+      "edges",
+      "gap",
+      "gaps",
+      "margin",
+      "margins",
+      "padding",
       "panel",
-      "settings",
+      "screen",
+      "space",
+      "spacing",
       "statusbar",
+      "taskbar",
       "topbar"
     ],
-    "icon": "tune"
+    "icon": "space_bar",
+    "description": "Space between the bar and screen edges"
   },
   {
     "section": "barUseOverlayLayer",
@@ -1503,19 +1528,6 @@
       "windows"
     ]
   },
-  {
-    "section": "dockTransparency",
-    "label": "Opacity",
-    "tabIndex": 5,
-    "category": "Dock",
-    "keywords": [
-      "dock",
-      "launcher bar",
-      "opacity",
-      "taskbar"
-    ],
-    "icon": "opacity"
-  },
   {
     "section": "dockTrashFileManager",
     "label": "Open Trash With",
@@ -1733,6 +1745,23 @@
     ],
     "icon": "space_bar"
   },
+  {
+    "section": "dockTransparency",
+    "label": "Transparency",
+    "tabIndex": 5,
+    "category": "Dock",
+    "keywords": [
+      "alpha",
+      "dock",
+      "launcher bar",
+      "opacity",
+      "taskbar",
+      "translucent",
+      "transparency",
+      "transparent"
+    ],
+    "icon": "opacity"
+  },
   {
     "section": "dockTrash",
     "label": "Trash",
@@ -1769,6 +1798,21 @@
     ],
     "description": "Place the dock on the Wayland overlay layer"
   },
+  {
+    "section": "_tab_6",
+    "label": "Appearance",
+    "tabIndex": 6,
+    "category": "Dank Bar",
+    "keywords": [
+      "appearance",
+      "bar",
+      "dank",
+      "panel",
+      "statusbar",
+      "topbar"
+    ],
+    "icon": "palette"
+  },
   {
     "section": "barBorder",
     "label": "Border",
@@ -1818,21 +1862,6 @@
     "icon": "rounded_corner",
     "description": "Remove corner rounding from the bar"
   },
-  {
-    "section": "_tab_6",
-    "label": "Dank Bar",
-    "tabIndex": 6,
-    "category": "Dank Bar",
-    "keywords": [
-      "bar",
-      "dank",
-      "panel",
-      "statusbar",
-      "taskbar",
-      "topbar"
-    ],
-    "icon": "toolbar"
-  },
   {
     "section": "barAppearance",
     "label": "Dank Bar",
@@ -1953,25 +1982,6 @@
     ],
     "description": "Use a fixed shadow direction for this bar"
   },
-  {
-    "section": "barTransparency",
-    "label": "Opacity",
-    "tabIndex": 6,
-    "category": "Dank Bar",
-    "keywords": [
-      "background",
-      "bar",
-      "controls",
-      "dank",
-      "opacity",
-      "panel",
-      "statusbar",
-      "taskbar",
-      "topbar"
-    ],
-    "icon": "opacity",
-    "description": "Controls opacity of the bar background"
-  },
   {
     "section": "barShadow",
     "label": "Shadow Override",
@@ -1992,32 +2002,6 @@
     "icon": "layers",
     "description": "Override the global shadow with per-bar settings"
   },
-  {
-    "section": "barSpacing",
-    "label": "Spacing",
-    "tabIndex": 6,
-    "category": "Dank Bar",
-    "keywords": [
-      "bar",
-      "between",
-      "dank",
-      "edges",
-      "gap",
-      "gaps",
-      "margin",
-      "margins",
-      "padding",
-      "panel",
-      "screen",
-      "space",
-      "spacing",
-      "statusbar",
-      "taskbar",
-      "topbar"
-    ],
-    "icon": "space_bar",
-    "description": "Space between the bar and screen edges"
-  },
   {
     "section": "trayIconTint",
     "label": "System Tray Icon Tint",
@@ -2046,6 +2030,28 @@
     "icon": "filter_b_and_w",
     "description": "Controls how much original icon color is removed before applying tint"
   },
+  {
+    "section": "barTransparency",
+    "label": "Transparency",
+    "tabIndex": 6,
+    "category": "Dank Bar",
+    "keywords": [
+      "alpha",
+      "background",
+      "bar",
+      "dank",
+      "opacity",
+      "panel",
+      "statusbar",
+      "taskbar",
+      "topbar",
+      "translucent",
+      "transparency",
+      "transparent"
+    ],
+    "icon": "opacity",
+    "description": "Opacity of the bar background"
+  },
   {
     "section": "barWidgetOutline",
     "label": "Widget Outline",
@@ -2118,25 +2124,6 @@
     "icon": "wifi",
     "conditionKey": "dmsConnected"
   },
-  {
-    "section": "networkStatus",
-    "label": "Network Status",
-    "tabIndex": 7,
-    "category": "Network",
-    "keywords": [
-      "connection",
-      "connectivity",
-      "ethernet",
-      "internet",
-      "network",
-      "online",
-      "status",
-      "wi-fi",
-      "wifi",
-      "wireless"
-    ],
-    "icon": "lan"
-  },
   {
     "section": "_tab_8",
     "label": "Printers",
@@ -3805,6 +3792,7 @@
     "tabIndex": 10,
     "category": "Theme & Colors",
     "keywords": [
+      "alpha",
       "appearance",
       "colors",
       "controls",
@@ -3816,9 +3804,11 @@
       "shadow",
       "style",
       "theme",
-      "transparency"
+      "translucent",
+      "transparency",
+      "transparent"
     ],
-    "description": "Controls the opacity of the shadow"
+    "description": "Controls the transparency of the shadow"
   },
   {
     "section": "m3ElevationEnabled",
@@ -3843,34 +3833,8 @@
       "style",
       "theme"
     ],
-    "icon": "layers",
     "description": "Material inspired shadows and elevation on modals, popouts, and dialogs"
   },
-  {
-    "section": "popupTransparency",
-    "label": "Surface Opacity",
-    "tabIndex": 10,
-    "category": "Theme & Colors",
-    "keywords": [
-      "appearance",
-      "colors",
-      "controls",
-      "look",
-      "modal",
-      "modals",
-      "opacity",
-      "popouts",
-      "popup",
-      "scheme",
-      "shell",
-      "style",
-      "surface",
-      "surfaces",
-      "theme",
-      "transparency"
-    ],
-    "description": "Controls opacity of shell surfaces, popouts, and modals"
-  },
   {
     "section": "syncModeWithPortal",
     "label": "Sync Mode with Portal",
@@ -4002,6 +3966,35 @@
     "icon": "palette",
     "description": "Select the palette algorithm used for wallpaper-based colors"
   },
+  {
+    "section": "popupTransparency",
+    "label": "Transparency",
+    "tabIndex": 10,
+    "category": "Theme & Colors",
+    "keywords": [
+      "alpha",
+      "appearance",
+      "colors",
+      "content",
+      "controls",
+      "layers",
+      "look",
+      "modal",
+      "modals",
+      "opacity",
+      "popouts",
+      "popup",
+      "scheme",
+      "style",
+      "surface",
+      "their",
+      "theme",
+      "translucent",
+      "transparency",
+      "transparent"
+    ],
+    "description": "Controls opacity of all popouts, modals, and their content layers"
+  },
   {
     "section": "matugenTemplateVscode",
     "label": "VS Code",
@@ -4570,27 +4563,6 @@
     ],
     "description": "Automatically lock the screen when DMS starts"
   },
-  {
-    "section": "lockBeforeSuspend",
-    "label": "Lock before suspend",
-    "tabIndex": 11,
-    "category": "Lock Screen",
-    "keywords": [
-      "automatic",
-      "automatically",
-      "before",
-      "lock",
-      "login",
-      "password",
-      "prepares",
-      "screen",
-      "security",
-      "sleep",
-      "suspend",
-      "system"
-    ],
-    "description": "Automatically lock the screen when the system prepares to suspend"
-  },
   {
     "section": "lockScreenNotificationMode",
     "label": "Notification Display",
@@ -5498,26 +5470,6 @@
     ],
     "icon": "dashboard"
   },
-  {
-    "section": "notificationBodyFontSize",
-    "label": "Body Font Size",
-    "tabIndex": 17,
-    "category": "Notifications",
-    "keywords": [
-      "alert",
-      "alerts",
-      "body",
-      "font",
-      "messages",
-      "notif",
-      "notification",
-      "notifications",
-      "size",
-      "text",
-      "toast"
-    ],
-    "description": "Set the font size for notification body text (htmlBody)"
-  },
   {
     "section": "notificationCompactMode",
     "label": "Compact",
@@ -5915,19 +5867,22 @@
     "keywords": [
       "alert",
       "alerts",
-      "font",
+      "appear",
+      "choose",
+      "location",
       "messages",
       "notif",
       "notification",
       "notifications",
+      "popup",
       "popups",
-      "size",
-      "summary",
-      "text",
-      "toast"
+      "position",
+      "screen",
+      "toast",
+      "where"
     ],
     "icon": "notifications",
-    "description": "Set the font size for notification summary text"
+    "description": "Choose where notification popups appear on screen"
   },
   {
     "section": "notificationRules",
@@ -6077,26 +6032,6 @@
     ],
     "description": "Hide notification content until expanded; popups show collapsed by default"
   },
-  {
-    "section": "notificationSummaryFontSize",
-    "label": "Summary Font Size",
-    "tabIndex": 17,
-    "category": "Notifications",
-    "keywords": [
-      "alert",
-      "alerts",
-      "font",
-      "messages",
-      "notif",
-      "notification",
-      "notifications",
-      "size",
-      "summary",
-      "text",
-      "toast"
-    ],
-    "description": "Set the font size for notification summary text"
-  },
   {
     "section": "notificationDedupeEnabled",
     "label": "Suppress Duplicate Notifications",
@@ -6119,32 +6054,6 @@
       "toast"
     ]
   },
-  {
-    "section": "notificationShowTimeoutBar",
-    "label": "Timeout Progress Bar",
-    "tabIndex": 17,
-    "category": "Notifications",
-    "keywords": [
-      "alerts",
-      "bar",
-      "countdown",
-      "drains",
-      "messages",
-      "notification",
-      "notifications",
-      "panel",
-      "popup",
-      "progress",
-      "show",
-      "statusbar",
-      "taskbar",
-      "timeout",
-      "timer",
-      "toast",
-      "topbar"
-    ],
-    "description": "Show a bar that drains as the popup"
-  },
   {
     "section": "osdAlwaysShowValue",
     "label": "Always Show Percentage",
@@ -6788,6 +6697,27 @@
     "icon": "schedule",
     "description": "Gradually fade the screen before locking with a configurable grace period"
   },
+  {
+    "section": "lockBeforeSuspend",
+    "label": "Lock before suspend",
+    "tabIndex": 21,
+    "category": "Power & Sleep",
+    "keywords": [
+      "automatically",
+      "before",
+      "energy",
+      "lock",
+      "power",
+      "prepares",
+      "screen",
+      "security",
+      "shutdown",
+      "sleep",
+      "suspend",
+      "system"
+    ],
+    "description": "Automatically lock the screen when the system prepares to suspend"
+  },
   {
     "section": "fadeToLockGracePeriod",
     "label": "Lock fade grace period",
@@ -7189,36 +7119,6 @@
     ],
     "description": "Maximum number of entries that can be saved"
   },
-  {
-    "section": "clipboardVisibleEntryActions",
-    "label": "Visible Entry Actions",
-    "tabIndex": 23,
-    "category": "System",
-    "keywords": [
-      "action",
-      "actions",
-      "appear",
-      "buttons",
-      "choose",
-      "clipboard",
-      "cliphist",
-      "copy",
-      "delete",
-      "density",
-      "edit",
-      "entries",
-      "entry",
-      "hide",
-      "history",
-      "linux",
-      "os",
-      "paste",
-      "pin",
-      "system",
-      "visible"
-    ],
-    "description": "Choose which action buttons appear on clipboard entries"
-  },
   {
     "section": "_tab_24",
     "label": "Displays",
@@ -7321,8 +7221,7 @@
       "screen",
       "widgets"
     ],
-    "icon": "widgets",
-    "conditionKey": "dmsConnected"
+    "icon": "widgets"
   },
   {
     "section": "_tab_27",
@@ -8500,7 +8399,7 @@
       "topbar",
       "window"
     ],
-    "icon": "layers",
+    "icon": "crop_square",
     "description": "Use custom gaps instead of bar spacing",
     "conditionKey": "isNiri"
   },
@@ -8921,95 +8820,5 @@
     "icon": "select_window",
     "description": "Define compositor rules for window behavior",
     "conditionKey": "windowRulesCapable"
-  },
-  {
-    "section": "_tab_39",
-    "label": "Ethernet",
-    "tabIndex": 39,
-    "category": "Network",
-    "keywords": [
-      "connectivity",
-      "ethernet",
-      "network",
-      "online"
-    ],
-    "icon": "settings_ethernet"
-  },
-  {
-    "section": "networkEthernet",
-    "label": "Ethernet",
-    "tabIndex": 39,
-    "category": "Network",
-    "keywords": [
-      "adapters",
-      "connection",
-      "connectivity",
-      "ethernet",
-      "network",
-      "online",
-      "wired"
-    ],
-    "icon": "settings_ethernet"
-  },
-  {
-    "section": "_tab_40",
-    "label": "WiFi",
-    "tabIndex": 40,
-    "category": "Network",
-    "keywords": [
-      "connectivity",
-      "network",
-      "online",
-      "wifi"
-    ],
-    "icon": "wifi"
-  },
-  {
-    "section": "networkWifi",
-    "label": "WiFi",
-    "tabIndex": 40,
-    "category": "Network",
-    "keywords": [
-      "adapter",
-      "connectivity",
-      "network",
-      "online",
-      "radio",
-      "ssid",
-      "wi-fi",
-      "wifi",
-      "wireless"
-    ],
-    "icon": "wifi"
-  },
-  {
-    "section": "_tab_41",
-    "label": "VPN",
-    "tabIndex": 41,
-    "category": "Network",
-    "keywords": [
-      "connectivity",
-      "network",
-      "online",
-      "vpn"
-    ],
-    "icon": "vpn_key"
-  },
-  {
-    "section": "networkVpn",
-    "label": "VPN",
-    "tabIndex": 41,
-    "category": "Network",
-    "keywords": [
-      "connectivity",
-      "import",
-      "network",
-      "online",
-      "openvpn",
-      "profiles",
-      "vpn",
-      "wireguard"
-    ],
-    "icon": "vpn_key"
   }
 ]