summaryrefslogtreecommitdiff
path: root/dot-config
diff options
context:
space:
mode:
authorlittleblack111 <littleblack11111@gmail.com>2025-11-24 00:01:54 +0800
committerlittleblack111 <littleblack11111@gmail.com>2025-11-24 00:01:54 +0800
commit2455ede4644f394abf66cec3a06f647d377e9ec0 (patch)
tree188e30476eccd37b62e2a20c23180ef4017ced1d /dot-config
parent1daee55ed26dcee43f3ed3daa37fd164cc353a75 (diff)
bump: zed
Diffstat (limited to 'dot-config')
-rw-r--r--dot-config/opencode/AGENTS.md1
-rw-r--r--dot-config/wallust/templates/zed-contrast-from-helix.json2
-rw-r--r--dot-config/wallust/templates/zed-contrast.json2
-rw-r--r--dot-config/wallust/templates/zed.json2
-rw-r--r--dot-config/zed/keymap.json12
-rw-r--r--dot-config/zed/settings.json19
6 files changed, 22 insertions, 16 deletions
diff --git a/dot-config/opencode/AGENTS.md b/dot-config/opencode/AGENTS.md
index 2b7bd5c2..1977260c 100644
--- a/dot-config/opencode/AGENTS.md
+++ b/dot-config/opencode/AGENTS.md
@@ -22,5 +22,4 @@
- Use tab for indentation.
- Follow the Hungarian notation for appropriate language(i.e. C++).
-## Think like a programmer, not a writer, not looking for perfection.
diff --git a/dot-config/wallust/templates/zed-contrast-from-helix.json b/dot-config/wallust/templates/zed-contrast-from-helix.json
index 94f7e1ba..3713f6e8 100644
--- a/dot-config/wallust/templates/zed-contrast-from-helix.json
+++ b/dot-config/wallust/templates/zed-contrast-from-helix.json
@@ -16,7 +16,7 @@
"border.disabled": "{{color8}}55",
"elevated_surface.background": "{{color0}}",
"surface.background": "{{color0}}",
- "background": "{{background}}b3",
+ "background": "{{background}}CC",
"element.background": "{{color0}}",
"element.hover": "{{color8}}33",
"element.active": "{{color8}}55",
diff --git a/dot-config/wallust/templates/zed-contrast.json b/dot-config/wallust/templates/zed-contrast.json
index 73bd707e..bec4fbc7 100644
--- a/dot-config/wallust/templates/zed-contrast.json
+++ b/dot-config/wallust/templates/zed-contrast.json
@@ -16,7 +16,7 @@
"border.disabled": "{{color8}}55",
"elevated_surface.background": "{{color0}}",
"surface.background": "{{color0}}",
- "background": "{{background}}b3",
+ "background": "{{background}}CC",
"element.background": "{{color0}}",
"element.hover": "{{color8}}33",
"element.active": "{{color8}}55",
diff --git a/dot-config/wallust/templates/zed.json b/dot-config/wallust/templates/zed.json
index 7ee65061..305ff88a 100644
--- a/dot-config/wallust/templates/zed.json
+++ b/dot-config/wallust/templates/zed.json
@@ -16,7 +16,7 @@
"border.disabled": "{{color8}}66",
"elevated_surface.background": "{{color0}}CC",
"surface.background": "{{color0}}CC",
- "background": "{{background}}b3",
+ "background": "{{background}}CC",
"element.background": "{{color0}}CC",
"element.hover": "{{color1}}33",
"element.active": "{{color2}}55",
diff --git a/dot-config/zed/keymap.json b/dot-config/zed/keymap.json
index 30b25a30..c45fcb98 100644
--- a/dot-config/zed/keymap.json
+++ b/dot-config/zed/keymap.json
@@ -920,16 +920,22 @@
"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": {
- "space d": "diagnostics::Deploy"
+ "p": "editor::Paste"
}
},
{
- "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)",
+ "context": "(Editor && mode == full)",
"bindings": {
- "p": "editor::Paste"
+ "ctrl-h": null
}
}
]
diff --git a/dot-config/zed/settings.json b/dot-config/zed/settings.json
index ca11276d..1b97ce03 100644
--- a/dot-config/zed/settings.json
+++ b/dot-config/zed/settings.json
@@ -7,7 +7,10 @@
// custom settings, run `zed: open default settings` from the
// command palette (cmd-shift-p / ctrl-shift-p)
{
- "diagnostics": {
+ "collaboration_panel": {
+ "dock": "left"
+ },
+ "diagnostics": {
"inline": {
"enabled": true
}
@@ -25,6 +28,9 @@
"use_system_path_prompts": false,
"expand_excerpt_lines": 4,
"vim_mode": true,
+ "vim": {
+ "use_system_clipboard": "on_yank"
+ },
"features": {
"edit_prediction_provider": "copilot"
},
@@ -81,7 +87,7 @@
"relative_line_numbers": "wrapped",
"agent": {
"default_profile": "write",
- "always_allow_tool_actions": true,
+ "always_allow_tool_actions": true,
"default_model": {
"provider": "copilot_chat",
"model": "gpt-5.1-codex"
@@ -108,16 +114,11 @@
"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": 15.0,
"theme": "wal"
-} \ No newline at end of file
+}