Merge branch 'master' into dev

We no longer need the fork, as the themeing is now fully natively
supported

bin/omarchy-brightness-display

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Adjust brightness on the most likely display device.
+# Usage: omarchy-brightness-display <step>
+
+step="${1:-+5%}"
+
+# Start with the first possible output, then refine to the most likely given an order heuristic.
+device="$(ls -1 /sys/class/backlight 2>/dev/null | head -n1)"
+for candidate in amdgpu_bl* intel_backlight acpi_video*; do
+  if [[ -e "/sys/class/backlight/$candidate" ]]; then
+    device="$candidate"
+    break
+  fi
+done
+
+# Set the actual brightness of the display device.
+brightnessctl -d "$device" set "$step" >/dev/null
+
+# Use SwayOSD to display the new brightness setting.
+omarchy-swayosd-brightness "$(brightnessctl -d "$device" -m | cut -d',' -f4 | tr -d '%')"

bin/omarchy-brightness-display-apple

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.
+
+if [[ $# -eq 0 ]]; then
+  echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
+else
+  device="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
+  sudo asdcontrol "$device" -- "$1" >/dev/null
+  value="$(sudo asdcontrol "$device" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
+  omarchy-swayosd-brightness "$(( value * 100 / 60000 ))"
+fi

bin/omarchy-brightness-keyboard

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Adjust keyboard backlight brightness using available steps.
+# Usage: omarchy-brightness-keyboard <up|down>
+
+direction="${1:-up}"
+
+# Find keyboard backlight device (look for *kbd_backlight* pattern in leds class).
+device=""
+for candidate in /sys/class/leds/*kbd_backlight*; do
+  if [[ -e "$candidate" ]]; then
+    device="$(basename "$candidate")"
+    break
+  fi
+done
+
+if [[ -z "$device" ]]; then
+  echo "No keyboard backlight device found" >&2
+  exit 1
+fi
+
+# Get current and max brightness to determine step size.
+max_brightness="$(brightnessctl -d "$device" max)"
+current_brightness="$(brightnessctl -d "$device" get)"
+
+# Calculate step as one unit (keyboards typically have discrete levels like 0-3).
+if [[ "$direction" == "up" ]]; then
+  new_brightness=$((current_brightness + 1))
+  [[ $new_brightness -gt $max_brightness ]] && new_brightness=$max_brightness
+else
+  new_brightness=$((current_brightness - 1))
+  [[ $new_brightness -lt 0 ]] && new_brightness=0
+fi
+
+# Set the new brightness.
+brightnessctl -d "$device" set "$new_brightness" >/dev/null
+
+# Use SwayOSD to display the new brightness setting.
+percent=$((new_brightness * 100 / max_brightness))
+omarchy-swayosd-brightness "$percent"

bin/omarchy-cmd-apple-display-brightness

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.
-
-if [[ $# -eq 0 ]]; then
-  echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
-else
-  DEVICE="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
-  sudo asdcontrol "$DEVICE" -- "$1" >/dev/null
-  VALUE="$(sudo asdcontrol "$DEVICE" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
-  swayosd-client \
-    --monitor "$(hyprctl monitors -j | jq -r '.[]|select(.focused==true).name')" \
-    --custom-icon display-brightness \
-    --custom-progress "$(awk -v v="$VALUE" 'BEGIN{printf "%.2f", v/60000}')" \
-    --custom-progress-text "$(( VALUE * 100 / 60000 ))%"
-fi

bin/omarchy-cmd-screenrecord

@@ -14,6 +14,7 @@ fi
 DESKTOP_AUDIO="false"
 MICROPHONE_AUDIO="false"
 WEBCAM="false"
+WEBCAM_DEVICE=""
 STOP_RECORDING="false"
 
 for arg in "$@"; do
@@ -21,6 +22,7 @@ for arg in "$@"; do
     --with-desktop-audio) DESKTOP_AUDIO="true" ;;
     --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
     --with-webcam) WEBCAM="true" ;;
+    --webcam-device=*) WEBCAM_DEVICE="${arg#*=}" ;;
     --stop-recording) STOP_RECORDING="true"
   esac
 done
@@ -32,6 +34,15 @@ cleanup_webcam() {
 start_webcam_overlay() {
   cleanup_webcam
 
+  # Auto-detect first available webcam if none specified
+  if [[ -z "$WEBCAM_DEVICE" ]]; then
+    WEBCAM_DEVICE=$(v4l2-ctl --list-devices 2>/dev/null | grep -m1 "^\s*/dev/video" | tr -d '\t')
+    if [[ -z "$WEBCAM_DEVICE" ]]; then
+      notify-send "No webcam devices found" -u critical -t 3000
+      return 1
+    fi
+  fi
+
   # Get monitor scale
   local scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
 
@@ -41,7 +52,7 @@ start_webcam_overlay() {
   # Try preferred 16:9 resolutions in order, use first available
   local preferred_resolutions=("640x360" "1280x720" "1920x1080")
   local video_size_arg=""
-  local available_formats=$(v4l2-ctl --list-formats-ext -d /dev/video0 2>/dev/null)
+  local available_formats=$(v4l2-ctl --list-formats-ext -d "$WEBCAM_DEVICE" 2>/dev/null)
 
   for resolution in "${preferred_resolutions[@]}"; do
     if echo "$available_formats" | grep -q "$resolution"; then
@@ -50,7 +61,7 @@ start_webcam_overlay() {
     fi
   done
 
-  ffplay -f v4l2 $video_size_arg -framerate 30 /dev/video0 \
+  ffplay -f v4l2 $video_size_arg -framerate 30 "$WEBCAM_DEVICE" \
     -vf "scale=${target_width}:-1" \
     -window_title "WebcamOverlay" \
     -noborder \

bin/omarchy-hibernation-setup

@@ -67,4 +67,8 @@ sudo cp "$OMARCHY_PATH/default/systemd/hibernate.conf" /etc/systemd/sleep.conf.d
 echo "Regenerating initramfs..."
 sudo limine-mkinitcpio
 
-echo "Hibernation enabled"
+echo
+
+if gum confirm "Reboot to enable hiberation?"; then
+  omarchy-cmd-reboot
+fi

bin/omarchy-menu

@@ -88,10 +88,11 @@ show_learn_menu() {
 }
 
 show_trigger_menu() {
-  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle") in
+  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle\n  Hardware") in
   *Capture*) show_capture_menu ;;
   *Share*) show_share_menu ;;
   *Toggle*) show_toggle_menu ;;
+  *Hardware*) show_hardware_menu ;;
   *) show_main_menu ;;
   esac
 }
