From 3b369f38c99f01913787309479fab02e3b6ff265 Mon Sep 17 00:00:00 2001 From: xfy Date: Thu, 13 Feb 2025 08:32:44 +0800 Subject: [PATCH] update docker desktop settings --- zed/keymap.json | 15 ++++++++++----- zed/settings.json | 14 +++++++++++++- zsh/zshrc | 7 ++++++- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/zed/keymap.json b/zed/keymap.json index e9579b5..d0d4a9b 100644 --- a/zed/keymap.json +++ b/zed/keymap.json @@ -32,13 +32,16 @@ "space f f": "file_finder::Toggle", "space c a": "editor::ToggleCodeActions", // zed specific "space r n": "editor::Rename", - "space g g": [ - "workspace::SendKeystrokes", - ": new center terminal enter lazygit enter" + "space g l": [ + "task::Spawn", + { "task_name": "start lazygit", "reveal_target": "center" } ], "space t x": ["workspace::SendKeystrokes", ": clist enter"], "space t t": ["workspace::SendKeystrokes", ": new center terminal enter"], - "space h p": ["workspace::SendKeystrokes", ": toggle hunk diff enter"], + "space h p": [ + "workspace::SendKeystrokes", + ": toggle selected diff hunks enter" + ], "space h r": [ "workspace::SendKeystrokes", ": revert selected hunks enter" @@ -48,7 +51,9 @@ ": language selector: toggle enter" ], "alt-k": ["editor::MoveLineUp", { "display_lines": true }], - "alt-j": ["editor::MoveLineDown", { "display_lines": true }] + "alt-j": ["editor::MoveLineDown", { "display_lines": true }], + // lsp + "g r": ["workspace::SendKeystrokes", ": find all references enter"] } }, { diff --git a/zed/settings.json b/zed/settings.json index 898cec9..112c5bd 100644 --- a/zed/settings.json +++ b/zed/settings.json @@ -44,7 +44,7 @@ "theme": { "mode": "dark", "light": "One Light", - "dark": "Catppuccin Mocha (Blur)" + "dark": "Catppuccin Mocha" }, "base_keymap": "VSCode", "buffer_font_family": "JetBrainsMono Nerd Font", @@ -66,6 +66,11 @@ "file_icons": true, "git_status": false }, + "git": { + "inline_blame": { + "enabled": false + } + }, "file_scan_exclusions": [ // "**/.git", "**/.svn", @@ -76,6 +81,13 @@ "**/.classpath", "**/.settings" ], + "languages": { + "Python": { + "language_servers": ["ruff"] + // Or, if there are other language servers you want to use with Python + // "language_servers": ["pyright", "ruff"] + } + }, // "proxy": "http://127.0.0.1:10809", "ssh_connections": [ { diff --git a/zsh/zshrc b/zsh/zshrc index 432a256..c78ca37 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -114,10 +114,15 @@ if [[ $OSTYPE == "darwin"* ]]; then export PATH=/Volumes/SN/SDK/flutter/bin:$PATH # ollama export OLLAMA_MODELS=/Volumes/SN/Ollama/models/ - export OLLAMA_HOST=0.0.0.0:11434 + export OLLAMA_HOST=localhost:11434 # Add deno completions to search path if [[ ":$FPATH:" != *":/Users/xfy/.zsh/completions:"* ]]; then export FPATH="/Users/xfy/.zsh/completions:$FPATH"; fi . "/Users/xfy/.deno/env" + # The following lines have been added by Docker Desktop to enable Docker CLI completions. + fpath=(/Users/xfy/.docker/completions $fpath) + autoload -Uz compinit + compinit + # End of Docker CLI completions fi # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.