home-manager: update

[julm/julm-nix.git] / home-manager / profiles / git.nix

diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix
index f5f4dc7787db44e388e4039afa886e685655593b..7f320a18b49952c68bae2e4c03029501e248abf3 100644 (file)
--- a/home-manager/profiles/git.nix
+++ b/home-manager/profiles/git.nix
@@ -1,25 +1,43 @@
-{ pkgs, lib, ... }:
 {
-  home.packages = [
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  home.packages = lib.mkIf config.programs.git.enable [
     pkgs.b4
+    pkgs.delta
+    pkgs.difftastic
+    pkgs.git-absorb
+    pkgs.git-bug
     pkgs.git-chglog
     pkgs.git-cliff
     pkgs.git-crypt
+    pkgs.git-extras
     pkgs.git-filter-repo
     #pkgs.git-publish
     pkgs.git-quick-stats
+    pkgs.gitui
+    #pkgs.radicle-node
     pkgs.tig
   ];
   programs.git = {
-    enable = true;
-    ignores = [ "*~" "*.swp" ];
+    enable = lib.mkDefault true;
+    ignores = [
+      "*~"
+      "*.swp"
+    ];
     package = lib.mkDefault pkgs.gitMinimal;
     aliases = {
       a = "add";
+      ab = "absorb";
+      abr = "absorb -r";
       ap = "add -p";
+      au = "add -u";
       authors = "shortlog -s -n";
-      bl = "git log -p -M --follow --stat --";
       b = "branch";
+      bl = "git log -p -M --follow --stat --";
       c = "commit";
       ca = "commit --amend";
       caa = "commit --amend -C@";
@@ -28,18 +46,27 @@
       co = "checkout";
       d = "diff";
       dc = "diff --cached";
+      dcw = "diff --cached --word-diff=color";
       dh = "diff --histogram";
       dp = "diff --patience";
+      dt = "difftool --patience";
+      dtc = "difftool --cached";
+      dw = "diff --word-diff=color";
       g = "grep";
       ign = "ls-files -o -i --exclude-standard";
       l = "log";
       ll = "log --graph --decorate --pretty=oneline --abbrev-commit";
-      lp = "log -p --pretty=fuller";
-      lpg = "log -p --pretty=fuller -g";
+      lp = "log -p --pretty=fuller --stat";
+      lpg = "log -p --pretty=fuller --stat -g";
       p = "push -v";
-      pf = "push -vf";
-      pu = "pull";
+      pa = "patch";
+      patch = "push rad HEAD:refs/patches";
+      # See https://stackoverflow.com/a/65839129/6741004
+      pf = "push -v --force-with-lease --force-if-includes";
+      pl = "pull";
       r = "reset";
+      repack-1 = "git repack -a -d -f --depth=1 --window=1";
+      repack-250 = "git repack -a -d -f --depth=250 --window=250";
       rh = "reset --hard";
       ri = "rebase -i";
       rp = "reset -p";
@@ -48,6 +75,7 @@
       spush = "!git-svn dcommit";
       ss = "status -s";
       st = "status -uno";
+      stu = "status -unormal";
       sw = "switch";
       fetch-local = "!git fetch local && git tag -d $(git describe --exact-match 2>/dev/null >/dev/null) && git fetch --tags local";
       pull-local = "!git fetch-local && git checkout -B master local/master";
@@ -85,9 +113,11 @@
       };
       init.defaultBranch = "main";
       merge.tool = "vimdiff";
+      merge.conflictStyle = "zdiff3";
       protocol.version = 2;
       pull.rebase = true;
       push.default = "simple";
+      push.useForceIfIncludes = true;
       rebase.autosquash = "true";
       sendemail.chainReplyTo = "false";
       sendemail.composeencoding = "UTF-8";
@@ -100,5 +130,54 @@
       sendemail.validate = "true";
       web.browser = "elinks";
     };
+    iniContent = {
+      /*
+        diff.external = lib.concatStringsSep " " [
+          "${pkgs.difftastic}/bin/difft"
+            "--color auto"
+            "--background dark"
+            "--display side-by-side"
+        ];
+      */
+      # difftastic
+      /*
+        diff.tool = "difftastic";
+        difftool.prompt = false;
+        difftool.difftastic.cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
+        pager.difftool = true;
+      */
+
+      # delta
+      /*
+        core.pager = "delta --grep-separator-symbol keep";
+        interactive.diffFilter = "delta --color-only --features=interactive";
+        delta.features = "decorations";
+        delta.interactive = {
+          keep-plus-minus-markers = false;
+        };
+        delta.decorations = {
+          commit-decoration-style = "blue ol";
+          commit-style = "raw";
+          file-style = "omit";
+          hunk-header-decoration-style = "blue box";
+          hunk-header-file-style = "red";
+          hunk-header-line-number-style = "#067a00";
+          hunk-header-style = "file line-number syntax";
+        };
+      */
+    };
+  };
+  programs.bash = lib.mkIf config.programs.git.enable {
+    shellAliases = {
+      g = "git";
+      ge = "git-edit-commit";
+      gg = "git grep";
+      gge = "git-grep-edit";
+      gui = "gitui";
+    };
+    initExtra = ''
+      git-edit-commit () { $EDITOR $(git diff-tree --no-commit-id --name-only -r "$@"); }
+      git-grep-edit () { $EDITOR $(git grep --name-only --recursive "$@"); }
+    '';
   };
 }