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

rebase when pulling by default

Browse source
This commit is contained in:
Adithya 2023-07-08 14:11:28 +05:30
parent 36e35e2e47
commit fbaf835e0f
Signed by: adtya
GPG key ID: 48FC9915FFD326D0
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
home/programs/git.nix
View file

@ -1,8 +1,4 @@
{ {secrets, ...}: let
pkgs,
secrets,
...
}: let
user = secrets.users; user = secrets.users;
in { in {
programs.git = { programs.git = {
@ -10,10 +6,7 @@ in {
diff-so-fancy = { diff-so-fancy = {
enable = true; enable = true;
}; };
userEmail = userEmail = user.primary.emailAddress;
if pkgs.stdenv.isLinux
then user.primary.emailAddress
else user.primary.workEmail;
userName = user.primary.realName; userName = user.primary.realName;
signing = { signing = {
key = user.primary.pgpFingerprint; key = user.primary.pgpFingerprint;
@ -22,6 +15,7 @@ in {
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
push.autoSetupRemote = true; push.autoSetupRemote = true;
pull.rabase = true;
}; };
ignores = ["/.nix" "/.direnv"]; ignores = ["/.nix" "/.direnv"];
}; };