From 6366beb9a5818c060ec13b2de881d5460cb219aa Mon Sep 17 00:00:00 2001
From: Sebastian Fischer <typo3@evoweb.de>
Date: Sat, 7 Feb 2026 19:57:46 +0100
Subject: [PATCH] [TASK] Add git config settings

---
 config/home.nix | 90 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/config/home.nix b/config/home.nix
index d4cc62b..6d5cd17 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -99,10 +99,98 @@
     enable = true;
 
     settings = {
+      aliases = {
+        prune = "fetch --prune";
+        undo = "reset --soft HEAD^";
+        stash-all = "stash save --include-untracked";
+        graph = "log --graph --decorate --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'";
+      };
+
+      apply.whitespace = "fix";
+
+      branch = {
+        autosetuprebase = "remote";
+        sort = "-authordate";
+      };
+
+      "branch \"main\"" = {
+        remote = "origin";
+        merge = "refs/heads/main";
+        rebase = true;
+      };
+
+      color = {
+        ui = "auto";
+        branch = "auto";
+        diff = "auto";
+        status = "auto";
+        interactive = "auto";
+        pager = true;
+      };
+
+      "color \"branch\"" = {
+        current = "yellow reverse";
+        local = "yellow";
+        remote = "green";
+      };
+
+      "color \"diff\"" = {
+        meta = "yellow bold";
+        frag = "magenta bold";
+        old = "red bold";
+        new = "green bold";
+        whitespace = "red reverse";
+      };
+
+      "color \"diff-highlight\"" = {
+        oldNormal = "red bold";
+        oldHighlight = "red bold 52";
+        newNormal = "green bold";
+        newHighlight = "green bold 22";
+      };
+
+      "color \"status\"" = {
+        added = "yellow";
+        changed = "green";
+        untracked = "cyan";
+      };
+
+      core = {
+        pager = "less -FRSX";
+        whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol";
+        editor = "vim";
+        fileMode = false;
+        autocrlf = "input";
+      };
+
+      credential.helper = "cache";
+
+      diff.tool = "vimdiff";
+      difftool.prompt = false;
+
+      fetch.prune = true;
+      http.sslverify = false;
+
       init.defaultBranch = "main";
-      core.editor = "vim";
+
+      merge.tool = "vimdiff";
+      mergetool.prompt = false;
+
       pull.rebase = false;
+
+      push = {
+        default = "simple";
+        followTags = true;
+      };
+
+      rerere.enabled = 1;
+
+      status.showUntrackedFiles = "all";
     };
+
+    ignores = [
+      ".idea" # JetBrains IDEs
+    ];
   };
 
   # Vim Konfiguration