From d7a942a4807237f2c351b5b08b874eb8a37c3147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 1 Aug 2020 08:33:33 +0100 Subject: [PATCH] more more git config to nix --- .gitconfig_includes.common | 32 -------------------------------- nixos/git/home.nix | 4 ++++ 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common index 818ff7e0..8c75a21c 100644 --- a/.gitconfig_includes.common +++ b/.gitconfig_includes.common @@ -1,35 +1,3 @@ -[user] -name = Cyryl PÅ‚otnicki -email = cyplo@cyplo.net -[color] -ui = true -[help] -autocorrect = 1 -[push] -default = simple -[core] -pager = cat -[alias] -tree = log --show-signature --color --decorate --date=short --all --graph -n 3 -parent = log --pretty=%P -n 1 -newbranch = !git checkout master && git fetch -p && git reset --hard origin/master && git checkout -b "$2" -head = log HEAD -n1 -signedcommit = !git commit -S -[core] -autocrlf = false -[diff] -tool = vimdiff -[difftool] -prompt = false -[difftool "vimdiff"] -cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off' -[merge] -tool = kdiff3 -[mergetool] -keepBackup = false -[pager] -diff = diff-so-fancy | less --tabs=1,5 -RFX -show = diff-so-fancy | less --tabs=1,5 -RFX [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f diff --git a/nixos/git/home.nix b/nixos/git/home.nix index 0052aa90..e602f8e2 100644 --- a/nixos/git/home.nix +++ b/nixos/git/home.nix @@ -8,6 +8,10 @@ extraConfig = { credential = { helper ="cache"; }; core = { pager = "cat"; }; + colour.ui = true; + help.autocorrect = 1; + push.default = "simple"; + mergetool.keepBackup = false; pager = { diff = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX"; show = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";