diff --git a/machines/kcnhub/configuration.nix b/machines/kcnhub/configuration.nix
index b7baeb1..13a5896 100644
--- a/machines/kcnhub/configuration.nix
+++ b/machines/kcnhub/configuration.nix
@@ -106,9 +106,6 @@
     sops
     # Used for Key Generation
     age
-    # Needed to install claude code (do not touch)
-    unstable-unfree.claude-code
-
 
     # To try to make X11 forwarding work we install xauth
     xorg.xauth
diff --git a/machines/kcnhub/packages.nix b/machines/kcnhub/packages.nix
index 11cb352..9529748 100644
--- a/machines/kcnhub/packages.nix
+++ b/machines/kcnhub/packages.nix
@@ -1,5 +1,6 @@
 { ... }: {
   imports = [
+    ./packages/ai.nix
     ./packages/ngilab.nix
     ./packages/office.nix
     ./packages/terminal.nix
diff --git a/machines/kcnhub/packages/ai.nix b/machines/kcnhub/packages/ai.nix
new file mode 100644
index 0000000..d2c88a8
--- /dev/null
+++ b/machines/kcnhub/packages/ai.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }: {
+  environment.systemPackages = with pkgs; [
+    # v-- Proprietary (hence unfree)
+    unstable-unfree.claude-code
+    unstable.pi-coding-agent
+    # v-- Depends on CUDA (hence unfree)
+    unstable-unfree.llama-cpp
+  ];
+}