From 26d1ddfaee113b4be517cc7f3b369cdff74b2544 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Thu, 6 Mar 2025 18:40:43 +0100
Subject: [PATCH 1/4] hosts/monitoring-3: Enable websockets with Grafana
---
hosts/monitoring-3/grafana.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hosts/monitoring-3/grafana.nix b/hosts/monitoring-3/grafana.nix
index 8637c80..b7e88b2 100644
--- a/hosts/monitoring-3/grafana.nix
+++ b/hosts/monitoring-3/grafana.nix
@@ -38,6 +38,10 @@
enableACME = true;
forceSSL = true;
locations."/".proxyPass = "http://[::1]:3001/";
+ locations."= /api/live/ws" = {
+ proxyPass = "http://[::1]:3001";
+ proxyWebsockets = true;
+ };
};
};
};
From dbd16ed4382be569922e8004ddec08997c3ddb48 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Thu, 6 Mar 2025 20:05:08 +0100
Subject: [PATCH 2/4] pkgs/git-show-link: Add helper to display links to local
git objects
---
flake.nix | 1 +
hosts/krypton/programs.nix | 1 +
pkgs/git-show-link/default.nix | 13 +++++
pkgs/git-show-link/git-show-link.py | 85 +++++++++++++++++++++++++++++
pkgs/overlay.nix | 1 +
5 files changed, 101 insertions(+)
create mode 100644 pkgs/git-show-link/default.nix
create mode 100755 pkgs/git-show-link/git-show-link.py
diff --git a/flake.nix b/flake.nix
index c385647..0d6b9e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -147,6 +147,7 @@
git-checkout-github-pr
git-diff-word
git-pp
+ git-show-link
harmonia
iot-data
nix-remove-result-links
diff --git a/hosts/krypton/programs.nix b/hosts/krypton/programs.nix
index a58eb0b..ebd778f 100644
--- a/hosts/krypton/programs.nix
+++ b/hosts/krypton/programs.nix
@@ -29,6 +29,7 @@
chromium-incognito
print-afra
+ git-show-link
factorio-launcher
];
diff --git a/pkgs/git-show-link/default.nix b/pkgs/git-show-link/default.nix
new file mode 100644
index 0000000..9fe38bb
--- /dev/null
+++ b/pkgs/git-show-link/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+pkgs.writeTextFile {
+ name = "git-show-link";
+ executable = true;
+ destination = "/bin/git-show-link";
+ allowSubstitutes = true;
+ preferLocalBuild = false;
+ text = ''
+ #!${pkgs.python3.withPackages (ps: with ps; [])}/bin/python3
+ ${builtins.readFile ./git-show-link.py}
+ '';
+}
diff --git a/pkgs/git-show-link/git-show-link.py b/pkgs/git-show-link/git-show-link.py
new file mode 100755
index 0000000..f1d9705
--- /dev/null
+++ b/pkgs/git-show-link/git-show-link.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+
+import argparse
+import re
+import subprocess
+
+REMOTE_TYPES = [
+ {
+ # github
+ "match": re.compile(r'git@github.com:(?P<username>\w+)/(?P<project>\w+).git'),
+ "format-branch": lambda g, b: f"https://github.com/{g['username']}/{g['project']}/tree/{b}/",
+ "format-commit": lambda g, c: f"https://github.com/{g['username']}/{g['project']}/commit/{c}/",
+ },
+ {
+ # gitea
+ "match": re.compile(r'(?P<gituser>\w+)@(?P<host>[\w\.-]+):(?P<username>\w+)/(?P<project>\w+).git'),
+ "format-branch": lambda g, b: f"https://{g['host']}/{g['username']}/{g['project']}/src/branch/{b}/",
+ "format-commit": lambda g, c: f"https://{g['host']}/{g['username']}/{g['project']}/commit/{c}/",
+ },
+]
+
+def get_remote_branch():
+ s = subprocess.run(["git", "status", "--porcelain", "-uno", "-b", "--no-ahead-behind"], capture_output=True, text=True)
+
+ git_status_branch_info = s.stdout.splitlines()[0][3:].split()[0]
+
+ branches = git_status_branch_info.split("...")
+
+ if len(branches) != 2:
+ raise Exception("no branch name found")
+
+ local_branch, remote_branch = branches
+
+ remote, branch = remote_branch.split("/")
+
+ return {
+ "remote": remote,
+ "branch": branch,
+ }
+
+def get_remote_url(remote):
+ s = subprocess.run(["git", "remote", "get-url", remote], capture_output=True, text=True)
+
+ remote_url = s.stdout.strip()
+
+ return remote_url
+
+def get_last_commit():
+ s = subprocess.run(["git", "rev-parse", "HEAD"], capture_output=True, text=True)
+
+ commit = s.stdout.strip()
+
+ return commit
+
+def main():
+ parser = argparse.ArgumentParser(
+ prog='git-show-link',
+ )
+
+ parser.add_argument("--branch", dest="display_branch", action='store_true', help="Display link to branch, instead to commit")
+
+ args = parser.parse_args()
+
+ r = get_remote_branch()
+
+ remote_url = get_remote_url(r["remote"])
+
+ for remote_type in REMOTE_TYPES:
+ m = remote_type["match"].match(remote_url)
+
+ if m is None:
+ continue
+
+ g = m.groupdict()
+
+ if args.display_branch:
+ print(remote_type["format-branch"](g, r["branch"]))
+ else:
+ commit = get_last_commit()
+ print(remote_type["format-commit"](g, commit))
+ break
+
+
+if __name__ == "__main__":
+ main()
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index e478135..7caa76c 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -14,6 +14,7 @@ final: prev: {
git-checkout-github-pr = final.callPackage ./git-checkout-github-pr {};
git-diff-word = final.callPackage ./git-diff-word {};
git-pp = final.callPackage ./git-pp {};
+ git-show-link = final.callPackage ./git-show-link {};
iot-data = final.python3.pkgs.callPackage ./iot-data {};
nix-remove-result-links = final.callPackage ./nix-remove-result-links {};
nixfiles-auto-install = final.callPackage ./nixfiles/nixfiles-auto-install.nix {};
From 7254525c8edc8514f3b377bf3760fe033ce8d789 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Thu, 6 Mar 2025 20:14:27 +0100
Subject: [PATCH 3/4] pkgs/git-show-link: Match names with special chars too
---
pkgs/git-show-link/git-show-link.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/git-show-link/git-show-link.py b/pkgs/git-show-link/git-show-link.py
index f1d9705..0364cd3 100755
--- a/pkgs/git-show-link/git-show-link.py
+++ b/pkgs/git-show-link/git-show-link.py
@@ -7,13 +7,13 @@ import subprocess
REMOTE_TYPES = [
{
# github
- "match": re.compile(r'git@github.com:(?P<username>\w+)/(?P<project>\w+).git'),
+ "match": re.compile(r'git@github.com:(?P<username>[\w\.-]+)/(?P<project>[\w\.-]+).git'),
"format-branch": lambda g, b: f"https://github.com/{g['username']}/{g['project']}/tree/{b}/",
"format-commit": lambda g, c: f"https://github.com/{g['username']}/{g['project']}/commit/{c}/",
},
{
# gitea
- "match": re.compile(r'(?P<gituser>\w+)@(?P<host>[\w\.-]+):(?P<username>\w+)/(?P<project>\w+).git'),
+ "match": re.compile(r'(?P<gituser>[\w\.-]+)@(?P<host>[\w\.-]+):(?P<username>[\w\.-]+)/(?P<project>[\w\.-]+).git'),
"format-branch": lambda g, b: f"https://{g['host']}/{g['username']}/{g['project']}/src/branch/{b}/",
"format-commit": lambda g, c: f"https://{g['host']}/{g['username']}/{g['project']}/commit/{c}/",
},
From ccda80b74600132ca3c4b1c9ef18d07cc306de3c Mon Sep 17 00:00:00 2001
From: Flake Update Bot <flake-update-bot@clerie.de>
Date: Fri, 7 Mar 2025 03:04:18 +0100
Subject: [PATCH 4/4] Update nixpkgs 2025-03-07-02-03
---
flake.lock | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flake.lock b/flake.lock
index 257c57e..eccf6ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -542,11 +542,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1739866667,
- "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+ "lastModified": 1741173522,
+ "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+ "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
"type": "github"
},
"original": {