@@ -113,13 +114,43 @@ show_screenshot_menu() {
   esac
 }
 
+get_webcam_list() {
+  v4l2-ctl --list-devices 2>/dev/null | while IFS= read -r line; do
+    if [[ "$line" != $'\t'* && -n "$line" ]]; then
+      local name="$line"
+      IFS= read -r device || break
+      device=$(echo "$device" | tr -d '\t' | head -1)
+      [[ -n "$device" ]] && echo "$device  $name"
+    fi
+  done
+}
+
+show_webcam_select_menu() {
+  local devices=$(get_webcam_list)
+  local count=$(echo "$devices" | grep -c . 2>/dev/null || echo 0)
+
+  if [[ -z "$devices" || "$count" -eq 0 ]]; then
+    notify-send "No webcam devices found" -u critical -t 3000
+    return 1
+  fi
+
+  if [[ "$count" -eq 1 ]]; then
+    echo "$devices" | awk '{print $1}'
+  else
+    menu "Select Webcam" "$devices" | awk '{print $1}'
+  fi
+}
+
 show_screenrecord_menu() {
   omarchy-cmd-screenrecord --stop-recording && exit 0
 
   case $(menu "Screenrecord" "  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
   *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
   *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
-  *"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
+  *"With desktop + microphone audio + webcam")
+    local device=$(show_webcam_select_menu) || { back_to show_capture_menu; return; }
+    omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam --webcam-device="$device"
+    ;;
   *) back_to show_capture_menu ;;
   esac
 }
@@ -143,6 +174,13 @@ show_toggle_menu() {
   esac
 }
 
+show_hardware_menu() {
+  case $(menu "Toggle" "  Hybrid GPU") in
+  *"Hybrid GPU"*) present_terminal omarchy-toggle-hybrid-gpu ;;
+  *) show_trigger_menu ;;
+  esac
+}
+
 show_style_menu() {
   case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
   *Theme*) show_theme_menu ;;
@@ -407,7 +445,7 @@ show_remove_menu() {
 }
 
 show_remove_development_menu() {
-  case $(menu "Remove" "󰫏  Ruby on Rails\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
+  case $(menu "Remove" "󰫏  Ruby on Rails\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
   *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
   *JavaScript*) show_remove_javascript_menu ;;
   *Go*) present_terminal "omarchy-remove-dev-env go" ;;
@@ -425,7 +463,7 @@ show_remove_development_menu() {
 }
 
 show_remove_javascript_menu() {
-  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
+  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
   *Node*) present_terminal "omarchy-remove-dev-env node" ;;
   *Bun*) present_terminal "omarchy-remove-dev-env bun" ;;
   *Deno*) present_terminal "omarchy-remove-dev-env deno" ;;
@@ -434,7 +472,7 @@ show_remove_javascript_menu() {
 }
 
 show_remove_php_menu() {
-  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
+  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
   *PHP*) present_terminal "omarchy-remove-dev-env php" ;;
   *Laravel*) present_terminal "omarchy-remove-dev-env laravel" ;;
   *Symfony*) present_terminal "omarchy-remove-dev-env symfony" ;;
@@ -443,7 +481,7 @@ show_remove_php_menu() {
 }
 
 show_remove_elixir_menu() {
-  case $(menu "Remove" "  Elixir\n  Phoenix") in
+  case $(menu "Remove" "  Elixir\n  Phoenix") in
   *Elixir*) present_terminal "omarchy-remove-dev-env elixir" ;;
   *Phoenix*) present_terminal "omarchy-remove-dev-env phoenix" ;;
   *) show_remove_development_menu ;;
@@ -543,6 +581,7 @@ go_to_menu() {
   *learn*) show_learn_menu ;;
   *trigger*) show_trigger_menu ;;
   *share*) show_share_menu ;;
