Update version reporting

bin/omarchy-cmd-screenrecord

@@ -15,7 +15,7 @@ SCOPE="$1"
 AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
 
 start_screenrecording() {
-  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
 
   if lspci | grep -qi 'nvidia'; then
     wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
@@ -47,8 +47,7 @@ screenrecording_active() {
 if screenrecording_active; then
   stop_screenrecording
 elif [[ "$SCOPE" == "output" ]]; then
-  output=$(slurp -o) || exit 1
+  start_screenrecording
-  start_screenrecording -g "$output"
 else
   region=$(slurp) || exit 1
   start_screenrecording -g "$region"

bin/omarchy-install-dev-env

@@ -47,7 +47,6 @@ install_node() {
 case "$1" in
 ruby)
   echo -e "Installing Ruby on Rails...\n"
-  omarchy-pkg-add libyaml
   mise use --global ruby@latest
   mise settings add idiomatic_version_file_enable_tools ruby
   mise x ruby -- gem install rails --no-document

bin/omarchy-launch-or-focus

@@ -7,7 +7,7 @@ fi
 
 WINDOW_PATTERN="$1"
 LAUNCH_COMMAND="${2:-"uwsm app -- $WINDOW_PATTERN"}"
-WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
+WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class+" "+.title)|test($p;"i"))|.address' | head -n1)
 
 if [[ -n $WINDOW_ADDRESS ]]; then
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"

bin/omarchy-launch-webapp

@@ -3,7 +3,7 @@
 browser=$(xdg-settings get default-web-browser)
 
 case $browser in
-google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;;
+google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;;
 *) browser="chromium.desktop" ;;
 esac
 

bin/omarchy-menu

@@ -430,8 +430,7 @@ show_update_config_menu() {
 }
 
 show_update_hardware_menu() {
-  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  case $(menu "Restart" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
-  *Audio*) present_terminal omarchy-restart-pipewire ;;
   *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
   *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
   *) show_update_menu ;;

bin/omarchy-restart-bluetooth

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-echo -e "Unblocking bluetooth...\n"
 rfkill unblock bluetooth
 rfkill list bluetooth

bin/omarchy-restart-pipewire

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo -e "Restarting pipewire audio service...\n"
-systemctl --user restart pipewire.service

bin/omarchy-restart-wifi

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-echo -e "Unblocking wifi...\n"
 rfkill unblock wifi
 rfkill list wifi

bin/omarchy-theme-set-terminal

@@ -3,5 +3,12 @@
 case "$TERMINAL" in
 "alacritty") touch ~/.config/alacritty/alacritty.toml ;;
 "kitty") killall -SIGUSR1 kitty ;;
-"ghostty") killall -SIGUSR2 ghostty ;;
+"ghostty")
+  # Use a default theme if none exists
+  if [[ ! -f ~/.config/omarchy/current/theme/ghostty.conf ]]; then
+    echo "theme = Spacegray" >~/.config/omarchy/current/theme/ghostty.conf
+  fi
+
+  killall -USRSIG2 ghostty
+  ;;
 esac

bin/omarchy-theme-set-vscode

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments),
-# which jq doesn’t support.
-
 VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
 VS_CODE_SETTINGS="$HOME/.config/Code/User/settings.json"
 VS_CODE_SKIP_FLAG="$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes"
@@ -18,29 +15,12 @@ if omarchy-cmd-present code && [[ ! -f "$VS_CODE_SKIP_FLAG" ]]; then
       code --install-extension "$extension" >/dev/null
     fi
 
