pumpkin: lanzaboote: enable SecureBoot

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

diff --git a/home-manager/profiles/git.nix b/home-manager/profiles/git.nix
index 39baf3295ca04b5462fb03b9f9700e1265a33c64..7f320a18b49952c68bae2e4c03029501e248abf3 100644 (file)
--- a/home-manager/profiles/git.nix
+++ b/home-manager/profiles/git.nix
@@ -1,28 +1,39 @@
-{ 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";
-      ap = "add -p";
       abr = "absorb -r";
+      ap = "add -p";
       au = "add -u";
       authors = "shortlog -s -n";
       b = "branch";
@@ -45,12 +56,17 @@
       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";
@@ -59,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";
@@ -96,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";
@@ -113,42 +132,42 @@
     };
     iniContent = {
       /*
-      diff.external = lib.concatStringsSep " " [
-        "${pkgs.difftastic}/bin/difft"
-          "--color auto"
-          "--background dark"
-          "--display side-by-side"
-      ];
+        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;
+        diff.tool = "difftastic";
+        difftool.prompt = false;
+        difftool.difftastic.cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
+        pager.difftool = true;
       */
 
       # delta
       /*
-      core.pager = "delta";
-      interactive.diffFilter = "${pkgs.delta}/bin/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";
-      };
+        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 = {
+  programs.bash = lib.mkIf config.programs.git.enable {
     shellAliases = {
       g = "git";
       ge = "git-edit-commit";