diff --git a/.gitattributes b/.gitattributes index 0805c94..8b13789 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -* filter=yolk + diff --git a/eggs/zed/keymap.json b/eggs/zed/keymap.json index d894f90..03f3a0c 100644 --- a/eggs/zed/keymap.json +++ b/eggs/zed/keymap.json @@ -40,7 +40,7 @@ } }, { - "context": "MarkdownPreview || EmptyPane || Editor && VimControl && !VimWaiting && !menu", + "context": "MarkdownPreview || EmptyPane || Diagnostics || Editor && VimControl && !VimWaiting && !menu", "bindings": { "z space": "editor::FoldAll", "z backspace": "editor::FoldFunctionBodies", @@ -92,12 +92,17 @@ }, { "context": "Editor && vim_mode == normal && !VimWaiting && !menu", - "bindings": {} + "bindings": { + "backspace": ["vim::PushOperator", { "Sneak": {} }], + "return": ["vim::PushOperator", { "SneakBackward": {} }] + } }, { "context": "Editor && vim_mode == insert", "bindings": { - "ctrl-w": "editor::DeleteToPreviousWordStart" + "ctrl-w": "editor::DeleteToPreviousWordStart", + "alt-tab": "zeta::NextEdit", + "alt-shift-tab": "zeta::PreviousEdit" } }, { diff --git a/eggs/zed/settings.json b/eggs/zed/settings.json index 954f594..40b69b9 100644 --- a/eggs/zed/settings.json +++ b/eggs/zed/settings.json @@ -1,4 +1,8 @@ { + "features": { + "inline_completion_provider": "zed" + }, + "icon_theme": "Material Icon Theme", "telemetry": { "metrics": false, "diagnostics": false @@ -14,10 +18,11 @@ "provider": "copilot_chat", "model": "claude-3-5-sonnet" }, + "enable_experimental_live_diffs": true, "version": "2" }, "theme": "Gruvbox Dark Hard", - "buffer_font_size": 14, + "buffer_font_size": 14.0, "buffer_font_family": "Input", // "buffer_font_family": "Input", // "buffer_font_family": "FiraCode Nerd Font", @@ -59,7 +64,7 @@ }, "terminal": { - "font_family": "JetBrainsMono Nerd Font", + "font_family": "FiraCode Nerd Font", "font_size": 14 }, "vim_mode": true,