Merge branch 'master' into dev

This commit is contained in:
David Heinemeier Hansson
2026-02-20 20:21:43 +01:00
2 changed files with 7 additions and 1 deletions
+5
View File
@@ -141,4 +141,9 @@ clojure)
omarchy-pkg-add rlwrap
mise use --global clojure@latest
;;
scala)
echo -e "Installing Scala...\n"
mise use --global scala@latest
mise use --global scala-cli@latest
;;
esac
+2 -1
View File
@@ -386,7 +386,7 @@ show_install_font_menu() {
}
show_install_development_menu() {
case $(menu "Install" "󰫏 Ruby on Rails\n Docker DB\n JavaScript\n Go\n PHP\n Python\n Elixir\n Zig\n Rust\n Java\n .NET\n OCaml\n Clojure") in
case $(menu "Install" "󰫏 Ruby on Rails\n Docker DB\n JavaScript\n Go\n PHP\n Python\n Elixir\n Zig\n Rust\n Java\n .NET\n OCaml\n Clojure\n Scala") in
*Rails*) present_terminal "omarchy-install-dev-env ruby" ;;
*Docker*) present_terminal omarchy-install-docker-dbs ;;
*JavaScript*) show_install_javascript_menu ;;
@@ -400,6 +400,7 @@ show_install_development_menu() {
*NET*) present_terminal "omarchy-install-dev-env dotnet" ;;
*OCaml*) present_terminal "omarchy-install-dev-env ocaml" ;;
*Clojure*) present_terminal "omarchy-install-dev-env clojure" ;;
*Scala*) present_terminal "omarchy-install-dev-env scala" ;;
*) show_install_menu ;;
esac
}