From 72e863f6bedab1b06a30f63bf94c46b441439dd7 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 14 Jul 2025 18:43:21 -0700
Subject: [PATCH] Split out the packages that need a keyserver and rescue any
 failure with an explanation

---
 install/xtras.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/install/xtras.sh b/install/xtras.sh
index c4272e8..7f01d8b 100644
--- a/install/xtras.sh
+++ b/install/xtras.sh
@@ -1,10 +1,11 @@
 if [ -z "$OMARCHY_BARE" ]; then
   yay -S --noconfirm --needed \
-    gnome-calculator \
-    signal-desktop spotify dropbox-cli zoom \
+    gnome-calculator gnome-keyring signal-desktop \
     obsidian-bin typora libreoffice obs-studio kdenlive \
-    1password-beta 1password-cli gnome-keyring \
     pinta xournalpp localsend-bin
+
+  yay -S --noconfirm --needed spotify dropbox-cli 1password-beta 1password-cli ||
+    echo -e "\e[31mFailed to install Spotify, Dropbox, and/or 1password because of a keyserver problem. Continuing without!\e[0m"
 fi
 
 # Copy over Omarchy applications