feat: update dotfiles configuration

- zsh: add git worktree prune to git_clean function
- git: add settings.local.json to global ignore
- git: update user configuration and excludesfile path
- tmux: update tpm submodule
This commit is contained in:
2026-03-04 10:22:19 +08:00
parent 86eba8d87b
commit dd1cb2b0b1
4 changed files with 14 additions and 13 deletions

3
.zshrc
View File

@@ -182,7 +182,8 @@ function git_clean() {
git checkout "$base_branch" && \
git config pull.rebase false && \
git pull && \
git branch --merged | grep -v " $base_branch$" | cat | xargs git branch -d
git branch --merged | grep -v " $base_branch$" | cat | xargs git branch -d && \
git worktree prune --verbose
}
function git_config() {

View File

@@ -1,26 +1,25 @@
[init]
defaultBranch = main
defaultBranch = main
[user]
email =
name = d0zingcat
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPaVruhhL4O9BiAncnW1wH3jc7/hsqsXLknA8Xtnjjee
name = Tony Tang
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF23DQtdH5PODF9fYUHr49I1J3lfKLAPk4LG54MVUTcg
email = tonytang@lilith.com
[commit]
gpgsign = true
gpgsign = true
[gpg]
format = ssh
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
[url "https://"]
insteadOf = git://
[core]
editor = nvim
excludesfile = /Users/d0zingcat/.config/git/.gitignore
excludesfile = /Users/lilithgames/.gitignore_global
[pager]
difftool = true
@@ -38,7 +37,7 @@
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
pr = pull --rebase origin
pr = pull --rebase origin
unstage = reset HEAD --
p = push
st = status
@@ -53,7 +52,7 @@
#[difftool "sourcetree"]
# cmd = opendiff \"$LOCAL\" \"$REMOTE\"
# path =
# path =
#
#[mergetool "sourcetree"]
# cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"

1
git/ignore Normal file
View File

@@ -0,0 +1 @@
**/.claude/settings.local.json