From c373f5fcfdb05c9043217c732747705df8c44ae7 Mon Sep 17 00:00:00 2001
From: Martin <git@pander-on.de>
Date: Tue, 25 Feb 2025 14:29:55 +0100
Subject: [PATCH] Update git; Update vim

---
 nix/flake.nix                |  9 +++++++++
 nix/user/git.nix             | 35 ++++++++++++++++++++++++++++++++---
 nix/user/nvim.nix            |  5 ++++-
 nix/user/profiles/martin.nix | 13 +++++++++++++
 nix/user/sh.nix              |  1 +
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 nix/user/profiles/martin.nix

diff --git a/nix/flake.nix b/nix/flake.nix
index 458033c..7d31391 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -60,6 +60,15 @@
             ./user/task_home.nix
           ];
         };
+        "martin" = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+
+          modules = [ 
+            ./user/profiles/martin.nix
+            ./common.nix
+            ./user/task_home.nix
+          ];
+        };
         "pan" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 
diff --git a/nix/user/git.nix b/nix/user/git.nix
index b40f724..9479611 100644
--- a/nix/user/git.nix
+++ b/nix/user/git.nix
@@ -18,10 +18,39 @@
     difftastic.enable = true;
 
     extraConfig = {
-      core = {
-        editor = "nvim";
+      column.ui = "auto";
+      branch.sort = "-comitterdate";
+      tag.sort = "version:refname";
+      diff = {
+        algorithm = "histogram";
+        colorMoved = "plain";
+        mnemonicPrefix = "true";
+        renames = "true";
       };
-      push.default = "matching";
+      pull.rebase = "true";
+      push = {
+        default = "simple";
+        autoSetupRemote = "true";
+        followTags = "true";
+      };
+      fetch = {
+        prune = "true";
+        pruneTags = "true";
+        all = "true";
+      };
+      help.autocorrect = "prompt";
+      commit.verbose = "true";
+      rerere = {
+        enabled = "true";
+        autoupdate = "true";
+      };
+      rebase = {
+        autoSquas = "true";
+        autoStash = "true";
+        updateRefs = "true";
+      };
+      merge.conflictstyle = "zdiff3";
+      core.editor = "nvim";
       init.defaultBranch = "main";
     };
 
diff --git a/nix/user/nvim.nix b/nix/user/nvim.nix
index a65c307..1811ed6 100644
--- a/nix/user/nvim.nix
+++ b/nix/user/nvim.nix
@@ -8,12 +8,14 @@
     vimAlias = true;
 
     plugins = with pkgs.vimPlugins; [
+      aerial-nvim
+      zen-mode-nvim
       vim-commentary
       vim-repeat
       vim-surround
       targets-vim
       delimitMate
-      vim-startify
+      # vim-startify
       vim-windowswap
       vim-nix
       plenary-nvim
@@ -52,6 +54,7 @@
 
   home.packages = with pkgs; [
     nodejs-slim
+    marksman
   ];
 }
 
diff --git a/nix/user/profiles/martin.nix b/nix/user/profiles/martin.nix
new file mode 100644
index 0000000..4f9fc00
--- /dev/null
+++ b/nix/user/profiles/martin.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  home.username = "martin";
+  home.homeDirectory = "/Users/martin";
+
+  home.stateVersion = "24.05"; # Please read the comment before changing.
+
+  programs.git = {
+    userName = "Martin";
+    userEmail = "git@pander-on.de";
+  };
+}
diff --git a/nix/user/sh.nix b/nix/user/sh.nix
index 116d7b4..93226b7 100644
--- a/nix/user/sh.nix
+++ b/nix/user/sh.nix
@@ -79,6 +79,7 @@
     du-dust
     glow
     ripgrep-all
+    llm
     #nerdfonts
   ];