opdavies/nix-config
1
1
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Refactor

Browse source
This commit is contained in:
Oliver Davies 2025-07-24 23:40:59 +01:00
parent eb516819fa
commit c77d7e4e55
1 changed files with 51 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

107
modules2/git/defaults.nix
View file

@ -1,64 +1,59 @@
{ config, ... }: { config, ... }:
let
cfg = config;
in
{ {
flake.modules.homeManager.base = flake.modules.homeManager.base = hmArgs: {
{ config, ... }: programs.git = {
{ userName = config.flake.meta.owner.name;
programs.git = { userEmail = config.flake.meta.owner.email;
userName = cfg.flake.meta.owner.name;
userEmail = cfg.flake.meta.owner.email;
extraConfig = { extraConfig = {
branch = { branch = {
autosetupmerge = true; autosetupmerge = true;
autosetuprebase = "always"; autosetuprebase = "always";
sort = "-committerdate"; sort = "-committerdate";
};
checkout.defaultRemote = "origin";
color.ui = true;
column.ui = "auto";
commit.template = "${config.xdg.configHome}/git/message";
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";
};
diff.tool = "vimdiff";
fetch.prune = true;
gpg.format = "ssh";
grep.lineNumber = true;
help.autocorrect = "1";
init.defaultBranch = "main";
maintenance = {
auto = false;
strategy = "incremental";
};
merge.ff = "only";
push = {
autoSetupRemote = true;
default = "upstream";
};
pull = {
ff = "only";
rebase = true;
};
rebase = {
autosquash = true;
autostash = true;
};
user.signingkey = "~/.ssh/id_rsa.pub";
}; };
checkout.defaultRemote = "origin";
color.ui = true;
column.ui = "auto";
commit.template = "${hmArgs.config.xdg.configHome}/git/message";
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";
};
diff.tool = "vimdiff";
fetch.prune = true;
gpg.format = "ssh";
grep.lineNumber = true;
help.autocorrect = "1";
init.defaultBranch = "main";
maintenance = {
auto = false;
strategy = "incremental";
};
merge.ff = "only";
push = {
autoSetupRemote = true;
default = "upstream";
};
pull = {
ff = "only";
rebase = true;
};
rebase = {
autosquash = true;
autostash = true;
};
user.signingkey = "~/.ssh/id_rsa.pub";
}; };
}; };
};
} }