diff --git a/.bin/Snipaste.AppImage b/.bin/Snipaste.AppImage deleted file mode 100755 index 33949b4..0000000 Binary files a/.bin/Snipaste.AppImage and /dev/null differ diff --git a/.config/Brewfile b/.config/Brewfile index fd42844..554502f 100644 --- a/.config/Brewfile +++ b/.config/Brewfile @@ -14,13 +14,13 @@ brew "lazygit" brew "lua" brew "mackup" brew "mas" -brew "mysql@8.4", restart_service: :changed brew "ncmdump" brew "neovim" brew "nping" brew "nvm" brew "nvtop" brew "ocrmypdf" +brew "openjdk" brew "pnpm" brew "rclone" brew "repo" @@ -39,6 +39,7 @@ brew "xwininfo" cask "agent-tars" cask "alacritty" cask "alcove" +cask "android-studio" cask "appcleaner" cask "bettertouchtool" cask "cap" @@ -47,6 +48,7 @@ cask "cherry-studio" cask "clash-verge-rev" cask "coteditor" cask "cursor" +cask "daisydisk" cask "dockdoor" cask "flutter" cask "font-jetbrains-mono" @@ -76,6 +78,7 @@ cask "notion" cask "notion-calendar" cask "notion-mail" cask "obsidian" +cask "omnidisksweeper" cask "only-switch" cask "onyx" cask "orbstack" @@ -88,7 +91,6 @@ cask "slimhud" cask "snipaste" cask "spotify" cask "steam" -cask "syncalicious" cask "tagspaces" cask "thor" cask "trae" @@ -98,9 +100,9 @@ cask "visual-studio-code" cask "wechatwebdevtools" cask "windsurf" cask "wpsoffice-cn" +cask "zed" mas "Aspect Ratio", id: 1156930257 mas "CapCut", id: 1500855883 -mas "Codenote", id: 6744996909 mas "DaVinci Resolve", id: 571213070 mas "DevCleaner", id: 1388020431 mas "Developer", id: 640199958 @@ -119,20 +121,50 @@ mas "Wallpaper Monster", id: 6553989287 mas "Windows App", id: 1295203466 mas "Xcode", id: 497799835 mas "豆包", id: 6683305962 +vscode "alexisvt.flutter-snippets" +vscode "amazonwebservices.aws-toolkit-vscode" vscode "augment.vscode-augment" +vscode "continue.continue" +vscode "csstools.postcss" +vscode "dart-code.dart-code" +vscode "dart-code.flutter" vscode "docker.docker" vscode "github.copilot" vscode "github.copilot-chat" vscode "kevinrose.vsc-python-indent" +vscode "mikestead.dotenv" vscode "ms-azuretools.vscode-docker" +vscode "ms-ceintl.vscode-language-pack-zh-hans" vscode "ms-python.debugpy" vscode "ms-python.python" vscode "ms-python.vscode-pylance" 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.cmake-tools" +vscode "ms-vscode.cpptools" +vscode "ms-vscode.cpptools-extension-pack" +vscode "ms-vscode.cpptools-themes" vscode "ms-vscode.remote-explorer" vscode "parallelsdesktop.parallels-desktop" -vscode "saoudrizwan.claude-dev" +vscode "redhat.java" +vscode "serenade.serenade" vscode "subframe7536.theme-maple" +vscode "tomoki1207.pdf" +vscode "twxs.cmake" +vscode "visualstudioexptteam.intellicode-api-usage-examples" +vscode "visualstudioexptteam.vscodeintellicode" +vscode "vscjava.vscode-gradle" +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 "vscode-icons-team.vscode-icons" +vscode "vscodevim.vim" +vscode "vue.volar" +vscode "wicked-labs.wvsc-serendipity" vscode "yuyuanweb.mianshiya-vscode-extension" +vscode "yzane.markdown-pdf" +vscode "yzhang.markdown-all-in-one" diff --git a/.config/fish/conf.d/brew.fish b/.config/fish/conf.d/brew.fish index 929a607..18fcab0 100644 --- a/.config/fish/conf.d/brew.fish +++ b/.config/fish/conf.d/brew.fish @@ -1,4 +1,11 @@ eval "$(/opt/homebrew/bin/brew shellenv)" +set -x HOMEBREW_BREW_GIT_REMOTE "https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/brew.git" +set -x HOMEBREW_CORE_GIT_REMOTE "https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/homebrew-core.git" +set -x HOMEBREW_API_DOMAIN "https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles/api" +set -x HOMEBREW_BOTTLE_DOMAIN "https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles" +#set -x HOMEBREW_INSTALL_FROM_API 1 +set -x HOMEBREW_PIP_INDEX_URL "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" + function b command brew $argv if contains -- "install" $argv; or contains -- "remove" $argv; or contains -- "uninstall" $argv; diff --git a/.config/fish/conf.d/flutter.fish b/.config/fish/conf.d/flutter.fish new file mode 100644 index 0000000..179c54a --- /dev/null +++ b/.config/fish/conf.d/flutter.fish @@ -0,0 +1,3 @@ +set -x PUB_HOSTED_URL "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" +set -x FLUTTER_STORAGE_BASE_URL "https://mirrors.tuna.tsinghua.edu.cn/flutter" + diff --git a/.config/fish/conf.d/homebrew-registry.fish b/.config/fish/conf.d/homebrew-registry.fish deleted file mode 100644 index a603ce4..0000000 --- a/.config/fish/conf.d/homebrew-registry.fish +++ /dev/null @@ -1,4 +0,0 @@ -set -x HOMEBREW_BREW_GIT_REMOTE "https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/brew.git" -set -x HOMEBREW_CORE_GIT_REMOTE "https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/homebrew-core.git" -set -x HOMEBREW_API_DOMAIN "https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles/api" -set -x HOMEBREW_BOTTLE_DOMAIN "https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles" diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index dfec8e4..fb3ffcd 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,5 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 +SETUVAR --export JAVA_HOME:/opt/homebrew/opt/java SETUVAR THEME_EDEN_PROMPT_CHAR:\u00bb SETUVAR --export ZLUA_LUAEXE:/opt/homebrew/bin/lua SETUVAR --export ZLUA_SCRIPT:/Users/marsway/\x2ebin/z\x2elua/z\x2elua diff --git a/.config/shell.conf.d/brew.sh b/.config/shell.conf.d/brew.sh index 8e27422..9b983b2 100644 --- a/.config/shell.conf.d/brew.sh +++ b/.config/shell.conf.d/brew.sh @@ -3,7 +3,7 @@ export HOMEBREW_BOTTLE_DOMAIN="https://mirrors.tuna.tsinghua.edu.cn/homebrew-bot export HOMEBREW_BREW_GIT_REMOTE="https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/brew.git" export HOMEBREW_CORE_GIT_REMOTE="https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/homebrew-core.git" export HOMEBREW_INSTALL_FROM_API=1 -export HOMEBREW_PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" +export HOMEBREW_PIP_INDEX_URL=https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple eval "$(/opt/homebrew/bin/brew shellenv)" @@ -16,3 +16,11 @@ install_brew() { done brew update } + +b() { + brew $@ + if [[ $ = "install" || $1 == "remove" || $1 == "uninstall" ]]; then + echo "Updating Brewfile..." + brew bundle dump --force --file=~/.config/Brewfile + fi +} diff --git a/.config/shell.conf.d/conf.sh b/.config/shell.conf.d/conf.sh index 3c98a15..bd88da8 100644 --- a/.config/shell.conf.d/conf.sh +++ b/.config/shell.conf.d/conf.sh @@ -1,4 +1,5 @@ source /Users/marsway/.config/shell.conf.d/brew.sh +source /Users/marsway/.config/shell.conf.d/flutter.sh source /Users/marsway/.config/shell.conf.d/tool.sh source /Users/marsway/.config/shell.conf.d/aliases/crack.sh source /Users/marsway/.config/shell.conf.d/aliases/editor.sh diff --git a/.config/shell.conf.d/flutter.sh b/.config/shell.conf.d/flutter.sh new file mode 100644 index 0000000..0afca23 --- /dev/null +++ b/.config/shell.conf.d/flutter.sh @@ -0,0 +1,2 @@ +export FLUTTER_STORAGE_BASE_URL="https://mirrors.tuna.tsinghua.edu.cn/flutter" +export PUB_HOSTED_URL="https://mirrors.tuna.tsinghua.edu.cn/dart-pub" diff --git a/.gitmodules b/.gitmodules index 6baca9f..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +0,0 @@ -[submodule ".bin/z.lua"] - path = .bin/z.lua - url = https://github.com/skywind3000/z.lua.git -[submodule "install/clash-linux"] - path = install/clash-linux - url = https://gh-proxy.com/https://github.com/nelvko/clash-for-linux-install.git diff --git a/.ssh/config b/.ssh/config index 50b750c..c8d99e2 100644 --- a/.ssh/config +++ b/.ssh/config @@ -18,3 +18,6 @@ Host g User ubuntu ServerAliveInterval 30 + +Host * + IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"