electria/nixowos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

defaults: cleanup

Browse source
This commit is contained in:
Elec3137 2026-03-23 20:53:59 -07:00
commit d8071797fd
7 changed files with 73 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

12
defaults/git.nix
View file

@ -7,13 +7,14 @@
let
name = "git";
cfg = config.nixowos.cli.${name};
cfg = config.nixowos.defaults.${name};
superCfg = config.programs.${name};
in
{
options.nixowos.cli.${name} = {
enable = lib.mkEnableOption name;
options = {
nixowos.defaults.${name}.enable = lib.mkEnableOption name;
delta.enable = lib.mkEnableOption "delta within git" // {
programs.${name}.delta.enable = lib.mkEnableOption "delta within git" // {
default = true;
};
};
@ -21,7 +22,6 @@ in
config = lib.mkIf cfg.enable {
programs.git = {
enable = true;
config = lib.mkMerge [
{
@ -34,7 +34,7 @@ in
merge.conflictStyle = "zdiff3";
commit.verbose = true; # show diffs in commit editor
}
(lib.mkIf cfg.delta.enable {
(lib.mkIf superCfg.delta.enable {
core.pager = "${pkgs.delta}/bin/delta";
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
delta.navigate = true; # use n and N to move between diff sections