diff --git a/fish/fish_variables b/fish/fish_variables index fcbc651..5c3bde1 100644 --- a/fish/fish_variables +++ b/fish/fish_variables @@ -1,4 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:4300 +SETUVAR __fish_webconfig_theme_notification:set\x2dtheme\x2dv1\x2d\x234 +SETUVAR --export fish_term24bit:0 SETUVAR fish_user_paths:/opt/homebrew/sbin\x1e/opt/homebrew/bin diff --git a/fish/functions/br.fish b/fish/functions/br.fish new file mode 100644 index 0000000..c3dd0b6 --- /dev/null +++ b/fish/functions/br.fish @@ -0,0 +1,3 @@ +function br --wraps='proxy_enable; brew up; brew upgrade' --description 'alias br proxy_enable; brew up; brew upgrade' + proxy_enable; brew up; brew upgrade $argv +end diff --git a/fish/functions/lg.fish b/fish/functions/lg.fish deleted file mode 100644 index 0a580d9..0000000 --- a/fish/functions/lg.fish +++ /dev/null @@ -1,3 +0,0 @@ -function lg --wraps=/Users/congyu/lg/lg --description 'alias lg /Users/congyu/lg/lg' - /Users/congyu/lg/lg $argv -end diff --git a/zed/settings.json b/zed/settings.json index 6c7856f..4aad9f1 100644 --- a/zed/settings.json +++ b/zed/settings.json @@ -7,10 +7,25 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { - "vim_mode": true, + "agent": { + "inline_assistant_model": { + "provider": "copilot_chat", + "model": "gemini-3.1-pro-preview", + "enable_thinking": false + }, + "default_model": { + "provider": "copilot_chat", + "model": "gpt-5-mini", + "enable_thinking": false + }, + "favorite_models": [], + "model_parameters": [] + }, "agent_servers": { - "codex": { + "codex-acp": { + "type": "registry", "default_config_options": { + "mode": "auto", "reasoning_effort": "xhigh" } } @@ -35,7 +50,11 @@ }, "show_wrap_guides": true, "title_bar": { + "show_user_picture": false, + "show_user_menu": false, "show_sign_in": false, + "show_project_items": true, + "show_branch_icon": false, }, "git_panel": { "default_width": 280.0, diff --git a/zed/settings_backup.json b/zed/settings_backup.json deleted file mode 100644 index ca1011d..0000000 --- a/zed/settings_backup.json +++ /dev/null @@ -1,129 +0,0 @@ -// 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) -{ - "show_edit_predictions": false, - "relative_line_numbers": "disabled", - "agent": { - "default_model": { - "provider": "copilot_chat", - "model": "gpt-5-mini" - }, - "favorite_models": [], - "model_parameters": [] - }, - "edit_predictions": { - "mode": "eager", - "provider": "copilot" - }, - "remove_trailing_whitespace_on_save": false, - "inline_code_actions": true, - "gutter": { - "breakpoints": true, - "line_numbers": true, - }, - "drag_and_drop_selection": { - "delay": 100, - }, - "buffer_line_height": "comfortable", - "terminal": { - "font_family": ".ZedMono", - "font_size": 15.0, - "detect_venv": "off", - }, - "show_wrap_guides": true, - "title_bar": { - "show_sign_in": false, - }, - "git_panel": { - "default_width": 320.0, - }, - "outline_panel": { - "default_width": 320.0, - }, - "notification_panel": { - "dock": "right", - }, - "debugger": { - "dock": "bottom", - }, - "telemetry": { - "diagnostics": false, - "metrics": false, - }, - "base_keymap": "VSCode", - "ui_font_size": 16, - "buffer_font_features": { - "calt": false, - // "NWID": true - }, - "buffer_font_family": "Iosevka Terminal Wide", - "project_panel": { - "default_width": 320.0, - "scrollbar": { - "show": "never", - }, - "entry_spacing": "standard", - }, - "tab_size": 4, - "format_on_save": "off", - "ensure_final_newline_on_save": false, - // "preferred_line_length": 80, - "soft_wrap": "editor_width", - "git": { - "inline_blame": { - "enabled": false, - }, - }, - "collaboration_panel": { - "button": false, - }, - // "vim_mode": true, - ////// LSP config ////// - "lsp": { - "texlab": { - "settings": { - "texlab": { - "build": { - "onSave": true, - "forwardSearchAfter": false, - }, - }, - }, - }, - "clangd": { - "binary": { - "ignore_system_version": true, - "path": "/opt/homebrew/opt/llvm/bin/clangd", - "arguments": [], - }, - }, - }, - "file_types": { - "Cython": ["sage"], - }, - "languages": { - "LaTeX": { - "show_edit_predictions": false - }, - "Haskell": { - "tab_size": 2, - "hard_tabs": false, - }, - }, - "theme_overrides": { - "One Light": { - "syntax": { - "link_text": { - "font_style": "normal" - } - } - }, - }, -} -