mirror of
https://github.com/tedkulp/dotfiles
synced 2026-04-28 23:26:40 -04:00
Ted Kulp
105 lines
2.8 KiB
Plaintext
105 lines
2.8 KiB
Plaintext
[user]
|
|
name = Ted Kulp
|
|
{% if yadm.hostname == "ALLOCATE-Y3HW9MWW2D" %}
|
|
email = ted@allocate.co
|
|
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsv4Cz+g1q93ifvEhSyMgE6mWiKacoLRKyHgWC7Vey7
|
|
{% else %}
|
|
email = ted@tedkulp.com
|
|
gmail = tedkulp@gmail.com
|
|
signingKey = AE6B007E2FAB1C94319C7C09FD56BE79CDAE7895
|
|
{% endif %}
|
|
|
|
{% if yadm.hostname == "ALLOCATE-Y3HW9MWW2D" %}
|
|
[core]
|
|
commentChar = @
|
|
pager = delta
|
|
excludesFile = ~/.gitignore
|
|
|
|
[gpg]
|
|
format = ssh
|
|
|
|
[gpg "ssh"]
|
|
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
|
|
allowedSignersFile = /Users/tedkulp/.ssh/allowed_signers
|
|
{% else %}
|
|
[core]
|
|
pager = delta
|
|
excludesFile = ~/.gitignore
|
|
{% endif %}
|
|
|
|
[commit]
|
|
gpgsign = true
|
|
|
|
[credential]
|
|
helper = osxkeychain
|
|
|
|
[pull]
|
|
rebase = false
|
|
|
|
[tag]
|
|
forceSignAnnotated = true
|
|
|
|
[alias]
|
|
mdr = merge --no-commit --no-ff
|
|
mom = merge --no-edit origin/main
|
|
moma = merge --no-edit origin/master
|
|
dlb = "dead-local-branches"
|
|
ddlb = "delete-dead-local-branches"
|
|
fdlb = "force-delete-dead-local-branches"
|
|
dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }'"
|
|
delete-dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }' | xargs -r git branch -d"
|
|
force-delete-dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }' | xargs -r git branch -D"
|
|
|
|
[init]
|
|
defaultBranch = main
|
|
|
|
[push]
|
|
autoSetupRemote = true
|
|
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
|
|
[delta]
|
|
features = catppuccin-mocha
|
|
navigate = true # use n/N to jump between hunks
|
|
side-by-side = true
|
|
line-numbers = true
|
|
dark = true
|
|
|
|
[merge]
|
|
conflictstyle = diff3
|
|
|
|
[diff]
|
|
colorMoved = default
|
|
|
|
[delta "catppuccin-mocha"]
|
|
blame-palette = "#1e1e2e #181825 #11111b #313244 #45475a"
|
|
commit-decoration-style = "#6c7086" bold box ul
|
|
dark = true
|
|
file-decoration-style = "#6c7086"
|
|
file-style = "#cdd6f4"
|
|
hunk-header-decoration-style = "#6c7086" box ul
|
|
hunk-header-file-style = bold
|
|
hunk-header-line-number-style = bold "#a6adc8"
|
|
hunk-header-style = file line-number syntax
|
|
line-numbers-left-style = "#6c7086"
|
|
line-numbers-minus-style = bold "#f38ba8"
|
|
line-numbers-plus-style = bold "#a6e3a1"
|
|
line-numbers-right-style = "#6c7086"
|
|
line-numbers-zero-style = "#6c7086"
|
|
# 35% red 65% base
|
|
minus-emph-style = bold syntax "#694559"
|
|
# 20% red 80% base
|
|
minus-style = syntax "#493447"
|
|
# 35% green 65% base
|
|
plus-emph-style = bold syntax "#4e6356"
|
|
# 20% green 80% base
|
|
plus-style = syntax "#394545"
|
|
map-styles = \
|
|
bold purple => syntax "#5b4e74", \
|
|
bold blue => syntax "#445375", \
|
|
bold cyan => syntax "#446170", \
|
|
bold yellow => syntax "#6b635b"
|
|
# Should match the name of the bat theme
|
|
syntax-theme = Catppuccin Mocha
|