From d31c43d3c0cd3e3533c46bb9a69274d18e0075da Mon Sep 17 00:00:00 2001 From: Marsway Date: Wed, 9 Apr 2025 11:59:12 +0800 Subject: [PATCH] backup: 2025-04-08 --- .bin/z.lua | 1 + .config/Brewfile | 73 +++++++++++++++++++++++++++++++++++ .config/fish/conf.d/brew.fish | 4 +- .config/fish/conf.d/z.fish | 2 +- .config/fish/fish_variables | 2 +- .gitmodules | 3 ++ .vimrc | 32 +++++++-------- Brewfile | 5 ++- 8 files changed, 101 insertions(+), 21 deletions(-) create mode 160000 .bin/z.lua create mode 100644 .config/Brewfile diff --git a/.bin/z.lua b/.bin/z.lua new file mode 160000 index 0000000..4bbd0f1 --- /dev/null +++ b/.bin/z.lua @@ -0,0 +1 @@ +Subproject commit 4bbd0f1e5889f2755438952785a11b7a8222f696 diff --git a/.config/Brewfile b/.config/Brewfile new file mode 100644 index 0000000..c50b0f9 --- /dev/null +++ b/.config/Brewfile @@ -0,0 +1,73 @@ +brew "autossh" +brew "fish" +brew "fzf" +brew "go" +brew "htop" +brew "lua" +brew "mackup" +brew "mas" +brew "neofetch" +brew "neovim" +brew "node" +brew "ocrmypdf" +brew "pnpm" +brew "repo" +brew "rust" +brew "stow" +brew "stylua" +brew "tmux" +brew "trash" +brew "tree" +brew "wget" +brew "xdotool" +brew "xprop" +brew "xwininfo" +cask "agent-tars" +cask "alacritty" +cask "bettertouchtool" +cask "capacities" +cask "cherry-studio" +cask "clash-verge-rev" +cask "coteditor" +cask "cursor" +cask "dockdoor" +cask "flutter" +cask "font-jetbrains-mono" +cask "font-jetbrains-mono-nerd-font" +cask "font-maple-mono-nf-cn" +cask "ghostty" +cask "hammerspoon" +cask "kando" +cask "keka" +cask "kitty" +cask "lm-studio" +cask "lookaway" +cask "lunarbar" +cask "maccy" +cask "miniconda" +cask "obsidian" +cask "only-switch" +cask "orbstack" +cask "picgo" +cask "snipaste" +cask "spacelauncher" +cask "syncalicious" +cask "tailscale" +cask "thor" +cask "trae" +cask "trae-cn" +cask "visual-studio-code" +cask "wezterm" +vscode "github.copilot" +vscode "github.copilot-chat" +vscode "kevinrose.vsc-python-indent" +vscode "ms-azuretools.vscode-docker" +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-explorer" +vscode "parallelsdesktop.parallels-desktop" +vscode "subframe7536.theme-maple" diff --git a/.config/fish/conf.d/brew.fish b/.config/fish/conf.d/brew.fish index accb2ce..01196ec 100644 --- a/.config/fish/conf.d/brew.fish +++ b/.config/fish/conf.d/brew.fish @@ -1,8 +1,8 @@ function brew command /bin/zsh -c "brew $argv" echo "Updating Brewfile..." - command /bin/zsh -c "brew bundle dump --force --file=~/.vvconfig/Brewfile" + command /bin/zsh -c "brew bundle dump --force --file=~/.config/Brewfile" end function brew_install - brew bundle --file="~/.vvconfig/Brewfile" + brew bundle --file="~/.config/Brewfile" end diff --git a/.config/fish/conf.d/z.fish b/.config/fish/conf.d/z.fish index 34b3557..556c538 100644 --- a/.config/fish/conf.d/z.fish +++ b/.config/fish/conf.d/z.fish @@ -1,4 +1,4 @@ -lua ~/.vvconfig/scripts/z.lua/z.lua --init fish | source +lua ~/.bin/z.lua/z.lua --init fish | source abbr -a zs 'z -c' abbr -a zb 'z -b' abbr -a zbi 'z -b -i' diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 84af588..eeab3f9 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -2,7 +2,7 @@ # VERSION: 3.0 SETUVAR THEME_EDEN_PROMPT_CHAR:\u00bb SETUVAR --export ZLUA_LUAEXE:/opt/homebrew/bin/lua -SETUVAR --export ZLUA_SCRIPT:/Users/marsway/\x2evvconfig/scripts/z\x2elua/z\x2elua +SETUVAR --export ZLUA_SCRIPT:/Users/marsway/\x2ebin/z\x2elua/z\x2elua SETUVAR _ZL_DATA:/Users/marsway/\x2elocal/share/zlua/zlua\x2etxt SETUVAR _ZL_DATA_DIR:/Users/marsway/\x2elocal/share/zlua SETUVAR __fish_initialized:3800 diff --git a/.gitmodules b/.gitmodules index 4545970..6b7aca2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule ".config/alacritty/themes"] path = .config/alacritty/themes url = https://github.com/alacritty/alacritty-theme.git +[submodule ".bin/z.lua"] + path = .bin/z.lua + url = https://github.com/skywind3000/z.lua.git diff --git a/.vimrc b/.vimrc index 68a050b..18628bb 100755 --- a/.vimrc +++ b/.vimrc @@ -1,31 +1,31 @@ " function " count -source ~/.vvconfig/.config/vim/vimconfig/Count.vim +source ~/.config/vim/vimconfig/Count.vim " toggle comment -source ~/.vvconfig/.config/vim/vimconfig/ToggleComment.vim +source ~/.config/vim/vimconfig/ToggleComment.vim " auto insert copyright when create .h .cc file -source ~/.vvconfig/.config/vim/vimconfig/CopyRight.vim +source ~/.config/vim/vimconfig/CopyRight.vim " macro definition __copyRight__ -source ~/.vvconfig/.config/vim/vimconfig/InsertCopyRight.vim +source ~/.config/vim/vimconfig/InsertCopyRight.vim " normal config -source ~/.vvconfig/.config/vim/vimconfig/setting.vim +source ~/.config/vim/vimconfig/setting.vim " NERDTree -set runtimepath+=~/.vvconfig/.config/vim/vimplugin/nerdtree-master -source ~/.vvconfig/.config/vim/vimconfig/nerdtree.vim +set runtimepath+=~/.config/vim/vimplugin/nerdtree-master +source ~/.config/vim/vimconfig/nerdtree.vim " auto reformat when save .h .cc file -source ~/.vvconfig/.config/vim/vimconfig/autoReformat.vim +source ~/.config/vim/vimconfig/autoReformat.vim " theme " vim color -source ~/.vvconfig/.config/vim/vimcolor/solarized-master/vim-colors-solarized/colors/solarized.vim +source ~/.config/vim/vimcolor/solarized-master/vim-colors-solarized/colors/solarized.vim " cpp highLight -source ~/.vvconfig/.config/vim/vimcolor/setCpp.vim +source ~/.config/vim/vimcolor/setCpp.vim " airline -set runtimepath+=~/.vvconfig/.config/vim/vimplugin/vim-airline-master -source ~/.vvconfig/.config/vim/vimcolor/airline.vim +set runtimepath+=~/.config/vim/vimplugin/vim-airline-master +source ~/.config/vim/vimcolor/airline.vim " one dark -set runtimepath+=~/.vvconfig/.config/vim/vimplugin/onedark.vim-main -source ~/.vvconfig/.config/vim/vimcolor/onedark.vim +set runtimepath+=~/.config/vim/vimplugin/onedark.vim-main +source ~/.config/vim/vimcolor/onedark.vim " rainbow -set runtimepath+=~/.vvconfig/.config/vim/vimplugin/rainbow-master -source ~/.vvconfig/.config/vim/vimcolor/rainbow.vim +set runtimepath+=~/.config/vim/vimplugin/rainbow-master +source ~/.config/vim/vimcolor/rainbow.vim diff --git a/Brewfile b/Brewfile index 7d2a3ad..c50b0f9 100644 --- a/Brewfile +++ b/Brewfile @@ -19,6 +19,9 @@ brew "tmux" brew "trash" brew "tree" brew "wget" +brew "xdotool" +brew "xprop" +brew "xwininfo" cask "agent-tars" cask "alacritty" cask "bettertouchtool" @@ -48,12 +51,12 @@ cask "orbstack" cask "picgo" cask "snipaste" cask "spacelauncher" +cask "syncalicious" cask "tailscale" cask "thor" cask "trae" cask "trae-cn" cask "visual-studio-code" -cask "warp" cask "wezterm" vscode "github.copilot" vscode "github.copilot-chat"