From 37f0c18b78f195a0a85f25fe74b4afb41534fde0 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 25 Aug 2025 09:22:55 +0200
Subject: [PATCH] All packages in one place

---
 install.sh            |  1 -
 install/apps/xtras.sh | 16 ----------------
 install/packages.sh   | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100755 install/apps/xtras.sh

diff --git a/install.sh b/install.sh
index 37686c04..666a841a 100755
--- a/install.sh
+++ b/install.sh
@@ -53,7 +53,6 @@ source $OMARCHY_INSTALL/login/alt-bootloaders.sh
 source $OMARCHY_INSTALL/apps/webapps.sh
 source $OMARCHY_INSTALL/apps/tuis.sh
 source $OMARCHY_INSTALL/apps/mimetypes.sh
-source $OMARCHY_INSTALL/apps/xtras.sh
 
 # Updates
 sudo updatedb
diff --git a/install/apps/xtras.sh b/install/apps/xtras.sh
deleted file mode 100755
index 0c70663c..00000000
--- a/install/apps/xtras.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --noconfirm --needed \
-  gnome-calculator gnome-keyring signal-desktop \
-  obsidian libreoffice obs-studio kdenlive \
-  1password-beta 1password-cli \
-  xournalpp localsend typora
-
-# Packages known to be flaky or having key signing issues are run one-by-one
-for pkg in spotify pinta; do
-  sudo pacman -S --noconfirm --needed "$pkg" ||
-    echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m"
-done
-
-# Copy over Omarchy applications
-source omarchy-refresh-applications || true
diff --git a/install/packages.sh b/install/packages.sh
index 339baf01..af5f0364 100644
--- a/install/packages.sh
+++ b/install/packages.sh
@@ -1,4 +1,6 @@
 sudo pacman -S --noconfirm --needed \
+  1password-beta \
+  1password-cli \
   alacritty \
   avahi \
   bash-completion \
@@ -27,6 +29,8 @@ sudo pacman -S --noconfirm --needed \
   fzf \
   gcc14 \
   github-cli \
+  gnome-calculator \
+  gnome-keyring \
   gnome-themes-extra \
   gum \
   gvfs-mtp \
@@ -42,14 +46,17 @@ sudo pacman -S --noconfirm --needed \
   imv \
   inetutils \
   jq \
+  kdenlive \
   kvantum-qt5 \
   lazydocker \
   lazygit \
   less \
   libqalculate \
+  libreoffice \
   limine-mkinitcpio-hook \
   limine-snapper-sync \
   llvm \
+  localsend \
   luarocks \
   mako \
   man \
@@ -63,8 +70,11 @@ sudo pacman -S --noconfirm --needed \
   noto-fonts-extra \
   nss-mdns \
   nvim \
+  obs-studio \
+  obsidian \
   omarchy-chromium \
   pamixer \
+  pinta \
   playerctl \
   plocate \
   plymouth \
@@ -76,7 +86,9 @@ sudo pacman -S --noconfirm --needed \
   python-terminaltexteffects \
   ripgrep \
   satty \
+  signal-desktop \
   slurp \
+  spotify \
   starship \
   sushi \
   swaybg \
@@ -88,6 +100,7 @@ sudo pacman -S --noconfirm --needed \
   ttf-font-awesome \
   ttf-ia-writer \
   ttf-jetbrains-mono \
+  typora \
   tzupdate \
   ufw \
   ufw-docker \
@@ -105,5 +118,6 @@ sudo pacman -S --noconfirm --needed \
   xdg-desktop-portal-gtk \
   xdg-desktop-portal-hyprland \
   xmlstarlet \
+  xournalpp \
   yaru-icon-theme \
   zoxide