update

Signed-off-by: Lee Tang <i@d0zingcat.dev>

.Brewfile.Darwin.gooddeAir

@@ -1,15 +1,16 @@
+tap "go-swagger/go-swagger"
 tap "homebrew/bundle"
 tap "homebrew/cask"
 tap "homebrew/cask-drivers"
 tap "homebrew/core"
 tap "homebrew/services"
 tap "mongodb/brew"
+brew "xz"
+brew "jpeg-xl"
 brew "argocd"
 brew "coreutils"
 brew "readline"
 brew "asdf"
-brew "sqlite"
-brew "xz"
 brew "autojump"
 brew "bat"
 brew "bpytop"
@@ -20,8 +21,12 @@ brew "difftastic"
 brew "direnv"
 brew "dosbox"
 brew "fd"
+brew "harfbuzz"
+brew "tesseract"
+brew "ffmpeg"
 brew "fzf"
 brew "git"
+brew "gnu-sed"
 brew "gnupg"
 brew "go"
 brew "gojq"
@@ -29,7 +34,9 @@ brew "node"
 brew "graphql-cli"
 brew "helm"
 brew "helmfile"
+brew "hugo"
 brew "jq"
+brew "openjdk"
 brew "zookeeper"
 brew "kafka"
 brew "kubernetes-cli"
@@ -45,7 +52,10 @@ brew "pinentry-mac"
 brew "pnpm"
 brew "postgresql@14"
 brew "pyenv"
+brew "qt@5"
+brew "pyqt@5"
 brew "python@3.10"
+brew "rclone"
 brew "redis", restart_service: true
 brew "ripgrep"
 brew "rustup-init"
@@ -61,6 +71,8 @@ brew "trzsz-go"
 brew "wakeonlan"
 brew "wget"
 brew "wireguard-tools"
+brew "youtube-dl"
+brew "go-swagger/go-swagger/go-swagger"
 brew "mongodb/brew/mongodb-community"
 cask "1password"
 cask "1password-cli"
@@ -73,17 +85,18 @@ cask "dash"
 cask "datagrip"
 cask "discord"
 cask "docker"
+cask "feishu"
 cask "google-chrome"
 cask "google-drive"
+cask "jetbrains-toolbox"
 cask "keepingyouawake"
-cask "lark"
 cask "logi-options-plus"
 cask "logseq"
-cask "microsoft-edge"
 cask "ngrok"
 cask "notion"
 cask "obsidian"
 cask "only-switch"
+cask "orbstack"
 cask "raycast"
 cask "sourcetree"
 cask "spotify"
@@ -109,8 +122,68 @@ mas "Pages", id: 409201541
 mas "Reeder", id: 1529448980
 mas "Slack", id: 803453959
 mas "Tailscale", id: 1475387142
-mas "Twitter", id: 1482454543
-mas "Userscripts", id: 1463298887
+mas "Userscripts-Mac-App", id: 1463298887
 mas "Vimari", id: 1480933944
 mas "WeChat", id: 836500024
 mas "Xcode", id: 497799835
