Merge branch 'main' into osk-update-on-activelayout-event

.config/quickshell/ii/services/HyprlandXkb.qml

@@ -17,7 +17,6 @@ Singleton {
     property string currentLayoutName: ""
     property string currentLayoutCode: ""
     // For the service
-    property string targetDeviceName: "hl-virtual-keyboard"
     property var baseLayoutFilePath: "/usr/share/X11/xkb/rules/base.lst"
     property bool needsLayoutRefresh: false
 
@@ -72,7 +71,7 @@ Singleton {
             id: devicesCollector
             onStreamFinished: {
                 const parsedOutput = JSON.parse(devicesCollector.text);
-                const hyprlandKeyboard = parsedOutput["keyboards"].find(kb => kb.name === root.targetDeviceName);
+                const hyprlandKeyboard = parsedOutput["keyboards"].find(kb => kb.main === true);
                 root.layoutCodes = hyprlandKeyboard["layout"].split(",");
                 root.currentLayoutName = hyprlandKeyboard["active_keymap"];
                 // console.log("[HyprlandXkb] Fetched | Layouts (multiple: " + (root.layouts.length > 1) + "): "
@@ -86,8 +85,6 @@ Singleton {
         target: Hyprland
         function onRawEvent(event) {
             if (event.name === "activelayout") {
-                // We're triggering refresh here because Hyprland virtual kb after a config reload disappears
-                // from `hyprctl devices` and it only comes back at the next activelayout event.
                 if (root.needsLayoutRefresh) {
                     root.needsLayoutRefresh = false;
                     fetchLayoutsProc.running = true;
@@ -98,8 +95,6 @@ Singleton {
 
                 // Update when layout might have changed
                 const dataString = event.data;
-                if (!dataString.startsWith(root.targetDeviceName))
-                    return;
                 root.currentLayoutName = dataString.split(",")[1];
 
                 // Update layout for on-screen keyboard (osk)