diff options
| author | littleblack111 <littleblack11111@gmail.com> | 2025-11-23 21:46:29 +0800 |
|---|---|---|
| committer | littleblack111 <littleblack11111@gmail.com> | 2025-11-23 21:46:29 +0800 |
| commit | 1daee55ed26dcee43f3ed3daa37fd164cc353a75 (patch) | |
| tree | 6c276a95fe7732c89769c77ea93027638185d92c | |
| parent | 0a7ba7b011ff197d6e89b6769f0923f82e6eac9d (diff) | |
bump: zed
| -rw-r--r-- | dot-config/wallust/templates/zed-contrast-from-helix.json | 2 | ||||
| -rw-r--r-- | dot-config/wallust/wallust.toml | 4 | ||||
| -rw-r--r-- | dot-config/zed/keymap.json | 57 | ||||
| -rw-r--r-- | dot-config/zed/settings.json | 42 | ||||
| -rw-r--r-- | dot-config/zed/settings_backup.json | 115 |
5 files changed, 211 insertions, 9 deletions
diff --git a/dot-config/wallust/templates/zed-contrast-from-helix.json b/dot-config/wallust/templates/zed-contrast-from-helix.json index f4704380..94f7e1ba 100644 --- a/dot-config/wallust/templates/zed-contrast-from-helix.json +++ b/dot-config/wallust/templates/zed-contrast-from-helix.json @@ -4,7 +4,7 @@ "author": "Fuwn <contact@fuwn.me>", "themes": [ { - "name": "wal2", + "name": "wal", "appearance": "dark", "style": { "background.appearance": "blurred", diff --git a/dot-config/wallust/wallust.toml b/dot-config/wallust/wallust.toml index 171ccb3c..f06694e4 100644 --- a/dot-config/wallust/wallust.toml +++ b/dot-config/wallust/wallust.toml @@ -1,7 +1,9 @@ backend = "full" palette = "dark" color_space = "lchmixed" -# check_contrast = true +threshold = 15 +check_contrast = true + [templates] hypr.template = "hypr.conf" diff --git a/dot-config/zed/keymap.json b/dot-config/zed/keymap.json index c3fb9f4e..30b25a30 100644 --- a/dot-config/zed/keymap.json +++ b/dot-config/zed/keymap.json @@ -813,6 +813,7 @@ } }, { + "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { "space g b": "editor::ToggleGitBlameInline" } @@ -876,5 +877,59 @@ "bindings": { "ctrl-n": null } - } + }, + { + "context": "Workspace", + "bindings": { + "ctrl-alt-shift-j": "workspace::ToggleBottomDock" + } + }, + { + "context": "Workspace", + "bindings": { + "ctrl-j": null + } + }, + { + "context": "Workspace", + "bindings": { + "ctrl-alt-shift-h": "workspace::ToggleLeftDock" + } + }, + { + "context": "Workspace", + "bindings": { + "ctrl-alt-shift-l": "workspace::ToggleRightDock" + } + }, + { + "context": "Workspace", + "bindings": { + "ctrl-b": null + } + }, + { + "context": "Workspace", + "bindings": { + "ctrl-alt-b": null + } + }, + { + "context": "(VimControl && !menu)", + "bindings": { + "space g d": "editor::OpenExcerpts" + } + }, + { + "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", + "bindings": { + "space d": "diagnostics::Deploy" + } + }, + { + "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", + "bindings": { + "p": "editor::Paste" + } + } ] diff --git a/dot-config/zed/settings.json b/dot-config/zed/settings.json index 1c118ca3..ca11276d 100644 --- a/dot-config/zed/settings.json +++ b/dot-config/zed/settings.json @@ -7,10 +7,29 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { + "diagnostics": { + "inline": { + "enabled": true + } + }, + "context_servers": { + "mcp-server-context7": { + "source": "extension", + "enabled": true, + "settings": { + "context7_api_key": "ctx7sk-8e011f3f-f864-4383-98ac-f1a2ec2b2d7f" + } + } + }, + "when_closing_with_no_tabs": "platform_default", + "use_system_path_prompts": false, + "expand_excerpt_lines": 4, + "vim_mode": true, "features": { "edit_prediction_provider": "copilot" }, "edit_predictions": { + "disabled_globs": [], "mode": "subtle" }, "git": { @@ -28,6 +47,8 @@ "mute_on_join": true }, "project_panel": { + "git_status": true, + "button": true, "indent_size": 20.0 }, "active_pane_modifiers": { @@ -48,6 +69,9 @@ "show": true }, "title_bar": { + "show_sign_in": true, + "show_project_items": true, + "show_branch_name": true, "show_menus": false, "show_user_picture": false, "show_onboarding_banner": false, @@ -56,6 +80,8 @@ "cursor_shape": "bar", "relative_line_numbers": "wrapped", "agent": { + "default_profile": "write", + "always_allow_tool_actions": true, "default_model": { "provider": "copilot_chat", "model": "gpt-5.1-codex" @@ -67,7 +93,6 @@ "ui_font_family": "Inter Variable", "auto_update": false, "helix_mode": true, - "vim_mode": true, "telemetry": { "diagnostics": false, "metrics": false @@ -77,17 +102,22 @@ }, "base_keymap": "VSCode", "status_bar": { - "experimental.show": false + "experimental.show": true }, "minimap": { "show": "never" }, "cursor_blink": true, - "buffer_font_fallbacks": ["Menlo", "Monaco", "Courier New", "monospace"], + "buffer_font_fallbacks": [ + "Menlo", + "Monaco", + "Courier New", + "monospace" + ], "buffer_font_family": "JetBrainsMono Nerd Font", "hard_tabs": true, "tab_size": 4, "ui_font_size": 18.0, - "buffer_font_size": 16.0, - "theme": "wal2" -} + "buffer_font_size": 15.0, + "theme": "wal" +}
\ No newline at end of file diff --git a/dot-config/zed/settings_backup.json b/dot-config/zed/settings_backup.json new file mode 100644 index 00000000..f7e0e329 --- /dev/null +++ b/dot-config/zed/settings_backup.json @@ -0,0 +1,115 @@ +// Zed settings +// +// For information on how to configure Zed, see the Zed +// documentation: https://zed.dev/docs/configuring-zed +// +// To see all of Zed's default settings without changing your +// custom settings, run `zed: open default settings` from the +// command palette (cmd-shift-p / ctrl-shift-p) +{ + "context_servers": { + "mcp-server-context7": { + "enabled": true, + "settings": { + "context7_api_key": "ctx7sk-8e011f3f-f864-4383-98ac-f1a2ec2b2d7f" + } + } + }, + "when_closing_with_no_tabs": "platform_default", + "use_system_path_prompts": false, + "expand_excerpt_lines": 4, + "vim_mode": true, + "features": { + "edit_prediction_provider": "copilot" + }, + "edit_predictions": { + "mode": "subtle" + }, + "git": { + "inline_blame": { + "show_commit_summary": true, + "enabled": false + } + }, + "inlay_hints": { + "show_background": false, + "enabled": true + }, + "use_system_prompts": true, + "calls": { + "mute_on_join": true + }, + "project_panel": { + "git_status": true, + "button": true, + "indent_size": 20.0 + }, + "active_pane_modifiers": { + "border_size": 0.0, + "inactive_opacity": 0.5 + }, + "use_system_window_tabs": false, + "bottom_dock_layout": "contained", + "preview_tabs": { + "enable_preview_from_file_finder": false + }, + "tabs": { + "show_diagnostics": "all", + "file_icons": true, + "git_status": true + }, + "tab_bar": { + "show": true + }, + "title_bar": { + "show_sign_in": true, + "show_project_items": true, + "show_branch_name": true, + "show_menus": false, + "show_user_picture": false, + "show_onboarding_banner": false, + "show_branch_icon": true + }, + "cursor_shape": "bar", + "relative_line_numbers": "wrapped", + "agent": { + "always_allow_tool_actions": true, + "default_model": { + "provider": "copilot_chat", + "model": "gpt-5.1-codex" + }, + "play_sound_when_agent_done": true, + "model_parameters": [] + }, + "icon_theme": "Colored Zed Icons Theme Dark", + "ui_font_family": "Inter Variable", + "auto_update": false, + "helix_mode": true, + "telemetry": { + "diagnostics": false, + "metrics": false + }, + "node": { + "npm_path": "bun" + }, + "base_keymap": "VSCode", + "status_bar": { + "experimental.show": true + }, + "minimap": { + "show": "never" + }, + "cursor_blink": true, + "buffer_font_fallbacks": [ + "Menlo", + "Monaco", + "Courier New", + "monospace" + ], + "buffer_font_family": "JetBrainsMono Nerd Font", + "hard_tabs": true, + "tab_size": 4, + "ui_font_size": 18.0, + "buffer_font_size": 15.0, + "theme": "wal" +}
\ No newline at end of file |
