adtya/configuration.nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace diff-so-fancy with delta

Browse source
This commit is contained in:
Adithya 2023-08-17 10:24:50 +05:30
parent a200fdc3a4
commit c2de229dea
Signed by: adtya
GPG key ID: 48FC9915FFD326D0
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
home/programs/git.nix
View file

@ -3,8 +3,12 @@
in { in {
programs.git = { programs.git = {
enable = true; enable = true;
diff-so-fancy = { delta = {
enable = true; enable = true;
options = {
side-by-side = true;
syntax-theme = "Dracula";
};
}; };
userEmail = user.primary.emailAddress; userEmail = user.primary.emailAddress;
userName = user.primary.realName; userName = user.primary.realName;
@ -14,6 +18,7 @@ in {
}; };
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "diff3";
push.autoSetupRemote = true; push.autoSetupRemote = true;
pull.rebase = true; pull.rebase = true;
}; };