diff --git a/bin/omarchy-install-dev-env b/bin/omarchy-install-dev-env index 1e8480a..5453e8d 100755 --- a/bin/omarchy-install-dev-env +++ b/bin/omarchy-install-dev-env @@ -6,7 +6,7 @@ if [[ -z "$1" ]]; then fi install_php() { - sudo pacman -Sy php composer php-sqlite --noconfirm + sudo pacman -S php composer php-sqlite --noconfirm # Install Path for Composer if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then diff --git a/bin/omarchy-install-steam b/bin/omarchy-install-steam index 9eb826d..1d58845 100755 --- a/bin/omarchy-install-steam +++ b/bin/omarchy-install-steam @@ -2,8 +2,7 @@ echo "Adding multilib repository for 32-bit compatibility" sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf -sudo pacman -Sy echo "Now pick dependencies matching your graphics card" -sudo pacman -S steam +sudo pacman -Syu --noconfirm steam setsid gtk-launch steam >/dev/null 2>&1 & diff --git a/bin/omarchy-launch-floating-terminal-with-presentation b/bin/omarchy-launch-floating-terminal-with-presentation new file mode 100755 index 0000000..ecba263 --- /dev/null +++ b/bin/omarchy-launch-floating-terminal-with-presentation @@ -0,0 +1,4 @@ +#!/bin/bash + +cmd="$*" +setsid alacritty --class Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done" diff --git a/bin/omarchy-menu b/bin/omarchy-menu index f5179cb..ce94bae 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -26,7 +26,7 @@ terminal() { } present_terminal() { - alacritty --class Omarchy -e bash -c "omarchy-show-logo; eval \"$1\"; omarchy-show-done;" + omarchy-launch-floating-terminal-with-presentation $1 } edit_in_nvim() { @@ -35,23 +35,23 @@ edit_in_nvim() { } install() { - present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2" + present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2" } install_and_launch() { - present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2 && setsid gtk-launch $3" + present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3" } install_font() { - present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'" + present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'" } aur_install() { - present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2" + present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2" } aur_install_and_launch() { - present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3" + present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3" } show_learn_menu() { diff --git a/bin/omarchy-pkg-aur-install b/bin/omarchy-pkg-aur-install index 25aff21..c99ee71 100755 --- a/bin/omarchy-pkg-aur-install +++ b/bin/omarchy-pkg-aur-install @@ -18,7 +18,7 @@ pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}") if [[ -n "$pkg_names" ]]; then # Convert newline-separated selections to space-separated for yay - echo "$pkg_names" | tr '\n' ' ' | xargs yay -Sy --noconfirm + echo "$pkg_names" | tr '\n' ' ' | xargs yay -S --noconfirm sudo updatedb omarchy-show-done fi diff --git a/bin/omarchy-pkg-install b/bin/omarchy-pkg-install index 7f86106..8a6c1ce 100755 --- a/bin/omarchy-pkg-install +++ b/bin/omarchy-pkg-install @@ -14,12 +14,11 @@ fzf_args=( --color 'pointer:green,marker:green' ) -sudo pacman -Sy pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}") if [[ -n "$pkg_names" ]]; then # Convert newline-separated selections to space-separated for yay - echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Sy --noconfirm + echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm sudo updatedb omarchy-show-done fi diff --git a/bin/omarchy-update-available b/bin/omarchy-update-available index 808513e..2555821 100755 --- a/bin/omarchy-update-available +++ b/bin/omarchy-update-available @@ -1,13 +1,18 @@ #!/bin/bash -# Ensure remote is reachable -if ! git -C "$OMARCHY_PATH" ls-remote &>/dev/null; then - echo "Error: Unable to reach remote repository." +# Get remote tag +latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1) +if [[ -z "$latest_tag" ]]; then + echo "Error: Could not retrieve latest tag." exit 1 fi -latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1) +# Get local tag current_tag=$(git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1)) +if [[ -z "$current_tag" ]]; then + echo "Error: Could not retrieve current tag." + exit 1 +fi if [[ "$current_tag" != "$latest_tag" ]]; then echo "Omarchy update available ($latest_tag)" diff --git a/boot.sh b/boot.sh index 17ad668..98df4e4 100755 --- a/boot.sh +++ b/boot.sh @@ -14,7 +14,7 @@ ansi_art=' ▄▄▄ clear echo -e "\n$ansi_art\n" -sudo pacman -Sy --noconfirm --needed git +sudo pacman -Syu --noconfirm --needed git # Use custom repo if specified, otherwise default to basecamp/omarchy OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}" diff --git a/config/hypr/bindings.conf b/config/hypr/bindings.conf index 6164ec0..fc6d9ce 100644 --- a/config/hypr/bindings.conf +++ b/config/hypr/bindings.conf @@ -2,7 +2,7 @@ $terminal = uwsm app -- alacritty $browser = omarchy-launch-browser -bindd = SUPER, return, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd) +bindd = SUPER, return, Terminal, exec, $terminal --working-directory=$(omarchy-cmd-terminal-cwd) bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window bindd = SUPER, B, Browser, exec, $browser bindd = SUPER, M, Music, exec, uwsm app -- spotify diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index 7ff8c0e..ab1cf55 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -46,7 +46,7 @@ "custom/update": { "format": "", "exec": "omarchy-update-available", - "on-click": "alacritty --class Omarchy --title Omarchy -e omarchy-update", + "on-click": "omarchy-launch-floating-terminal-with-presentation omarchy-update", "tooltip-format": "Omarchy update available", "interval": 3600 }, diff --git a/install/config/hardware/nvidia.sh b/install/config/hardware/nvidia.sh index 6623de6..c2b54e5 100755 --- a/install/config/hardware/nvidia.sh +++ b/install/config/hardware/nvidia.sh @@ -36,7 +36,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then fi # force package database refresh - sudo pacman -Syy + sudo pacman -Syu --noconfirm # Install packages PACKAGES_TO_INSTALL=( diff --git a/install/config/localdb.sh b/install/config/localdb.sh old mode 100644 new mode 100755 diff --git a/install/preflight/repositories.sh b/install/preflight/repositories.sh index 59c18f3..c368955 100755 --- a/install/preflight/repositories.sh +++ b/install/preflight/repositories.sh @@ -1,7 +1,7 @@ #!/bin/bash # Install build tools -sudo pacman -Sy --needed --noconfirm base-devel +sudo pacman -S --needed --noconfirm base-devel # Add fun and color and verbosity to the pacman installer if ! grep -q "ILoveCandy" /etc/pacman.conf; then @@ -30,16 +30,10 @@ if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ]; then if ! grep -q "chaotic-aur" /etc/pacman.conf; then echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null fi - - # Refresh all repos - sudo pacman -Sy else echo -e "Failed to install Chaotic-AUR, so won't include it in pacman config!" fi fi -# Allow repository index updates without sudo -sudo tee /etc/sudoers.d/repositories >/dev/null </dev/null; then - sudo pacman -Sy --noconfirm --needed walker-bin libqalculate + sudo pacman -S --noconfirm --needed walker-bin libqalculate sudo pacman -Rns --noconfirm wofi rm -rf ~/.config/wofi diff --git a/migrations/1753352057.sh b/migrations/1753352057.sh index 3c3b915..3265f6a 100755 --- a/migrations/1753352057.sh +++ b/migrations/1753352057.sh @@ -11,7 +11,7 @@ if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.c echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null # Refresh pacman package databases - sudo pacman -Sy + sudo pacman -Syu --noconfirm else echo "Failed to install Chaotic-AUR, so won't include it in pacman config!" fi diff --git a/migrations/1754509222.sh b/migrations/1754509222.sh index 8ad7ad4..ced63c6 100644 --- a/migrations/1754509222.sh +++ b/migrations/1754509222.sh @@ -1,3 +1,3 @@ echo "Add xmlstarlet needed for updating fonts via Omarchy menu" -sudo pacman -Sy --noconfirm --needed xmlstarlet +sudo pacman -S --noconfirm --needed xmlstarlet diff --git a/migrations/1754515289.sh b/migrations/1754515289.sh index 17a3d56..23f4db5 100644 --- a/migrations/1754515289.sh +++ b/migrations/1754515289.sh @@ -1,4 +1,4 @@ echo "Update and restart Walker to resolve stuck Omarchy menu" -sudo pacman -Sy --noconfirm walker-bin +sudo pacman -Syu --noconfirm walker-bin omarchy-restart-walker diff --git a/migrations/1755164105.sh b/migrations/1755164105.sh index 17dd2a7..a17ac58 100644 --- a/migrations/1755164105.sh +++ b/migrations/1755164105.sh @@ -11,7 +11,7 @@ set_theme_colors() { if command -v chromium &>/dev/null; then sudo pacman -Rns --noconfirm chromium || true - sudo pacman -Sy --noconfirm omarchy-chromium + sudo pacman -S --noconfirm omarchy-chromium if pgrep -x chromium; then if gum confirm "Chromium must be restarted. Ready?"; then diff --git a/migrations/1755795450.sh b/migrations/1755795450.sh index 96df3fc..3e2b3e6 100644 --- a/migrations/1755795450.sh +++ b/migrations/1755795450.sh @@ -1,3 +1,3 @@ echo "Ensure latest uwsm is installed" -sudo pacman -Sy --noconfirm uwsm +sudo pacman -Syu --noconfirm uwsm diff --git a/migrations/1755870033.sh b/migrations/1755870033.sh index e1a0be0..fde865b 100644 --- a/migrations/1755870033.sh +++ b/migrations/1755870033.sh @@ -1,3 +1,5 @@ echo "Use current terminal shell cwd for new terminal working directories" -sed -i 's|bindd = SUPER, return, Terminal, exec, \$terminal|bindd = SUPER, return, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf +if ! grep -q "working-directory" ~/.config/hypr/bindings.conf; then + sed -i '/bindd = SUPER, return, Terminal, exec, \$terminal/ s|$| --working-directory=$(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf +fi diff --git a/migrations/1756103168.sh b/migrations/1756103168.sh deleted file mode 100644 index bef59f4..0000000 --- a/migrations/1756103168.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "Allow pacman -Sy without sudo to easier installs" - -sudo tee /etc/sudoers.d/repositories >/dev/null <