alarsyo/nixos-config
alarsyo/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

home: git: move settings around

Browse source
This commit is contained in:
Antoine Martin 2025-11-26 15:49:49 +01:00
parent f7e37941b6
commit fb1ce98514
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
home/git.nix
View file

@ -17,19 +17,18 @@ in {
config = mkIf cfg.enable {
programs.git = {
enable = true;
delta = {
enable = true;
options = {
syntax-theme = "Solarized (light)";
};
};
lfs.enable = true;
userEmail = "antoine@alarsyo.net";
userName = "Antoine Martin";
extraConfig = {
settings = {
user = {
name = "Antoine Martin";
email = "antoine@alarsyo.net";
};
alias = {
push-wip = "push -o ci.skip";
push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
};
commit = {verbose = true;};
core = {editor = "vim";};
init = {defaultBranch = "main";};
@ -38,12 +37,6 @@ in {
maintenance.prefetch.enabled = false;
};
aliases = {
push-wip = "push -o ci.skip";
push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
};
includes = [
{
condition = "gitdir:~/work/lrde/";
@ -64,5 +57,13 @@ in {
"/.envrc"
];
};
programs.delta = {
enable = true;
enableGitIntegration = true;
options = {
syntax-theme = "Solarized (light)";
};
};
};
}