From dd45febeced149a7a426e56dee05673af3c320ff Mon Sep 17 00:00:00 2001
From: Lee Tang <i@d0zingcat.dev>
Date: Tue, 25 Jul 2023 11:37:13 +0800
Subject: [PATCH] update

Signed-off-by: Lee Tang <i@d0zingcat.dev>
---
 .Brewfile.Darwin.gooddeAir |  2 +
 .zshrc                     | 24 ++++++------
 starship.toml              | 79 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/.Brewfile.Darwin.gooddeAir b/.Brewfile.Darwin.gooddeAir
index 6dd258d..c54070c 100644
--- a/.Brewfile.Darwin.gooddeAir
+++ b/.Brewfile.Darwin.gooddeAir
@@ -105,6 +105,7 @@ cask "raycast"
 cask "sourcetree"
 cask "spotify"
 cask "stats"
+cask "tabby"
 cask "tableplus"
 cask "telegram"
 cask "temurin"
@@ -143,6 +144,7 @@ vscode "eriklynd.json-tools"
 vscode "fabiospampinato.vscode-diff"
 vscode "GitHub.codespaces"
 vscode "GitHub.copilot"
+vscode "GitHub.copilot-chat"
 vscode "GitHub.vscode-pull-request-github"
 vscode "gitpod.gitpod-desktop"
 vscode "golang.go"
diff --git a/.zshrc b/.zshrc
index 316bd8d..a143de2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -37,28 +37,24 @@ export GIT_EXTERNAL_DIFF=difft
 
 FPATH="$brew_opt/share/zsh/site-functions:${ASDF_DIR}/completions:${FPATH}"
 DISABLE_MAGIC_FUNCTIONS=true
+
+
 source $HOME/.antigen/antigen.zsh
-
-
-
 antigen use oh-my-zsh
-
+antigen bundle zsh-users/zsh-autosuggestions
+antigen bundle zsh-users/zsh-syntax-highlighting
+antigen bundle zsh-users/zsh-completions
 antigen bundle git
 antigen bundle kubectl
 antigen bundle vi-mode
 antigen bundle autojump
 antigen bundle pip
 antigen bundle asdf
-#antigen bundle "MichaelAquilina/zsh-autoswitch-virtualenv"
 antigen bundle nvim
+antigen bundle fzf
 antigen bundle darvid/zsh-poetry
 antigen bundle Aloxaf/fzf-tab
-antigen bundle fzf
-
-antigen bundle zsh-users/zsh-autosuggestions
-antigen bundle zsh-users/zsh-syntax-highlighting
-antigen bundle zsh-users/zsh-completions
-
+antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
 antigen apply
 
 source <(kubectl completion zsh)
@@ -207,5 +203,7 @@ function git_clean() {
 #export PKG_CONFIG_PATH="/usr/local/opt/zlib/lib/pkgconfig"
 
 #compdef __start_kubectl k
-eval "$(op completion zsh)"; compdef _op op
-eval "$(pyenv virtualenv-init -)"
+#export PYENV_VIRTUALENV_DISABLE_PROMPT=1
+#eval "$(op completion zsh)"; compdef _op op
+#eval "$(pyenv init -)"
+#eval "$(pyenv virtualenv-init -)"
diff --git a/starship.toml b/starship.toml
index 6867fb3..42a8aa6 100644
--- a/starship.toml
+++ b/starship.toml
@@ -1,5 +1,56 @@
+palette = "catppuccin_mocha"
+
+# Inserts a blank line between shell prompts
+add_newline = true
+scan_timeout = 10
+
 format = '$directory$git_branch$git_commit$git_state$git_status$golang$helm$java$nodejs$python$red$ruby$rust$kubernetes$custom$cmd_duration$lua$line_break$jobs$time$status$shell$character'
 
+# Replace the "❯" symbol in the prompt with "➜"
+[character]                            # The name of the module we are configuring is "character"
+success_symbol = "[➜](bold green)"    # The "success_symbol" segment is being set to "➜" with the color "bold green"
+error_symbol = "[➜](bold red)"
+
+[time]
+disabled = true
+time_format = '%R'
+format = '[\[ $time \]]($style) '
+style = "white dimmed"
+
+[username]
+style_user = "purple bold"
+style_root = "red bold"
+format = "[$user]($style) in "
+disabled = true
+show_always = true
+
+[shell]
+format = 'in [$indicator \]]($style) '
+disabled = true
+style = "white dimmed"
+
+[status]
+# format = '[$symbol $signal_name\($signal_number\)]($style) '
+format = '[$symbol]($style) '
+map_symbol = true
+disabled = false
+
+[cmd_duration]
+show_notifications = false
+min_time = 1_000
+format = "took [$duration](bold yellow)"
+min_time_to_notify = 70_000
+
+[sudo]
+style = "bold red"
+symbol = "root "
+disabled = false
+
+[memory_usage]
+disabled = true
+threshold = 50
+format = "with [${ram_pct}]($style) $symbol"
+
 [git_commit]
 tag_disabled = true
 only_detached = false
@@ -18,3 +69,31 @@ pyenv_version_name = false
 #symbol = 'ʕ◔ϖ◔ʔ '
 
 [rust]
+
+[palettes.catppuccin_mocha]
+rosewater = "#f5e0dc"
+flamingo = "#f2cdcd"
+pink = "#f5c2e7"
+mauve = "#cba6f7"
+red = "#f38ba8"
+maroon = "#eba0ac"
+peach = "#fab387"
+yellow = "#f9e2af"
+green = "#a6e3a1"
+teal = "#94e2d5"
+sky = "#89dceb"
+sapphire = "#74c7ec"
+blue = "#89b4fa"
+lavender = "#b4befe"
+text = "#cdd6f4"
+subtext1 = "#bac2de"
+subtext0 = "#a6adc8"
+overlay2 = "#9399b2"
+overlay1 = "#7f849c"
+overlay0 = "#6c7086"
+surface2 = "#585b70"
+surface1 = "#45475a"
+surface0 = "#313244"
+base = "#1e1e2e"
+mantle = "#181825"
+crust = "#11111b"