+  *capture*) show_capture_menu ;;
   *style*) show_style_menu ;;
   *theme*) show_theme_menu ;;
   *screenshot*) show_screenshot_menu ;;

bin/omarchy-swayosd-brightness

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Display brightness level using SwayOSD on the current monitor.
+# Usage: omarchy-swayosd-brightness <percent>
+
+percent="$1"
+
+progress="$(awk -v p="$percent" 'BEGIN{printf "%.2f", p/100}')"
+[[ "$progress" == "0.00" ]] && progress="0.01"
+
+swayosd-client \
+  --monitor "$(hyprctl monitors -j | jq -r '.[]|select(.focused==true).name')" \
+  --custom-icon display-brightness \
+  --custom-progress "$progress" \
+  --custom-progress-text "${percent}%"

bin/omarchy-theme-set-browser

@@ -2,7 +2,7 @@
 
 CHROMIUM_THEME=~/.config/omarchy/current/theme/chromium.theme
 
-if omarchy-cmd-present chromium || omarchy-cmd-present helium-browser || omarchy-cmd-present brave; then
+if omarchy-cmd-present chromium || omarchy-cmd-present brave; then
   if [[ -f $CHROMIUM_THEME ]]; then
     THEME_RGB_COLOR=$(<$CHROMIUM_THEME)
     THEME_HEX_COLOR=$(printf '#%02x%02x%02x' ${THEME_RGB_COLOR//,/ })
@@ -13,14 +13,8 @@ if omarchy-cmd-present chromium || omarchy-cmd-present helium-browser || omarchy
   fi
 
   if omarchy-cmd-present chromium; then
-    rm -f /etc/chromium/policies/managed/color.json
-    chromium --no-startup-window --set-theme-color="$THEME_RGB_COLOR" >/dev/null
-
-    if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
-      chromium --no-startup-window --set-color-scheme="light" >/dev/null
-    else
-      chromium --no-startup-window --set-color-scheme="dark" >/dev/null
-    fi
+    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
+    chromium --refresh-platform-policy --no-startup-window >/dev/null
   fi
 
   if omarchy-cmd-present brave; then

bin/omarchy-theme-set-templates

@@ -13,22 +13,21 @@ hex_to_rgb() {
 
 # Only generate dynamic templates for themes with a colors.toml definition
 if [[ -f $COLORS_FILE ]]; then
-  # Parse TOML using yq (treating it as YAML since the flat key=value structure is compatible)
-  # We convert 'key = value' to 'key: value' to make it valid YAML, then use yq/jq to generate the replacement commands.
   sed_script=$(mktemp)
 
-  # Generate standard and _strip substitutions
-  sed 's/=/:/' "$COLORS_FILE" | yq -r 'to_entries[] | "s|{{ \(.key) }}|\(.value)|g", "s|{{ \(.key)_strip }}|\(.value | sub("^#";""))|g"' > "$sed_script"
-
-  # Generate _rgb substitutions for hex colors
   while IFS='=' read -r key value; do
-    key=$(echo "$key" | xargs)
-    value=$(echo "$value" | xargs | tr -d '"')
+    key="${key//[\"\' ]/}"                # strip quotes and spaces from key
+    [[ $key && $key != \#* ]] || continue # skip empty lines and comments
+    value="${value#*[\"\']}"
+    value="${value%%[\"\']*}" # extract value between quotes (ignores inline comments)
+
+    printf 's|{{ %s }}|%s|g\n' "$key" "$value"            # {{ key }} -> value
+    printf 's|{{ %s_strip }}|%s|g\n' "$key" "${value#\#}" # {{ key_strip }} -> value without leading #
     if [[ $value =~ ^# ]]; then
       rgb=$(hex_to_rgb "$value")
-      echo "s|{{ ${key}_rgb }}|${rgb}|g" >> "$sed_script"
+      echo "s|{{ ${key}_rgb }}|${rgb}|g"
     fi
-  done < "$COLORS_FILE"
+  done <"$COLORS_FILE" >"$sed_script"
 
   shopt -s nullglob
 
@@ -39,7 +38,7 @@ if [[ -f $COLORS_FILE ]]; then
 
     # Don't overwrite configs already exists in the output directory (copied from theme specific folder)
     if [[ ! -f $output_path ]]; then
-      sed -f "$sed_script" "$tpl" > "$output_path"
+      sed -f "$sed_script" "$tpl" >"$output_path"
     fi
   done
 

bin/omarchy-toggle-hybrid-gpu

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Toggle dedicated vs integrated GPU mode via supergfxd (for hybrid gpu laptops, like Asus G14).
+# Requires reboot to take effect.
+
+# Ensure supergfxctl has been installed
+if omarchy-cmd-missing supergfxctl; then
+  omarchy-pkg-add supergfxctl
+  sudo systemctl enable supergfxd
+
+  # Needed to deal with restoring to sleep where going through VFIO first means we don't need to reboot.
+  sudo sed -i "s/\"vfio_enable\": \".*\"/\"vfio_enable\": true/" /etc/supergfxd.conf
+fi
+
+gpu_mode=$(supergfxctl -g)
+
+case "$gpu_mode" in
+"Integrated")
+  if gum confirm "Enable dedicated GPU and reboot?"; then
+    # Switch to hybrid mode
+    sudo sed -i "s/\"mode\": \".*\"/\"mode\": \"Hybrid\"/" /etc/supergfxd.conf
+
+    # Let hybrid mode be the default after system sleep
+    sudo rm -rf /usr/lib/systemd/system-sleep/force-igpu
+
+    # Remove the startup delay override (not needed for Hybrid mode)
+    sudo rm -rf /etc/systemd/system/supergfxd.service.d/delay-start.conf
+
+    omarchy-cmd-reboot
+  fi
+  ;;
+"Hybrid")
+  if gum confirm "Use only integrated GPU and reboot?"; then
+    # Switch to integrated mode
+    sudo sed -i "s/\"mode\": \".*\"/\"mode\": \"Integrated\"/" /etc/supergfxd.conf
+
+    # Force igpu mode after system sleep (or dgpu could get activated)
+    sudo mkdir -p /usr/lib/systemd/system-sleep
+    sudo cp -p  $OMARCHY_PATH/default/systemd/system-sleep/force-igpu /usr/lib/systemd/system-sleep/
+
+    # Delay supergfxd startup to avoid race condition with display manager
+    # that can cause system freeze when booting in Integrated mode
+    sudo mkdir -p /etc/systemd/system/supergfxd.service.d
+    sudo cp -p $OMARCHY_PATH/default/systemd/system/supergfxd.service.d/delay-start.conf /etc/systemd/system/supergfxd.service.d/
+
+    omarchy-cmd-reboot
+  fi
+  ;;
+*)
+  echo "Hybrid GPU not found or in unknown mode."
+  exit 1
+  ;;
+esac

bin/omarchy-update-analyze-logs

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+update_log="/tmp/omarchy-update.log"
+
+# Check for errors
+if grep -qi "error" "$update_log"; then
+  echo -e "\e[31mNon-stopping errors detected during update:\e[0m"
+  grep -i "error" "$update_log"
+  echo
+fi
+
+# Check for initramfs generation failure
+if grep -q "Updating linux initcpios" "$update_log"; then
+  if ! grep -q "Initcpio image generation successful" "$update_log"; then
+    echo -e '\e[31mError: Initramfs generation may have failed. Review logs before restart.\e[0m'
+    echo
+  fi
+fi

bin/omarchy-update-aur-pkgs

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Update AUR packages if any are installed
+if pacman -Qem >/dev/null; then
+  if omarchy-pkg-aur-accessible; then
+    echo -e "\e[32m\nUpdate AUR packages\e[0m"
+    yay -Sua --noconfirm --ignore gcc14,gcc14-libs
+    echo
+  else
+    echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
+    echo
+  fi
+fi

bin/omarchy-update-orphan-pkgs

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+orphans=$(pacman -Qtdq || true)
+if [[ -n $orphans ]]; then
+  echo -e "\e[32m\nRemove orphan system packages\e[0m"
+  for pkg in $orphans; do
+    sudo pacman -Rs --noconfirm "$pkg" || true
+  done
+  echo
+fi

bin/omarchy-update-perform

@@ -5,13 +5,21 @@ set -e
 # Ensure screensaver/sleep doesn't set in during updates
 hyprctl dispatch tagwindow +noidle &> /dev/null || true
 
+# Capture update logs
+exec > >(tee "/tmp/omarchy-update.log") 2>&1
+
 # Perform all update steps
 omarchy-update-time
 omarchy-update-keyring
 omarchy-update-available-reset
 omarchy-update-system-pkgs
 omarchy-migrate
+omarchy-update-aur-pkgs
+omarchy-update-orphan-pkgs
 omarchy-hook post-update
+
+omarchy-update-analyze-logs
+
 omarchy-update-restart
 
 # Re-enable screensaver/sleep after updates

bin/omarchy-update-system-pkgs

@@ -4,24 +4,3 @@ set -e
 
 echo -e "\e[32m\nUpdate system packages\e[0m"
 sudo pacman -Syyu --noconfirm
-
-# Update AUR packages if any are installed
-if pacman -Qem >/dev/null; then
-  if omarchy-pkg-aur-accessible; then
-    echo -e "\e[32m\nUpdate AUR packages\e[0m"
-    yay -Sua --noconfirm
-    echo
-  else
-    echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
-    echo
-  fi
-fi
-
-orphans=$(pacman -Qtdq || true)
-if [[ -n $orphans ]]; then
-  echo -e "\e[32m\nRemove orphan system packages\e[0m"
-  for pkg in $orphans; do
-    sudo pacman -Rs --noconfirm "$pkg" || true
-  done
-  echo
-fi

bin/omarchy-windows-vm

@@ -254,25 +254,6 @@ remove_windows() {
   echo "Windows VM removal completed!"
 }
 
-wait_for_rdp_ready() {
-  local WIN_USER="$1"
-  local WIN_PASS="$2"
-  local TIMEOUT=240
-  local SECONDS=0
-
-  echo "Waiting for Windows VM to be ready..."
-
-  while ! timeout 5s xfreerdp3 /auth-only /cert:ignore /u:"$WIN_USER" /p:"$WIN_PASS" /v:127.0.0.1:3389 &>/dev/null; do
-    sleep 2
-    if [ $SECONDS -gt $TIMEOUT ]; then
-      echo "❌ Timeout waiting for RDP!"
-      echo "   The VM might still be installing Windows."
-      echo "   Check progress at: http://127.0.0.1:8006"
-      return 1
-    fi
-  done
-}
-
 launch_windows() {
   KEEP_ALIVE=false
   if [ "$1" = "--keep-alive" ] || [ "$1" = "-k" ]; then
@@ -309,11 +290,19 @@ launch_windows() {
       notify-send -u critical "Windows VM" "Failed to start Windows VM"
       exit 1
     fi
-  fi
 
-  if ! wait_for_rdp_ready "$WIN_USER" "$WIN_PASS"; then
-    notify-send -u critical "Windows VM" "Did not come alive in time."
-    exit 1
+    echo "Waiting for Windows VM to start..."
+    WAIT_COUNT=0
+    until docker logs omarchy-windows 2>&1 | grep -qi "windows started successfully"; do
+      sleep 2
+      WAIT_COUNT=$((WAIT_COUNT + 1))
+      if [ $WAIT_COUNT -gt 60 ]; then  # 2 minutes timeout
+        echo ""
+        echo "❌ Timeout: Windows VM failed to start within 2 minutes"
+        echo "   Check logs: docker logs omarchy-windows"
+        exit 1
+      fi
+    done
   fi
 
   # Build the connection info
@@ -346,7 +335,7 @@ To stop: omarchy-windows-vm stop"
   # If scale is less than 130%, don't set any scale (use default 100)
 
   # Connect with RDP in fullscreen (auto-detects resolution)
-  xfreerdp3 /u:"$WIN_USER" /p:"$WIN_PASS" /v:127.0.0.1:3389 -grab-keyboard /sound /microphone /cert:ignore /title:"Windows VM - Omarchy" /dynamic-resolution /gfx:AVC444 /floatbar:sticky:off,default:visible,show:fullscreen $RDP_SCALE
+  xfreerdp3 /u:"$WIN_USER" /p:"$WIN_PASS" /v:127.0.0.1:3389 -grab-keyboard /sound /microphone /clipboard /cert:ignore /title:"Windows VM - Omarchy" /dynamic-resolution /gfx:AVC444 /floatbar:sticky:off,default:visible,show:fullscreen $RDP_SCALE
 
   # After RDP closes, stop the container unless --keep-alive was specified
   if [ "$KEEP_ALIVE" = false ]; then

boot.sh

@@ -28,12 +28,10 @@ git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/
 
 # Use custom branch if instructed, otherwise default to master
 OMARCHY_REF="${OMARCHY_REF:-master}"
-if [[ $OMARCHY_REF != "master" ]]; then
-  echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
-  cd ~/.local/share/omarchy
-  git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
-  cd -
-fi
+echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
+cd ~/.local/share/omarchy
+git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
+cd -
 
 # Set edge mirror for dev installs
 if [[ $OMARCHY_REF == "dev" ]]; then

config/elephant/symbols.toml

@@ -0,0 +1 @@
+command = 'wl-copy && hyprctl dispatch sendshortcut "SHIFT, Insert,"'

config/hypr/input.conf

@@ -3,6 +3,10 @@
 input {
   # Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
   # kb_layout = us,dk,eu
+
+  # Use a specific keyboard variant if needed (e.g. intl for international keyboards)
+  # kb_variant = intl
+
   kb_options = compose:caps # ,grp:alts_toggle
 
   # Change speed of keyboard repeat

config/waybar/config.jsonc

@@ -116,6 +116,7 @@
     "format-muted": "",
     "format-icons": {
       "headphone": "",
+      "headset": "",
       "default": ["", "", ""]
     }
   },

default/bash/aliases

@@ -21,9 +21,9 @@ if command -v zoxide &> /dev/null; then
   }
 fi
 
-open() {
+open() (
   xdg-open "$@" >/dev/null 2>&1 &
-}
+)
 
 # Directories
 alias ..='cd ..'

default/bash/functions

@@ -58,7 +58,7 @@ img2jpg() {
   img="$1"
   shift
 
-  magick "$img" $@ -quality 95 -strip ${img%.*}-optimized.jpg
+  magick "$img" $@ -quality 95 -strip ${img%.*}-converted.jpg
 }
 
 # Transcode any image to JPG image that's great for sharing online without being too big
@@ -66,7 +66,14 @@ img2jpg-small() {
   img="$1"
   shift
 
-  magick "$img" $@ -resize 1080x\> -quality 95 -strip ${img%.*}-optimized.jpg
+  magick "$img" $@ -resize 1080x\> -quality 95 -strip ${img%.*}-small.jpg
+}
+# Transcode any image to JPG image that's great for sharing online without being too big
+img2jpg-medium() {
+  img="$1"
+  shift
+
+  magick "$img" $@ -resize 1800x\> -quality 95 -strip ${img%.*}-medium.jpg
 }
 
 # Transcode any image to compressed-but-lossless PNG

default/hypr/bindings/media.conf

@@ -6,14 +6,16 @@ bindeld = ,XF86AudioRaiseVolume, Volume up, exec, $osdclient --output-volume rai
 bindeld = ,XF86AudioLowerVolume, Volume down, exec, $osdclient --output-volume lower
 bindeld = ,XF86AudioMute, Mute, exec, $osdclient --output-volume mute-toggle
 bindeld = ,XF86AudioMicMute, Mute microphone, exec, $osdclient --input-volume mute-toggle
-bindeld = ,XF86MonBrightnessUp, Brightness up, exec, $osdclient --brightness raise
-bindeld = ,XF86MonBrightnessDown, Brightness down, exec, $osdclient --brightness lower
+bindeld = ,XF86MonBrightnessUp, Brightness up, exec, omarchy-brightness-display +5%
+bindeld = ,XF86MonBrightnessDown, Brightness down, exec, omarchy-brightness-display 5%-
+bindeld = ,XF86KbdBrightnessUp, Keyboard brightness up, exec, omarchy-brightness-keyboard up
+bindeld = ,XF86KbdBrightnessDown, Keyboard brightness down, exec, omarchy-brightness-keyboard down
 
 # Precise 1% multimedia adjustments with Alt modifier
 bindeld = ALT, XF86AudioRaiseVolume, Volume up precise, exec, $osdclient --output-volume +1
 bindeld = ALT, XF86AudioLowerVolume, Volume down precise, exec, $osdclient --output-volume -1
-bindeld = ALT, XF86MonBrightnessUp, Brightness up precise, exec, $osdclient --brightness +1
-bindeld = ALT, XF86MonBrightnessDown, Brightness down precise, exec, $osdclient --brightness -1
+bindeld = ALT, XF86MonBrightnessUp, Brightness up precise, exec, omarchy-brightness-display +1%
+bindeld = ALT, XF86MonBrightnessDown, Brightness down precise, exec, omarchy-brightness-display 1%-
 
 # Requires playerctl
 bindld = , XF86AudioNext, Next track, exec, $osdclient --playerctl next

default/hypr/bindings/utilities.conf

@@ -1,6 +1,7 @@
 # Menus
 bindd = SUPER, SPACE, Launch apps, exec, omarchy-launch-walker
 bindd = SUPER CTRL, E, Emoji picker, exec, omarchy-launch-walker -m symbols
+bindd = SUPER CTRL, C, Capture menu, exec, omarchy-menu capture
 bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
 bindd = SUPER, ESCAPE, System menu, exec, omarchy-menu system
 bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
@@ -28,9 +29,9 @@ bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle
 bindd = SUPER CTRL, N, Toggle nightlight, exec, omarchy-toggle-nightlight
 
 # Control Apple Display brightness
-bindd = CTRL, F1, Apple Display brightness down, exec, omarchy-cmd-apple-display-brightness -5000
-bindd = CTRL, F2, Apple Display brightness up, exec, omarchy-cmd-apple-display-brightness +5000
-bindd = SHIFT CTRL, F2, Apple Display full brightness, exec, omarchy-cmd-apple-display-brightness +60000
+bindd = CTRL, F1, Apple Display brightness down, exec, omarchy-brightness-display-apple -5000
+bindd = CTRL, F2, Apple Display brightness up, exec, omarchy-brightness-display-apple +5000
+bindd = SHIFT CTRL, F2, Apple Display full brightness, exec, omarchy-brightness-display-apple +60000
 
 # Captures
 bindd = , PRINT, Screenshot with editing, exec, omarchy-cmd-screenshot

default/hypr/looknfeel.conf

@@ -131,6 +131,11 @@ cursor {
     hide_on_key_press = true
 }
 
+# Auto toggle scratchpad on switching workspace from scratchpad
+binds {
+    hide_special_on_workspace_change = true
+}
+
 # Style Gum confirm to match terminal theme
 env = GUM_CONFIRM_PROMPT_FOREGROUND,6       # Cyan
 env = GUM_CONFIRM_SELECTED_FOREGROUND,0     # Black

default/limine/default.conf

@@ -3,7 +3,7 @@ TARGET_OS_NAME="Omarchy"
 ESP_PATH="/boot"
 
 KERNEL_CMDLINE[default]="@@CMDLINE@@"
-KERNEL_CMDLINE[default]+="quiet splash"
+KERNEL_CMDLINE[default]+=" quiet splash"
 
 ENABLE_UKI=yes
 CUSTOM_UKI_NAME="omarchy"

default/omarchy-skill/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: Omarchy
+name: omarchy
 description: >
   REQUIRED for ANY changes to Linux desktop, window manager, or system config.
   Use when editing ~/.config/hypr/, ~/.config/waybar/, ~/.config/walker/,

default/systemd/system-sleep/force-igpu

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Use the Vfio to Integrated trick to turn off NVIDIA dgpu when in integrated mode
+# without needing to restart the computer. This is needed because computers like the Asus G14
+# will wake after suspend in Hybrid mode, even if the system was in Integrated mode before
+# suspending.
+
+if [[ $1 == "post" ]]; then
+  # small delay so the device is fully re-enumerated
+  sleep 4
+
+  # force-bind dGPU to vfio (fully detached from nvidia)
+  /usr/bin/supergfxctl -m Vfio
+  sleep 1
+
+  # then go back to Integrated, which powers it off again
+  /usr/bin/supergfxctl -m Integrated
+fi

default/systemd/system/supergfxd.service.d/delay-start.conf

@@ -0,0 +1,6 @@
+[Service]
+# Delay startup to avoid race condition with display manager initialization
+# when booting in Integrated mode. Without this delay, the system can freeze
+# on boot because supergfxd tries to disable the dGPU while the display
+# subsystem is still initializing.
+ExecStartPre=/bin/sleep 5

default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf

@@ -0,0 +1,18 @@
+## Use software volume control for all ALSA devices.
+## This prevents hardware mixer quirks (like muffled audio on Realtek codecs)
+## and provides consistent volume behavior across all hardware.
+
+monitor.alsa.rules = [
+  {
+    matches = [
+      {
+        device.name = "~alsa_card.*"
+      }
+    ]
+    actions = {
+      update-props = {
+        api.alsa.soft-mixer = true
+      }
+    }
+  }
+]

install/config/all.sh

@@ -26,6 +26,7 @@ run_logged $OMARCHY_INSTALL/config/hardware/bluetooth.sh
 run_logged $OMARCHY_INSTALL/config/hardware/printer.sh
 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/legacy-gpu-terminal.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-bcm43xx.sh
@@ -33,3 +34,5 @@ run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-suspend-nvme.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-surface-keyboard.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-asus-rog-audio-mixer.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-asus-rog-mic.sh

install/config/hardware/fix-asus-rog-audio-mixer.sh

@@ -0,0 +1,9 @@
+# Fix audio volume on Asus ROG laptops by using a soft mixer.
+
+if [[ "$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)" == "ASUSTeK COMPUTER INC." ]] &&
+   grep -q "ROG" /sys/class/dmi/id/product_family 2>/dev/null; then
+
+  mkdir -p ~/.config/wireplumber/wireplumber.conf.d/
+  cp $OMARCHY_PATH/default/wireplumber/wireplumber.conf.d/alsa-soft-mixer.conf ~/.config/wireplumber/wireplumber.conf.d/
+  rm -rf ~/.local/state/wireplumber/default-routes
+fi

install/config/hardware/fix-asus-rog-mic.sh

@@ -0,0 +1,17 @@
+# Fix internal mic gain on ASUS ROG laptops with Realtek ALC285.
+# The mic boost is way too high by default, causing clipping.
+# Sets levels and stores ALSA state so it persists across reboots.
+
+if [[ "$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)" == "ASUSTeK COMPUTER INC." ]] &&
+   grep -q "ROG" /sys/class/dmi/id/product_family 2>/dev/null; then
+
+  for card in /proc/asound/card*/codec*; do
+    if grep -q "ALC285" "$card" 2>/dev/null; then
+      cardnum=$(echo "$card" | grep -oP 'card\K\d+')
+      amixer -c "$cardnum" set 'Internal Mic Boost' 0 >/dev/null 2>&1 || true
+      amixer -c "$cardnum" set 'Capture' 70% >/dev/null 2>&1 || true
+      sudo alsactl store "$cardnum" 2>/dev/null || true
+      break
+    fi
+  done
+fi

install/config/hardware/legacy-gpu-terminal.sh

@@ -0,0 +1,17 @@
+# Ghostty requires modern GPU acceleration (OpenGL/Vulkan) which is often unstable
+# or missing on legacy hardware. Detect legacy GPU drivers and fall back to Alacritty.
+
+legacy_drivers=("radeon")
+
+for card in /sys/class/drm/card*; do
+  if [[ -e "$card/device/driver" ]]; then
+    driver=$(basename "$(readlink -f "$card/device/driver")")
+
+    for legacy in "${legacy_drivers[@]}"; do
+      if [[ "$driver" == "$legacy" ]]; then
+        omarchy-install-terminal alacritty
+        exit 0
+      fi
+    done
+  fi
+done

install/config/hardware/nvidia.sh

@@ -7,8 +7,8 @@ if [ -n "$NVIDIA" ]; then
   if echo "$NVIDIA" | grep -qE "RTX [2-9][0-9]|GTX 16"; then
     # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
     PACKAGES=(nvidia-open-dkms nvidia-utils lib32-nvidia-utils libva-nvidia-driver)
-  elif echo "$NVIDIA" | grep -qE "GTX 9|GTX 10|Quadro P"; then
-    # Pascal (10xx or Quadro Pxxx) and Maxwell (9xx) use legacy branch that can only be installed from AUR
+  elif echo "$NVIDIA" | grep -qE "GTX 9|GTX 10|Quadro P|MX1|MX2|MX3"; then
+    # Pascal (10xx, Quadro Pxxx, MX150, MX2xx, and MX3xx) and Maxwell (9xx, MX110, and MX130) use legacy branch that can only be installed from AUR
     PACKAGES=(nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils)
   fi
   # Bail if no supported GPU
@@ -17,7 +17,7 @@ if [ -n "$NVIDIA" ]; then
     exit 0
   fi
 
-  pacman -S --needed --noconfirm "$KERNEL_HEADERS" "${PACKAGES[@]}"
+  omarchy-pkg-add "$KERNEL_HEADERS" "${PACKAGES[@]}"
 
   # Configure modprobe for early KMS
   sudo tee /etc/modprobe.d/nvidia.conf <<EOF >/dev/null

install/omarchy-base.packages

@@ -13,6 +13,7 @@ bluetui
 bolt
 brightnessctl
 btop
+chromium
 clang
 cups
 cups-browsed
@@ -87,7 +88,6 @@ nss-mdns
 nvim
 obs-studio
 obsidian
-omarchy-chromium
 omarchy-nvim
 omarchy-walker
 opencode
@@ -144,5 +144,4 @@ xmlstarlet
 xournalpp
 yaru-icon-theme
 yay
-yq
 zoxide

install/preflight/pacman.sh

@@ -19,5 +19,5 @@ if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
 
 
   # Refresh all repos
-  sudo pacman -Syu --noconfirm
+  sudo pacman -Syyu --noconfirm
 fi

migrations/1766942230.sh

@@ -3,6 +3,17 @@ echo "Migrate legacy NVIDIA GPUs to nvidia-580xx driver (if needed)"
 # Only migrate GTX 9xx or 10xx (Pascal/Maxwell)
 NVIDIA="$(lspci | grep -i 'nvidia')"
 if echo "$NVIDIA" | grep -qE "GTX 9|GTX 10"; then
+  if ! pacman -Qq | grep -qE '^linux(-[a-z0-9]+)?-headers$'; then
+    echo "Error: no linux headers package installed (required for DKMS drivers). Please install the appropriate headers and re-run this migration."
+    exit 1
+  fi
+
   # Piping yes to override existing packages
   yes | sudo pacman -S nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils
+
+  # Verify packages were installed
+  if ! pacman -Qq nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils &>/dev/null; then
+    echo "Error: NVIDIA 580xx driver packages failed to install"
+    exit 1
+  fi
 fi

migrations/1767306902.sh

@@ -1,7 +1,5 @@
 echo "Migrate to new theme setup"
 
-omarchy-pkg-add yq
-
 # Move user-added backgrounds from Omarchy theme folders to user config
 OMARCHY_DIR="$HOME/.local/share/omarchy"
 USER_BACKGROUNDS_DIR="$HOME/.config/omarchy/backgrounds"

migrations/1768270644.sh

@@ -0,0 +1,14 @@
+echo "Add icon for headset audio profile in Waybar"
+
+if ! grep -q '"headset": ""' "$HOME/.config/waybar/config.jsonc"; then
+  sed -i '
+    /"pulseaudio": {/,/^[ ]*}/{
+      /"format-icons": {/,/^[ ]*}/{
+        /"default":/i\
+\      "headset": "",
+      }
+    }
+  ' "$HOME/.config/waybar/config.jsonc"
+
+  omarchy-restart-waybar
+fi

migrations/1768906440.sh

@@ -0,0 +1,19 @@
+echo "Migrate legacy mobile NVIDIA GPUs to nvidia-580xx driver (if needed)"
+
+# Only migrate MX1xx, 2xx or 3xx (Pascal/Maxwell)
+NVIDIA="$(lspci | grep -i 'nvidia')"
+if echo "$NVIDIA" | grep -qE "MX1|MX2|MX3"; then
+  if ! pacman -Qq | grep -qE '^linux(-[a-z0-9]+)?-headers$'; then
+    echo "Error: no linux headers package installed (required for DKMS drivers). Please install the appropriate headers and re-run this migration."
+    exit 1
+  fi
+
+  # Piping yes to override existing packages
+  yes | sudo pacman -S nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils
+
+  # Verify packages were installed
+  if ! pacman -Qq nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils &>/dev/null; then
+    echo "Error: NVIDIA 580xx driver packages failed to install"
+    exit 1
+  fi
+fi

migrations/1768916735.sh

@@ -0,0 +1,9 @@
+echo "Fix microphone gain and audio mixing on Asus ROG laptops"
+
+source "$OMARCHY_PATH/install/config/hardware/fix-asus-rog-mic.sh"
+source "$OMARCHY_PATH/install/config/hardware/fix-asus-rog-audio-mixer.sh"
+
+if [[ "$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)" == "ASUSTeK COMPUTER INC." ]] &&
+   grep -q "ROG" /sys/class/dmi/id/product_family 2>/dev/null; then
+  omarchy-restart-pipewire
+fi

migrations/1769182209.sh

@@ -0,0 +1,4 @@
+echo "Enable auto-pasting for the emoji picker"
+
+omarchy-refresh-config elephant/symbols.toml
+omarchy-restart-walker

migrations/1769510847.sh

@@ -0,0 +1,5 @@
+echo "Switch back to mainline chromium now that it supports full live themeing"
+
+omarchy-pkg-drop omarchy-chromium
+omarchy-pkg-add chromium
+omarchy-theme-set-browser

themes/catppuccin/waybar.css

@@ -0,0 +1,2 @@
+@define-color foreground #cdd6f4;
+@define-color background #181824;

themes/hackerman/colors.toml

@@ -1,4 +1,4 @@
-accent = "#829dd4"
+accent = "#82FB9C"
 cursor = "#ddf7ff"
 foreground = "#ddf7ff"
 background = "#0B0C16"

version

@@ -1 +1 @@
-3.3.1
+3.3.4