From 23aec94f2a80576d090e1cc1035515c2ff445196 Mon Sep 17 00:00:00 2001
From: mikl <mikl@iscg.dev>
Date: Wed, 1 Jul 2026 02:00:38 +0300
Subject: [PATCH] feat: add ollama, git-delta, alejandra, broot, trash-cli,
 texliveFull; extract git.nix

---
 home/cli.nix     |  8 ++++++++
 home/default.nix |  3 +--
 home/git.nix     | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 home/git.nix

diff --git a/home/cli.nix b/home/cli.nix
index 9262a19..22b043a 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -26,6 +26,14 @@
     (pass.withExtensions (ext: [ ext.pass-otp ]))
     gpgme
     gnupg
+
+    # Extras
+    ollama          # CLI для LLM
+    git-delta       # красивый git diff
+    alejandra       # nix-форматтер
+    broot           # tree с превью
+    trash-cli       # rm с корзиной
+    texliveFull     # LaTeX (~4GB, для математики)
   ];
 
   # TODO: global npm/pnpm packages not managed by nix for now
diff --git a/home/default.nix b/home/default.nix
index 737b6cb..e4dc0f1 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,13 +2,12 @@
 {
   imports = [
     ./cli.nix
+    ./git.nix
     ./zsh.nix
   ];
 
   home.stateVersion = "24.11";
 
-  programs.git.enable = true;
-
   home.sessionVariables = {
     SEARXNG_URL = "https://search.iscg.dev";
     PATH = "/etc/profiles/per-user/michaotic/bin:$HOME/.nix-profile/bin:$HOME/bin:$HOME/.local/bin:$HOME/.npm-global/bin:/Users/michaotic/.opencode/bin:/Users/michaotic/.local/share/pi-node/node-v22.23.1-darwin-arm64/bin";
diff --git a/home/git.nix b/home/git.nix
new file mode 100644
index 0000000..3dab10d
--- /dev/null
+++ b/home/git.nix
@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+{
+  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";
+        email = "michaotic@iscg.dev";
+      };
+      init.defaultBranch = "main";
+      pull.rebase = true;
+    };
+    
+    # Extra gitignore
+    ignores = [
+      ".DS_Store"
+      "*.swp"
+    ];
+  };
+}