Commit 0af3b6ee3678

@@ -5,6 +5,7 @@
 }:
 {
   home.packages = with pkgs; [
+    chmouzies-ai
     aichat
     aider-chat
     goose-cli

@@ -28,6 +28,7 @@
     jujutsu
     jj-fzf
     devenv
+    chmouzies-git
 
     # old
     cmake

@@ -23,7 +23,7 @@
     # operator-sdk
     snazy
     kubelogin-oidc
-    chmouzies-kubernetes # FIXME update this
+    chmouzies-kubernetes
     tektoncd-cli
     tektoncd-cli-pac
     # knd

@@ -0,0 +1,26 @@
+# https://github.com/chmouel/chmouzies/tree/master/kubernetes
+{
+  stdenv,
+  fetchFromGitLab,
+  python313,
+  installShellFiles,
+}:
+
+stdenv.mkDerivation rec {
+  name = "chmouzies-ai";
+  pname = "chmouzies-ai";
+
+  version = "0-unstable-2025-09-30";
+
+  src = fetchFromGitLab {
+    owner = "chmouel";
+    repo = "chmouzies";
+    rev = "10773a982503829e5f276a3bd8fd526dab4f92d3";
+    sha256 = "sha256-Lr4tYzgEhvVhJhSRDGuUlrp7XP2iUNX7H2nizlEko3Q=";
+  };
+
+  propagatedBuildInputs = [ python313 ];
+  nativeBuildInputs = [ installShellFiles ];
+
+  builder = ./builder.ai.sh;
+}

@@ -0,0 +1,11 @@
+source $stdenv/setup
+ls $stdenv
+
+BINARIES="aicommit git-commit-suggest-label"
+
+mkdir -p $out/bin
+for b in ${BINARIES}; do
+	cp $src/ai/${b} $out/bin/
+done
+
+installShellCompletion --cmd aicommit --zsh $src/ai/_aicommit

@@ -0,0 +1,12 @@
+source $stdenv/setup
+ls $stdenv
+
+BINARIES="gh-prcheck gh-actionfollow gh-clone gh-issuef gh-issuecreate gh-completer git-branch-cleanup git-remote-branch git-wt-delete git-wt-create"
+
+mkdir -p $out/bin
+for b in ${BINARIES}; do
+	cp $src/git/${b} $out/bin/
+done
+
+installShellCompletion --cmd gh-issuecreate --zsh $src/git/_gh-issuecreate
+installShellCompletion --cmd gh-clone --zsh $src/git/_gh-clone

@@ -0,0 +1,26 @@
+# https://github.com/chmouel/chmouzies/tree/master/kubernetes
+{
+  stdenv,
+  fetchFromGitLab,
+  python313,
+  installShellFiles,
+}:
+
+stdenv.mkDerivation rec {
+  name = "chmouzies-git";
+  pname = "chmouzies-git";
+
+  version = "0-unstable-2025-09-30";
+
+  src = fetchFromGitLab {
+    owner = "chmouel";
+    repo = "chmouzies";
+    rev = "10773a982503829e5f276a3bd8fd526dab4f92d3";
+    sha256 = "sha256-Lr4tYzgEhvVhJhSRDGuUlrp7XP2iUNX7H2nizlEko3Q=";
+  };
+
+  propagatedBuildInputs = [ python313 ];
+  nativeBuildInputs = [ installShellFiles ];
+
+  builder = ./builder.git.sh;
+}

@@ -7,13 +7,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "chmouzies.kubernetes";
+  name = "chmouzies-kubernetes";
+  pname = "chmouzies-kubernetes";
+
+  version = "0-unstable-2025-09-30";
 
   src = fetchFromGitLab {
     owner = "chmouel";
     repo = "chmouzies";
-    rev = "67191c029cb0d68e0cc2f384fabe6c62a0189e27";
-    sha256 = "sha256-XJOms+r86Y2Y9UiWEP0IG9TqMsI6TgiNZrkDinHxOhc=";
+    rev = "10773a982503829e5f276a3bd8fd526dab4f92d3";
+    sha256 = "sha256-Lr4tYzgEhvVhJhSRDGuUlrp7XP2iUNX7H2nizlEko3Q=";
   };
 
   propagatedBuildInputs = [ python313 ];

@@ -22,6 +22,8 @@ in
   batzconverter = pkgs.callPackage ./batzconverter { };
   manifest-tool = pkgs.callPackage ./manifest-tool { };
 
+  chmouzies-ai = pkgs.callPackage ./chmouzies/ai.nix { };
+  chmouzies-git = pkgs.callPackage ./chmouzies/git.nix { };
   chmouzies-kubernetes = pkgs.callPackage ./chmouzies/kubernetes.nix { };
 
   systemd-email = pkgs.callPackage ./systemd-email { };