diff --git a/agent/BACKLOG.md b/agent/BACKLOG.md index 7d184a4..028a285 100644 --- a/agent/BACKLOG.md +++ b/agent/BACKLOG.md @@ -109,12 +109,6 @@ guard covering every internal leaf; external GUIs and free-text prompts retain their explicit Esc exceptions. Pass = no internal leaf can strand the user and the guard fails on a regression. -### 107. Direct keybindings for System and Tools menus - -Add conflict-free direct bindings for System and Tools through the canonical -`keybinds.nix` source of truth. Pass = both routes open directly, generated -Hyprland bindings and the cheatsheet agree, and conflict checks stay green. - ### 108. Keybindings menu presentation and completeness audit Group the menu as Window, Workspace, Menu, and Media, then prove every live diff --git a/agent/JOURNAL.md b/agent/JOURNAL.md index 8c9838b..a6c7c9d 100644 --- a/agent/JOURNAL.md +++ b/agent/JOURNAL.md @@ -19,6 +19,20 @@ Template: --- +## 2026-07-13 — #107 direct System/Tools menu keybinds (this commit) +- **Task:** BACKLOG #107 — conflict-free direct bindings via keybinds.nix. +- **Did:** `SUPER+CTRL+I` → `nomarchy-menu system` (Super+I settings muscle + memory), `SUPER+CTRL+T` → `nomarchy-menu tools` in keybinds.nix (single + source: Hyprland + cheatsheet); root-menu Tools/System rows now carry + `menuHint` shortcut hints. +- **Verified:** V2 — eval: 41 binds, zero duplicate mods+key; both binds in + the generated Hyprland config; built nomarchy-menu bash -n green with + cheatsheet rows + hints rendered. In-session on the live ISO: VIEWED + `/tmp/nomarchy-v2-swap-93/40-system-menu.png` + `41-tools-menu.png` — + both submenus open directly from the binds. V0 flake check green. +- **Pending:** nothing. +- **Next suggestion:** #99 pending the focused doctor/theme-switch VM run. + ## 2026-07-13 — #93 installer swap prompt labeled + explained (this commit) - **Task:** BACKLOG #93 — the swap field was a bare prefilled gum input (no visible section, label, or unit; the placeholder never shows once a value diff --git a/modules/home/keybinds.nix b/modules/home/keybinds.nix index da26fe5..7b94082 100644 --- a/modules/home/keybinds.nix +++ b/modules/home/keybinds.nix @@ -54,6 +54,9 @@ { mods = "$mod CTRL"; key = "P"; action = "exec, nomarchy-menu colorpicker"; desc = "Color picker (→ clipboard)"; } { mods = "$mod CTRL"; key = "A"; action = "exec, nomarchy-menu ask"; desc = "Ask Claude"; } { mods = "$mod CTRL"; key = "D"; action = "exec, nomarchy-menu dnd"; desc = "Do Not Disturb toggle"; } + # I as in "settings" muscle memory (Super+I elsewhere); T for Tools. + { mods = "$mod CTRL"; key = "I"; action = "exec, nomarchy-menu system"; desc = "System menu"; } + { mods = "$mod CTRL"; key = "T"; action = "exec, nomarchy-menu tools"; desc = "Tools menu"; } { mods = "$mod SHIFT"; key = "C"; action = "exec, hyprpicker -a"; desc = "Color picker (→ clipboard)"; } # Focus — SUPER + arrow keys. diff --git a/modules/home/rofi.nix b/modules/home/rofi.nix index ac3cd36..7f9e8e2 100644 --- a/modules/home/rofi.nix +++ b/modules/home/rofi.nix @@ -1263,8 +1263,8 @@ ${themeRows} choice=$( { row "Apps${appsHint}" applications-all row "Look & Feel" preferences-desktop-theme - row "Tools" applications-utilities - row "System" preferences-system + row "Tools${menuHint "tools"}" applications-utilities + row "System${menuHint "system"}" preferences-system row "Power${menuHint "power"}" system-shutdown row "Keybindings${menuHint "keybinds"}" preferences-desktop-keyboard } | rofi_menu -show-icons -markup-rows -p Menu) || exit 0