Merge pull request #1232 from basecamp/dev

Omarchy 2.0.5

bin/omarchy-install-dev-env

@@ -33,6 +33,11 @@ install_php() {
   done
 }
 
+install_node() {
+  echo -e "Installing Node.js...\n"
+  mise use --global node@lts
+}
+
 case "$1" in
 ruby)
   echo -e "Installing Ruby on Rails...\n"
@@ -42,8 +47,7 @@ ruby)
   echo -e "\nYou can now run: rails new myproject"
   ;;
 node)
-  echo -e "Installing Node.js...\n"
-  mise use --global node@lts
+  install_node
   ;;
 bun)
   echo -e "Installing Bun...\n"
@@ -64,6 +68,7 @@ php)
 laravel)
   echo -e "Installing PHP and Laravel...\n"
   install_php
+  install_node
   composer global require laravel/installer
   echo -e "\nYou can now run: laravel new myproject"
   ;;

bin/omarchy-snapshot

@@ -16,9 +16,15 @@ case "$COMMAND" in
 create)
   DESC="$(omarchy-version)"
 
-  for config in root home; do
+  echo -e "\e[32mCreate system snapshot\e[0m"
+  
+  # Get existing snapper config names from CSV output
+  mapfile -t CONFIGS < <(sudo snapper --csvout list-configs | awk -F, 'NR>1 {print $1}')
+
+  for config in "${CONFIGS[@]}"; do
     sudo snapper -c "$config" create -c number -d "$DESC"
   done
+  echo
   ;;
 restore)
   sudo limine-snapper-restore

bin/omarchy-version-branch

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo $(git -C "$OMARCHY_PATH" rev-parse --abbrev-ref HEAD)

config/fastfetch/config.jsonc

@@ -68,6 +68,12 @@
       "keyColor": "blue",
       "text": "version=$(omarchy-version); echo \"Omarchy $version\""
     },
+    {
+      "type": "command",
+      "key": "│ ├󰘬",
+      "keyColor": "blue",
+      "text": "branch=$(omarchy-version-branch); echo \"$branch\""
+    },
     {
       "type": "kernel",
       "key": "│ ├",

config/hypr/hypridle.conf

@@ -2,7 +2,6 @@ general {
     lock_cmd = omarchy-lock-screen                         # lock screen and 1password
     before_sleep_cmd = loginctl lock-session               # lock before suspend.
     after_sleep_cmd = hyprctl dispatch dpms on             # to avoid having to press a key twice to turn on the display.
-    on_unlock_cmd = omarchy-restart-waybar                 # prevent stacking of waybar when waking
     inhibit_sleep = 3                                      # wait until screen is locked
 }
 

install/packages.sh

@@ -95,7 +95,6 @@ sudo pacman -S --noconfirm --needed \
   tldr \
   tree-sitter-cli \
   ttf-cascadia-mono-nerd \
-  ttf-font-awesome \
   ttf-ia-writer \
   ttf-jetbrains-mono \
   typora \
@@ -113,6 +112,7 @@ sudo pacman -S --noconfirm --needed \
   wl-clip-persist \
   wl-clipboard \
   wl-screenrec \
+  woff2-font-awesome \
   xdg-desktop-portal-gtk \
   xdg-desktop-portal-hyprland \
   xmlstarlet \

install/preflight/repositories.sh

@@ -8,9 +8,9 @@ if ! grep -q "ILoveCandy" /etc/pacman.conf; then
   sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
 fi
 
-# Add the Omarchy repository as first choice
+# Add the Omarchy repository
 if ! grep -q "omarchy" /etc/pacman.conf; then
-  sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' /etc/pacman.conf
+  echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/\n" | sudo tee -a /etc/pacman.conf >/dev/null
 fi
 
 # Set mirrors to global ones only

migrations/1756153445.sh

@@ -0,0 +1,10 @@
+echo "Checking and correcting Snapper configs if needed"
+if command -v snapper &>/dev/null; then
+  if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
+    sudo snapper -c root create-config /
+  fi
+
+  if ! sudo snapper list-configs 2>/dev/null | grep -q "home"; then
+    sudo snapper -c home create-config /home
+  fi
+fi

migrations/1756360551.sh

@@ -0,0 +1,6 @@
+echo "Move Omarchy Package Repository after Arch core/extra/multilib for extra security on resolution"
+
+sudo cp /etc/pacman.conf /etc/pacman.conf.bak
+sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
+sudo sed -i '/\[chaotic-aur\]/i\[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/\n' /etc/pacman.conf ||
+  sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/" >> /etc/pacman.conf'

migrations/1756363651.sh

@@ -0,0 +1,3 @@
+echo "Update About config to include the Omarchy branch name"
+
+omarchy-refresh-fastfetch

migrations/1756365707.sh

@@ -0,0 +1,4 @@
+# FIXME: This really shouldn't happen, need to find out why!
+echo "Ensure walker is present"
+
+sudo pacman -Syu --needed --noconfirm walker-bin

migrations/1756371020.sh

@@ -0,0 +1,3 @@
+echo "Stop restarting waybar on unlock to see if we have solved the stacking problem for good"
+
+omarchy-refresh-hypridle