Migrate from .stow-rename to --dotfiles

dot-config/git/attributes

@@ -0,0 +1,3 @@
+*.yml diff=dyff
+*.yaml diff=dyff
+*.lockb binary diff=lockb

dot-config/git/config

@@ -0,0 +1,116 @@
+# vim: ft=gitconfig
+[user]
+	name = Danielle McLean
+	email = dani@00dani.me
+	signingkey = 83F3DCEC98D522B6A38AF5D927D076D2ACA7BABE
+
+[commit]
+	gpgsign = true
+
+[alias]
+	co = checkout
+	d = diff
+	l = log --graph --pretty=graph --date=relative
+	up = pull --prune --rebase=merges --autostash
+	patch = !git --no-pager diff --no-color
+	st = status --short
+	shove = "!f() { git push ${1:-origin} :; }; f"
+
+[color "diff"]
+	meta = yellow
+	frag = magenta bold
+	commit = yellow bold
+	old = red bold
+	new = green bold
+	whitespace = red reverse
+
+[color "diff-highlight"]
+	oldNormal = red bold
+	oldHighlight = red bold 52
+	newNormal = green bold
+	newHighlight = green bold 22
+
+[column]
+	ui = auto
+
+[core]
+	pager = delta
+
+[interactive]
+	diffFilter = delta --color-only
+
+[delta]
+	line-numbers = true
+	syntax-theme = Monokai Extended
+
+[diff]
+	colorMoved = true
+
+[diff "dyff"]
+	command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
+
+[diff "gpg"]
+	binary = true
+	textconv = "gpg -qd --no-tty"
+
+[diff "lockb"]
+	binary = true
+	textconv = "bun"
+
+[diff "sops"]
+	textconv = "sops -d"
+
+[dude]
+	icon = ~/.config/git-dude/icon.png
+
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+
+[gpg]
+	program = gpg-for-git-signing
+
+[help]
+	autocorrect = 20
+
+[init]
+	defaultBranch = main
+
+[log]
+	decorate = true
+
+[merge]
+	conflictStyle = diff3
+
+[pretty]
+	graph = tformat:%C(auto)%h %G? %s% gD% D
+
+[pull]
+	rebase = false
+
+[push]
+	default = simple
+	gpgSign = if-asked
+
+[rerere]
+	enabled = true
+
+[status]
+	branch = true
+
+[submodule]
+	recurse = true
+
+[url "git@github.com:"]
+	pushInsteadOf = https://github.com/
+
+[url "git@git.00dani.me:"]
+	pushInsteadOf = https://git.00dani.me/
+
+[include]
+	path = tools/kdiff3
+	path = tools/kitty-diff
+	path = config.os
+	path = config.local

dot-config/git/hooks/commit-msg

@@ -0,0 +1,17 @@
+#!/bin/sh
+echo >> $1
+
+echo Calculating git guilt... >&2
+# git-guilt only works on actual commits, not on the index. Fortunately we can
+# create a temporary commit for git-guilt to look at, using git-stash!
+git stash save -q
+
+# stash@{0}^2 is the index. I know, it's weird.
+git guilt HEAD stash@{0}^2 | tee -a $1 >&2
+
+# Now restore the changes from stash, so we can actually commit them. ;)
+git stash pop -q --index
+
+echo >> $1
+echo Fetching a whatthecommit message... >&2
+curl -s http://whatthecommit.com/index.txt | tee -a $1 >&2

dot-config/git/tools/kdiff3

@@ -0,0 +1,5 @@
+# vim: ft=gitconfig
+[merge]
+	tool = kdiff3
+[diff]
+	tool = kdiff3

dot-config/git/tools/kitty-diff

@@ -0,0 +1,5 @@
+# vim: ft=gitconfig
+[difftool "kitty"]
+    cmd = kitty +kitten diff $LOCAL $REMOTE
+[difftool "kitty.gui"]
+    cmd = kitty kitty +kitten diff $LOCAL $REMOTE

dot-config/zsh/functions/_git-finish

@@ -0,0 +1,3 @@
+#compdef git-finish
+#description smoothly finish a git-flow feature or hotfix branch
+_arguments '1:branch:__git_branch_names' '2:pull request number:'