diff --git a/bin/omakub b/bin/omakub index 41e4745..4f0a433 100755 --- a/bin/omakub +++ b/bin/omakub @@ -1,7 +1,4 @@ #!/bin/bash -source $OMAKUB_PATH/ascii.sh -echo "" # Add spacing -echo " $(cat $OMAKUB_PATH/version)" -echo "" # Add spacing +source $OMAKUB_PATH/bin/omakub-sub/header.sh source $OMAKUB_PATH/bin/omakub-sub/menu.sh diff --git a/bin/omakub-sub/header.sh b/bin/omakub-sub/header.sh new file mode 100644 index 0000000..74f7937 --- /dev/null +++ b/bin/omakub-sub/header.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +source $OMAKUB_PATH/ascii.sh +echo "" # Add spacing +echo " $(cat $OMAKUB_PATH/version)" +echo "" # Add spacing diff --git a/bin/omakub-sub/install-dev-editor.sh b/bin/omakub-sub/install-dev-editor.sh new file mode 100644 index 0000000..fec28ca --- /dev/null +++ b/bin/omakub-sub/install-dev-editor.sh @@ -0,0 +1,24 @@ +CHOICES=( + "Cursor AI Code Editor" + "Doom Emacs Emacs framework with curated list of packages" + "RubyMine IntelliJ's commercial Ruby editor" + "Windsurf Another AI Code Editor" + "Zed Fast all-purpose editor" + "<< Back " +) + +CHOICE=$(gum choose "${CHOICES[@]}" --height 8 --header "Install editor") + +if [[ "$CHOICE" == "<< Back"* ]] || [[ -z "$CHOICE" ]]; then + # Don't install anything + echo "" +else + INSTALLER=$(echo "$CHOICE" | awk -F ' {2,}' '{print $1}' | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g') + INSTALLER_FILE="$OMAKUB_PATH/install/desktop/optional/app-$INSTALLER.sh" + + source $INSTALLER_FILE && gum spin --spinner globe --title "Install completed!" -- sleep 3 +fi + +clear +source $OMAKUB_PATH/bin/omakub-sub/header.sh +source $OMAKUB_PATH/bin/omakub-sub/install.sh diff --git a/bin/omakub-sub/install.sh b/bin/omakub-sub/install.sh index 4bbfe68..5dce448 100644 --- a/bin/omakub-sub/install.sh +++ b/bin/omakub-sub/install.sh @@ -1,28 +1,25 @@ CHOICES=( + "Dev Editor Install alternative programming editors" "Dev Language Install programming language environment" "Dev Database Install development database in Docker" "1password Manage your passwords securely across devices" "Audacity Record and edit audio" "ASDControl Set brightness on Apple Studio and XDR displays via cli" "Brave Chrome-based browser with built-in ad blocking" - "Cursor The AI Code Editor" - "Doom Emacs Emacs framework with curated list of packages" "Dropbox Sync files across computers with ease" "Mainline Kernels Install newer Linux kernels than Ubuntu defaults" "OBS Studio Record screencasts with inputs from both display + webcam" "Ollama Run LLMs, like Meta's Llama3, locally" - "RubyMine IntelliJ's commercial Ruby editor" "Scrcpy Android screen mirroring (requires dev mode / USB debug on!)" "Spotify Stream music from the world's most popular service" "Steam Play games from Valve's store" "VirtualBox Virtual machines to run Windows/Linux" - "Zed Fast all-purpose editor" "Zoom Attend and host video chat meetings" "> All Re-run any of the default installers" "<< Back " ) -CHOICE=$(gum choose "${CHOICES[@]}" --height 23 --header "Install application") +CHOICE=$(gum choose "${CHOICES[@]}" --height 20 --header "Install application") if [[ "$CHOICE" == "<< Back"* ]] || [[ -z "$CHOICE" ]]; then # Don't install anything @@ -38,6 +35,7 @@ else INSTALLER=$(echo "$CHOICE" | awk -F ' {2,}' '{print $1}' | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g') case "$INSTALLER" in + "dev-editor") INSTALLER_FILE="$OMAKUB_PATH/bin/omakub-sub/install-dev-editor.sh" ;; "dev-language") INSTALLER_FILE="$OMAKUB_PATH/install/terminal/select-dev-language.sh" ;; "dev-database") INSTALLER_FILE="$OMAKUB_PATH/install/terminal/select-dev-storage.sh" ;; "ollama") INSTALLER_FILE="$OMAKUB_PATH/install/terminal/optional/app-ollama.sh" ;;