Revert seamless nvim/zellij nav; keep Ctrl+hjkl (#198)

Per decision: keep Neovim's own Ctrl+hjkl for its splits and scope
Alt+hjkl to zellij panes — the two nav layers stay separate, with no
wasm plugin and nothing new to maintain.

Backs out the step-3 seamless work (zellij-autolock + zellij-nav.nvim):
- remove dot_files/zellij/autolock.kdl, hypercube/plugins/nav.lua, and
  config/keymaps.lua; unwire them from config/lazy.lua and plugins/
  init.lua.
- devcube Containerfile: drop the wasm bake + autolock merge step.
- docs: KEYBINDINGS.md nav notes and the config.kdl comments now state
  the two-layer split plainly; KEYBINDINGS-PROPOSAL.md records §4/step 3
  as declined.

Kept (unaffected by this decision): the single Ctrl+Space zellij leader,
Ghostty as a plain renderer, and zellij in the base image.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SDzdtoy59UEWDZvZhZBkhB

Author: claude

KEYBINDINGS-PROPOSAL.md

@@ -3,8 +3,16 @@
 > Addresses [#198](https://github.com/binarypie-dev/hypercube/issues/198) —
 > "devcube: Fix keybindings mess."
 >
-> Status: **proposal / RFC.** No configs are changed by this document. It
-> describes the target scheme, the rationale, and a staged migration.
+> Status: **proposal / RFC.** It describes the target scheme, the rationale, and
+> a staged migration.
+>
+> **Adopted:** the single `Ctrl+Space` zellij leader (§"Tier 2"), Ghostty as a
+> plain renderer (§"Tier 4"/step 2), and shipping zellij in the base image.
+> **Declined:** the seamless cross-boundary `Alt+hjkl` of §4 / step 3 (the
+> `vim-zellij-navigator` / autolock route below). It needs a baked wasm plugin
+> and a first-run permission grant for marginal benefit, so Neovim keeps its own
+> `Ctrl+hjkl` for splits and `Alt+hjkl` stays scoped to zellij panes — the two
+> nav layers are intentionally separate. The §4 design is kept for the record.
 
 ## The problem
 

KEYBINDINGS.md

@@ -21,9 +21,10 @@ There is no pane-mode vs tab-mode vs resize-mode to juggle. See
 [KEYBINDINGS-PROPOSAL.md](KEYBINDINGS-PROPOSAL.md) for the full rationale
 ([#198](https://github.com/binarypie-dev/hypercube/issues/198)).
 
-> The scheme is now in place end to end: zellij owns multiplexing under the
-> `Ctrl+Space` leader, Ghostty is a plain renderer (no terminal leader), and
-> `Alt+hjkl` moves focus seamlessly between Neovim splits and zellij panes.
+> zellij owns multiplexing under the `Ctrl+Space` leader and Ghostty is a plain
+> renderer (no terminal leader). Within a tab, `Alt+hjkl` moves between zellij
+> panes; Neovim keeps its own `Ctrl+hjkl` for moving between its splits. The two
+> are intentionally separate — Neovim is the editor layer, zellij the mux layer.
 
 ## Hyprland Window Management
 
@@ -162,12 +163,9 @@ These work everywhere, no mode required:
 | `Alt + h/j/k/l` | Move focus (hops between tabs at the edges) |
 | `Alt + =` / `Alt + -` | Grow / shrink pane |
 
-> **Seamless with Neovim.** `Alt+hjkl` also steps *into* and out of Neovim's
-> own splits, so the editor ↔ agent boundary needs no gear-change. Inside `devc`
-> this is handled by `zellij-autolock` (holds zellij in locked mode while nvim is
-> focused, so the keys reach nvim) plus `zellij-nav.nvim` (does the in-editor
-> move and hands off to the next zellij pane at the edge). On first launch zellij
-> asks once to grant the autolock plugin its permissions.
+> `Alt+hjkl` moves between zellij **panes**. Inside Neovim, use Neovim's own
+> `Ctrl+hjkl` to move between **its** splits (see the Neovim section); the two
+> navigation layers are kept separate by design.
 
 ---
 
@@ -267,14 +265,13 @@ Neovim uses LazyVim with **Space** as the leader key.
 
 | Keybinding | Action |
 |------------|--------|
-| `Alt+H/J/K/L` | Navigate windows — and out into zellij panes at the edge |
+| `Ctrl+H/J/K/L` | Navigate Neovim windows |
 | `Space w` | Window menu |
 | `Space -` | Horizontal split |
 | `Space \|` | Vertical split |
 
-> `Alt+hjkl` is the single nav chord across Neovim and zellij (see the zellij
-> section). LazyVim's old `Ctrl+hjkl` window nav is retired
-> ([#198](https://github.com/binarypie-dev/hypercube/issues/198)).
+> `Ctrl+hjkl` moves between Neovim's own splits; `Alt+hjkl` moves between zellij
+> panes (see the zellij section). They're separate layers by design.
 
 ### Buffers
 

dot_files/devcube/Containerfile

@@ -281,18 +281,6 @@ COPY zellij/   /root/.config/zellij/
 COPY workmux/  /root/.config/workmux/
 COPY starship/ /usr/share/hypercube/config/starship/
 
-# zellij-autolock: bake the wasm at a stable image path (so a stale home volume
-# can't shadow it) and fold its config (zellij/autolock.kdl) into the seeded
-# config.kdl. With zellij-nav.nvim in the baked Neovim config this gives
-# seamless Alt+hjkl navigation between Neovim splits and zellij panes (#198).
-# DEVCUBE ONLY — the host base image keeps a plain /etc/zellij/config.kdl.
-ARG ZELLIJ_AUTOLOCK_VERSION=0.2.2
-RUN mkdir -p /usr/share/zellij/plugins \
-    && curl -fsSL "https://github.com/fresh2dev/zellij-autolock/releases/download/${ZELLIJ_AUTOLOCK_VERSION}/zellij-autolock.wasm" \
-       -o /usr/share/zellij/plugins/zellij-autolock.wasm \
-    && cat /root/.config/zellij/autolock.kdl >> /root/.config/zellij/config.kdl \
-    && rm /root/.config/zellij/autolock.kdl
-
 # Make fish root's login shell so every interactive shell in the container
 # (zellij panes, `just shell`, any sub-shell) loads the baked fish config --
 # including the WORKMUX_BACKEND=zellij pin in conf.d/10-devcube.fish.

dot_files/nvim/config/lua/config/keymaps.lua

@@ -28,7 +28,6 @@ end
 local hypercube_ui = require("hypercube.plugins.ui")
 local hypercube_extras = require("hypercube.plugins.extras")
 local hypercube_ai = require("hypercube.plugins.ai")
-local hypercube_nav = require("hypercube.plugins.nav")
 
 require("lazy").setup({
   spec = {
@@ -39,7 +38,6 @@ require("lazy").setup({
     hypercube_ui,
     hypercube_extras,
     hypercube_ai,
-    hypercube_nav,
 
     -- Your personal plugins (add files to ~/.config/hypercube/nvim/lua/plugins/)
     { import = "plugins" },

dot_files/nvim/config/lua/config/lazy.lua

@@ -11,7 +11,4 @@ return {
 
   -- Import Hypercube AI (sidekick.nvim)
   { import = "hypercube.plugins.ai" },
-
-  -- Import Hypercube navigation (seamless Neovim ↔ zellij)
-  { import = "hypercube.plugins.nav" },
 }

dot_files/nvim/config/lua/hypercube/plugins/init.lua

@@ -43,9 +43,9 @@ default_layout "compact"
 //   ESCAPE   g lock (pass every key to a focused TUI; Ctrl+Space unlocks)
 //   Esc / Enter returns to Normal.
 //
-// NO leader needed — these work everywhere (and cross into nvim splits once
-// vim-zellij-navigator is wired up, see KEYBINDINGS-PROPOSAL.md step 3):
+// NO leader needed — these move focus between zellij panes from anywhere:
 //   Alt h/j/k/l  move focus      Alt = / Alt -  grow / shrink pane
+// (Inside Neovim, use Neovim's own Ctrl+hjkl for its splits — separate layer.)
 //
 // workmux ↔ zellij:  `workmux add <branch>` opens each git worktree as its own
 //   TAB running the agent (see ../workmux/config.yaml). So your parallel agents
@@ -60,8 +60,7 @@ keybinds clear-defaults=true {
         bind "Ctrl Space" { SwitchToMode "tmux"; }
 
         // Bare directional focus + resize — no mode, muscle memory everywhere.
-        // MoveFocusOrTab so h/l also hop between tabs at the edges. nvim grabs
-        // these first when focused, falling through to zellij at split edges.
+        // MoveFocusOrTab so h/l also hop between tabs at the pane-grid edges.
         bind "Alt h" "Alt Left"  { MoveFocusOrTab "Left"; }
         bind "Alt l" "Alt Right" { MoveFocusOrTab "Right"; }
         bind "Alt j" "Alt Down"  { MoveFocus "Down"; }