diff --git a/systems/aarch64-darwin/m4/default.nix b/systems/aarch64-darwin/m4/default.nix
index 16f6052..e63872b 100644
--- a/systems/aarch64-darwin/m4/default.nix
+++ b/systems/aarch64-darwin/m4/default.nix
@@ -35,15 +35,24 @@ with lib.metacfg;
   };
 
   environment.systemPackages = with pkgs; [
+    azure-cli
+    kubectl
+    kubectx
+    k9s
     attic-client
-    claude-code
-    dnsmasq
-    gh
     imagemagick
+    gh
     libvirt
-    nodejs
-    qemu
+    dnsmasq
     virt-manager
+    qemu
+    claude-code
+    nodejs
+    goose-cli
+    aider-chat
+    fabric-ai
+    gemini-cli
+    opencode
   ];
 
   users.users.harald.shell = pkgs.fish;
diff --git a/systems/aarch64-darwin/rialo/default.nix b/systems/aarch64-darwin/rialo/default.nix
index d59dab7..2d96c30 100644
--- a/systems/aarch64-darwin/rialo/default.nix
+++ b/systems/aarch64-darwin/rialo/default.nix
@@ -33,15 +33,22 @@ with lib.metacfg;
   };
 
   environment.systemPackages = with pkgs; [
+    azure-cli
+    kubectl
+    kubectx
+    k9s
     attic-client
-    claude-code
-    dnsmasq
-    gh
     imagemagick
+    gh
     libvirt
-    nodejs
-    qemu
+    dnsmasq
     virt-manager
+    qemu
+    claude-code
+    nodejs
+    goose-cli
+    aider-chat
+    fabric-ai
   ];
 
   users.users.harald.shell = pkgs.fish;