+vscode "42Crunch.vscode-openapi"
+vscode "antfu.browse-lite"
+vscode "antfu.vite"
+vscode "asvetliakov.vscode-neovim"
+vscode "dbaeumer.vscode-eslint"
+vscode "eamodio.gitlens"
+vscode "eriklynd.json-tools"
+vscode "fabiospampinato.vscode-diff"
+vscode "GitHub.codespaces"
+vscode "GitHub.copilot"
+vscode "GitHub.vscode-pull-request-github"
+vscode "gitpod.gitpod-desktop"
+vscode "golang.go"
+vscode "JuanBlanco.solidity"
+vscode "LeetCode.vscode-leetcode"
+vscode "Lencerf.beancount"
+vscode "mohsen1.prettify-json"
+vscode "ms-azuretools.vscode-docker"
+vscode "ms-mssql.mssql"
+vscode "ms-mssql.sql-bindings-vscode"
+vscode "ms-ossdata.vscode-postgresql"
+vscode "ms-python.isort"
+vscode "ms-python.python"
+vscode "ms-python.vscode-pylance"
+vscode "ms-toolsai.jupyter-keymap"
+vscode "ms-vscode-remote.remote-containers"
+vscode "ms-vscode-remote.remote-ssh"
+vscode "ms-vscode-remote.remote-ssh-edit"
+vscode "ms-vscode-remote.remote-wsl"
+vscode "ms-vscode-remote.vscode-remote-extensionpack"
+vscode "ms-vscode.cpptools"
+vscode "ms-vscode.makefile-tools"
+vscode "ms-vscode.remote-explorer"
+vscode "ms-vscode.remote-server"
+vscode "ms-vscode.vscode-typescript-next"
+vscode "polarmutex.beancount-langserver"
+vscode "quicktype.quicktype"
+vscode "redhat.java"
+vscode "redhat.vscode-commons"
+vscode "redhat.vscode-yaml"
+vscode "RemixProject.ethereum-remix"
+vscode "rust-lang.rust-analyzer"
+vscode "serayuzgur.crates"
+vscode "shd101wyy.markdown-preview-enhanced"
+vscode "tamasfe.even-better-toml"
+vscode "timonwong.shellcheck"
+vscode "tomsaunders.vscode-workspace-explorer"
+vscode "vadimcn.vscode-lldb"
+vscode "VisualStudioExptTeam.intellicode-api-usage-examples"
+vscode "VisualStudioExptTeam.vscodeintellicode"
+vscode "vscjava.vscode-java-debug"
+vscode "vscjava.vscode-java-dependency"
+vscode "vscjava.vscode-java-pack"
+vscode "vscjava.vscode-java-test"
+vscode "vscjava.vscode-maven"
+vscode "vscodevim.vim"
+vscode "Vue.volar"
+vscode "WakaTime.vscode-wakatime"
+vscode "yzhang.markdown-all-in-one"
+vscode "ZainChen.json"
+vscode "zhwu95.riscv"

.zshrc

@@ -32,6 +32,7 @@ CPPFLAGS="-I$brew_opt/zlib/include -I$brew_opt/openssl@3/include"
 export LDFLAGS=$LDFLAGS
 export CPPFLAGS=$CPPFLAGS
 export ZSH_HIGHLIGHT_MAXLENGTH=60
+export GIT_EXTERNAL_DIFF=difft
 
 
 FPATH="$brew_opt/share/zsh/site-functions:${ASDF_DIR}/completions:${FPATH}"

git/config

@@ -25,16 +25,16 @@
 [pager]
     difftool = true
 
-[diff]
-    external = difft
-    tool = difftastic
-
-[difftool]
-    prompt = false
-
-[difftool "difftastic"]
-    prompt = false
-    cmd = difft "$LOCAL" "$REMOTE"
+#[diff]
+#    external = difft
+#    tool = difftastic
+#
+#[difftool]
+#    prompt = false
+#
+#[difftool "difftastic"]
+#    prompt = false
+#    cmd = difft "$LOCAL" "$REMOTE"
 
 [alias]
     lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit

nvim/lua/config/nvim_cmp.lua

@@ -29,10 +29,10 @@ cmp.setup({
         ['<C-e>'] = function(fallback)
             fallback()
         end,
-        ['<CR>'] = cmp.mapping.confirm({
-            behavior = cmp.ConfirmBehavior.Replace,
-            select = true,
-        }),
+        -- ['<CR>'] = cmp.mapping.confirm({
+        --     behavior = cmp.ConfirmBehavior.Replace,
+        --     select = true,
+        -- }),
         ['<C-y>'] = cmp.mapping.confirm({ select = true }),
         -- ['<C-n>'] = cmp.mapping.select_next_item(),
         -- ['<C-p>'] = cmp.mapping.select_prev_item(),