From a477e89b8055ecad50d170d8fcea71d74f0ea0e7 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sat, 18 Jan 2025 01:28:29 +0100 Subject: [PATCH] couple small zed things --- .config/zed/keymap.json | 41 +++++++++++++++++---------------------- .config/zed/settings.json | 39 +++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 29 deletions(-) diff --git a/.config/zed/keymap.json b/.config/zed/keymap.json index 0525e87..a161a50 100644 --- a/.config/zed/keymap.json +++ b/.config/zed/keymap.json @@ -13,29 +13,17 @@ "alt-c": "pane::CloseActiveItem", "ctrl-shift-w": null, "ctrl-q": null, - "ctrl-h": [ - "workspace::ActivatePaneInDirection", - "Left" - ], - "ctrl-l": [ - "workspace::ActivatePaneInDirection", - "Right" - ], - "ctrl-k": [ - "workspace::ActivatePaneInDirection", - "Up" - ], - "ctrl-j": [ - "workspace::ActivatePaneInDirection", - "Down" - ], + "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], + "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], + "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], + "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"] } }, { "context": "Workspace", "bindings": { "f5": "workspace::ToggleLeftDock", - "alt-v": "terminal_panel::ToggleFocus", + "alt-v": "terminal_panel::ToggleFocus" } }, { @@ -54,6 +42,12 @@ "ctrl-w": "terminal::ToggleViMode" } }, + { + "context": "Editor", + "bindings": { + "alt-enter": "repl::Run" + } + }, { "context": "VimControl && !menu", "bindings": { @@ -86,7 +80,7 @@ "line": true } } - ], + ] } }, { @@ -98,7 +92,8 @@ "task_name": "lazygit", "reveal_target": "center" } - ] + ], + "space f f": "editor::Format" } }, { @@ -107,14 +102,14 @@ "ctrl-l": "vim::Right", "ctrl-h": "vim::Left", "ctrl-j": "vim::Down", - "ctrl-k": "vim::Up", + "ctrl-k": "vim::Up" } }, { "context": "Editor && (showing_code_actions || showing_completions)", "bindings": { "shift-tab": "editor::ContextMenuPrev", - "tab": "editor::ContextMenuNext", + "tab": "editor::ContextMenuNext" } }, { @@ -134,7 +129,7 @@ { "skip_prompt": false } - ], + ] } - }, + } ] diff --git a/.config/zed/settings.json b/.config/zed/settings.json index 6752a04..92d9e31 100644 --- a/.config/zed/settings.json +++ b/.config/zed/settings.json @@ -23,8 +23,8 @@ "version": "2" }, "buffer_font_size": 17, - "format_on_save": "language_server", - "formatter": "language_server", + "format_on_save": "prettier", + "formatter": "prettier", "buffer_font_family": "FiraCode Nerd Font", "tab_size": 4, "vim_mode": true, @@ -61,13 +61,40 @@ "cargo": { "features": "all", "allTargets": true - }, + } + } + }, + "ruff": { + "initialization_options": { + "settings": { + // Ruff server settings goes here + "lineLength": 80, + "lint": { + "extendSelect": ["I"] + } + } } } }, "soft_wrap": "editor_width", "show_wrap_guides": true, - "wrap_guides": [ - 80 - ], + "wrap_guides": [80], + "languages": { + "Python": { + "language_servers": ["ruff"], + "format_on_save": "language_server", + "formatter": [ + { + "language_server": { + "name": "ruff" + } + } + ] + // "language_servers": ["pyright", "ruff"] + }, + "Rust": { + "format_on_save": "language_server", + "formatter": "language_server" + } + } }