diff --git a/tasks/workstation/linux/software/llm.md b/tasks/workstation/linux/software/llm.md index 4cacc3e..0df4495 100644 --- a/tasks/workstation/linux/software/llm.md +++ b/tasks/workstation/linux/software/llm.md @@ -43,6 +43,17 @@ overwhelming them with technical details unless asked. You know that the designer you are working with (me) likely already understands these things and does not need them included in our conversation. +Android SDK is at $ANDROID_HOME and should be "$HOME/SDKs/Android/Sdk". +Flutter SDK is at $FLUTTER_HOME and should be "$HOME/SDKs/Flutter/flutter". +Java SDK (JDK) is at $JAVA_HOME and should be "$HOME/SDKs/Java". + +These may be useful to add to your PATH: + +- "$ANDROID_HOME/platform-tools" +- "$ANDROID_HOME/cmdline-tools/latest/bin" +- "$FLUTTER_HOME/bin" +- "$JAVA_HOME/bin" + #### Quick Developer Handles code changes with simpler technologies, preferring minimal changes, and diff --git a/tasks/workstation/linux/software/llm.yml b/tasks/workstation/linux/software/llm.yml index bd02572..6a1ba50 100644 --- a/tasks/workstation/linux/software/llm.yml +++ b/tasks/workstation/linux/software/llm.yml @@ -558,11 +558,12 @@ echo "RUN: Updating..." docker pull $image & - if curl -sf --max-time 5 -o /dev/null https://hyperling.com; then - # Internet is available, pull extra packages. useful for having - # model compile Android apps, need to verify for Flutter. - packages="xz-utils libglu1-mesa libglu1-mesa ninja-build libnotify-bin libgtk-3-dev liblzma-dev libstdc++-12-dev libc6:amd64 libstdc++6 lib32z1 libbz2-1.0 default-jdk libncurses-dev android-udev-rules" - fi + # This takes too long. Mount JDK from the host instead. + #if curl -sf --max-time 5 -o /dev/null https://hyperling.com; then + # # Internet is available, pull extra packages. useful for having + # # model compile Android apps, need to verify for Flutter. + # packages="default-jdk xz-utils libglu1-mesa libglu1-mesa ninja-build libnotify-bin libgtk-3-dev liblzma-dev libstdc++-12-dev libc6:amd64 libstdc++6 lib32z1 libbz2-1.0 libncurses-dev android-udev-rules" + #fi # Start the open-terminal program. # https://github.com/open-webui/open-terminal#configuration @@ -570,10 +571,17 @@ exec docker run \ --name open-terminal \ --network=host \ - -v {{ user_user.home }}/AI-Sandbox:{{ user_user.home }} \ - -v {{ user_user.home }}/Code:{{ user_user.home }}/Code \ - -e OPEN_TERMINAL_FILE_BROWSER_ROOT={{ user_user.home }} \ - -e OPEN_TERMINAL_API_KEY={{ open_terminal_key }} \ + -v {{ user_user.home }}/AI-Sandbox:/home/user \ + -v {{ user_user.home }}/Code:/home/user/Code \ + -v {{ user_user.home }}/SDKs:/home/user/SDKs \ + -v {{ jdk_src }}:{{ jdk_src }} \ + -e ANDROID_HOME="/home/user/SDKs/Android/Sdk" \ + -e FLUTTER_HOME="/home/user/SDKs/Flutter/flutter" \ + -e JAVA_HOME="/home/user/SDKs/Java" \ + -v {{ user_user.home }}/.gradle:/home/user/.gradle \ + -v {{ user_user.home }}/.pub_cache:/home/user/.pub_cache \ + -e OPEN_TERMINAL_FILE_BROWSER_ROOT="/home/user" \ + -e OPEN_TERMINAL_API_KEY="{{ open_terminal_key }}" \ -e OPEN_TERMINAL_PACKAGES="$packages" \ $image run --port {{ open_terminal_port }}