aubergine: sftp: do not bind on off2

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

diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix
index d34647358d9ba7fa62865c550392090b7701b220..677f4a68a6340329c5dcea9c104c96f9fbb00884 100644 (file)
--- a/home-manager/profiles/git.nix
+++ b/home-manager/profiles/git.nix
@@ -1,28 +1,35 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, config, ... }:
 {
-  home.packages = [
+  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;
+    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@";
@@ -41,11 +48,14 @@
       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";
       rh = "reset --hard";
       ri = "rebase -i";
@@ -55,6 +65,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";
@@ -92,9 +103,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";
@@ -126,8 +139,8 @@
 
       # delta
       /*
-      core.pager = "delta";
-      interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only --features=interactive";
+      core.pager = "delta --grep-separator-symbol keep";
+      interactive.diffFilter = "delta --color-only --features=interactive";
       delta.features = "decorations";
       delta.interactive = {
         keep-plus-minus-markers = false;
@@ -144,7 +157,7 @@
       */
     };
   };
-  programs.bash = {
+  programs.bash = lib.mkIf config.programs.git.enable {
     shellAliases = {
       g = "git";
       ge = "git-edit-commit";