From d1dbdc9b9c327898009c18a69c094cd9b3ece500 Mon Sep 17 00:00:00 2001
From: wholteza <zackarias@montell.se>
Date: Fri, 14 Aug 2026 09:37:04 +0200
Subject: [PATCH] Make bootstrap arch idempotent

---
 .config/yadm/bootstrap##distro.arch | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/.config/yadm/bootstrap##distro.arch b/.config/yadm/bootstrap##distro.arch
index c675180..0e0d448 100755
--- a/.config/yadm/bootstrap##distro.arch
+++ b/.config/yadm/bootstrap##distro.arch
@@ -1,12 +1,13 @@
 #!/bin/bash
 # Installs requirements for my arch setup.
 
-set -e
+set -euo pipefail
 
-sudo pacman -Suy --noconfirm archlinux-keyring
-sudo pacman -Suy --noconfirm
+# Refresh the keyring first, then do the full upgrade against synced dbs.
+sudo pacman -Sy --noconfirm archlinux-keyring
+sudo pacman -Su --noconfirm
 
-sudo pacman -Sy --noconfirm \
+sudo pacman -S --needed --noconfirm \
   fd \
   tmux \
   nvm \
@@ -28,19 +29,18 @@ sudo pacman -Sy --noconfirm \
 
 bob install nightly
 bob use nightly
-vim --version
+nvim --version
 
-if [ ! -d /home/wholteza/repos/yay ]; then
-	cd ~
-	mkdir -p repos
-	cd repos
-        sudo pacman -S --needed git base-devel
+if [ ! -d "$HOME/repos/yay" ]; then
+	mkdir -p "$HOME/repos"
+	cd "$HOME/repos"
+	sudo pacman -S --needed --noconfirm git base-devel
 	git clone https://aur.archlinux.org/yay.git
 	cd yay
-	makepkg -si
+	makepkg -si --noconfirm
 fi
 
-yay -S --noconfirm \
+yay -S --needed --noconfirm \
   fnm \
   oh-my-posh \
   wezterm
@@ -51,5 +51,3 @@ eval "$(fnm env --use-on-cd --version-file-strategy=recursive)"
 fnm install 24
 fnm use 24
 
-npm install
-