avoid entering delta into systemPackages due to git module
This commit is contained in:
parent
6e94839e87
commit
90c0694ea8
1 changed files with 3 additions and 5 deletions
|
|
@ -16,15 +16,13 @@ in
|
||||||
delta.enable = lib.mkOption {
|
delta.enable = lib.mkOption {
|
||||||
default = true;
|
default = true;
|
||||||
example = false;
|
example = false;
|
||||||
description = "Whether to enable delta with git integration.";
|
description = "Whether to enable delta within git.";
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
environment.systemPackages = lib.mkIf cfg.delta.enable [ pkgs.delta ];
|
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|
@ -40,8 +38,8 @@ in
|
||||||
commit.verbose = true; # show diffs in commit editor
|
commit.verbose = true; # show diffs in commit editor
|
||||||
}
|
}
|
||||||
(lib.mkIf cfg.delta.enable {
|
(lib.mkIf cfg.delta.enable {
|
||||||
core.pager = "delta"; # depends on pkgs.delta!
|
core.pager = "${pkgs.delta}/bin/delta";
|
||||||
interactive.diffFilter = "delta --color-only";
|
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
|
||||||
delta.navigate = true; # use n and N to move between diff sections
|
delta.navigate = true; # use n and N to move between diff sections
|
||||||
delta.diff-highlight = true; # simpler mode, highlights inter-line changes
|
delta.diff-highlight = true; # simpler mode, highlights inter-line changes
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue