From 2bdb064c02507fe6fc4b2a1a0e5bd7388cd8d54b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 2 Jun 2025 09:26:38 +0200
Subject: [PATCH] Simplify so we can just run everything in the install dir

---
 install.sh                   |  8 +++++++-
 install/{yay.sh => 1-yay.sh} |  0
 install/all.sh               |  9 ---------
 install/configurations.sh    | 12 ------------
 install/development.sh       |  7 +++++++
 5 files changed, 14 insertions(+), 22 deletions(-)
 rename install/{yay.sh => 1-yay.sh} (100%)
 delete mode 100644 install/all.sh
 delete mode 100644 install/configurations.sh

diff --git a/install.sh b/install.sh
index 1f9f26f..b1f9f76 100644
--- a/install.sh
+++ b/install.sh
@@ -5,4 +5,10 @@ set -e
 trap 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR
 
 # Install everything
-source ~/.local/share/omarchy/install/all.sh
+for f in ~/.local/share/omarchy/install/*.sh; do source "$f"; done
+
+# Copy over Omarchy configs
+cp -R ~/.local/share/omarchy/config/* ~/.config/
+
+# Use default bashrc from Omarchy
+echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc
diff --git a/install/yay.sh b/install/1-yay.sh
similarity index 100%
rename from install/yay.sh
rename to install/1-yay.sh
diff --git a/install/all.sh b/install/all.sh
deleted file mode 100644
index 2beba58..0000000
--- a/install/all.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Install things in the right order
-source ~/.local/share/omarchy/install/yay.sh
-source ~/.local/share/omarchy/install/hyprlandia.sh
-source ~/.local/share/omarchy/install/desktop.sh
-source ~/.local/share/omarchy/install/terminal.sh
-source ~/.local/share/omarchy/install/development.sh
-source ~/.local/share/omarchy/install/docker.sh
-source ~/.local/share/omarchy/install/ssdm.sh
-source ~/.local/share/omarchy/install/configurations.sh
diff --git a/install/configurations.sh b/install/configurations.sh
deleted file mode 100644
index 1ffb44b..0000000
--- a/install/configurations.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# Install LazyVim
-git clone https://github.com/LazyVim/starter ~/.config/nvim
-rm -rf ~/.config/nvim/.git
-
-# Copy over Omarchy configs
-cp -R ~/.local/share/omarchy/config/* ~/.config/
-
-# Use default bashrc from Omarchy
-echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc
-
-# Turn off relative line numbers in nvim
-echo "vim.opt.relativenumber = false" >>~/.config/nvim/lua/config/options.lua
diff --git a/install/development.sh b/install/development.sh
index 232b1a0..4f456f9 100644
--- a/install/development.sh
+++ b/install/development.sh
@@ -2,3 +2,10 @@ yay -S --noconfirm \
   nvim luarocks tree-sitter-cli \
   mise github-cli \
   lazygit lazydocker
+
+# Install LazyVim
+git clone https://github.com/LazyVim/starter ~/.config/nvim
+rm -rf ~/.config/nvim/.git
+
+# Turn off relative line numbers in nvim
+echo "vim.opt.relativenumber = false" >>~/.config/nvim/lua/config/options.lua