From d106cd92843fcf6e6d6fdef3622acfed8bfaaba1 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Thu, 23 Oct 2025 20:28:51 -0400
Subject: [PATCH] Don't run as root and add missing pieces

---
 bin/omarchy-reinstall | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bin/omarchy-reinstall b/bin/omarchy-reinstall
index c95c8292..52c826ca 100755
--- a/bin/omarchy-reinstall
+++ b/bin/omarchy-reinstall
@@ -2,13 +2,18 @@
 
 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"
 
 if gum confirm "Are you sure you want to reinstall and lose all config changes?"; then
   echo "Resetting Omarchy repository"
-  git -C "$OMARCHY_PATH" switch master
-  git -C "$OMARCHY_PATH" reset --hard HEAD
-  git -C "$OMARCHY_PATH" pull
+  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
 
   echo "Reinstalling missing Omarchy packages"
   mapfile -t packages < <(grep -v '^#' "$OMARCHY_PATH/install/omarchy-base.packages" | grep -v '^$')
@@ -19,6 +24,10 @@ if gum confirm "Are you sure you want to reinstall and lose all config changes?"
   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
 fi