From aa952231f61a9ac46bcd4041952c3a59fc94424b Mon Sep 17 00:00:00 2001 From: Marsway Date: Wed, 5 Aug 2026 11:49:54 +0800 Subject: [PATCH] backup: 20260805 --- .config/Brewfile | 255 ++++++++++++++++++++++---------- .config/fish/conf.d/brew.fish | 10 +- .config/fish/conf.d/kaku.fish | 5 + .config/fish/conf.d/ls.fish | 9 +- .config/fish/config.fish | 13 +- .config/fish/fish_variables | 2 +- .config/fish/functions/cat.fish | 15 ++ .config/fish/functions/fix.fish | 3 + .config/fish/functions/y.fish | 3 + .config/fish/functions/z.fish | 3 + 10 files changed, 224 insertions(+), 94 deletions(-) create mode 100644 .config/fish/conf.d/kaku.fish create mode 100644 .config/fish/functions/cat.fish create mode 100644 .config/fish/functions/fix.fish create mode 100644 .config/fish/functions/y.fish create mode 100644 .config/fish/functions/z.fish diff --git a/.config/Brewfile b/.config/Brewfile index ac9ca15..10dc51f 100644 --- a/.config/Brewfile +++ b/.config/Brewfile @@ -1,191 +1,282 @@ tap "antoniorodr/memo" tap "hashicorp/tap" +tap "moonbai-studio/tungsten-edge" +tap "raskrebs/sonar" +tap "roversx/tap", trusted: { casks: ["launchnext"] } tap "steipete/tap" +tap "tamnd/tap" tap "timhartmann7/tap" tap "tw93/tap" -tap "yuzeguitarist/deck" +tap "vorssaint/tap" +tap "yuzeguitarist/deck", trusted: { casks: ["deckclip"] } +# Command-line client tool for Alibaba aDrive disk brew "aliyunpan" +# Download with resuming and segmented downloading brew "aria2" +# Clone of cat(1) with syntax highlighting and Git integration +brew "bat" +# Cross-platform make brew "cmake" +# Dependency manager for Cocoa projects brew "cocoapods" +# Container runtimes on MacOS (and Linux) with minimal setup brew "colima", restart_service: :changed +# Modern, maintained replacement for ls +brew "eza" +# User-friendly command-line shell for UNIX-like operating systems brew "fish" +# Plugin manager for the Fish shell brew "fisher" +# Command-line fuzzy finder written in Go +brew "fzf" +# Open-source, cross-platform JavaScript runtime environment brew "node" +# Interact with Google Gemini AI models from the command-line brew "gemini-cli" +# GitHub command-line tool brew "gh" +# Syntax-highlighting pager for git and diff output +brew "git-delta" +# Render markdown on the CLI +brew "glow" +# Open source programming language to build simple/reliable/efficient software brew "go" +# Google Suite CLI brew "gogcli" +# Tool for glamorous shell scripts brew "gum" +# Fast, simple & powerful blog framework brew "hexo" +# Improved top (interactive process viewer) brew "htop" +# Kubernetes command-line interface brew "kubernetes-cli" +# Simple terminal UI for git commands brew "lazygit" +# LLVM's OpenMP runtime library brew "libomp" +# Next-gen compiler infrastructure brew "llvm" +# Web based real-time log viewer +brew "logdy" +# Powerful, lightweight programming language brew "lua" -brew "mackup" +# Mac App Store command-line interface brew "mas" +# Deep clean and optimize your Mac +brew "mole" +# Remote terminal application brew "mosh" +# Open source relational database management system brew "mysql-client" +# Ping Tool in Rust with Real-Time Data and Visualizations brew "nbping" +# Convert Netease Cloud Music ncm files to mp3/flac files brew "ncmdump" +# Fast, highly customisable system info script brew "neofetch" +# Ambitious Vim-fork focused on extensibility and agility brew "neovim" +# Manage multiple Node.js versions brew "nvm" +# Interactive GPU process monitor brew "nvtop" +# Adds an OCR text layer to scanned PDF files brew "ocrmypdf" +# Development kit for the Java programming language brew "openjdk" +# Package compiler and linker metadata toolkit brew "pkgconf" -brew "pnpm", link: false +# Fast, disk space efficient package manager +brew "pnpm" +# Rsync for cloud storage brew "rclone" +# Repository tool for Android development brew "repo" +# Search tool like grep and The Silver Searcher +brew "ripgrep" +# Safe, concurrent, practical language brew "rust" +# Cross-shell prompt for astronauts +brew "starship" +# Organize software neatly under a single directory tree (e.g. /usr/local) brew "stow" +# Opinionated Lua code formatter brew "stylua" +# Version control system designed to be a better CVS brew "subversion" +# Rich and complete approach to parallelism in C++ brew "tbb" +# Traceroute implementation using TCP packets brew "tcptraceroute" +# User interface to the TELNET protocol brew "telnet" +# Terminal multiplexer brew "tmux" +# CLI tool that moves files or folder to the trash brew "trash" +# Display directories as trees (with optional color/HTML output) brew "tree" +# Cozy typing speed tester in terminal brew "typioca" +# Extremely fast Python package installer and resolver, written in Rust brew "uv" +# Internet file retriever brew "wget" +# Fake keyboard/mouse input and window management for X brew "xdotool" +# Property displayer for X brew "xprop" +# Print information about windows on an X server brew "xwininfo" -brew "antoniorodr/memo/memo" -brew "hashicorp/tap/terraform" -brew "steipete/tap/remindctl" -brew "timhartmann7/tap/omnyssh" +# Blazing fast terminal file manager written in Rust, based on async I/O +brew "yazi" +# Shell extension to navigate your filesystem faster +brew "zoxide" +# Fish-like fast/unobtrusive autosuggestions for zsh +brew "zsh-autosuggestions" +# Additional completion definitions for zsh +brew "zsh-completions" +# Fish shell like syntax highlighting for zsh +brew "zsh-syntax-highlighting" +# CLI app to manage your Apple Notes and Apple reminders +brew "antoniorodr/memo/memo", trusted: true +# Terraform +brew "hashicorp/tap/terraform", trusted: true +# CLI tool for monitoring ports and processes +brew "raskrebs/sonar/sonar", trusted: true +# Fast CLI for Apple Reminders +brew "steipete/tap/remindctl", trusted: true +# TUI SSH dashboard & server manager +brew "timhartmann7/tap/omnyssh", trusted: true +# Command-line interface for 1Password cask "1password-cli" +# Multimodal AI agent for GUI interaction cask "agent-tars" -cask "aldente" -cask "alt-tab" -cask "appcleaner" -cask "bettertouchtool" +# Replacement for the built-in Cmd+Tab app switcher +cask "bettercmdtab" +# Calendar software focusing on flexibility and reliability cask "busycal" -cask "cap" +# Web debugging Proxy application cask "charles" +# Desktop app for GPT-4 / GPT-3.5 (OpenAI API) +cask "chatbox" +# Desktop client that supports multiple LLM providers cask "cherry-studio" +# OpenAI's coding agent that runs in your terminal cask "codex" -cask "coteditor" -cask "cursor" +# Disk space visualiser cask "daisydisk" -cask "yuzeguitarist/deck/deckclip" +# Teamwork app by Alibaba Group cask "dingtalk" +# Voice and text chat software cask "discord" +# Window peeking utility app cask "dockdoor" +# Email client +cask "fastmail" +# UI toolkit for building applications for mobile, web and desktop cask "flutter" cask "font-fira-code" cask "font-fira-code-nerd-font" cask "font-jetbrains-mono" cask "font-jetbrains-mono-nerd-font" cask "font-maple-mono-nf-cn" +cask "font-source-han-sans-vf" +# Audio player cask "foobar2000" +# Terminal emulator that uses platform-native UI and GPU acceleration cask "ghostty" +# Desktop client for GitHub repositories cask "github" -cask "google-chrome" +# Client for the Google Drive storage service cask "google-drive" +# Application launcher and productivity software cask "hapigo" +# Hex editor for reverse engineers +cask "imhex" +# Tool for multi-language users cask "input-source-pro" -cask "tw93/tap/kakuku" -cask "keka" +# Clone any website for offline viewing, with the JavaScript stripped out +cask "tamnd/tap/kage", trusted: true +# Agent-centric IDE with spec-driven development +cask "kiro" +# Search and play songs from a variety of online sources cask "listen1" +# Break time reminder app cask "lookaway" +# Adaptive brightness for external displays +cask "lunar" +# Lunar calendar for menu bar +cask "lunarbar" +# Lyrics for iTunes, Spotify, Vox and Audirvana Plus cask "lyricsx" +# Photo editing and beautification software +cask "meituxiuxiu" +# Minimal installer for conda cask "miniconda" +# Smooths scrolling and set mouse scroll directions independently +cask "mos" +# Open-source music notation software cask "musescore" +# Database administration and development tool cask "navicat-premium-lite" -cask "notion" -cask "obs" -cask "obsidian" +# Finds large, unwanted files and deletes them cask "omnidisksweeper" -cask "only-switch" +# Document editor +cask "onlyoffice" +# Replacement for Docker Desktop cask "orbstack" +# Tool for uploading images +cask "picgo" +# Apple Notes extension +cask "pronotes" +# Open-source application manager and system cleaner cask "puremac" -cask "qq" +# Better Finder alternative cask "qspace-pro" +# Font manager that helps preview, install, sync and manage fonts cask "rightfont" -cask "slack" +# Replacement for the volume, brightness and keyboard backlight HUDs cask "slimhud" +# Snip or pin screenshots cask "snipaste" -cask "soundsource" +# Video game digital distribution service cask "steam" +# Remote access and connectivity software focused on security cask "teamviewer" +# 以「窗口」为单位的 macOS 底部任务条，替代系统程序坞 +cask "moonbai-studio/tungsten-edge/tungsten-edge", trusted: true +# Removes vocals from audio files cask "ultimate-vocal-remover" -cask "visual-studio-code" -cask "wechatwebdevtools" -cask "wolai" +# Menu bar toolkit with keep-awake, system monitor and volume mixer +cask "vorssaint/tap/vorssaint", trusted: true +# Free messaging and calling application +cask "wechat" +# All-in-one office service platform in Chinese +cask "wpsoffice-cn" +# Gecko based web browser cask "zen" +# Video communication and virtual meeting platform cask "zoom" -mas "AnySearch", id: 6762029307 mas "Aspect Ratio", id: 1156930257 mas "DaVinci Resolve", id: 571213070 -mas "DevCleaner", id: 1388020431 mas "Developer", id: 640199958 mas "Eye Monitor", id: 1527031341 +mas "FastZip", id: 1565629813 mas "flomo", id: 1665341561 mas "Gifski", id: 1351639930 +mas "Keynote讲演", id: 361285480 mas "LocalSend", id: 1661733229 -mas "Nex Terminal", id: 6742214286 +mas "Numbers表格", id: 361304891 +mas "Pages文稿", id: 361309726 mas "QianJi", id: 1473785373 -mas "rcmd", id: 1596283165 -mas "SenPlayer", id: 6443975850 mas "SnippetsLab", id: 1006087419 -mas "VMware Remote Console", id: 1230249825 mas "Windows App", id: 1295203466 -mas "慢读", id: 1523989532 +mas "WonderPen", id: 6476477820 +mas "库乐队", id: 682658836 +mas "无限暖暖", id: 6502622479 mas "网易爆米花", id: 6553989480 -mas "豆包", id: 6683305962 -vscode "alexisvt.flutter-snippets" -vscode "csstools.postcss" -vscode "dart-code.dart-code" -vscode "dart-code.flutter" -vscode "docker.docker" -vscode "github.copilot-chat" -vscode "halo-dev.halo" -vscode "kevinrose.vsc-python-indent" -vscode "mikestead.dotenv" -vscode "ms-azuretools.vscode-containers" -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-python.vscode-python-envs" -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.cpp-devtools" -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 "redhat.java" -vscode "saoudrizwan.claude-dev" -vscode "subframe7536.theme-maple" -vscode "tomoki1207.pdf" -vscode "twxs.cmake" -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" -uv "kimi-cli" npm "@larksuite/cli" npm "pm2" npm "uipro-cli" diff --git a/.config/fish/conf.d/brew.fish b/.config/fish/conf.d/brew.fish index 18fcab0..7f20d54 100644 --- a/.config/fish/conf.d/brew.fish +++ b/.config/fish/conf.d/brew.fish @@ -1,10 +1,10 @@ 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_BREW_GIT_REMOTE "https://mirrors.bfsu.edu.cn/git/homebrew/brew.git" +set -x HOMEBREW_CORE_GIT_REMOTE "https://mirrors.bfsu.edu.cn/git/homebrew/homebrew-core.git" +set -x HOMEBREW_API_DOMAIN "https://mirrors.bfsu.edu.cn/homebrew-bottles/api" +set -x HOMEBREW_BOTTLE_DOMAIN "https://mirrors.bfsu.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" +set -x HOMEBREW_PIP_INDEX_URL "https://mirrors.bfsu.edu.cn/pypi/web/simple" function b command brew $argv diff --git a/.config/fish/conf.d/kaku.fish b/.config/fish/conf.d/kaku.fish new file mode 100644 index 0000000..68bd265 --- /dev/null +++ b/.config/fish/conf.d/kaku.fish @@ -0,0 +1,5 @@ +# Kaku shell integration -- managed. Remove with: kaku reset +set -l _kaku_fish_init "$HOME/.config/kaku/fish/kaku.fish" +if test -f $_kaku_fish_init + source $_kaku_fish_init +end diff --git a/.config/fish/conf.d/ls.fish b/.config/fish/conf.d/ls.fish index 03b411d..59a63d8 100644 --- a/.config/fish/conf.d/ls.fish +++ b/.config/fish/conf.d/ls.fish @@ -1,9 +1,12 @@ function l - command ls --color=auto -l $argv + command eza +end +function ll + command eza -l end function la - command ls --color=auto -la $argv + command eza -la end function lg - command ls --color=auto -la | grep $argv[1] + command eza -la | grep $argv[1] end diff --git a/.config/fish/config.fish b/.config/fish/config.fish index b377a1e..337012a 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -35,6 +35,13 @@ set -gx PATH $PATH /Users/marsway/.lmstudio/bin # End of LM Studio CLI section -# Added by Antigravity -fish_add_path /Users/marsway/.antigravity/antigravity/bin -fish_add_path $HOME/.local/bin +# Hermes Agent — ensure ~/.local/bin is on PATH +fish_add_path "$HOME/.local/bin" + +# >>> otty shell integration >>> +# Added by Otty — toggle in Settings > Shell > Shell Integration. +# Inert unless launched by Otty (it sets $OTTY_SHELL_INTEGRATION). +if test -n "$OTTY_SHELL_INTEGRATION" -a -r "$OTTY_SHELL_INTEGRATION/otty-integration.fish" + source "$OTTY_SHELL_INTEGRATION/otty-integration.fish" +end +# <<< otty shell integration <<< diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index fa4daca..c0d2613 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -11,7 +11,7 @@ SETUVAR _fisher_jorgebucaran_2F_nvm_2E_fish_files:\x7e/\x2econfig/fish/functions SETUVAR _fisher_plugins:jorgebucaran/nvm\x2efish SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR all_proxy:\x1d -SETUVAR fish_user_paths:/Users/marsway/\x2ebin/VMware\x20OVF\x20Tool\x1e/Users/marsway/\x2elocal/bin\x1e/opt/homebrew/opt/mysql\x2dclient/bin\x1e/Users/marsway/\x2eantigravity/antigravity/bin\x1e/opt/homebrew/opt/openjdk/bin\x1e/opt/homebrew/sbin\x1e/opt/clash/bin\x1e/opt/homebrew/opt/mysql\x408\x2e4/bin\x1e/opt/homebrew/bin +SETUVAR fish_user_paths:/Users/marsway/\x2econfig/kaku/fish/bin\x1e/Users/marsway/\x2ebin/VMware\x20OVF\x20Tool\x1e/Users/marsway/\x2elocal/bin\x1e/opt/homebrew/opt/mysql\x2dclient/bin\x1e/Users/marsway/\x2eantigravity/antigravity/bin\x1e/opt/homebrew/opt/openjdk/bin\x1e/opt/homebrew/sbin\x1e/opt/clash/bin\x1e/opt/homebrew/opt/mysql\x408\x2e4/bin\x1e/opt/homebrew/bin SETUVAR pure_begin_prompt_with_current_directory:true SETUVAR pure_check_for_new_release:false SETUVAR pure_color_at_sign:pure_color_mute diff --git a/.config/fish/functions/cat.fish b/.config/fish/functions/cat.fish new file mode 100644 index 0000000..e0d8fab --- /dev/null +++ b/.config/fish/functions/cat.fish @@ -0,0 +1,15 @@ +function cat + if test (count $argv) -eq 1 + set file $argv[1] + + if test -f "$file" + if string match -rq '\.md$' -- "$file" + command glow "$file" + else + command bat --paging=never "$file" + end + return + end + end + command bat $argv +end diff --git a/.config/fish/functions/fix.fish b/.config/fish/functions/fix.fish new file mode 100644 index 0000000..5789f9c --- /dev/null +++ b/.config/fish/functions/fix.fish @@ -0,0 +1,3 @@ +function fix + sudo xattr -r -d com.apple.quarantine $argv +end diff --git a/.config/fish/functions/y.fish b/.config/fish/functions/y.fish new file mode 100644 index 0000000..d2c924c --- /dev/null +++ b/.config/fish/functions/y.fish @@ -0,0 +1,3 @@ +function y + command yazi $argv +end diff --git a/.config/fish/functions/z.fish b/.config/fish/functions/z.fish new file mode 100644 index 0000000..6b6bb6c --- /dev/null +++ b/.config/fish/functions/z.fish @@ -0,0 +1,3 @@ +function z + command zoxide $argv +end