-    # Create config file if there isn't already one
+    # Update theme in settings.json
-    mkdir -p "$(dirname "$VS_CODE_SETTINGS")"
+    jq -n --arg t "$theme_name" '(input? // {}) | .["workbench.colorTheme"] = $t' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new"
-    if [[ ! -f "$VS_CODE_SETTINGS" ]]; then
-      printf '{\n}\n' > "$VS_CODE_SETTINGS"
-    fi
-
-    # Create a `workbench.colorTheme` entry in settings.  
-    if ! grep -q '"workbench.colorTheme"' "$VS_CODE_SETTINGS"; then
-      # Insert `"workbench.colorTheme": "",` immediately after the first `{`
-      # Use sed's first-match range (0,/{/) to only replace the first `{`
-      sed -i --follow-symlinks -E '0,/\{/{s/\{/{\
-  "workbench.colorTheme": "",/}' "$VS_CODE_SETTINGS"
-    fi
-
-    # Update theme
-    sed -i --follow-symlinks -E \
-      "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
-      "$VS_CODE_SETTINGS"
   else
     # Remove theme from settings.json when the theme doesn't have vscode support
-    if [[ -f "$VS_CODE_SETTINGS" ]]; then
+    jq 'del(.["workbench.colorTheme"])' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new"
-      sed -i --follow-symlinks -E '/"workbench\.colorTheme"[[:space:]]*:[^,}]*,?/d' "$VS_CODE_SETTINGS"
-
-    fi
   fi
+
+  mv "${VS_CODE_SETTINGS}.new" "$VS_CODE_SETTINGS"
 fi

bin/omarchy-tui-install

@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
+Exec=$TERMINAL --class $APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
 Icon=$ICON_PATH

bin/omarchy-version

@@ -1,3 +1,2 @@
 #!/bin/bash
-
+cat $OMARCHY_PATH/version
-git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1)

config/ghostty/config

@@ -1,5 +1,5 @@
 # Dynamic theme colors
-config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
+config-file = "~/.config/omarchy/current/theme/ghostty.conf"
 
 # Font
 font-family = "CaskaydiaMono Nerd Font"
@@ -12,7 +12,7 @@ window-padding-y = 14
 confirm-close-surface=false
 resize-overlay = never
 
-# Cursor styling
+# Cursor stlying
 cursor-style = "block"
 cursor-style-blink = false
 shell-integration-features = no-cursor

config/hypr/input.conf

@@ -27,9 +27,8 @@ input {
   }
 }
 
-# Scroll nicely in the terminal
+# Scroll faster in the terminal
-windowrule = scrolltouchpad 1.5, class:(Alacritty|kitty)
+windowrule = scrolltouchpad 1.5, tag:terminal
-windowrule = scrolltouchpad 0.2, class:com.mitchellh.ghostty
 
 # Enable touchpad gestures for changing workspaces
 # See https://wiki.hyprland.org/Configuring/Gestures/

config/hypr/looknfeel.conf

@@ -15,9 +15,3 @@ decoration {
     # Use round window corners
     # rounding = 8
 }
-
-# https://wiki.hypr.land/Configuring/Dwindle-Layout/
-dwindle {
-    # Avoid overly wide single-window layouts on wide screens
-    # single_window_aspect_ratio = 1 1
-}

default/hypr/apps/system.conf

@@ -4,7 +4,7 @@ windowrule = center, tag:floating-window
 windowrule = size 800 600, tag:floating-window
 
 windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
-windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files)
+windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open Folder|Save.*Files?|Save.*As|Save|All Files)
 
 # Fullscreen screensaver
 windowrule = fullscreen, class:Screensaver

default/hypr/looknfeel.conf

@@ -87,8 +87,3 @@ misc {
     disable_splash_rendering  = true
     focus_on_activate = true
 }
-
-# https://wiki.hypr.land/Configuring/Variables/#cursor
-cursor {
-    hide_on_key_press = true
-}

install/config/all.sh

@@ -24,6 +24,6 @@ run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
 run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
 run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm43xx.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh

install/config/hardware/fix-apple-bcm4360.sh

@@ -0,0 +1,5 @@
+# Install wifi drivers for 2013-2015 MacBooks using the BCM4360 chip
+if lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"; then
+  echo "Apple BCM4360 detected"
+  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
+fi

install/config/hardware/fix-apple-bcm43xx.sh

