starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-07-13 16:12:40 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: programs.git - renamed options

Browse Source
This commit is contained in:
Ryan Yin
2025-11-11 10:59:04 +08:00
parent d0035905e1
commit cd4389a40f
1 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
home/base/core/git.nix
+29 -27
View File
@@ -40,18 +40,27 @@
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
userName = myvars.userfullname; # signing = {
userEmail = myvars.useremail; # key = "xxx";
# signByDefault = true;
# };
includes = [ includes = [
{ {
# use different email & name for work # use different email & name for work:
#
# [user]
# email = "xxx@xxx.com"
# name = "Ryan Yin"
path = "~/work/.gitconfig"; path = "~/work/.gitconfig";
condition = "gitdir:~/work/"; condition = "gitdir:~/work/";
} }
]; ];
extraConfig = { settings = {
user.email = myvars.useremail;
user.name = myvars.userfullname;
init.defaultBranch = "main"; init.defaultBranch = "main";
trim.bases = "develop,master,main"; # for git-trim trim.bases = "develop,master,main"; # for git-trim
push.autoSetupRemote = true; push.autoSetupRemote = true;
@@ -63,30 +72,9 @@
"ssh://git@github.com/ryan4yin" = { "ssh://git@github.com/ryan4yin" = {
insteadOf = "https://github.com/ryan4yin"; insteadOf = "https://github.com/ryan4yin";
}; };
# "ssh://git@gitlab.com/" = { # "ssh://git@bitbucket.com/ryan4yin" = {
# insteadOf = "https://gitlab.com/"; # insteadOf = "https://bitbucket.com/ryan4yin";
# }; # };
# "ssh://git@bitbucket.com/" = {
# insteadOf = "https://bitbucket.com/";
# };
};
};
# signing = {
# key = "xxx";
# signByDefault = true;
# };
# A syntax-highlighting pager for git, diff, grep, and blame output
delta = {
enable = true;
options = {
diff-so-fancy = true;
line-numbers = true;
true-color = "always";
# features => named groups of settings, used to keep related settings organized
# features = "";
};
}; };
aliases = { aliases = {
@@ -117,6 +105,20 @@
foreach = "submodule foreach"; foreach = "submodule foreach";
}; };
}; };
};
# A syntax-highlighting pager for git, diff, grep, and blame output
programs.delta = {
enable = true;
enableGitIntegration = true;
options = {
diff-so-fancy = true;
line-numbers = true;
true-color = "always";
# features => named groups of settings, used to keep related settings organized
# features = "";
};
};
# Git terminal UI (written in go). # Git terminal UI (written in go).
programs.lazygit.enable = true; programs.lazygit.enable = true;