Commit adf2d6c43ced

Vincent Demeester <vincent@sbr.pm>
2026-04-15 15:45:36
feat: bump chmouzies and add misc package
Bumped all chmouzies packages to latest upstream (2026-04-14). Updated git package to reflect renamed and new scripts (gh-checks, git-bumpt, git-create-branch, etc.). Added chmouzies-misc package with vi-errscreen terminal error jumper and assisted-by git hook for AI disclosure trailers.
1 parent 797a834
Changed files (6)
home/common/dev/base.nix
@@ -24,6 +24,7 @@
     jujutsu
     # jj-fzf
     chmouzies-git
+    chmouzies-misc
 
     rclone
 
pkgs/chmouzies/ai.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "chmouzies-ai";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFromGitLab {
     owner = "chmouel";
     repo = "chmouzies";
-    rev = "10773a982503829e5f276a3bd8fd526dab4f92d3";
-    hash = "sha256-Lr4tYzgEhvVhJhSRDGuUlrp7XP2iUNX7H2nizlEko3Q=";
+    rev = "99b02ddf55c76b667e670e63e9ea303986d49cc7";
+    hash = "sha256-hXjAkF0JmrVr0GoCj07eFiSMKVnC0+PpKTcyx6IwNmk=";
   };
 
   propagatedBuildInputs = [ python313 ];
pkgs/chmouzies/git.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "chmouzies-git";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFromGitLab {
     owner = "chmouel";
     repo = "chmouzies";
-    rev = "10773a982503829e5f276a3bd8fd526dab4f92d3";
-    hash = "sha256-Lr4tYzgEhvVhJhSRDGuUlrp7XP2iUNX7H2nizlEko3Q=";
+    rev = "99b02ddf55c76b667e670e63e9ea303986d49cc7";
+    hash = "sha256-hXjAkF0JmrVr0GoCj07eFiSMKVnC0+PpKTcyx6IwNmk=";
   };
 
   propagatedBuildInputs = [ python313 ];
@@ -24,16 +24,20 @@ stdenv.mkDerivation {
   installPhase =
     let
       binaries = [
-        "gh-prcheck"
         "gh-actionfollow"
+        "gh-attach-pr"
+        "gh-checks"
         "gh-clone"
-        "gh-issuef"
-        "gh-issuecreate"
         "gh-completer"
+        "gh-issuecreate"
+        "gh-issuef"
+        "gh-push-other"
         "git-branch-cleanup"
+        "git-browse"
+        "git-bumpt"
+        "git-create-branch"
         "git-remote-branch"
-        "git-wt-delete"
-        "git-wt-create"
+        "git-spinoff"
       ];
     in
     ''
@@ -44,6 +48,8 @@ stdenv.mkDerivation {
 
       installShellCompletion --cmd gh-issuecreate --zsh $src/git/_gh-issuecreate
       installShellCompletion --cmd gh-clone --zsh $src/git/_gh-clone
+      installShellCompletion --cmd git-branch-switch --zsh $src/git/_git-branch-switch
+      installShellCompletion --cmd git-branch-list --zsh $src/git/_git-branch-list
 
       runHook postInstall
     '';
pkgs/chmouzies/kubernetes.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "chmouzies-kubernetes";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFromGitLab {
     owner = "chmouel";
     repo = "chmouzies";
-    rev = "10773a982503829e5f276a3bd8fd526dab4f92d3";
-    hash = "sha256-Lr4tYzgEhvVhJhSRDGuUlrp7XP2iUNX7H2nizlEko3Q=";
+    rev = "99b02ddf55c76b667e670e63e9ea303986d49cc7";
+    hash = "sha256-hXjAkF0JmrVr0GoCj07eFiSMKVnC0+PpKTcyx6IwNmk=";
   };
 
   propagatedBuildInputs = [ python313 ];
pkgs/chmouzies/misc.nix
@@ -0,0 +1,45 @@
+# https://gitlab.com/chmouel/chmouzies/tree/master/misc
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  python313,
+  makeWrapper,
+}:
+
+stdenv.mkDerivation {
+  pname = "chmouzies-misc";
+  version = "0-unstable-2026-04-14";
+
+  src = fetchFromGitLab {
+    owner = "chmouel";
+    repo = "chmouzies";
+    rev = "99b02ddf55c76b667e670e63e9ea303986d49cc7";
+    hash = "sha256-hXjAkF0JmrVr0GoCj07eFiSMKVnC0+PpKTcyx6IwNmk=";
+  };
+
+  propagatedBuildInputs = [ python313 ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/git-hooks
+
+    # vi-errscreen: terminal error jumper (works with emacs via EDITOR=emacsclient)
+    cp $src/misc/vi-errscreen $out/bin/vi-errscreen
+    chmod +x $out/bin/vi-errscreen
+
+    # assisted-by: git prepare-commit-msg hook for AI disclosure
+    cp $src/ai/assisted-by.prepare-commit-msg $out/share/git-hooks/assisted-by.prepare-commit-msg
+    chmod +x $out/share/git-hooks/assisted-by.prepare-commit-msg
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Chmouel's misc tools: terminal error jumper and AI-assisted-by git hook";
+    homepage = "https://gitlab.com/chmouel/chmouzies";
+    platforms = lib.platforms.unix;
+  };
+}
pkgs/default.nix
@@ -63,6 +63,7 @@ in
   chmouzies-ai = pkgs.callPackage ./chmouzies/ai.nix { };
   chmouzies-git = pkgs.callPackage ./chmouzies/git.nix { };
   chmouzies-kubernetes = pkgs.callPackage ./chmouzies/kubernetes.nix { };
+  chmouzies-misc = pkgs.callPackage ./chmouzies/misc.nix { };
 
   systemd-email = pkgs.callPackage ./systemd-email { };