diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/fish/config.fish | 5 | ||||
| -rw-r--r-- | config/git/config.darwin | 26 |
2 files changed, 30 insertions, 1 deletions
diff --git a/config/fish/config.fish b/config/fish/config.fish index dfefe8e..ac14b33 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -143,7 +143,10 @@ if status is-interactive abbr t2 'tree -L 2' abbr t3 'tree -L 3' - command -qv bat && alias cat='bat' + if command -qv bat + alias cat='bat --theme gruvbox-dark' + set -gx MANPAGER "sh -c 'col -bx | bat --theme gruvbox-dark -l man -p'" + end # git abbr ga 'git add' diff --git a/config/git/config.darwin b/config/git/config.darwin index 7d27b5b..dd3f5b0 100644 --- a/config/git/config.darwin +++ b/config/git/config.darwin @@ -7,11 +7,37 @@ rebase = false [merge] tool = vimdiff + conflictstyle = diff3 [commit] gpgsign = false [init] defaultBranch = master [core] editor = "VIMINIT='' nvim" + pager = delta +[interactive] + diffFilter = delta --color-only --syntax-theme gruvbox-dark +[diff] + colorMoved = default +[delta] + syntax-theme = gruvbox-dark + # side-by-side = true + navigate = true # use n and N to move between diff sections + line-numbers = true + + +# [http] +# sslVerify = false +[credential] + helper = store +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process +[gpg] + format = ssh +[gpg "ssh"] + allowedSignersFile = # vim:ft=gitconfig |