diff --git a/README.md b/README.md index 9bd4230f..91b315c7 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/bin/omakub-sub/uninstall.sh b/bin/omakub-sub/uninstall.sh index f9c633cf..35744935 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/configs/ulauncher.desktop b/configs/ulauncher.desktop index da1504d3..1a367824 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/prompt b/defaults/bash/prompt index 3a52ba75..4901a584 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/install.sh b/install.sh index 2d551e32..8a535f4c 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 8fc2e0c3..17843276 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-spotify.sh b/install/desktop/optional/app-spotify.sh index ceba0fc6..57b0dbfd 100644 --- a/install/desktop/optional/app-spotify.sh +++ b/install/desktop/optional/app-spotify.sh @@ -1,5 +1,5 @@ # Stream music using https://spotify.com -curl -sS https://download.spotify.com/debian/pubkey_6224F9941A8AA6D1.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg +curl -sS https://download.spotify.com/debian/pubkey_C85668DF69375001.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg echo "deb [signed-by=/etc/apt/trusted.gpg.d/spotify.gpg] http://repository.spotify.com stable non-free" | sudo tee /etc/apt/sources.list.d/spotify.list sudo apt update -y sudo apt install -y spotify-client diff --git a/install/terminal/app-neovim.sh b/install/terminal/app-neovim.sh index a5ea1a42..0ccebfe3 100644 --- a/install/terminal/app-neovim.sh +++ b/install/terminal/app-neovim.sh @@ -11,9 +11,8 @@ cd - if [ ! -d "$HOME/.config/nvim" ]; then # Use LazyVim git clone https://github.com/LazyVim/starter ~/.config/nvim - - # Disable update notification popup in starter config - sed -i 's/checker = { enabled = true }/checker = { enabled = true, notify = false }/g' ~/.config/nvim/lua/config/lazy.lua + # Remove the .git folder, so you can add it to your own repo later + rm -rf ~/.config/nvim/.git # Make everything match the terminal transparency mkdir -p ~/.config/nvim/plugin/after diff --git a/install/terminal/mise.sh b/install/terminal/mise.sh index 9a7e3ebd..d7fd0e6c 100644 --- a/install/terminal/mise.sh +++ b/install/terminal/mise.sh @@ -1,7 +1,7 @@ # Install mise for managing multiple versions of languages. See https://mise.jdx.dev/ -sudo apt update -y && sudo apt install -y gpg sudo wget curl +sudo apt update -y && sudo apt install -y gpg wget curl sudo install -dm 755 /etc/apt/keyrings wget -qO - https://mise.jdx.dev/gpg-key.pub | gpg --dearmor | sudo tee /etc/apt/keyrings/mise-archive-keyring.gpg 1>/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/themes/set-vscode-theme.sh b/themes/set-vscode-theme.sh index bfd8fdbf..5419d41f 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