Big bundle of changes!

2 files changed, 48 insertions, 2 deletions

diff --git a/zed/keymap.json b/zed/keymap.json
index 591ab50..51f7ee4 100644
--- a/zed/keymap.json
+++ b/zed/keymap.json
@@ -5,12 +5,50 @@
 //
 // To see the default key bindings run `zed: open default keymap`
 // from the command palette.
+//
+// For vim docs see: https://zed.dev/docs/vim
 [
   {
+    "context": "VimControl && !menu",
+    "bindings": {
+      // Put key bindings here if you want them to work in normal & visual mode.
+      // "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
+      // "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"],
+      "ctrl-l": "pane::ActivateNextItem",
+      "ctrl-h": "pane::ActivatePrevItem",
+      "ctrl-3": "tab_switcher::Toggle"
+    }
+  },
+  {
+    "context": "vim_mode == normal && !menu",
+    "bindings": {
+      // "shift-y": ["workspace::SendKeystrokes", "y $"] // Use neovim's yank behavior: yank to end of line.
+    }
+  },
+  {
+    "context": "vim_mode == insert",
+    "bindings": {
+      // "j k": "vim::NormalBefore" // In insert mode, make jk escape to normal mode.
+    }
+  },
+  {
+    "context": "EmptyPane || SharedScreen",
+    "bindings": {
+      // Put key bindings here (in addition to the context above) if you want them to
+      // work when no editor exists.
+      // "space f": "file_finder::Toggle"
+    }
+  },
+  {
     "context": "Workspace",
     "bindings": {
       // "shift shift": "file_finder::Toggle"
-      "alt-`": "workspace::ToggleBottomDock"
+      "alt-`": "workspace::ToggleBottomDock",
+      "alt-b": "workspace::ToggleLeftDock",
+      "alt-w": "pane::CloseActiveItem",
+      "alt-enter": "editor::ToggleCodeActions"
     }
   },
   {
diff --git a/zed/settings.json b/zed/settings.json
index 58c5898..b1f3346 100644
--- a/zed/settings.json
+++ b/zed/settings.json
@@ -6,6 +6,10 @@
 // custom settings, run `zed: open default settings` from the
 // command palette (cmd-shift-p / ctrl-shift-p)
 {
+  // Delete this duplicate telemetry section since it exists later in the file,
+  "tab_bar": {
+    "show": true
+  },
   "assistant": {
     "default_model": {
       "provider": "zed.dev",
@@ -13,6 +17,10 @@
     },
     "version": "2"
   },
+  "features": {
+    "inline_completion_provider": "supermaven",
+    "show_inline_completions": false
+  },
   "languages": {
     "Ruby": {
       "language_servers": [
@@ -55,6 +63,6 @@
   "theme": {
     "mode": "system",
     "light": "Rosé Pine",
-    "dark": "One Dark"
+    "dark": "Andromeda"
   }
 }