.bashrc

@@ -25,3 +25,5 @@ PS1="\[\e[1;32m\]\h:\W \u$\[\e[0m\] "
 # better back-searching
 bind '"\e[A": history-search-backward'
 bind '"\e[B": history-search-forward'
+
+. "$HOME/.cargo/env"

.gitconfig

@@ -27,25 +27,16 @@
 [help]
     autocorrect = 10
 
-
-[merge]
-    tool = vscode
-[mergetool "vscode"]
-    cmd = code --wait --diff $LOCAL $REMOTE
-
-[diff]
-    tool = vscode
-[difftool "vscode"]
-    cmd = code --wait --diff $LOCAL $REMOTE
-
 [alias]
     p = push
     pp = publish
+    s = switch
+    sc = switch create
     rb = pull --rebase
     rbc = rebase --continue
     rba = rebase --abort
-    fancy-log = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --date=relative
-    branches = for-each-ref --count=10 --sort='-authordate:iso8601' --format=' %(color:green)%(authordate:relative) %09%(color:white)%(objectname:short) %(color:yellow)%(refname:short) %09%(color:white)%(upstream:track) %(contents:subject)' refs/heads --no-merged
+    l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --date=relative
+    b = for-each-ref --count=10 --sort='-authordate:iso8601' --format=' %(color:green)%(authordate:relative) %09%(color:white)%(objectname:short) %(color:yellow)%(refname:short) %09%(color:white)%(upstream:track) %(contents:subject)' refs/heads --no-merged
     edit-conflicted = ! git diff --name-only | uniq | xargs $(echo $EDITOR)
     history = log -p --
 	pushf = push --force-with-lease
@@ -58,11 +49,7 @@
 	excludesfile = /Users/tom/.gitignore_global
 	whitespace = tab-in-indent,trailing-space,space-before-tab
 	ignorecase = false
-	editor = vim -c 'startinsert'
-
-[merge]
-	tool = code
-#       conflictstyle = diff3
+# editor = vim -c 'startinsert'
 
 [push]
 	default = upstream
@@ -82,3 +69,7 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+
+[include]
+    path = ~/dotfiles/.gitconfig_difftastic
+    condition = command -v difft >/dev/null 2>&1

.gitignore_global

@@ -9,3 +9,4 @@ Icon
 
 .todo
 bak
+_docs

.rc.d/aliases.sh

@@ -84,5 +84,7 @@ checkout() {
   cd "$HOME/repos/$DIR" || return
 }
 
+alias ac="git diff --staged | llm -m openrouter/meta-llama/llama-4-maverick:free -s 'Write a concise, imperative-mood git commit message summarizing these changes. Begin with feat, fix, bug, or chore. No preamble or yapping.' | git commit -F -"
+
 alias pbjson="pbpaste | jq -r"
 alias pbjsons="pbpaste | jq -sRr '@json'"

.rc.d/git.sh

@@ -62,7 +62,6 @@ alias gsb='git status -sb'
 alias gsd='git svn dcommit'
 alias gsi='git submodule init'
 alias gsps='git show --pretty=short --show-signature'
-alias gsr='git svn rebase'
 alias gss='git status -s'
 alias gst='git status'
 alias gsta='git stash save'
@@ -75,4 +74,5 @@ alias gsts='git stash show --text'
 alias gsu='git submodule update'
 
 alias gp='git push'
+alias gpf='git push --force-with-lease'
 alias gpl='git pull'

.zshrc

@@ -21,7 +21,7 @@ fi
 if [[ -n $SSH_CONNECTION ]]; then
   export EDITOR='vim'
 else
-  export EDITOR='code --wait'
+  export EDITOR='zed --wait'
 fi
 
 # The next line updates PATH for the Google Cloud SDK.
@@ -41,3 +41,5 @@ export PATH="$BUN_INSTALL/bin:$PATH"
 
 # zoxide
 if command -v zoxide >/dev/null 2>&1; then eval "$(zoxide init zsh)"; fi
+
+. "$HOME/.cargo/env"