bup

cleo.home.nix

@@ -127,10 +127,12 @@ in
 
   home.sessionVariables = {
     # Points to the Homebrew location mentioned in your caveat
-    ANDROID_HOME = "/opt/homebrew/share/android-commandlinetools";
     JAVA_HOME = "/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home";
     NPM_CONFIG_PREFIX = "${config.home.homeDirectory}/.npm-global";
     GRANTED_ALIAS_CONFIGURED = "true";
+    # Stub SDK root so tools that require ANDROID_HOME/platform-tools/adb work
+    # even though adb is managed by Homebrew (android-platform-tools cask).
+    ANDROID_HOME = "${config.home.homeDirectory}/android-sdk";
   };
 
   home.sessionPath = [
@@ -142,6 +144,10 @@ in
   '' ;
 
   home.file.".config/1Password/ssh/agent.toml".source = ./config.agent.toml;
+  # Stub Android SDK directory so ANDROID_HOME/platform-tools/adb resolves to
+  # the adb binary installed by the android-platform-tools Homebrew cask.
+  home.file."android-sdk/platform-tools/adb".source = config.lib.file.mkOutOfStoreSymlink "/opt/homebrew/bin/adb";
+  home.file."android-sdk/cmdline-tools/latest/bin/sdkmanager".source = config.lib.file.mkOutOfStoreSymlink "/opt/homebrew/bin/sdkmanager";
   xdg.configFile."opencode/opencode.jsonc".source = config.lib.file.mkOutOfStoreSymlink "/Users/matthew.bessette/nixos/config.opencode.jsonc";
 
   programs.tmux.enable = true;