diff --git a/home/cli.nix b/home/cli.nix index 22b043a..eef6a71 100644 --- a/home/cli.nix +++ b/home/cli.nix @@ -29,7 +29,7 @@ # Extras ollama # CLI для LLM - git-delta # красивый git diff + delta # красивый git diff (synonym: git-delta) alejandra # nix-форматтер broot # tree с превью trash-cli # rm с корзиной diff --git a/home/git.nix b/home/git.nix index 3dab10d..f8b0705 100644 --- a/home/git.nix +++ b/home/git.nix @@ -2,20 +2,7 @@ { programs.git = { 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 = { user = { name = "michaotic"; @@ -25,10 +12,22 @@ pull.rebase = true; }; - # Extra gitignore ignores = [ ".DS_Store" "*.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"; + }; + }; }