aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/development/git/default.nix84
-rw-r--r--modules/scripts/default.nix1
-rw-r--r--modules/scripts/git-log-graph/default.nix25
-rw-r--r--modules/scripts/git-log-graph/script.sh60
4 files changed, 88 insertions, 82 deletions
diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index 031194b..8e27d3b 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -104,88 +104,8 @@
};
core.askPass = "";
alias = {
- log-graph = ''
- !f() {
- fmt=$(printf '\033[1;34mCommit:\033[0m \033[33m%%h\033[0m \033[91m%%d\033[0m%%n\x01%%H\x01%%n\033[1;34mParents:\033[0m \033[35m%%p\033[0m%%n\033[1;34mAuthor:\033[0m \033[32m%%an\033[0m <\033[96m%%ae\033[0m>%%n\033[1;34mDate:\033[0m \033[36m%%ad (%%ar)\033[0m%%n%%n%%B%%n\033[90m--------------------------------------------------------\033[0m')
- git-graph --model custom --color always --sparse --style round --format="$fmt" | awk '
- index($0, "\x01") > 0 {
- line = $0
- start = index(line, "\x01")
- rest = substr(line, start + 1)
- stop = index(rest, "\x01")
- hash = substr(rest, 1, stop - 1)
- prefix = substr(line, 1, start - 1)
-
- gsub(/\033\[[0-9;]*[a-zA-Z]/, "", hash)
- gsub(/[^0-9a-fA-F]/, "", hash)
-
- if (length(hash) >= 7) {
- cmd = "git log -1 --format=\"%G?|%GK\" " hash " 2>/dev/null"
- cmd | getline sig
- close(cmd)
- split(sig, a, "|")
- st = a[1]; key = a[2]
- } else {
- st = ""; key = ""
- }
-
- if (st == "G") label = "\033[32mgood\033[0m"
- else if (st == "B") label = "\033[31mbad\033[0m"
- else if (st == "U") label = "\033[33muntrusted\033[0m"
- else if (st == "X") label = "\033[33mexpired sig\033[0m"
- else if (st == "Y") label = "\033[33mexpired key\033[0m"
- else if (st == "R") label = "\033[31mrevoked\033[0m"
- else if (st == "E") label = "\033[90munverifiable\033[0m"
- else label = "\033[90mnone\033[0m"
- keydisp = (key == "") ? "\033[90m-\033[0m" : "\033[35m" key "\033[0m"
- printf "%s\033[1;34mSignature:\033[0m %s %s\n", prefix, label, keydisp
- next
- }
- { print }
- '
- }; f | less -R
- '';
- log-graph-embed = ''
- !f() {
- fmt=$(printf '\033[1;34mCommit:\033[0m \033[33m%%h\033[0m \033[91m%%d\033[0m%%n\x01%%H\x01%%n\033[1;34mParents:\033[0m \033[35m%%p\033[0m%%n\033[1;34mAuthor:\033[0m \033[32m%%an\033[0m <\033[96m%%ae\033[0m>%%n\033[1;34mDate:\033[0m \033[36m%%ad (%%ar)\033[0m%%n%%n%%B%%n\033[90m--------------------------------------------------------\033[0m')
- git-graph --model custom --color always --sparse --style round --no-pager --format="$fmt" | awk '
- index($0, "\x01") > 0 {
- line = $0
- start = index(line, "\x01")
- rest = substr(line, start + 1)
- stop = index(rest, "\x01")
- hash = substr(rest, 1, stop - 1)
- prefix = substr(line, 1, start - 1)
-
- gsub(/\033\[[0-9;]*[a-zA-Z]/, "", hash)
- gsub(/[^0-9a-fA-F]/, "", hash)
-
- if (length(hash) >= 7) {
- cmd = "git log -1 --format=\"%G?|%GK\" " hash " 2>/dev/null"
- cmd | getline sig
- close(cmd)
- split(sig, a, "|")
- st = a[1]; key = a[2]
- } else {
- st = ""; key = ""
- }
-
- if (st == "G") label = "\033[32mgood\033[0m"
- else if (st == "B") label = "\033[31mbad\033[0m"
- else if (st == "U") label = "\033[33muntrusted\033[0m"
- else if (st == "X") label = "\033[33mexpired sig\033[0m"
- else if (st == "Y") label = "\033[33mexpired key\033[0m"
- else if (st == "R") label = "\033[31mrevoked\033[0m"
- else if (st == "E") label = "\033[90munverifiable\033[0m"
- else label = "\033[90mnone\033[0m"
- keydisp = (key == "") ? "\033[90m-\033[0m" : "\033[35m" key "\033[0m"
- printf "%s\033[1;34mSignature:\033[0m %s %s\n", prefix, label, keydisp
- next
- }
- { print }
- '
- }; f
- '';
+ log-graph = "!git-log-graph";
+ log-graph-embed = "!GIT_LOG_GRAPH_EMBED=1 git-log-graph";
};
}
(
diff --git a/modules/scripts/default.nix b/modules/scripts/default.nix
index caa3af7..abefa5d 100644
--- a/modules/scripts/default.nix
+++ b/modules/scripts/default.nix
@@ -8,6 +8,7 @@
./deep-clean
./gopass-ssh-load
./gpg-backup
+ ./git-log-graph
./neomutt-sync
./screen-recording
./system-monitor
diff --git a/modules/scripts/git-log-graph/default.nix b/modules/scripts/git-log-graph/default.nix
new file mode 100644
index 0000000..a7753ff
--- /dev/null
+++ b/modules/scripts/git-log-graph/default.nix
@@ -0,0 +1,25 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+let
+ inherit ((import ../lib.nix { inherit lib pkgs; })) mkScriptModule;
+ base = mkScriptModule {
+ name = "git-log-graph";
+ path = ./script.sh;
+ description = "Git log graph with signature verification\nRun with GIT_LOG_GRAPH_EMBED=1 or --embed to skip the pager";
+ deps = [
+ pkgs.git
+ pkgs.git-graph
+ pkgs.gawk
+ pkgs.less
+ ];
+ inherit config;
+ };
+in
+{
+ options = base.options;
+ config = base.moduleConfig;
+}
diff --git a/modules/scripts/git-log-graph/script.sh b/modules/scripts/git-log-graph/script.sh
new file mode 100644
index 0000000..0cc03bd
--- /dev/null
+++ b/modules/scripts/git-log-graph/script.sh
@@ -0,0 +1,60 @@
+set -euo pipefail
+
+embed=0
+if [[ "${GIT_LOG_GRAPH_EMBED:-}" == "1" || "${1:-}" == "--embed" ]]; then
+ embed=1
+fi
+
+fmt=$(printf '\033[1;34mCommit:\033[0m \033[33m%%h\033[0m \033[91m%%d\033[0m%%n\x01%%H\x01%%n\033[1;34mParents:\033[0m \033[35m%%p\033[0m%%n\033[1;34mAuthor:\033[0m \033[32m%%an\033[0m <\033[96m%%ae\033[0m>%%n\033[1;34mDate:\033[0m \033[36m%%ad (%%ar)\033[0m%%n%%n%%B%%n\033[90m--------------------------------------------------------\033[0m')
+
+# shellcheck disable=SC2016 # awk expressions must not be expanded by bash
+awk_prog='
+ index($0, "\x01") > 0 {
+ line = $0
+ start = index(line, "\x01")
+ rest = substr(line, start + 1)
+ stop = index(rest, "\x01")
+ hash = substr(rest, 1, stop - 1)
+ prefix = substr(line, 1, start - 1)
+
+ gsub(/\033\[[0-9;]*[a-zA-Z]/, "", hash)
+ gsub(/[^0-9a-fA-F]/, "", hash)
+
+ if (length(hash) >= 7) {
+ cmd = "git log -1 --format=\"%G?|%GK\" " hash " 2>/dev/null"
+ cmd | getline sig
+ close(cmd)
+ split(sig, a, "|")
+ st = a[1]; key = a[2]
+ } else {
+ st = ""; key = ""
+ }
+
+ if (st == "G") label = "\033[32mgood\033[0m"
+ else if (st == "B") label = "\033[31mbad\033[0m"
+ else if (st == "U") label = "\033[33muntrusted\033[0m"
+ else if (st == "X") label = "\033[33mexpired sig\033[0m"
+ else if (st == "Y") label = "\033[33mexpired key\033[0m"
+ else if (st == "R") label = "\033[31mrevoked\033[0m"
+ else if (st == "E") label = "\033[90munverifiable\033[0m"
+ else label = "\033[90mnone\033[0m"
+ keydisp = (key == "") ? "\033[90m-\033[0m" : "\033[35m" key "\033[0m"
+ printf "%s\033[1;34mSignature:\033[0m %s %s\n", prefix, label, keydisp
+ next
+ }
+ { print }
+'
+
+graph() {
+ if [[ $embed -eq 1 ]]; then
+ git-graph --model custom --color always --sparse --style round --no-pager --format="$fmt" | gawk "$awk_prog"
+ else
+ git-graph --model custom --color always --sparse --style round --format="$fmt" | gawk "$awk_prog"
+ fi
+}
+
+if [[ $embed -eq 1 ]]; then
+ graph
+else
+ less -R < <(graph)
+fi
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-11 01:44:27 +0000