From 11d2d2f70e20a6894b3f5b202143ba13733fcb3e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 5 Jan 2026 11:00:56 +0100
Subject: [PATCH] Extract the rest of the reinstall flow into separate parts

---
 bin/omarchy-reinstall         | 29 ++++-------------------------
 bin/omarchy-reinstall-configs | 20 ++++++++++++++++++++
 bin/omarchy-reinstall-git     |  8 ++++++++
 bin/omarchy-reinstall-pkgs    |  5 +----
 4 files changed, 33 insertions(+), 29 deletions(-)
 create mode 100755 bin/omarchy-reinstall-configs
 create mode 100755 bin/omarchy-reinstall-git

diff --git a/bin/omarchy-reinstall b/bin/omarchy-reinstall
index 9613817f..59420afa 100755
--- a/bin/omarchy-reinstall
+++ b/bin/omarchy-reinstall
@@ -1,33 +1,12 @@
 #!/bin/bash
+set -e
 
 # Attempt to reinstall all default Omarchy packages and reset all the default configs.
 
-set -e
-
-if [ "$EUID" -eq 0 ]; then
-  echo "Error: This script should not be run as root"
-  exit 1
-fi
-
-echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All changes to configs will be lost.\n"
+echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All user changes to configs will be lost.\n"
 
 if gum confirm "Are you sure you want to reinstall and lose all config changes?"; then
-  echo "Resetting Omarchy repository"
-  git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
-  rm -rf $OMARCHY_PATH
-  mv ~/.local/share/omarchy-new $OMARCHY_PATH
-
+  omarchy-reinstall-git
   omarchy-reinstall-pkgs
-
-  echo "Resetting all Omarchy configs"
-  cp -R ~/.local/share/omarchy/config/* ~/.config/
-  cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
-  echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null
-
-  $(bash $OMARCHY_PATH/install/config/theme.sh)
-  $(bash $OMARCHY_PATH/install/config/git.sh)
-
-  omarchy-refresh-limine
-  omarchy-refresh-plymouth
-  omarchy-nvim-setup
+  omarchy-reinstall-configs
 fi
diff --git a/bin/omarchy-reinstall-configs b/bin/omarchy-reinstall-configs
new file mode 100755
index 00000000..d1a99c42
--- /dev/null
+++ b/bin/omarchy-reinstall-configs
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+# Overwrite all user configs with the Omarchy defaults.
+
+if [ "$EUID" -eq 0 ]; then
+  echo "Error: This script should not be run as root"
+  exit 1
+fi
+
+echo "Resetting all Omarchy configs"
+cp -R ~/.local/share/omarchy/config/* ~/.config/
+cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
+echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null
+
+$(bash $OMARCHY_PATH/install/config/theme.sh)
+
+omarchy-refresh-limine
+omarchy-refresh-plymouth
+omarchy-nvim-setup
diff --git a/bin/omarchy-reinstall-git b/bin/omarchy-reinstall-git
new file mode 100755
index 00000000..26fab51d
--- /dev/null
+++ b/bin/omarchy-reinstall-git
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Reinstall the Omarchy configuration directory from the git source.
+
+git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
+mv $OMARCHY_PATH ~/.local/share/omarchy-old
+mv ~/.local/share/omarchy-new $OMARCHY_PATH
diff --git a/bin/omarchy-reinstall-pkgs b/bin/omarchy-reinstall-pkgs
index 218e4bbe..d70d0643 100755
--- a/bin/omarchy-reinstall-pkgs
+++ b/bin/omarchy-reinstall-pkgs
@@ -1,10 +1,7 @@
 #!/bin/bash
-
-# Attempt to reinstall all default Omarchy packages and reset all the default configs.
-
 set -e
 
-echo "Reinstalling missing Omarchy packages from stable repository"
+# Reinstall all default Omarchy packages from the stable channel and downgrade any packages that are too new.
 
 # Set the package repository to the stable mirrors
 omarchy-refresh-pacman