fix: use delta package name and programs.delta module
This commit is contained in:
parent
23aec94f2a
commit
01c8a89eb6
2 changed files with 14 additions and 15 deletions
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
# Extras
|
# Extras
|
||||||
ollama # CLI для LLM
|
ollama # CLI для LLM
|
||||||
git-delta # красивый git diff
|
delta # красивый git diff (synonym: git-delta)
|
||||||
alejandra # nix-форматтер
|
alejandra # nix-форматтер
|
||||||
broot # tree с превью
|
broot # tree с превью
|
||||||
trash-cli # rm с корзиной
|
trash-cli # rm с корзиной
|
||||||
|
|
|
||||||
27
home/git.nix
27
home/git.nix
|
|
@ -2,20 +2,7 @@
|
||||||
{
|
{
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
# Use git-delta for pretty diffs
|
|
||||||
delta = {
|
|
||||||
enable = true;
|
|
||||||
options = {
|
|
||||||
navigate = true; # n/N to move between files
|
|
||||||
light = false; # dark mode
|
|
||||||
line-numbers = true;
|
|
||||||
side-by-side = false;
|
|
||||||
syntax-theme = "Catppuccin-mocha";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Git user config
|
|
||||||
settings = {
|
settings = {
|
||||||
user = {
|
user = {
|
||||||
name = "michaotic";
|
name = "michaotic";
|
||||||
|
|
@ -25,10 +12,22 @@
|
||||||
pull.rebase = true;
|
pull.rebase = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Extra gitignore
|
|
||||||
ignores = [
|
ignores = [
|
||||||
".DS_Store"
|
".DS_Store"
|
||||||
"*.swp"
|
"*.swp"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Use git-delta for pretty diffs
|
||||||
|
programs.delta = {
|
||||||
|
enable = true;
|
||||||
|
enableGitIntegration = true;
|
||||||
|
options = {
|
||||||
|
navigate = true; # n/N to move between files
|
||||||
|
light = false; # dark mode
|
||||||
|
line-numbers = true;
|
||||||
|
side-by-side = false;
|
||||||
|
syntax-theme = "Catppuccin-mocha";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue