mirror of
https://github.com/nix-community/home-manager.git
synced 2025-11-08 19:46:05 +01:00
diff-so-fancy: use freeform settings option
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
parent
bb7bb23583
commit
85cd07b8b0
4 changed files with 70 additions and 90 deletions
|
|
@ -1,8 +1,10 @@
|
|||
{
|
||||
programs.diff-so-fancy = {
|
||||
enable = true;
|
||||
markEmptyLines = false;
|
||||
changeHunkIndicators = true;
|
||||
settings = {
|
||||
markEmptyLines = false;
|
||||
changeHunkIndicators = true;
|
||||
};
|
||||
};
|
||||
programs.git.enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
};
|
||||
|
||||
test.asserts.warnings.expected = [
|
||||
"The option `programs.git.diff-so-fancy.changeHunkIndicators' defined in ${lib.showFiles options.programs.git.diff-so-fancy.changeHunkIndicators.files} has been renamed to `programs.diff-so-fancy.changeHunkIndicators'."
|
||||
"The option `programs.git.diff-so-fancy.markEmptyLines' defined in ${lib.showFiles options.programs.git.diff-so-fancy.markEmptyLines.files} has been renamed to `programs.diff-so-fancy.markEmptyLines'."
|
||||
"The option `programs.git.diff-so-fancy.changeHunkIndicators' defined in ${lib.showFiles options.programs.git.diff-so-fancy.changeHunkIndicators.files} has been renamed to `programs.diff-so-fancy.settings.changeHunkIndicators'."
|
||||
"The option `programs.git.diff-so-fancy.markEmptyLines' defined in ${lib.showFiles options.programs.git.diff-so-fancy.markEmptyLines.files} has been renamed to `programs.diff-so-fancy.settings.markEmptyLines'."
|
||||
"The option `programs.git.diff-so-fancy.enable' defined in ${lib.showFiles options.programs.git.diff-so-fancy.enable.files} has been renamed to `programs.diff-so-fancy.enable'."
|
||||
"`programs.diff-so-fancy.enableGitIntegration` automatic enablement is deprecated. Please explicitly set `programs.diff-so-fancy.enableGitIntegration = true`."
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
programs.diff-so-fancy = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
markEmptyLines = false;
|
||||
changeHunkIndicators = true;
|
||||
stripLeadingSymbols = false;
|
||||
settings = {
|
||||
markEmptyLines = false;
|
||||
changeHunkIndicators = true;
|
||||
stripLeadingSymbols = false;
|
||||
};
|
||||
};
|
||||
|
||||
programs.git.enable = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue