1 files changed, 23 insertions, 2 deletions

diff --git a/menubar/hotkey.swift b/menubar/hotkey.swift
index c5ab178..136d94d 100644
--- a/menubar/hotkey.swift
+++ b/menubar/hotkey.swift
@@ -12,6 +12,7 @@ import Carbon.HIToolbox
 struct Settings: Equatable {
     var hotkey = "ctrl+opt+cmd+e"
     var jumpHotkey = "ctrl+opt+cmd+u"
+    var searchHotkey = "ctrl+opt+cmd+shift+u"
 
     static var directory: String {
         environment["DINGGER_CONFIG_DIR"] ?? (NSHomeDirectory() + "/.config/dingger")
@@ -28,10 +29,28 @@ struct Settings: Equatable {
         # Jump to the agent at the top of the waiting list (blocked first, then
         # the longest done), like clicking the tmux status line.
         jump_hotkey = "ctrl+opt+cmd+u"
+        # Search all agents by name, session, window, harness, status, or
+        # directory, and jump to one.
+        search_hotkey = "ctrl+opt+cmd+shift+u"
+
+        """
+
+    /// Earlier templates, replaced on upgrade if the user never edited them.
+    private static let olderTemplates = [firstTemplate, secondTemplate]
+
+    private static let secondTemplate = """
+        # dingger settings. The menu bar app reloads this file when you save it.
+        # Shortcuts: modifiers ctrl, opt, cmd, shift; keys a-z, 0-9, f1-f12, space.
+
+        [shortcuts]
+        # Show or hide the floating panel.
+        hotkey = "ctrl+opt+cmd+e"
+        # Jump to the agent at the top of the waiting list (blocked first, then
+        # the longest done), like clicking the tmux status line.
+        jump_hotkey = "ctrl+opt+cmd+u"
 
         """
 
-    /// The first template, replaced on upgrade if the user never edited it.
     private static let firstTemplate = """
         # dingger settings. The menu bar app reloads this file when you save it.
 
@@ -46,7 +65,7 @@ struct Settings: Equatable {
     /// upgrade it if it is still an unedited older template.
     static func ensureFile() {
         let existing = try? String(contentsOfFile: path, encoding: .utf8)
-        guard existing == nil || existing == firstTemplate else { return }
+        guard existing == nil || olderTemplates.contains(existing!) else { return }
         try? FileManager.default.createDirectory(atPath: directory, withIntermediateDirectories: true)
         try? template.write(toFile: path, atomically: true, encoding: .utf8)
     }
@@ -64,6 +83,7 @@ struct Settings: Equatable {
             switch parts[0] {
             case "hotkey": settings.hotkey = value
             case "jump_hotkey": settings.jumpHotkey = value
+            case "search_hotkey": settings.searchHotkey = value
             default: break
             }
         }
@@ -139,6 +159,7 @@ enum GlobalHotkey {
     enum Id: UInt32 {
         case panel = 1
         case jump = 2
+        case search = 3
     }
 
     private static var references: [UInt32: EventHotKeyRef] = [:]