diff options
Diffstat (limited to 'dot_config')
| -rw-r--r-- | dot_config/git/config | 68 | ||||
| -rw-r--r-- | dot_config/git/macos.config | 3 | ||||
| -rw-r--r-- | dot_config/git/signers.ssh | 3 |
3 files changed, 68 insertions, 6 deletions
diff --git a/dot_config/git/config b/dot_config/git/config index 2704edf..28e9188 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -1,22 +1,59 @@ [alias] aa = add -A bd = branch -D - ci = commit --verbose + ci = commit co = checkout - cb = checkout -b - dc = diff --cached + df = difftool st = status root = rev-parse --show-toplevel -[apply] - whitespace = warn +[branch] + sort = -committerdate +[columns] + ui = auto +[commit] + verbose = true +[core] + # excludesFile: reminder that it defaults to ~/.config/git/ignore + fsmonitor = true + untrackedcache = true [diff] algorithm = histogram + external = difft + tool = difftastic +[difftool] + prompt = false +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" +[fetch] + prune = true + pruneTags = true +[gpg] + format = ssh +[gpg "ssh"] + allowedSignersFile = "~/.config/git/signers.ssh" + defaultKeyCommand = "ssh-add -L" # default: first key in agent [init] defaultBranch = main +[log] + # WHATWG Dates and Times Microsyntax + # I legitimately like this one ever since I implemented janet-date. + # It's the one that makes the most sense, at least to me. + date = "format:%F %T%z" +[merge] + conflictstyle = zdiff3 +[pager] + difftool = true +[pull] + rebase = true [push] autoSetupRemote = true + default = simple [rebase] autoSquash = true + autoStash = true + updateRefs = true +[rerere] + enabled = true [sendemail] from = code@toast.bunkerlabs.net smtpencryption = tls @@ -30,12 +67,31 @@ email = code@toast.bunkerlabs.net name = Chloé Vulquin +# platform includes +[includeIf "gitdir:/home/"] + path = "~/.config/git/linux.config" + +[includeIf "gitdir:/Users/"] + path = "~/.config/git/macos.config" + +# intended workflow: +# own projects: clone with me: +# github projects: clone with gh: +# potential TODO: clone gh: but push to st: fork ? may not be possible +# it would be possible if you could have something like: +# [remote "me"] +# url = st:* +# and the * was somehow implied to be $(basename $origin) [url "git@github.com:CosmicToast/"] - insteadOf = "st:" + insteadOf = "me:" [url "https://github.com/"] insteadOf = "gh:" +[url "git@github.com:"] + pushInsteadOf = "https://github.com" + pushInsteadOf = "gh:" + [filter "lfs"] smudge = git-lfs smudge -- %f process = git-lfs filter-process diff --git a/dot_config/git/macos.config b/dot_config/git/macos.config new file mode 100644 index 0000000..96cfe43 --- /dev/null +++ b/dot_config/git/macos.config @@ -0,0 +1,3 @@ +# vim: ft=gitconfig +[credential] + helper = osxkeychain diff --git a/dot_config/git/signers.ssh b/dot_config/git/signers.ssh new file mode 100644 index 0000000..f7f910e --- /dev/null +++ b/dot_config/git/signers.ssh @@ -0,0 +1,3 @@ +# my keys +toast@bunkerlabs.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBD5Nq0RmRQYgoBljM0m5VzFeCkuc6lbhxr2WdCrvuD6 toast@nightsti +toast@bunkerlabs.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINdS4mACE+bUMYlXj4UocqoFUSBrkJbyQjvFawjJBbsb toast@framesti |