diff --git a/hosts/common/optional/claude-code.nix b/hosts/common/optional/claude-code.nix
new file mode 100644
index 0000000..031bd72
--- /dev/null
+++ b/hosts/common/optional/claude-code.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [ claude-code ];
+}
diff --git a/hosts/nixos/rihla/default.nix b/hosts/nixos/rihla/default.nix
index 8d3c7f5..cde2395 100644
--- a/hosts/nixos/rihla/default.nix
+++ b/hosts/nixos/rihla/default.nix
@@ -47,6 +47,7 @@
       "nix-ld"
       "secure-boot"
       "yubikey"
+      "claude-code"
     ])
 
     #