hyprland: add serial to output model generator

quickshell/Modals/DankLauncherV2/Controller.qml

@@ -684,12 +684,15 @@ Item {
         if (searchMode === "all") {
             if (searchQuery && searchQuery.length >= 2) {
                 _pluginPhasePending = true;
-                _pluginPhaseForceFirst = shouldResetSelection;
-                _phase1Items = allItems;
+                _phase1Items = allItems.slice();
                 pluginPhaseTimer.restart();
-                isSearching = true;
-                searchCompleted();
-                return;
+                if (allItems.length === 0) {
+                    _pluginPhaseForceFirst = shouldResetSelection;
+                    isSearching = true;
+                    searchCompleted();
+                    return;
+                }
+                _pluginPhaseForceFirst = false;
             } else if (!searchQuery) {
                 var emptyTriggerOrdered = getEmptyTriggerPluginsOrdered();
                 for (var i = 0; i < emptyTriggerOrdered.length; i++) {
@@ -1614,25 +1617,41 @@ Item {
         itemExecuted();
     }
 
-    function launchApp(app) {
+    function _resolveDesktopEntry(app) {
         if (!app)
+            return null;
+        if (app.command)
+            return app;
+        var id = app.id || app.execString || app.exec || "";
+        if (!id)
+            return null;
+        return DesktopEntries.heuristicLookup(id);
+    }
+
+    function launchApp(app) {
+        var entry = _resolveDesktopEntry(app);
+        if (!entry)
             return;
-        SessionService.launchDesktopEntry(app);
-        AppUsageHistoryData.addAppUsage(app);
+        SessionService.launchDesktopEntry(entry);
+        AppUsageHistoryData.addAppUsage(entry);
     }
 
     function launchAppWithNvidia(app) {
-        if (!app)
+        var entry = _resolveDesktopEntry(app);
+        if (!entry)
             return;
-        SessionService.launchDesktopEntry(app, true);
-        AppUsageHistoryData.addAppUsage(app);
+        SessionService.launchDesktopEntry(entry, true);
+        AppUsageHistoryData.addAppUsage(entry);
     }
 
     function launchAppAction(actionItem) {
-        if (!actionItem || !actionItem.parentApp || !actionItem.actionData)
+        if (!actionItem || !actionItem.actionData)
             return;
-        SessionService.launchDesktopAction(actionItem.parentApp, actionItem.actionData);
-        AppUsageHistoryData.addAppUsage(actionItem.parentApp);
+        var entry = _resolveDesktopEntry(actionItem.parentApp);
+        if (!entry)
+            return;
+        SessionService.launchDesktopAction(entry, actionItem.actionData);
+        AppUsageHistoryData.addAppUsage(entry);
     }
 
     function openFile(path) {

quickshell/Modules/Dock/Dock.qml

@@ -553,15 +553,7 @@ Variants {
 
                         Rectangle {
                             anchors.fill: parent
-                            color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, backgroundTransparency)
-                            border.color: Theme.outlineMedium
-                            border.width: 1
-                            radius: Theme.cornerRadius
-                        }
-
-                        Rectangle {
-                            anchors.fill: parent
-                            color: Qt.rgba(Theme.surfaceTint.r, Theme.surfaceTint.g, Theme.surfaceTint.b, 0.04)
+                            color: Theme.withAlpha(Theme.surfaceContainer, backgroundTransparency)
                             radius: Theme.cornerRadius
                         }
                     }

quickshell/Modules/Dock/DockContextMenu.qml

@@ -165,7 +165,7 @@ PanelWindow {
         }
 
         width: Math.min(400, Math.max(180, menuColumn.implicitWidth + Theme.spacingS * 2))
-        height: Math.max(60, menuColumn.implicitHeight + Theme.spacingS * 2)
+        height: menuColumn.implicitHeight + Theme.spacingS * 2
         color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
         radius: Theme.cornerRadius
         border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
@@ -388,18 +388,31 @@ PanelWindow {
                 radius: Theme.cornerRadius
                 color: pinArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
 
-                StyledText {
+                Row {
                     anchors.left: parent.left
                     anchors.leftMargin: Theme.spacingS
                     anchors.right: parent.right
                     anchors.rightMargin: Theme.spacingS
                     anchors.verticalCenter: parent.verticalCenter
-                    text: root.appData && root.appData.isPinned ? I18n.tr("Unpin from Dock") : I18n.tr("Pin to Dock")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    font.weight: Font.Normal
-                    elide: Text.ElideRight
-                    wrapMode: Text.NoWrap
+                    spacing: Theme.spacingXS
+
+                    DankIcon {
+                        anchors.verticalCenter: parent.verticalCenter
+                        name: root.appData && root.appData.isPinned ? "keep_off" : "push_pin"
+                        size: 14
+                        color: Theme.surfaceText
+                        opacity: 0.7
+                    }
+
+                    StyledText {
+                        anchors.verticalCenter: parent.verticalCenter
+                        text: root.appData && root.appData.isPinned ? I18n.tr("Unpin from Dock") : I18n.tr("Pin to Dock")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceText
+                        font.weight: Font.Normal
+                        elide: Text.ElideRight
+                        wrapMode: Text.NoWrap
+                    }
                 }
 
                 DankRipple {
@@ -448,18 +461,31 @@ PanelWindow {
                 radius: Theme.cornerRadius
                 color: nvidiaArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : "transparent"
 
-                StyledText {
+                Row {
                     anchors.left: parent.left
                     anchors.leftMargin: Theme.spacingS
                     anchors.right: parent.right
                     anchors.rightMargin: Theme.spacingS
                     anchors.verticalCenter: parent.verticalCenter
-                    text: I18n.tr("Launch on dGPU")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    font.weight: Font.Normal
-                    elide: Text.ElideRight
-                    wrapMode: Text.NoWrap
+                    spacing: Theme.spacingXS
+
+                    DankIcon {
+                        anchors.verticalCenter: parent.verticalCenter
+                        name: "memory"
+                        size: 14
+                        color: Theme.surfaceText
+                        opacity: 0.7
+                    }
+
+                    StyledText {
+                        anchors.verticalCenter: parent.verticalCenter
+                        text: I18n.tr("Launch on dGPU")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceText
+                        font.weight: Font.Normal
+                        elide: Text.ElideRight
+                        wrapMode: Text.NoWrap
+                    }
                 }
 
                 DankRipple {
@@ -490,23 +516,31 @@ PanelWindow {
                 radius: Theme.cornerRadius
                 color: closeArea.containsMouse ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12) : "transparent"
 
-                StyledText {
+                Row {
                     anchors.left: parent.left
                     anchors.leftMargin: Theme.spacingS
                     anchors.right: parent.right
                     anchors.rightMargin: Theme.spacingS
                     anchors.verticalCenter: parent.verticalCenter
-                    text: {
-                        if (root.appData && root.appData.type === "grouped") {
-                            return "Close All Windows";
-                        }
-                        return "Close Window";
+                    spacing: Theme.spacingXS
+
+                    DankIcon {
+                        anchors.verticalCenter: parent.verticalCenter
+                        name: "close"
+                        size: 14
+                        color: closeArea.containsMouse ? Theme.error : Theme.surfaceText
+                        opacity: 0.7
+                    }
+
+                    StyledText {
+                        anchors.verticalCenter: parent.verticalCenter
+                        text: root.appData && root.appData.type === "grouped" ? I18n.tr("Close All Windows") : I18n.tr("Close Window")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: closeArea.containsMouse ? Theme.error : Theme.surfaceText
+                        font.weight: Font.Normal
+                        elide: Text.ElideRight
+                        wrapMode: Text.NoWrap
                     }
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: closeArea.containsMouse ? Theme.error : Theme.surfaceText
-                    font.weight: Font.Normal
-                    elide: Text.ElideRight
-                    wrapMode: Text.NoWrap
                 }
 
                 DankRipple {

quickshell/Modules/Settings/DisplayConfig/DisplayConfigState.qml

@@ -1061,7 +1061,7 @@ Singleton {
 
     function getHyprlandOutputIdentifier(output, outputName) {
         if (SettingsData.displayNameMode === "model" && output?.make && output?.model)
-            return "desc:" + output.make + " " + output.model;
+            return "desc:" + output.make + " " + output.model + " " + (output?.serial || "Unknown");
         return outputName;
     }
 

quickshell/Modules/WallpaperBackground.qml

@@ -242,7 +242,7 @@ Variants {
             Image {
                 id: nextWallpaper
                 anchors.fill: parent
-                visible: true
+                visible: source !== ""
                 opacity: 0
                 layer.enabled: false
                 asynchronous: true
@@ -512,14 +512,18 @@ Variants {
                 }
             }
 
-            MultiEffect {
+            Loader {
                 anchors.fill: parent
-                source: effectLoader.active ? effectLoader.item : currentWallpaper
-                visible: CompositorService.isNiri && SettingsData.blurWallpaperOnOverview && NiriService.inOverview && currentWallpaper.source !== ""
-                blurEnabled: true
-                blur: 0.8
-                blurMax: 75
-                autoPaddingEnabled: false
+                active: CompositorService.isNiri && SettingsData.blurWallpaperOnOverview && NiriService.inOverview && currentWallpaper.source !== ""
+
+                sourceComponent: MultiEffect {
+                    anchors.fill: parent
+                    source: effectLoader.active ? effectLoader.item : currentWallpaper
+                    blurEnabled: true
+                    blur: 0.8
+                    blurMax: 75
+                    autoPaddingEnabled: false
+                }
             }
         }
     }

quickshell/Services/HyprlandService.qml

@@ -55,7 +55,7 @@ Singleton {
 
     function getOutputIdentifier(output, outputName) {
         if (SettingsData.displayNameMode === "model" && output.make && output.model)
-            return "desc:" + output.make + " " + output.model;
+            return "desc:" + output.make + " " + output.model + " " + (output.serial || "Unknown");
         return outputName;
     }
 

quickshell/Services/SettingsSearchService.qml

@@ -16,6 +16,7 @@ Singleton {
     property var registeredCards: ({})
     property var settingsIndex: []
     property bool indexLoaded: false
+    property var _translatedCache: []
 
     readonly property var conditionMap: ({
             "isNiri": () => CompositorService.isNiri,
@@ -38,9 +39,11 @@ Singleton {
             try {
                 root.settingsIndex = JSON.parse(text());
                 root.indexLoaded = true;
+                root._rebuildTranslationCache();
             } catch (e) {
                 console.warn("SettingsSearchService: Failed to parse index:", e);
                 root.settingsIndex = [];
+                root._translatedCache = [];
             }
         }
         onLoadFailed: error => console.warn("SettingsSearchService: Failed to load index:", error)
@@ -131,6 +134,27 @@ Singleton {
         };
     }
 
+    function _rebuildTranslationCache() {
+        var cache = [];
+        for (var i = 0; i < settingsIndex.length; i++) {
+            var item = settingsIndex[i];
+            var t = translateItem(item);
+            cache.push({
+                section: t.section,
+                label: t.label,
+                tabIndex: t.tabIndex,
+                category: t.category,
+                keywords: t.keywords,
+                icon: t.icon,
+                description: t.description,
+                conditionKey: t.conditionKey,
+                labelLower: t.label.toLowerCase(),
+                categoryLower: t.category.toLowerCase()
+            });
+        }
+        _translatedCache = cache;
+    }
+
     function search(text) {
         query = text;
         if (!text) {
@@ -138,18 +162,19 @@ Singleton {
             return;
         }
 
-        const queryLower = text.toLowerCase().trim();
-        const queryWords = queryLower.split(/\s+/).filter(w => w.length > 0);
-        const scored = [];
+        var queryLower = text.toLowerCase().trim();
+        var queryWords = queryLower.split(/\s+/).filter(w => w.length > 0);
+        var scored = [];
+        var cache = _translatedCache;
 
-        for (const item of settingsIndex) {
-            if (!checkCondition(item))
+        for (var i = 0; i < cache.length; i++) {
+            var entry = cache[i];
+            if (!checkCondition(entry))
                 continue;
 
-            const translated = translateItem(item);
-            const labelLower = translated.label.toLowerCase();
-            const categoryLower = translated.category.toLowerCase();
-            let score = 0;
+            var labelLower = entry.labelLower;
+            var categoryLower = entry.categoryLower;
+            var score = 0;
 
             if (labelLower === queryLower) {
                 score = 10000;
@@ -162,24 +187,32 @@ Singleton {
             }
 
             if (score === 0) {
-                for (const keyword of item.keywords) {
-                    if (keyword.startsWith(queryLower)) {
-                        score = Math.max(score, 800);
+                var keywords = entry.keywords;
+                for (var k = 0; k < keywords.length; k++) {
+                    if (keywords[k].startsWith(queryLower)) {
+                        score = 800;
                         break;
                     }
-                    if (keyword.includes(queryLower)) {
-                        score = Math.max(score, 400);
+                    if (keywords[k].includes(queryLower) && score < 400) {
+                        score = 400;
                     }
                 }
             }
 
             if (score === 0 && queryWords.length > 1) {
-                let allMatch = true;
-                for (const word of queryWords) {
-                    const inLabel = labelLower.includes(word);
-                    const inKeywords = item.keywords.some(k => k.includes(word));
-                    const inCategory = categoryLower.includes(word);
-                    if (!inLabel && !inKeywords && !inCategory) {
+                var allMatch = true;
+                for (var w = 0; w < queryWords.length; w++) {
+                    var word = queryWords[w];
+                    if (labelLower.includes(word))
+                        continue;
+                    var inKeywords = false;
+                    for (var k = 0; k < entry.keywords.length; k++) {
+                        if (entry.keywords[k].includes(word)) {
+                            inKeywords = true;
+                            break;
+                        }
+                    }
+                    if (!inKeywords && !categoryLower.includes(word)) {
                         allMatch = false;
                         break;
                     }
@@ -190,7 +223,7 @@ Singleton {
 
             if (score > 0) {
                 scored.push({
-                    item: translated,
+                    item: entry,
                     score: score
                 });
             }