initial commit: most of previous configuration reworked

1 files changed, 58 insertions, 0 deletions

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
new file mode 100644
index 0000000..597ef64
--- /dev/null
+++ b/common/commandline/git.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, ... }:
+
+{
+  # TODO: add signing
+  home-manager.users.minijackson = { ... }:
+  {
+    programs.git = {
+      enable = true;
+      package = pkgs.gitAndTools.gitFull;
+      userEmail = "minijackson@riseup.net";
+      userName = "Minijackson";
+
+      extraConfig = let
+        deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
+      in {
+        core = {
+          whitespace = "trailing-space,space-before-tab";
+          pager = deltaCommand;
+          interactive.diffFilter = "${deltaCommand} --color-only";
+        };
+        merge = { tool = "nvimdiff"; };
+        "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; };
+
+        delta = with config.theme.colors; {
+          features = "line-numbers decorations";
+          whitespace-error-style = "22 reverse";
+          decorations = {
+            minus-style = "normal red";
+            minus-non-emph-style = "normal red";
+            minus-emph-style = "normal brightred";
+            minus-empty-line-marker-style = "normal red";
+
+            plus-style = "reverse green";
+            plus-non-emph-style = "reverse green";
+            plus-emph-style = "reverse brightgreen";
+            plus-empty-line-marker-style = "reverse green";
+
+            whitespace-error-style = "reverse green";
+
+            line-numbers-minus-style = "brightred";
+            line-numbers-zero-style = "brightblack";
+            line-numbers-plus-style = "brightgreen";
+
+            file-style = "bright${dominantName}";
+            line-numbers-left-style = dominantName;
+            line-numbers-right-style = dominantName;
+          };
+        };
+
+      };
+    };
+  };
+
+  home-manager.users.root = { ... }:
+  {
+    programs.git = config.home-manager.users.minijackson.programs.git;
+  };
+}