diff --git a/hosts/common/optional/android-studio.nix b/hosts/common/optional/android-studio.nix
new file mode 100644
index 0000000..bc8b8f5
--- /dev/null
+++ b/hosts/common/optional/android-studio.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+let
+  androidComposition = pkgs.androidenv.composeAndroidPackages {
+    includeNDK = true;
+  };
+  androidSdk = androidComposition.androidsdk;
+in
+{
+  environment = {
+    systemPackages = with pkgs; [
+      androidSdk
+      android-studio-full
+    ];
+
+    variables = let
+      sdkPath = "${androidSdk}/libexec/android-sdk";
+    in {
+      ANDROID_HOME = sdkPath;
+      ANDROID_SDK_ROOT = sdkPath;
+      ANDROID_NDK_ROOT = "${sdkPath}/ndk-bundle";
+      ANDROID_USER_HOME = "\${HOME}/.android";
+    };
+  };
+}
diff --git a/hosts/nixos/rihla/default.nix b/hosts/nixos/rihla/default.nix
index f466fc8..f46596c 100644
--- a/hosts/nixos/rihla/default.nix
+++ b/hosts/nixos/rihla/default.nix
@@ -45,6 +45,7 @@
     #
     (map (c: lib.custom.relativeToRoot "hosts/common/optional/${c}.nix") [
       "1password"
+      "android-studio"
       "claude-code"
       "dconf"
       "docker"