From a5c73d5c8e01fa3bd9057b89c849272c317159ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Fri, 18 Oct 2024 09:04:52 +0200 Subject: [PATCH] git: add config --- dot_config/git/{config => config.tmpl} | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) rename dot_config/git/{config => config.tmpl} (65%) diff --git a/dot_config/git/config b/dot_config/git/config.tmpl similarity index 65% rename from dot_config/git/config rename to dot_config/git/config.tmpl index 162ff87..dd4f89c 100644 --- a/dot_config/git/config +++ b/dot_config/git/config.tmpl @@ -1,6 +1,6 @@ [user] name = VladimĂ­r Dudr - email = vladimir@tango-dj.cz + email = dudr@metrans.cz [http "https://gopkg.in"] followRedirects = true @@ -27,9 +27,6 @@ syntax-theme = gruvbox-dark hyperlinks = true -[interactive] - diffFilter = delta --color-only - [diff] algorithm = patience external = difft @@ -42,3 +39,13 @@ [merge] tool = nvimdiff conflictstyle = diff3 +[credential] + helper = gopass +[credential "https://gitlab.corp.metrans.cz"] + username = dudr + +[diff "sops"] + textconv = sops --config /dev/null -d + +[diff "ansible-vault"] + textconv = ansible-vault view --vault-password-file <(gopass show --password metrans/ansible-vault)