lucas/dotfiles
1
0
Fork 0
Code Activity

fix(nix): add more git settings

Browse source
This commit is contained in:
Lucas Sta Maria 2025-03-14 11:30:30 -04:00
parent 1ad021b79c
commit 7634895fe7
No known key found for this signature in database
GPG key ID: F07FB16A826E3B47
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
nix/hosts/framework/home.nix
View file

@ -364,6 +364,23 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.mu.enable = true; programs.mu.enable = true;
programs.git = {
enable = true;
userName = "Lucas Sta Maria";
userEmail = "lucas@priime.dev";
signing = {
key = "2EAF5BA156A36810B057BF61F07FB16A826E3B47";
signByDefault = true;
};
extraConfig = {
pull.rebase = true;
github.user = "priime0";
credential.helper = "store";
merge.conflictstyle = "zdiff3";
diff.algorithm = "histogram";
};
};
programs.direnv = { programs.direnv = {
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;
@ -394,21 +411,6 @@
}; };
}; };
programs.git = {
enable = true;
userName = "Lucas Sta Maria";
userEmail = "lucas@priime.dev";
signing = {
key = "2EAF5BA156A36810B057BF61F07FB16A826E3B47";
signByDefault = true;
};
extraConfig = {
pull.rebase = true;
github.user = "priime0";
credential.helper = "store";
};
};
programs.gh = { programs.gh = {
enable = true; enable = true;
settings.editor = "emacsclient"; settings.editor = "emacsclient";