diff --git a/README.md b/README.md index 9bd4230..91b315c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,6 @@ Omakub is released under the [MIT License](https://opensource.org/licenses/MIT). ## Extras -While omakub is purposed to be an opiniated take, the open source community offers alternative customization, add-ons, extras, that you can use to adjust, replace or enrich your experience. +While omakub is purposed to be an opinionated take, the open source community offers alternative customization, add-ons, extras, that you can use to adjust, replace or enrich your experience. -[⇒ Browse the omakub extensions.](EXTENSIONS.md) \ No newline at end of file +[⇒ Browse the omakub extensions.](EXTENSIONS.md) diff --git a/applications/icons/cursor.png b/applications/icons/cursor.png new file mode 100644 index 0000000..3345b7d Binary files /dev/null and b/applications/icons/cursor.png differ diff --git a/bin/omakub-sub/install.sh b/bin/omakub-sub/install.sh index 3e35081..48f49fc 100644 --- a/bin/omakub-sub/install.sh +++ b/bin/omakub-sub/install.sh @@ -4,6 +4,7 @@ CHOICES=( "1password Manage your passwords securely across devices" "Audacity Record and edit audio" "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" "OBS Studio Record screencasts with inputs from both display + webcam" diff --git a/bin/omakub-sub/uninstall.sh b/bin/omakub-sub/uninstall.sh index f9c633c..3574493 100644 --- a/bin/omakub-sub/uninstall.sh +++ b/bin/omakub-sub/uninstall.sh @@ -1,4 +1,4 @@ -UNINSTALLER=$(gum file $OMAKUB_PATH/uninstall) +UNINSTALLER=$(gum file $OMAKUB_PATH/uninstall --height 26) [ -n "$UNINSTALLER" ] && gum confirm "Run uninstaller?" && source $UNINSTALLER && gum spin --spinner globe --title "Uninstall completed!" -- sleep 3 clear source $OMAKUB_PATH/bin/omakub diff --git a/boot.sh b/boot.sh index 746c6e2..b489a85 100755 --- a/boot.sh +++ b/boot.sh @@ -9,7 +9,7 @@ ascii_art='________ __ ___. ' echo -e "$ascii_art" -echo "=> Omakub is for fresh Ubuntu 24.04 installations only!" +echo "=> Omakub is for fresh Ubuntu 24.04+ installations only!" echo -e "\nBegin installation (or abort with ctrl+c)..." sudo apt-get update >/dev/null diff --git a/configs/ulauncher.desktop b/configs/ulauncher.desktop index da1504d..1a36782 100644 --- a/configs/ulauncher.desktop +++ b/configs/ulauncher.desktop @@ -4,7 +4,7 @@ Comment=Application launcher for Linux GenericName=Launcher Categories=GNOME;GTK;Utility; TryExec=/usr/bin/ulauncher -Exec=env GDK_BACKEND=x11 /usr/bin/ulauncher --hide-window --hide-window +Exec=env GDK_BACKEND=wayland /usr/bin/ulauncher --hide-window --hide-window Icon=ulauncher Terminal=false Type=Application diff --git a/defaults/bash/aliases b/defaults/bash/aliases index 5232f64..0a95107 100644 --- a/defaults/bash/aliases +++ b/defaults/bash/aliases @@ -1,5 +1,5 @@ # File system -alias ls='eza -lh --group-directories-first --icons' +alias ls='eza -lh --group-directories-first --icons=auto' alias lsa='ls -a' alias lt='eza --tree --level=2 --long --icons --git' alias lta='lt -a' diff --git a/defaults/bash/prompt b/defaults/bash/prompt index 3a52ba7..4901a58 100644 --- a/defaults/bash/prompt +++ b/defaults/bash/prompt @@ -2,6 +2,6 @@ force_color_prompt=yes color_prompt=yes -# Simple prompt with path in the window/pane title and carat for typing line +# Simple prompt with path in the window/pane title and caret for typing line PS1=$'\uf0a9 ' PS1="\[\e]0;\w\a\]$PS1" diff --git a/defaults/xcompose b/defaults/xcompose index 24a6b72..116d75d 100644 --- a/defaults/xcompose +++ b/defaults/xcompose @@ -20,3 +20,6 @@ include "%L"

: "🙏" # pray : "😉" # wink : "👌" # OK + : "👋" # greeting + : "💪" # arm + : "🤯" # blowing diff --git a/install.sh b/install.sh index 2d551e3..8a535f4 100644 --- a/install.sh +++ b/install.sh @@ -16,7 +16,7 @@ if $RUNNING_GNOME; then source ~/.local/share/omakub/install/terminal/required/app-gum.sh >/dev/null source ~/.local/share/omakub/install/first-run-choices.sh - echo "Installing terminal and desktop tools.." + echo "Installing terminal and desktop tools..." else echo "Only installing terminal tools..." fi diff --git a/install/check-version.sh b/install/check-version.sh index 8fc2e0c..1784327 100644 --- a/install/check-version.sh +++ b/install/check-version.sh @@ -12,7 +12,7 @@ fi if [ "$ID" != "ubuntu" ] || [ $(echo "$VERSION_ID >= 24.04" | bc) != 1 ]; then echo "$(tput setaf 1)Error: OS requirement not met" echo "You are currently running: $ID $VERSION_ID" - echo "OS required: ubuntu 24.04 or higher" + echo "OS required: Ubuntu 24.04 or higher" echo "Installation stopped." exit 1 fi diff --git a/install/desktop/optional/app-cursor.sh b/install/desktop/optional/app-cursor.sh new file mode 100644 index 0000000..ddab8fe --- /dev/null +++ b/install/desktop/optional/app-cursor.sh @@ -0,0 +1,24 @@ +cd /tmp +curl -L --output cursor.appimage https://downloader.cursor.sh/linux/x64 +sudo mv cursor.appimage /opt/cursor.appimage +sudo chmod +x /opt/cursor.appimage +sudo apt install -y fuse3 +sudo apt install -y libfuse2t64 + +DESKTOP_FILE="/usr/share/applications/cursor.desktop" + +sudo bash -c "cat > $DESKTOP_FILE" </dev/null -echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=amd64] https://mise.jdx.dev/deb stable main" | sudo tee /etc/apt/sources.list.d/mise.list +echo "deb [signed-by=/etc/apt/keyrings/mise-archive-keyring.gpg arch=$(dpkg --print-architecture)] https://mise.jdx.dev/deb stable main" | sudo tee /etc/apt/sources.list.d/mise.list sudo apt update sudo apt install -y mise diff --git a/install/terminal/select-dev-language.sh b/install/terminal/select-dev-language.sh index 7750c18..de30b18 100644 --- a/install/terminal/select-dev-language.sh +++ b/install/terminal/select-dev-language.sh @@ -19,45 +19,42 @@ enable_lazyvim_extras() { } if [[ -n "$languages" ]]; then - for language in $languages; do - case $language in - Ruby) - mise use --global ruby@3.3 - mise x ruby -- gem install rails --no-document - ;; - Node.js) - mise use --global node@lts - - enable_lazyvim_extras "lazyvim.plugins.extras.lang.typescript" - ;; - Go) - mise use --global go@latest - - enable_lazyvim_extras "lazyvim.plugins.extras.lang.go" - ;; - PHP) - sudo add-apt-repository -y ppa:ondrej/php - sudo apt -y install php8.3 php8.3-{curl,apcu,intl,mbstring,opcache,pgsql,mysql,sqlite3,redis,xml,zip} - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php --quiet && sudo mv composer.phar /usr/local/bin/composer - rm composer-setup.php - - enable_lazyvim_extras "lazyvim.plugins.extras.lang.php" - ;; - Python) - mise use --global python@latest - ;; - Elixir) - mise use --global erlang@latest - mise use --global elixir@latest - mise x elixir -- mix local.hex --force - ;; - Rust) - bash -c "$(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs)" -- -y - ;; - Java) - mise use --global java@latest - ;; - esac - done + for language in $languages; do + case $language in + Ruby) + mise use --global ruby@3.4 + mise x ruby -- gem install rails --no-document + ;; + Node.js) + mise use --global node@lts + enable_lazyvim_extras "lazyvim.plugins.extras.lang.typescript" + ;; + Go) + mise use --global go@latest + enable_lazyvim_extras "lazyvim.plugins.extras.lang.go" + ;; + PHP) + sudo add-apt-repository -y ppa:ondrej/php + sudo apt -y install php8.4 php8.4-{curl,apcu,intl,mbstring,opcache,pgsql,mysql,sqlite3,redis,xml,zip} + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php --quiet && sudo mv composer.phar /usr/local/bin/composer + rm composer-setup.php + enable_lazyvim_extras "lazyvim.plugins.extras.lang.php" + ;; + Python) + mise use --global python@latest + ;; + Elixir) + mise use --global erlang@latest + mise use --global elixir@latest + mise x elixir -- mix local.hex --force + ;; + Rust) + bash -c "$(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs)" -- -y + ;; + Java) + mise use --global java@latest + ;; + esac + done fi diff --git a/migrations/1738744474.sh b/migrations/1738744474.sh new file mode 100644 index 0000000..0f1847c --- /dev/null +++ b/migrations/1738744474.sh @@ -0,0 +1,3 @@ +# Local XCompose must change for included files to be picked up by ibus +sed -i '1i # Touched to update for Omakub defaults [5/2/2025]' ~/.XCompose +ibus restart diff --git a/themes/set-vscode-theme.sh b/themes/set-vscode-theme.sh index bfd8fdb..5419d41 100644 --- a/themes/set-vscode-theme.sh +++ b/themes/set-vscode-theme.sh @@ -1,2 +1,4 @@ -code --install-extension $VSC_EXTENSION >/dev/null -sed -i "s/\"workbench.colorTheme\": \".*\"/\"workbench.colorTheme\": \"$VSC_THEME\"/g" ~/.config/Code/User/settings.json +if command -v code &>/dev/null; then + code --install-extension $VSC_EXTENSION >/dev/null + sed -i "s/\"workbench.colorTheme\": \".*\"/\"workbench.colorTheme\": \"$VSC_THEME\"/g" ~/.config/Code/User/settings.json +fi diff --git a/uninstall/app-cursor.sh b/uninstall/app-cursor.sh new file mode 100644 index 0000000..45216b0 --- /dev/null +++ b/uninstall/app-cursor.sh @@ -0,0 +1,2 @@ +sudo rm /opt/cursor.appimage +sudo rm /usr/share/applications/cursor.desktop diff --git a/uninstall/app-zed.sh b/uninstall/app-zed.sh index a8f566f..20ff835 100644 --- a/uninstall/app-zed.sh +++ b/uninstall/app-zed.sh @@ -1,4 +1,4 @@ rm -rf ~/.local/zed.app rm -rf ~/.local/bin/zed -rm .rf ~/.local/share/applications/dev.zed.Zed.desktop +rm -rf ~/.local/share/applications/dev.zed.Zed.desktop rm -rf ~/.config/zed diff --git a/version b/version index 781dcb0..2bf1ca5 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.3 +1.1.7