From dfda4f895acd7877029fa67d98e2f8bbcaae74b9 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 25 Aug 2025 07:04:43 +0200 Subject: [PATCH] Rip out the last remnants of AUR --- bin/omarchy-cmd-screenrecord | 9 --------- bin/omarchy-cmd-tzupdate | 8 -------- install/apps/aur.sh | 11 ----------- install/apps/xtras.sh | 3 ++- install/desktop/desktop.sh | 2 +- install/desktop/fonts.sh | 2 +- install/development/terminal.sh | 3 ++- migrations/1753468218.sh | 9 +++------ migrations/1753908454.sh | 10 ++++------ migrations/1755455095.sh | 16 ++++++---------- migrations/1756060611.sh | 17 +++++++++++++---- 11 files changed, 32 insertions(+), 58 deletions(-) delete mode 100644 install/apps/aur.sh diff --git a/bin/omarchy-cmd-screenrecord b/bin/omarchy-cmd-screenrecord index 5914fd5b..4abffc6c 100755 --- a/bin/omarchy-cmd-screenrecord +++ b/bin/omarchy-cmd-screenrecord @@ -16,15 +16,6 @@ screenrecording() { if lspci | grep -Eqi 'nvidia|intel.*graphics'; then wf-recorder -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" else - if ! command -v wl-screenrec >/dev/null; then - notify-send "Installing wl-screenrec in order to make screen recordings..." - if omarchy-pkg-aur-accessible; then - yay -S --noconfirm wl-screenrec - else - notify-send "Installing wl-screenrec failed due to AUR being unavailable..." - fi - fi - wl-screenrec -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@" fi } diff --git a/bin/omarchy-cmd-tzupdate b/bin/omarchy-cmd-tzupdate index 7ab85abd..ff47f55e 100755 --- a/bin/omarchy-cmd-tzupdate +++ b/bin/omarchy-cmd-tzupdate @@ -1,13 +1,5 @@ #!/bin/bash -if ! command -v tzupdate &>/dev/null; then - if omarchy-pkg-aur-accessible; then - yay -S --noconfirm tzupdate - else - notify-send "Installing tzupdate failed due to AUR being unavailable..." - fi -fi - sudo tzupdate new_timezone=$(timedatectl show -p Timezone --value) omarchy-restart-waybar diff --git a/install/apps/aur.sh b/install/apps/aur.sh deleted file mode 100644 index 1b00f79f..00000000 --- a/install/apps/aur.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if omarchy-pkg-aur-accessible; then - yay -S --noconfirm --needed \ - typora ttf-ia-writer \ - tzupdate wl-screenrec python-terminaltexteffects -else - echo -e "\n\e[31mAUR is unavailable. Skipping installation of: 1password, Typora, tte, tzupdate !\e[0m" - echo "You will have to install these later when AUR is available." - sleep 5 -fi diff --git a/install/apps/xtras.sh b/install/apps/xtras.sh index a1429fa9..e85e4ba2 100644 --- a/install/apps/xtras.sh +++ b/install/apps/xtras.sh @@ -4,7 +4,8 @@ sudo pacman -S --noconfirm --needed \ gnome-calculator gnome-keyring signal-desktop \ obsidian libreoffice obs-studio kdenlive \ 1password-beta 1password-cli \ - xournalpp localsend + xournalpp localsend \ + typora # Packages known to be flaky or having key signing issues are run one-by-one for pkg in spotify pinta; do diff --git a/install/desktop/desktop.sh b/install/desktop/desktop.sh index e1226c5c..4c02c15a 100644 --- a/install/desktop/desktop.sh +++ b/install/desktop/desktop.sh @@ -4,6 +4,6 @@ sudo pacman -S --noconfirm --needed \ brightnessctl playerctl pamixer wiremix wireplumber \ fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \ nautilus sushi ffmpegthumbnailer gvfs-mtp \ - slurp satty wf-recorder \ + slurp satty wf-recorder wl-screenrec \ mpv evince imv \ walker-bin omarchy-chromium diff --git a/install/desktop/fonts.sh b/install/desktop/fonts.sh index 912efce4..488af44e 100644 --- a/install/desktop/fonts.sh +++ b/install/desktop/fonts.sh @@ -1,7 +1,7 @@ #!/bin/bash sudo pacman -S --noconfirm --needed \ - ttf-font-awesome ttf-cascadia-mono-nerd ttf-jetbrains-mono \ + ttf-font-awesome ttf-cascadia-mono-nerd ttf-jetbrains-mono ttf-ia-writer \ noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra mkdir -p ~/.local/share/fonts diff --git a/install/development/terminal.sh b/install/development/terminal.sh index 28986e2f..f0352153 100644 --- a/install/development/terminal.sh +++ b/install/development/terminal.sh @@ -6,5 +6,6 @@ sudo pacman -S --noconfirm --needed \ wl-clipboard fastfetch btop \ man tldr less whois plocate \ starship bash-completion \ - gum python-poetry-core \ + gum python-poetry-core python-terminaltexteffects \ + tzupdate \ alacritty diff --git a/migrations/1753468218.sh b/migrations/1753468218.sh index 0b87330c..8fa3ba58 100644 --- a/migrations/1753468218.sh +++ b/migrations/1753468218.sh @@ -1,8 +1,5 @@ echo "Add Terminal Text Effects for rizzing Omarchy" -if omarchy-pkg-aur-accessible; then - if ! yay -Q python-terminaltexteffects &>/dev/null; then - yay -S --noconfirm --needed python-terminaltexteffects - fi -else - echo -e "\n\e[31mAUR is unavailable. Install python-terminaltexteffects via AUR manually later.\e[0m" + +if ! pacman -Q python-terminaltexteffects &>/dev/null; then + sudo pacman -S --noconfirm python-terminaltexteffects fi diff --git a/migrations/1753908454.sh b/migrations/1753908454.sh index d2551b89..8b603247 100644 --- a/migrations/1753908454.sh +++ b/migrations/1753908454.sh @@ -5,10 +5,8 @@ if ! pacman -Q ttf-cascadia-mono-nerd &>/dev/null; then fc-cache fi -if omarchy-aur-accessible; then - if ! yay -Q ttf-ia-writer &>/dev/null; then - yay -S --noconfirm ttf-ia-writer - rm -rf ~/.local/share/fonts/iAWriterMonoS* - fc-cache - fi +if ! pacman -Q ttf-ia-writer &>/dev/null; then + sudo pacman -S --noconfirm ttf-ia-writer + rm -rf ~/.local/share/fonts/iAWriterMonoS* + fc-cache fi diff --git a/migrations/1755455095.sh b/migrations/1755455095.sh index 3f6a6679..4aed9d56 100644 --- a/migrations/1755455095.sh +++ b/migrations/1755455095.sh @@ -1,13 +1,9 @@ echo "Ensure TTE and dependencies are installed" -if omarchy-pkg-aur-accessible; then - if ! yay -Q python-poetry-core &>/dev/null; then - yay -S --noconfirm python-poetry-core - fi - - if ! yay -Q python-terminaltexteffects &>/dev/null; then - yay -S --noconfirm python-terminaltexteffects - fi -else - echo -e "\n\e[31mAUR is unavailable. Skipping installation. Please try manually later.\e[0m" +if ! pacman -Q python-poetry-core &>/dev/null; then + sudo pacman -S --noconfirm python-poetry-core +fi + +if ! pacman -Q python-terminaltexteffects &>/dev/null; then + sudo pacman -S --noconfirm python-terminaltexteffects fi diff --git a/migrations/1756060611.sh b/migrations/1756060611.sh index 756d9ec4..7ea9b027 100644 --- a/migrations/1756060611.sh +++ b/migrations/1756060611.sh @@ -1,5 +1,12 @@ echo "Migrate AUR packages to official repos where possible" +reinstall_package_opr() { + if pacman -Q $1 >/dev/null; then + sudo pacman -Rns --noconfirm $1 + sudo pacman -S --noconfirm $1 + fi +} + if command -v obsidian >/dev/null; then sudo pacman -Rns --noconfirm obsidian-bin sudo pacman -S --noconfirm obsidian @@ -15,7 +22,9 @@ if pacman -Q omarchy-chromium-bin >/dev/null; then sudo pacman -S --noconfirm omarchy-chromium fi -if pacman -Q walker-bin >/dev/null; then - sudo pacman -Rns --noconfirm walker-bin - sudo pacman -S --noconfirm walker-bin -fi +reinstall_package_opr walker-bin +reinstall_package_opr wl-screenrec +reinstall_package_opr python-terminaltexteffects +reinstall_package_opr tzupdate +reinstall_package_opr typora +reinstall_package_opr ttf-ia-writer