@@ -1,11 +0,0 @@
-# Install Wi-Fi drivers for Broadcom chips on MacBooks:
-# - BCM4360 (2013–2015)
-# - BCM4331 (2012, early 2013)
-
-pci_info=$(lspci -nnv)
-
-if echo "$pci_info" | grep -q "106b:" && 
-  (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then
-  echo "Apple BCM4360 / BCM4331 detected"
-  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
-fi

install/config/hardware/fix-apple-spi-keyboard.sh

@@ -1,12 +1,7 @@
 # Detect MacBook models that need SPI keyboard modules
-product_name="$(cat /sys/class/dmi/id/product_name 2>/dev/null)"
+if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
-if [[ "$product_name" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
   echo "Detected MacBook with SPI keyboard"
 
   sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms
-  if [[ "$product_name" == "MacBook8,1" ]]; then
+  echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
-    echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
-  else
-    echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
-  fi
 fi

install/iso.sh

@@ -0,0 +1,14 @@
+# Called by Omarchy ISO setup before starting configurator and archinstall
+
+source "$OMARCHY_INSTALL/preflight/set-size-vars.sh"
+source "$OMARCHY_INSTALL/helpers/logo.sh"
+source "$OMARCHY_INSTALL/preflight/gum.sh"
+source "$OMARCHY_INSTALL/helpers/tail-log-output.sh"
+source "$OMARCHY_INSTALL/helpers/trap-errors.sh"
+
+source $OMARCHY_INSTALL/helpers/chroot.sh
+source $OMARCHY_INSTALL/helpers/logo.sh
+source $OMARCHY_INSTALL/helpers/gum.sh
+source $OMARCHY_INSTALL/helpers/errors.sh
+source $OMARCHY_INSTALL/helpers/logging.sh
+source $OMARCHY_INSTALL/helpers/layout.sh

migrations/1758436991.sh

@@ -1,17 +0,0 @@
-echo "Fix Disk Usage and Docker TUIs"
-
-APP_DIR="$HOME/.local/share/applications"
-ICON_DIR="$APP_DIR/icons"
-
-# Don't use omarchy-tui-remove to preserve icons
-
-if [[ -f "$APP_DIR/Docker.desktop" ]]; then
-  rm "$APP_DIR/Docker.desktop"
-  omarchy-tui-install "Docker" "lazydocker" tile "$ICON_DIR/Docker.png"
-fi
-
-if [[ -f "$APP_DIR/Disk Usage.desktop" ]]; then
-  rm "$APP_DIR/Disk Usage.desktop" 
-  omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float "$ICON_DIR/Disk Usage.png"
-fi
-

themes/matte-black/ghostty.conf

@@ -1,12 +1,3 @@
-background = #121212
-foreground = #BEBEBE
-
-cursor-color = #EAEAEA
-cursor-text = #121212
-
-selection-background = #333333
-selection-foreground = #EAEAEA
-
 # normal colors
 palette = 0=#333333
 palette = 1=#D35F5F

themes/matte-black/vscode.json

@@ -1,4 +1,4 @@
 {
-  "name": "Matte Black",
+  "name": "MatteBlack",
   "extension": "TahaYVR.matteblack"
 }

themes/osaka-jade/ghostty.conf

@@ -1,25 +1 @@
-# primary
+theme = TokyoNight
-background = #111c18
-foreground = #C1C497
-cursor-color = #D7C995
-cursor-text = #000000
-
-# normal colors
-palette = 0=#23372B
-palette = 1=#FF5345
-palette = 2=#549e6a
-palette = 3=#459451
-palette = 4=#509475
-palette = 5=#D2689C
-palette = 6=#2DD5B7
-palette = 7=#F6F5DD
-
-# bright colors
-palette = 8=#53685B
-palette = 9=#db9f9c
-palette = 10=#143614
-palette = 11=#E5C736
-palette = 12=#ACD4CF
-palette = 13=#75bbb3
-palette = 14=#8CD3CB
-palette = 15=#9eebb3

version

@@ -0,0 +1 @@
+3.0.0-RC