merge upstream

2025-05-21 00:22:49 -06:00
parent 08b9014ee2
commit 65b5ec93c7
87 changed files with 2119 additions and 1602 deletions
@@ -11,19 +11,15 @@ import Quickshell.Hyprland

 Singleton {
    id: root
-    property var defaultKeybinds: []
-    property var userKeybinds: []
+    property var defaultKeybinds: {"children": []}
+    property var userKeybinds: {"children": []}
    property var keybinds: ({
        children: [
-            ...defaultKeybinds.children,
-            ...userKeybinds.children,
+            ...(defaultKeybinds.children ?? []),
+            ...(userKeybinds.children ?? []),
        ]
    })

-    // onKeybindsChanged: {
-    //     console.log("[CheatsheetKeybinds] Keybinds changed:", JSON.stringify(keybinds, null, 2))
-    // }   
-
    Connections {
        target: Hyprland