Remove mimetypes

Updated hyprland throws Invalid rule / Invalid parameter on the pip windowrule

applications/Alacritty.desktop

@@ -1,8 +1,3 @@
-echo "Make Alacritty compatible with X-TerminalArgs"
-
-if omarchy-pkg-present alacritty; then
-  mkdir -p ~/.local/share/applications
-  cat > ~/.local/share/applications/Alacritty.desktop << EOF
 [Desktop Entry]
 Type=Application
 TryExec=alacritty
@@ -24,5 +19,3 @@ X-TerminalArgDir=--working-directory=
 [Desktop Action New]
 Name=New Terminal
 Exec=alacritty
-EOF
-fi

autostart/walker.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Walker
-Comment=Walker Service
-Exec=walker --gapplication-service
-StartupNotify=false
-Terminal=false
-Type=Application

bin/omarchy-branch-set

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-branch-set [master|dev]"
-  exit 1
-else
-  branch="$1"
-fi
-
-case "$branch" in
-  "master") git -C $OMARCHY_PATH switch master ;;
-  "dev") git -C $OMARCHY_PATH switch dev ;;
-  *) echo "Unknown branch: $branch"; exit 1; ;;
-esac

bin/omarchy-channel-set

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-channel-set [stable|edge|dev]"
-  exit 1
-else
-  channel="$1"
-fi
-
-case "$channel" in
-"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
-"edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
-"dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
-*) echo "Unknown channel: $channel"; exit 1; ;;
-esac
-
-omarchy-update -y

bin/omarchy-cmd-first-run

@@ -12,7 +12,6 @@ if [[ -f "$FIRST_RUN_MODE" ]]; then
   bash "$OMARCHY_PATH/install/first-run/firewall.sh"
   bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
   bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
-  bash "$OMARCHY_PATH/install/first-run/elephant.sh"
   sudo rm -f /etc/sudoers.d/first-run
 
   bash "$OMARCHY_PATH/install/first-run/welcome.sh"

bin/omarchy-cmd-reboot

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-omarchy-state clear re*-required
-omarchy-hyprland-window-close-all
-sleep 1 # Allow apps like Chrome to shutdown correctly
-systemctl reboot --no-wall

bin/omarchy-cmd-screenrecord

@@ -8,17 +8,15 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-DESKTOP_AUDIO="false"
-MICROPHONE_AUDIO="false"
+SCOPE=""
+AUDIO="false"
 WEBCAM="false"
-STOP_RECORDING="false"
 
 for arg in "$@"; do
   case "$arg" in
-    --with-desktop-audio) DESKTOP_AUDIO="true" ;;
-    --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
+    --with-audio) AUDIO="true" ;;
     --with-webcam) WEBCAM="true" ;;
-    --stop-recording) STOP_RECORDING="true"
+    output|region) SCOPE="$arg" ;;
   esac
 done
 
@@ -59,35 +57,27 @@ start_webcam_overlay() {
 
 start_screenrecording() {
   local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
-  local audio_devices=""
   local audio_args=""
 
-  [[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"
+  # Merge audio tracks into one - separate tracks only play one at a time in most players
+  [[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input"
 
-  if [[ "$MICROPHONE_AUDIO" == "true" ]]; then
-    # Merge audio tracks into one - separate tracks only play one at a time in most players
-    [[ -n "$audio_devices" ]] && audio_devices+="|"
-    audio_devices+="default_input"
-  fi
-
-  [[ -n "$audio_devices" ]] && audio_args+="-a $audio_devices"
-
-  gpu-screen-recorder -w portal -f 60 -fallback-cpu-encoding yes -o "$filename" $audio_args -ac aac &
+  gpu-screen-recorder -w "$@" -f 60 -c mp4 -o "$filename" $audio_args &
   toggle_screenrecording_indicator
 }
 
 stop_screenrecording() {
-  pkill -SIGINT -f "^gpu-screen-recorder"  # SIGINT required to save video properly
+  pkill -SIGINT -f "gpu-screen-recorder"  # SIGINT required to save video properly
 
   # Wait a maximum of 5 seconds to finish before hard killing
   local count=0
-  while pgrep -f "^gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
+  while pgrep -f "gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
     sleep 0.1
     count=$((count + 1))
   done
 
-  if pgrep -f "^gpu-screen-recorder" >/dev/null; then
-    pkill -9 -f "^gpu-screen-recorder"
+  if pgrep -f "gpu-screen-recorder" >/dev/null; then
+    pkill -9 -f "gpu-screen-recorder"
     cleanup_webcam
     notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
   else
@@ -102,19 +92,51 @@ toggle_screenrecording_indicator() {
 }
 
 screenrecording_active() {
-  pgrep -f "^gpu-screen-recorder" >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
+  pgrep -f "gpu-screen-recorder" >/dev/null || pgrep -x slurp >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
 }
 
 if screenrecording_active; then
-  if pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "^gpu-screen-recorder" >/dev/null; then
+  if pgrep -x slurp >/dev/null; then
+    pkill -x slurp 2>/dev/null
+  elif pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "gpu-screen-recorder" >/dev/null; then
     cleanup_webcam
   else
     stop_screenrecording
   fi
-elif [[ "$STOP_RECORDING" == "false" ]]; then
+elif [[ "$SCOPE" == "output" ]]; then
   [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
 
-  start_screenrecording || cleanup_webcam
+  if ! output=$(slurp -o -f "%o"); then
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  if [[ -z "$output" ]]; then
+    notify-send "Error" "Could not detect monitor" -u critical
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  start_screenrecording "$output"
 else
-  exit 1
+  [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
+
+  scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
+
+  if ! region=$(slurp -f "%wx%h+%x+%y"); then
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  if [[ "$region" =~ ^([0-9]+)x([0-9]+)\+([0-9]+)\+([0-9]+)$ ]]; then
+    w=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[1]} * $scale}")
+    h=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[2]} * $scale}")
+    x=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[3]} * $scale}")
+    y=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[4]} * $scale}")
+    scaled_region="${w}x${h}+${x}+${y}"
+  else
+    scaled_region="$region"
+  fi
+
+  start_screenrecording region -region "$scaled_region"
 fi

bin/omarchy-cmd-screensaver

@@ -1,33 +1,28 @@
 #!/bin/bash
 
 screensaver_in_focus() {
-  hyprctl activewindow -j | jq -e '.class == "org.omarchy.screensaver"' >/dev/null 2>&1
+  hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
 }
 
 exit_screensaver() {
   hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
-  pkill -f org.omarchy.screensaver 2>/dev/null
+  pkill -f "alacritty --class Screensaver" 2>/dev/null
   exit 0
 }
 
-# Exit the screensaver on signals and input from keyboard and mouse
 trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
 
-printf '\033]11;rgb:00/00/00\007'  # Set background color to black
-
 hyprctl keyword cursor:invisible true &>/dev/null
 
-tty=$(tty 2>/dev/null)
-
 while true; do
+  effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
   tte -i ~/.config/omarchy/branding/screensaver.txt \
-    --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
-    --random-effect --exclude-effects dev_worm \
-    --no-eol --no-restore-cursor &
+    --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
+    "$effect" &
 
-  while pgrep -t "${tty#/dev/}" -x tte >/dev/null; do
-    if read -n1 -t 1 || ! screensaver_in_focus; then
+  while pgrep -x tte >/dev/null; do
+    if read -n 1 -t 3 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-shutdown

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-omarchy-state clear re*-required
-omarchy-hyprland-window-close-all
-sleep 1 # Allow apps like Chrome to shutdown correctly
-systemctl poweroff --no-wall

bin/omarchy-cmd-terminal-cwd

@@ -6,10 +6,8 @@ shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)
 
 if [[ -n $shell_pid ]]; then
   cwd=$(readlink -f "/proc/$shell_pid/cwd" 2>/dev/null)
-  shell=$(readlink -f "/proc/$shell_pid/exe" 2>/dev/null)
 
-  # Check if $shell is a valid shell and $cwd is a directory.
-  if grep -qs "$shell" /etc/shells && [[ -d $cwd ]]; then
+  if [[ -d $cwd ]]; then
     echo "$cwd"
   else
     echo "$HOME"

bin/omarchy-debug

@@ -1,34 +1,7 @@
 #!/bin/bash
 
-NO_SUDO=false
-PRINT_ONLY=false
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --no-sudo)
-      NO_SUDO=true
-      shift
-      ;;
-    --print)
-      PRINT_ONLY=true
-      shift
-      ;;
-    *)
-      echo "Unknown option: $1"
-      echo "Usage: omarchy-debug [--no-sudo] [--print]"
-      exit 1
-      ;;
-  esac
-done
-
 LOG_FILE="/tmp/omarchy-debug.log"
 
-if [ "$NO_SUDO" = true ]; then
-  DMESG_OUTPUT="(skipped - --no-sudo flag used)"
-else
-  DMESG_OUTPUT="$(sudo dmesg)"
-fi
-
 cat > "$LOG_FILE" <<EOF
 Date: $(date)
 Hostname: $(hostname)
@@ -42,7 +15,7 @@ $(inxi -Farz)
 =========================================
 DMESG
 =========================================
-$DMESG_OUTPUT
+$(sudo dmesg)
 
 =========================================
 JOURNALCTL (CURRENT BOOT, ERRORS ONLY)
@@ -55,11 +28,6 @@ INSTALLED PACKAGES
 $({ expac -S '%n %v (%r)' $(pacman -Qqe) 2>/dev/null; comm -13 <(pacman -Sql | sort) <(pacman -Qqe | sort) | xargs -r expac -Q '%n %v (AUR)'; } | sort)
 EOF
 
-if [ "$PRINT_ONLY" = true ]; then
-  cat "$LOG_FILE"
-  exit 0
-fi
-
 OPTIONS=("View log" "Save in current directory")
 if ping -c 1 8.8.8.8 >/dev/null 2>&1; then
   OPTIONS=("Upload log" "${OPTIONS[@]}")

bin/omarchy-dev-add-migration

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# FIXME: Update behavior
 cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file

bin/omarchy-disk-config

@@ -0,0 +1,344 @@
+#!/usr/bin/env python3
+"""
+Omarchy Disk Configuration Tool
+
+Interactive partition editor and validator for Omarchy installations.
+"""
+
+import json
+import sys
+from pathlib import Path
+
+
+def _find_root_partition(disk_config):
+  for dev_mod in disk_config.device_modifications:
+    for part in dev_mod.partitions:
+      if part.mountpoint == Path('/'):
+        return part
+      
+      if part.btrfs_subvols:
+        for subvol in part.btrfs_subvols:
+          if subvol.mountpoint == Path('/'):
+            return part
+  
+  return None
+
+
+def validate_disk_config(config, interactive=True):
+  from archinstall.lib.models.device import FilesystemType, Size, Unit, EncryptionType
+  from archinstall.lib.output import info, warn
+  
+  if not config.disk_config:
+    return 'CONTINUE'
+  
+  validation_warnings = []
+  
+  boot_partition = None
+  for dev_mod in config.disk_config.device_modifications:
+    for part in dev_mod.partitions:
+      if part.mountpoint == Path('/boot') or part.mountpoint == Path('/efi'):
+        boot_partition = part
+        break
+  
+  if boot_partition:
+    min_boot_size = Size(2, Unit.GiB, boot_partition.length.sector_size)
+    if boot_partition.length >= min_boot_size:
+      size_gb = boot_partition.length.convert(Unit.GiB).value
+      info(f'✓ Boot partition size: {size_gb:.1f} GiB')
+    else:
+      size_mb = boot_partition.length.convert(Unit.MiB).value
+      warn(f'⚠ Boot partition is only {size_mb:.0f} MiB')
+      warn('  Omarchy recommends at least 2 GiB for boot partition')
+      warn('  Multiple kernels may not fit')
+      validation_warnings.append('boot_size')
+  else:
+    warn('⚠ Could not find boot partition (/boot or /efi)')
+    warn('  System may not boot correctly')
+    validation_warnings.append('no_boot')
+  
+  root_partition = _find_root_partition(config.disk_config)
+  
+  if root_partition:
+    if root_partition.fs_type == FilesystemType.Btrfs:
+      info('✓ Root filesystem is btrfs')
+      
+      if root_partition.btrfs_subvols:
+        subvol_names = [str(sv.name) for sv in root_partition.btrfs_subvols]
+        subvol_mounts = {str(sv.mountpoint): str(sv.name) for sv in root_partition.btrfs_subvols}
+        
+        required_subvols = {
+          '/': '@',
+          '/home': '@home',
+          '/var/log': '@log',
+          '/var/cache/pacman/pkg': '@pkg',
+        }
+        
+        missing_subvols = []
+        for mount, expected_name in required_subvols.items():
+          if mount not in subvol_mounts:
+            missing_subvols.append(f'{expected_name} → {mount}')
+          elif subvol_mounts[mount] != expected_name:
+            warn(f'⚠ Subvolume at {mount} is named "{subvol_mounts[mount]}" not "{expected_name}"')
+        
+        if missing_subvols:
+          warn(f'⚠ Missing recommended subvolumes: {", ".join(missing_subvols)}')
+          warn('  Omarchy recommends: @, @home, @log, @pkg')
+          warn('  Some features (like Snapper) may not work optimally')
+          info(f'  Current subvolumes: {", ".join(subvol_names)}')
+          validation_warnings.append('missing_subvols')
+        else:
+          info(f'✓ Btrfs subvolumes: {", ".join(subvol_names)}')
+      else:
+        warn('⚠ Btrfs partition has no subvolumes defined')
+        warn('  Omarchy recommends subvolumes for snapshots')
+        warn('  Required: @ (root), @home, @log, @pkg')
+        validation_warnings.append('no_subvols')
+    else:
+      fs_name = root_partition.fs_type.value if root_partition.fs_type else 'unknown'
+      warn(f'⚠ Root filesystem is {fs_name}, not btrfs')
+      warn('  Omarchy is designed for btrfs with snapshots')
+      warn('  Some features may not work correctly')
+      validation_warnings.append('not_btrfs')
+    
+    is_encrypted = False
+    if config.disk_config.disk_encryption:
+      enc = config.disk_config.disk_encryption
+      if enc.encryption_type != EncryptionType.NoEncryption:
+        is_encrypted = root_partition in enc.partitions
+    
+    if is_encrypted:
+      info('✓ Root partition is encrypted with LUKS')
+      
+      if config.disk_config.disk_encryption.iter_time != 2000:
+        old_time = config.disk_config.disk_encryption.iter_time
+        config.disk_config.disk_encryption.iter_time = 2000
+        info(f'✓ Adjusted iteration time: {old_time}ms → 2000ms')
+      else:
+        info('✓ Iteration time: 2000ms (optimal)')
+    else:
+      warn('⚠ Root partition is NOT encrypted')
+      warn('  Omarchy recommends LUKS encryption for security')
+      validation_warnings.append('no_encryption')
+  else:
+    warn('⚠ Could not identify root partition')
+    validation_warnings.append('no_root')
+  
+  if validation_warnings and interactive:
+    import subprocess
+    import shutil
+    
+    gum_path = shutil.which('gum')
+    if gum_path:
+      warn('')
+      
+      try:
+        result = subprocess.run(
+          ['gum', 'choose', '--header', 'Validation warnings detected. What would you like to do?',
+           'Re-edit partitions', 'Continue anyway', 'Abort'],
+          capture_output=True,
+          text=True,
+        )
+        
+        choice = result.stdout.strip() if result.stdout else ''
+        
+        if choice == 'Re-edit partitions':
+          return 'RE_EDIT'
+        elif choice == 'Abort':
+          return 'ABORT'
+        else:
+          info('Continuing despite warnings')
+          return 'CONTINUE'
+      
+      except (subprocess.CalledProcessError, KeyboardInterrupt):
+        return 'ABORT'
+  
+  return 'CONTINUE'
+
+
+def apply_omarchy_partition_defaults():
+  import archinstall.lib.interactions.disk_conf as disk_conf_module
+  from archinstall.lib.models.device import (
+    PartitionModification, ModificationStatus, PartitionType, 
+    Size, Unit, SectorSize, FilesystemType, PartitionFlag,
+    DeviceModification, BDevice
+  )
+  from archinstall.lib.interactions.disk_conf import get_default_btrfs_subvols
+  from archinstall.lib.disk.device_handler import device_handler
+  
+  def _boot_partition_2gib(sector_size: SectorSize, using_gpt: bool) -> PartitionModification:
+    flags = [PartitionFlag.BOOT]
+    size = Size(2, Unit.GiB, sector_size)
+    start = Size(1, Unit.MiB, sector_size)
+    if using_gpt:
+      flags.append(PartitionFlag.ESP)
+    
+    return PartitionModification(
+      status=ModificationStatus.Create,
+      type=PartitionType.Primary,
+      start=start,
+      length=size,
+      mountpoint=Path('/boot'),
+      fs_type=FilesystemType.Fat32,
+      flags=flags,
+    )
+  
+  def _select_main_filesystem_btrfs() -> FilesystemType:
+    return FilesystemType.Btrfs
+  
+  def _select_mount_options_compressed() -> list[str]:
+    return ['compress=zstd']
+  
+  def _suggest_single_disk_auto_subvolumes(
+    device: BDevice,
+    filesystem_type: FilesystemType | None = None,
+    separate_home: bool | None = None,
+  ):
+    if not filesystem_type:
+      filesystem_type = FilesystemType.Btrfs
+    
+    if filesystem_type == FilesystemType.Btrfs:
+      using_subvolumes = True
+      mount_options = ['compress=zstd']
+    else:
+      using_subvolumes = False
+      mount_options = []
+    
+    sector_size = device.device_info.sector_size
+    device_modification = DeviceModification(device, wipe=True)
+    using_gpt = device_handler.partition_table.is_gpt()
+    
+    boot_partition = _boot_partition_2gib(sector_size, using_gpt)
+    device_modification.add_partition(boot_partition)
+    
+    total_size = device.device_info.total_size
+    available_space = total_size - boot_partition.length - Size(1, Unit.MiB, sector_size)
+    
+    root_partition = PartitionModification(
+      status=ModificationStatus.Create,
+      type=PartitionType.Primary,
+      start=boot_partition.start + boot_partition.length,
+      length=available_space,
+      mountpoint=None if using_subvolumes else Path('/'),
+      fs_type=filesystem_type,
+      mount_options=mount_options,
+    )
+    
+    if using_subvolumes:
+      root_partition.btrfs_subvols = get_default_btrfs_subvols()
+    
+    device_modification.add_partition(root_partition)
+    return device_modification
+  
+  disk_conf_module._boot_partition = _boot_partition_2gib
+  disk_conf_module.select_main_filesystem_format = _select_main_filesystem_btrfs
+  disk_conf_module.select_mount_options = _select_mount_options_compressed
+  disk_conf_module.suggest_single_disk_layout = _suggest_single_disk_auto_subvolumes
+
+
+def load_config(config_file: Path, creds_file: Path | None = None):
+  from archinstall.lib.args import ArchConfig, Arguments
+  
+  with open(config_file) as f:
+    config_data = json.load(f)
+  
+  if creds_file and creds_file.exists():
+    with open(creds_file) as f:
+      creds_data = json.load(f)
+      config_data.update(creds_data)
+  
+  args = Arguments(
+    config=config_file,
+    creds=creds_file,
+    mountpoint=Path('/mnt'),
+    silent=True,
+  )
+  
+  return ArchConfig.from_config(config_data, args)
+
+
+def save_config(config, output_file: Path):
+  from archinstall.lib.output import info
+  
+  try:
+    config_dict = config.safe_json()
+    with open(output_file, 'w') as f:
+      json.dump(config_dict, f, indent=2, default=str)
+    info(f'✓ Configuration saved to: {output_file}')
+  except Exception as e:
+    from archinstall.lib.output import error
+    error(f'Failed to save config: {e}')
+    raise
+
+
+def main():
+  import argparse
+  
+  parser = argparse.ArgumentParser(description='Omarchy Disk Configuration Tool')
+  parser.add_argument('--config', type=Path, required=True, help='Path to config file')
+  parser.add_argument('--creds', type=Path, help='Path to credentials file')
+  parser.add_argument('--output', type=Path, help='Output path (default: overwrites input)')
+  parser.add_argument('--non-interactive', action='store_true', help='Skip interactive prompts')
+  
+  args = parser.parse_args()
+  
+  output_file = args.output or args.config
+  
+  if not args.config.exists():
+    print(f'ERROR: Config file not found: {args.config}', file=sys.stderr)
+    sys.exit(1)
+  
+  if args.creds and not args.creds.exists():
+    print(f'ERROR: Credentials file not found: {args.creds}', file=sys.stderr)
+    sys.exit(1)
+  
+  try:
+    from archinstall.lib.output import info, error
+    from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
+    from archinstall.tui.curses_menu import Tui
+    
+    apply_omarchy_partition_defaults()
+    
+    info('Loading configuration...')
+    config = load_config(args.config, args.creds)
+    
+    if not config.disk_config:
+      error('No disk configuration found in config file')
+      sys.exit(1)
+    
+    while True:
+      info('Launching partition editor...')
+      
+      with Tui():
+        edited_disk_config = DiskLayoutConfigurationMenu(config.disk_config).run()
+        if edited_disk_config:
+          config.disk_config = edited_disk_config
+          info('✓ Partition configuration updated')
+        else:
+          info('No changes made in partition editor')
+      
+      interactive = not args.non_interactive
+      validation_result = validate_disk_config(config, interactive=interactive)
+      
+      if validation_result == 'RE_EDIT':
+        continue
+      elif validation_result == 'ABORT':
+        info('Disk configuration cancelled by user')
+        sys.exit(1)
+      else:
+        break
+    
+    save_config(config, output_file)
+    info('✓ Disk configuration complete!')
+    
+  except KeyboardInterrupt:
+    print('\nCancelled by user', file=sys.stderr)
+    sys.exit(1)
+  except Exception as e:
+    print(f'ERROR: {e}', file=sys.stderr)
+    import traceback
+    traceback.print_exc()
+    sys.exit(1)
+
+
+if __name__ == '__main__':
+  main()

bin/omarchy-font-set

@@ -18,7 +18,6 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
       pkill -SIGUSR2 ghostty
     fi
 
-    sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
     xmlstarlet ed -L \
@@ -28,10 +27,7 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
 
     omarchy-restart-waybar
     omarchy-restart-swayosd
-
-    if pgrep -x ghostty; then
-      notify-send "    You must restart Ghostty to see font change"
-    fi
+    omarchy-restart-walker
 
     omarchy-hook font-set "$font_name"
   else

bin/omarchy-hyprland-window-pop

@@ -2,45 +2,21 @@
 
 # Toggle to pop-out a tile to stay fixed on a display basis.
 
-# Usage:
-# omarchy-hyprland-window-pop [width height [x y]]
-#
-# Arguments:
-#   width   Optional. Width of the floating window. Default: 1300
-#   height  Optional. Height of the floating window. Default: 900
-#   x       Optional. X position of the window. Must provide both X and Y to take effect.
-#   y       Optional. Y position of the window. Must provide both X and Y to take effect.
-#
-# Behavior:
-#   - If the window is already pinned, it will be unpinned and removed from the pop layer.
-#   - If the window is not pinned, it will be floated, resized, moved/centered, pinned, brought to top, and popped.
-
-width=${1:-1300}
-height=${2:-900}
-x=${3:-}
-y=${4:-}
-
 active=$(hyprctl activewindow -j)
-pinned=$(echo "$active" | jq ".pinned")
-addr=$(echo "$active" | jq -r ".address")
+pinned=$(echo "$active" | jq .pinned)
+addr=$(echo "$active" | jq -r  ".address")
+[ -z "$addr" ] && { echo "No active window"; exit 0; }
 
-if [[ $pinned == "true" ]]; then
+if [ "$pinned" = "true" ]; then
   hyprctl -q --batch \
-    "dispatch pin address:$addr;" \
-    "dispatch togglefloating address:$addr;" \
-    "dispatch tagwindow -pop address:$addr;"
-elif [[ -n $addr ]]; then
-  hyprctl dispatch togglefloating address:$addr
-  hyprctl dispatch resizeactive exact $width $height address:$addr
-
-  if [[ -n $x && -n $y ]]; then
-    hyprctl dispatch moveactive $x $y address:$addr
-  else
-    hyprctl dispatch centerwindow address:$addr
-  fi
-
+  "dispatch pin address:$addr;" \
+  "dispatch togglefloating address:$addr;" \
+  "dispatch tagwindow -pop address:$addr;"
+else
   hyprctl -q --batch \
-    "dispatch pin address:$addr;" \
-    "dispatch alterzorder top address:$addr;" \
-    "dispatch tagwindow +pop address:$addr;"
+  "dispatch togglefloating address:$addr;" \
+  "dispatch centerwindow address:$addr;" \
+  "dispatch pin address:$addr;" \
+  "dispatch alterzorder top address:$addr;" \
+  "dispatch tagwindow +pop address:$addr;"
 fi

bin/omarchy-install

@@ -0,0 +1,258 @@
+#!/usr/bin/env python3
+"""
+Omarchy Install
+
+Installs Arch Linux with Omarchy customizations using archinstall as a library.
+For disk configuration, use omarchy-disk-config.
+"""
+
+import json
+import sys
+import time
+from pathlib import Path
+
+
+def load_config(config_file: Path, creds_file: Path | None = None):
+  from archinstall.lib.args import ArchConfig, Arguments
+
+  with open(config_file) as f:
+    config_data = json.load(f)
+
+  if creds_file and creds_file.exists():
+    with open(creds_file) as f:
+      creds_data = json.load(f)
+      config_data.update(creds_data)
+
+  args = Arguments(
+    config=config_file,
+    creds=creds_file,
+    mountpoint=Path('/mnt'),
+    silent=True,
+    skip_ntp=True,
+    skip_wkd=True,
+  )
+
+  return ArchConfig.from_config(config_data, args)
+
+
+def load_omarchy_packages() -> list[str]:
+  omarchy_path = Path('/usr/share/omarchy/install')
+  packages = []
+
+  base_packages_file = omarchy_path / 'omarchy-base.packages'
+  if base_packages_file.exists():
+    with open(base_packages_file) as f:
+      packages.extend([line.strip() for line in f if line.strip() and not line.startswith('#')])
+
+  return packages
+
+
+def perform_installation(config_file: Path, creds_file: Path | None = None) -> None:
+  from archinstall.lib.disk.filesystem import FilesystemHandler
+  from archinstall.lib.installer import Installer
+  from archinstall.lib.models.device import DiskLayoutType, EncryptionType
+  from archinstall.lib.output import error, info
+  from archinstall.lib.profile.profiles_handler import profile_handler
+  from archinstall.lib.authentication.authentication_handler import auth_handler
+
+  start_time = time.time()
+
+  info('Loading configuration...')
+  config = load_config(config_file, creds_file)
+
+  if not config.disk_config:
+    error('No disk configuration found in config file')
+    error('Use omarchy-disk-config to configure disk layout first')
+    sys.exit(1)
+
+  disk_config = config.disk_config
+
+  if disk_config.config_type != DiskLayoutType.Pre_mount:
+    info('Performing filesystem operations...')
+    fs_handler = FilesystemHandler(disk_config)
+    fs_handler.perform_filesystem_operations()
+
+  mountpoint = Path('/mnt')
+
+  info('Loading Omarchy base packages...')
+  omarchy_packages = load_omarchy_packages()
+
+  info('Starting Omarchy installation...')
+
+  with Installer(
+    mountpoint,
+    disk_config,
+    kernels=config.kernels or ['linux'],
+  ) as installation:
+
+    info('Mounting filesystems...')
+    if disk_config.config_type != DiskLayoutType.Pre_mount:
+      installation.mount_ordered_layout()
+
+    installation.sanity_check()
+
+    if disk_config.disk_encryption and disk_config.disk_encryption.encryption_type != EncryptionType.NoEncryption:
+      info('Generating encryption keys...')
+      installation.generate_key_files()
+
+    if config.mirror_config:
+      info('Configuring mirrors...')
+      installation.set_mirrors(config.mirror_config, on_target=False)
+
+    info('Installing base system...')
+    installation.minimal_installation(
+      optional_repositories=config.mirror_config.optional_repositories if config.mirror_config else [],
+      mkinitcpio=not config.uki,
+      hostname=config.hostname,
+      locale_config=config.locale_config,
+    )
+
+    if config.mirror_config:
+      installation.set_mirrors(config.mirror_config, on_target=True)
+
+    if config.swap:
+      info('Setting up swap...')
+      installation.setup_swap('zram')
+
+    all_packages = omarchy_packages + (config.packages or [])
+    if all_packages:
+      info(f'Installing {len(all_packages)} packages...')
+      installation.add_additional_packages(all_packages)
+
+    if config.bootloader:
+      info(f'Installing bootloader: {config.bootloader.value}...')
+      installation.add_bootloader(config.bootloader, config.uki)
+
+    if config.network_config:
+      info('Configuring network...')
+      config.network_config.install_network_config(installation, config.profile_config)
+
+    if config.auth_config and config.auth_config.users:
+      info('Creating users...')
+      installation.create_users(config.auth_config.users)
+      auth_handler.setup_auth(installation, config.auth_config, config.hostname)
+
+    if config.app_config:
+      info('Installing applications...')
+      from archinstall.lib.applications.application_handler import application_handler
+      application_handler.install_applications(installation, config.app_config)
+
+    if config.profile_config:
+      info('Installing profile...')
+      profile_handler.install_profile_config(installation, config.profile_config)
+
+    if config.timezone:
+      installation.set_timezone(config.timezone)
+
+    if config.ntp:
+      installation.activate_time_synchronization()
+
+    from archinstall.lib.installer import accessibility_tools_in_use
+    if accessibility_tools_in_use():
+      installation.enable_espeakup()
+
+    if config.auth_config and config.auth_config.root_enc_password:
+      from archinstall.lib.models.users import User
+      root_user = User('root', config.auth_config.root_enc_password, False)
+      installation.set_user_password(root_user)
+
+    if config.profile_config and config.profile_config.profile:
+      config.profile_config.profile.post_install(installation)
+
+    if config.services:
+      info('Enabling services...')
+      installation.enable_service(config.services)
+
+    if disk_config.has_default_btrfs_vols():
+      btrfs_options = disk_config.btrfs_options
+      snapshot_config = btrfs_options.snapshot_config if btrfs_options else None
+      snapshot_type = snapshot_config.snapshot_type if snapshot_config else None
+      if snapshot_type:
+        installation.setup_btrfs_snapshot(snapshot_type, config.bootloader)
+
+    info('Mounting offline resources for chroot access...')
+    from archinstall.lib.general import SysCommand
+    import os
+    import shutil
+
+    offline_mirror_src = Path('/var/cache/omarchy/mirror/offline')
+    offline_mirror_dst = mountpoint / 'var/cache/omarchy/mirror/offline'
+    packages_src = Path('/opt/packages')
+    packages_dst = mountpoint / 'opt/packages'
+
+    os.makedirs(offline_mirror_dst, exist_ok=True)
+    os.makedirs(packages_dst, exist_ok=True)
+
+    if offline_mirror_src.exists():
+      SysCommand(f'mount --bind {offline_mirror_src} {offline_mirror_dst}')
+
+    if packages_src.exists():
+      SysCommand(f'mount --bind {packages_src} {packages_dst}')
+
+    pacman_conf_src = Path('/etc/pacman.conf')
+    pacman_conf_dst = mountpoint / 'etc/pacman.conf'
+    if pacman_conf_src.exists():
+      shutil.copy(pacman_conf_src, pacman_conf_dst)
+
+    info('Copying user info to chroot...')
+    os.makedirs(mountpoint / 'tmp', exist_ok=True)
+
+    if os.path.exists('/tmp/omarchy-user-name.txt'):
+      shutil.copy('/tmp/omarchy-user-name.txt', mountpoint / 'tmp/omarchy-user-name.txt')
+    if os.path.exists('/tmp/omarchy-user-email.txt'):
+      shutil.copy('/tmp/omarchy-user-email.txt', mountpoint / 'tmp/omarchy-user-email.txt')
+
+    if config.custom_commands:
+      info('Running Omarchy custom commands...')
+      from archinstall.lib.installer import run_custom_user_commands
+      run_custom_user_commands(config.custom_commands, installation)
+
+    info('Generating fstab...')
+    installation.genfstab()
+
+  end_time = time.time()
+  duration_seconds = int(end_time - start_time)
+  duration_mins = duration_seconds // 60
+  duration_secs = duration_seconds % 60
+
+  timing_file = mountpoint / 'tmp/omarchy-install-time.txt'
+  with open(timing_file, 'w') as f:
+    f.write(f"{duration_mins}m {duration_secs}s\n")
+
+  info(f'Installation complete! Total time: {duration_mins}m {duration_secs}s')
+
+
+def main():
+  import argparse
+
+  parser = argparse.ArgumentParser(description='Omarchy Install')
+  parser.add_argument('--config', type=Path, required=True, help='Path to config file')
+  parser.add_argument('--creds', type=Path, help='Path to credentials file')
+
+  args = parser.parse_args()
+
+  if not args.config.exists():
+    print(f'ERROR: Config file not found: {args.config}', file=sys.stderr)
+    sys.exit(1)
+
+  if args.creds and not args.creds.exists():
+    print(f'ERROR: Credentials file not found: {args.creds}', file=sys.stderr)
+    sys.exit(1)
+
+  try:
+    perform_installation(
+      config_file=args.config,
+      creds_file=args.creds,
+    )
+  except KeyboardInterrupt:
+    print('\nInstallation cancelled by user', file=sys.stderr)
+    sys.exit(1)
+  except Exception as e:
+    print(f'ERROR: Installation failed: {e}', file=sys.stderr)
+    import traceback
+    traceback.print_exc()
+    sys.exit(1)
+
+
+if __name__ == '__main__':
+  main()

bin/omarchy-install-dev-env

@@ -41,7 +41,7 @@ install_php() {
 
 install_node() {
   echo -e "Installing Node.js...\n"
-  mise use --global node
+  mise use --global node@lts
 }
 
 case "$1" in
@@ -50,7 +50,6 @@ ruby)
   omarchy-pkg-add libyaml
   mise use --global ruby@latest
   mise settings add idiomatic_version_file_enable_tools ruby
-  echo "gem: --no-document" > ~/.gemrc
   mise x ruby -- gem install rails --no-document
   echo -e "\nYou can now run: rails new myproject"
   ;;

bin/omarchy-install-docker-dbs

@@ -12,7 +12,7 @@ if [[ -n "$choices" ]]; then
   for db in $choices; do
     case $db in
     MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;
-    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres18 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:18 ;;
+    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres17 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:17 ;;
     MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;;
     Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;;
     MongoDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:27017:27017" --name mongodb -e MONGO_INITDB_ROOT_USERNAME=admin -e MONGO_INITDB_ROOT_PASSWORD=admin123 mongo:noble ;;

bin/omarchy-install-dropbox

@@ -5,4 +5,4 @@ omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-d
 
 echo "Starting Dropbox..."
 uwsm-app -- dropbox-cli start &>/dev/null &
-echo "See Dropbox icon behind  hover tray in top right and right-click for setup."
+echo "See Dropbox icon behind   hover tray in top right and right-click for setup."

bin/omarchy-install-final-configurations.sh

@@ -0,0 +1,110 @@
+#!/bin/bash
+#
+# Omarchy Final Configurations Installer
+#
+# This script runs from archinstall's custom_commands after base packages
+# and user creation. It switches to the created user and runs install.sh
+# to complete package installation and system configuration.
+#
+# archinstall runs custom_commands as root via:
+#   arch-chroot -S /mnt bash /var/tmp/user-command.0.sh
+#
+
+set -eEo pipefail
+
+# Setup comprehensive logging for chroot execution
+# This ensures all output is captured even though we're running inside chroot
+CHROOT_LOG_FILE="/var/log/omarchy-install-chroot.log"
+mkdir -p "$(dirname "$CHROOT_LOG_FILE")"
+touch "$CHROOT_LOG_FILE"
+
+# Redirect all output to both the log file and stdout
+# This way:
+# 1. Output is saved to /var/log/omarchy-install-chroot.log (inside chroot = /mnt/var/log on ISO)
+# 2. Output still goes to stdout so arch-chroot can potentially capture it
+# 3. We use exec to redirect the entire script's output from this point forward
+exec > >(tee -a "$CHROOT_LOG_FILE") 2>&1
+
+# Log script start with timestamp
+echo "========================================"
+echo "Omarchy Chroot Install Starting"
+echo "Started at: $(date '+%Y-%m-%d %H:%M:%S')"
+echo "Log file: $CHROOT_LOG_FILE"
+echo "========================================"
+echo
+
+# Find the first non-root user (UID >= 1000, < 60000)
+OMARCHY_USER=$(getent passwd | awk -F: '$3 >= 1000 && $3 < 60000 {print $1; exit}')
+
+if [[ -z "$OMARCHY_USER" ]]; then
+    echo "ERROR: No non-root user found!"
+    echo "Users created:"
+    getent passwd | awk -F: '$3 >= 1000 {print $1, $3}'
+    exit 1
+fi
+
+echo "Setting up Omarchy for user: $OMARCHY_USER"
+
+# Setup passwordless sudo (will be removed by post-install)
+echo "Setting up passwordless sudo..."
+mkdir -p /etc/sudoers.d
+cat >/etc/sudoers.d/99-omarchy-installer <<EOF
+root ALL=(ALL:ALL) NOPASSWD: ALL
+%wheel ALL=(ALL:ALL) NOPASSWD: ALL
+$OMARCHY_USER ALL=(ALL:ALL) NOPASSWD: ALL
+EOF
+chmod 440 /etc/sudoers.d/99-omarchy-installer
+
+# Get user info from /tmp (written by configurator)
+if [[ -f /tmp/omarchy-user-name.txt ]]; then
+  OMARCHY_USER_NAME=$(cat /tmp/omarchy-user-name.txt)
+else
+  OMARCHY_USER_NAME=""
+fi
+
+if [[ -f /tmp/omarchy-user-email.txt ]]; then
+  OMARCHY_USER_EMAIL=$(cat /tmp/omarchy-user-email.txt)
+else
+  OMARCHY_USER_EMAIL=""
+fi
+
+# Run install.sh as the user
+echo "========================================"
+echo "Running Omarchy installation as user: $OMARCHY_USER"
+echo "========================================"
+echo
+
+# Use runuser instead of su for better output handling
+# runuser doesn't go through PAM and preserves stdout/stderr better
+runuser -u "$OMARCHY_USER" -- bash -c "
+    set -eEo pipefail
+    export PYTHONUNBUFFERED=1
+    export OMARCHY_CHROOT_INSTALL=1
+    export OMARCHY_ARCHINSTALL_WRAPPER=1
+    export OMARCHY_USER='$OMARCHY_USER'
+    export OMARCHY_USER_NAME='$OMARCHY_USER_NAME'
+    export OMARCHY_USER_EMAIL='$OMARCHY_USER_EMAIL'
+    cd ~
+    source /usr/share/omarchy/install.sh
+"
+
+exit_code=$?
+
+if [[ $exit_code -eq 0 ]]; then
+    echo
+    echo "========================================"
+    echo "Omarchy install.sh completed successfully!"
+    echo "========================================"
+    echo
+    echo "========================================"
+    echo "Omarchy Chroot Install Completed"
+    echo "Finished at: $(date '+%Y-%m-%d %H:%M:%S')"
+    echo "Log file: $CHROOT_LOG_FILE"
+    echo "========================================"
+else
+    echo
+    echo "========================================"
+    echo "ERROR: Omarchy install.sh exited with code $exit_code"
+    echo "========================================"
+    exit $exit_code
+fi

bin/omarchy-install-steam

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 echo "Now pick dependencies matching your graphics card"
-sudo pacman -S steam
+sudo pacman -Syu --noconfirm steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-install-terminal

@@ -9,43 +9,31 @@ package="$1"
 
 # Map package name to desktop entry ID
 case "$package" in
-alacritty) desktop_id="Alacritty.desktop" ;;
-ghostty) desktop_id="com.mitchellh.ghostty.desktop" ;;
-kitty) desktop_id="kitty.desktop" ;;
-*)
-  echo "Unknown terminal: $package"
-  exit 1
-  ;;
+  alacritty)
+    desktop_id="Alacritty.desktop"
+    ;;
+  ghostty)
+    desktop_id="com.mitchellh.ghostty.desktop"
+    ;;
+  kitty)
+    desktop_id="kitty.desktop"
+    ;;
+  *)
+    echo "Unknown terminal: $package"
+    exit 1
+    ;;
 esac
 
 # Install package
 if omarchy-pkg-add $package; then
-  # Copy custom desktop entry for alacritty with X-TerminalArg* keys
-  if [[ $package == "alacritty" ]]; then
-    mkdir -p ~/.local/share/applications
-    cat > ~/.local/share/applications/Alacritty.desktop << EOF
-[Desktop Entry]
-Type=Application
-TryExec=alacritty
-Exec=alacritty
-Icon=Alacritty
-Terminal=false
-Categories=System;TerminalEmulator;
-Name=Alacritty
-GenericName=Terminal
-Comment=A fast, cross-platform, OpenGL terminal emulator
-StartupNotify=true
-StartupWMClass=Alacritty
-Actions=New;
-X-TerminalArgExec=-e
-X-TerminalArgAppId=--class=
-X-TerminalArgTitle=--title=
-X-TerminalArgDir=--working-directory=
+  # Set as default terminal
+  echo "Setting $package as new default terminal..."
+  sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
 
-[Desktop Action New]
-Name=New Terminal
-Exec=alacritty
-EOF
+  # Copy custom desktop entry for alacritty with X-TerminalArg* keys
+  if [ "$package" = "alacritty" ]; then
+    mkdir -p ~/.local/share/applications
+    cp "$OMARCHY_PATH/applications/Alacritty.desktop" ~/.local/share/applications/
   fi
 
   # Update xdg-terminals.list to prioritize the proper terminal

bin/omarchy-install-xbox-controllers

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Install xpadneo to ensure controllers work out of the box
-sudo pacman -S --noconfirm --needed linux-headers
-yay -S --noconfirm xpadneo-dkms
-
-# Prevent xpad/xpadneo driver conflict
-echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null
-echo hid_xpadneo | sudo tee /etc/modules-load.d/xpadneo.conf >/dev/null
-
-# Give user access to game controllers
-sudo usermod -a -G input $USER
-
-# Modules need to be loaded
-gum confirm "Install requires reboot. Ready?" && sudo reboot now

bin/omarchy-launch-about

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Omarchy -e bash -c 'fastfetch; read -n 1 -s'

bin/omarchy-launch-audio

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-omarchy-launch-or-focus-tui wiremix

bin/omarchy-launch-bluetooth

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rfkill unblock bluetooth
-exec omarchy-launch-or-focus-tui bluetui

bin/omarchy-launch-browser

@@ -3,10 +3,8 @@
 default_browser=$(xdg-settings get default-web-browser)
 browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
 
-if [[ $browser_exec =~ (firefox|zen|librewolf|mullvad) ]]; then
+if [[ $browser_exec =~ (firefox|zen|librewolf) ]]; then
   private_flag="--private-window"
-elif [[ $browser_exec =~ edge ]]; then
-  private_flag="--inprivate"
 else
   private_flag="--incognito"
 fi

bin/omarchy-launch-editor

@@ -3,8 +3,8 @@
 omarchy-cmd-present "$EDITOR" || EDITOR=nvim
 
 case "$EDITOR" in
-nvim | vim | nano | micro | hx | helix | fresh)
-  exec omarchy-launch-tui "$EDITOR" "$@"
+nvim | vim | nano | micro | hx | helix)
+  exec setsid uwsm-app -- xdg-terminal-exec "$EDITOR" "$@"
   ;;
 *)
   exec setsid uwsm-app -- "$EDITOR" "$@"

bin/omarchy-launch-floating-terminal-with-presentation

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cmd="$*"
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; if [ \$? -ne 130 ]; then omarchy-show-done; fi"
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"

bin/omarchy-launch-opencode

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.opencode -e bash -c 'cd ~/Work; opencode'

bin/omarchy-launch-or-focus

@@ -12,5 +12,5 @@ WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|selec
 if [[ -n $WINDOW_ADDRESS ]]; then
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
 else
-  eval exec setsid $LAUNCH_COMMAND
+  eval exec $LAUNCH_COMMAND
 fi

bin/omarchy-launch-or-focus-tui

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-APP_ID="org.omarchy.$(basename "$1")"
-LAUNCH_COMMAND="omarchy-launch-tui $@"
-
-exec omarchy-launch-or-focus "$APP_ID" "$LAUNCH_COMMAND"

bin/omarchy-launch-screensaver

@@ -6,47 +6,23 @@ if ! command -v tte &>/dev/null; then
 fi
 
 # Exit early if screensave is already running
-pgrep -f org.omarchy.screensaver && exit 0
+pgrep -f "alacritty --class Screensaver" && exit 0
 
 # Allow screensaver to be turned off but also force started
 if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
   exit 1
 fi
 
-# Silently quit Walker on overlay
-walker -q
-
 focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
-terminal=$(xdg-terminal-exec --print-id)
 
 for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
   hyprctl dispatch focusmonitor $m
 
-  case $terminal in
-  *Alacritty*)
-    hyprctl dispatch exec -- \
-      alacritty --class=org.omarchy.screensaver \
-      --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
-      -e omarchy-cmd-screensaver
-    ;;
-  *ghostty*)
-    hyprctl dispatch exec -- \
-      ghostty --class=org.omarchy.screensaver \
-      --config-file=~/.local/share/omarchy/default/ghostty/screensaver \
-      --font-size=18 \
-      -e omarchy-cmd-screensaver
-    ;;
-  *kitty*)
-    hyprctl dispatch exec -- \
-      kitty --class=org.omarchy.screensaver \
-      --override font_size=18 \
-      --override window_padding_width=0 \
-      -e omarchy-cmd-screensaver
-    ;;
-  *)
-    notify-send "✋  Screensaver only runs in Alacritty, Ghostty, or Kitty"
-    ;;
-  esac
+  # FIXME: Find a way to make this generic where we it can work for kitty + ghostty
+  hyprctl dispatch exec -- \
+    alacritty --class Screensaver \
+    --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
+    -e omarchy-cmd-screensaver
 done
 
 hyprctl dispatch focusmonitor $focused

bin/omarchy-launch-tui

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.$(basename $1) -e "$1" "${@:2}"

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*) ;;
+google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;;
 *) browser="chromium.desktop" ;;
 esac
 

bin/omarchy-launch-wifi

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-rfkill unblock wifi
-omarchy-launch-or-focus-tui impala
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Impala -e impala "$@"

bin/omarchy-lock-screen

@@ -3,13 +3,10 @@
 # Lock the screen
 pidof hyprlock || hyprlock &
 
-# Set keyboard layout to default (first layout)
-hyprctl switchxkblayout all 0 > /dev/null 2>&1
-
 # Ensure 1password is locked
 if pgrep -x "1password" >/dev/null; then
   1password --lock &
 fi
 
 # Avoid running screensaver when locked
-pkill -f org.omarchy.screensaver
+pkill -f "alacritty --class Screensaver"

bin/omarchy-menu

@@ -33,11 +33,11 @@ menu() {
     fi
   fi
 
-  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 630 -p "$prompt…" "${args[@]}" 2>/dev/null
+  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 600 -p "$prompt…" "${args[@]}" 2>/dev/null
 }
 
 terminal() {
-  xdg-terminal-exec --app-id=org.omarchy.terminal "$@"
+  xdg-terminal-exec --app-id=com.omarchy.Omarchy "$@"
 }
 
 present_terminal() {
@@ -112,19 +112,19 @@ show_screenshot_menu() {
 }
 
 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 ;;
+  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio\n  Display + Webcam") in
+  *"Region + Audio"*) omarchy-cmd-screenrecord region --with-audio ;;
+  *Region*) omarchy-cmd-screenrecord ;;
+  *"Display + Audio"*) omarchy-cmd-screenrecord output --with-audio ;;
+  *"Display + Webcam"*) omarchy-cmd-screenrecord output --with-audio --with-webcam ;;
+  *Display*) omarchy-cmd-screenrecord output ;;
   *) back_to show_capture_menu ;;
   esac
 }
 
 show_share_menu() {
   case $(menu "Share" "  Clipboard\n  File \n  Folder") in
-  *Clipboard*) omarchy-cmd-share clipboard ;;
+  *Clipboard*) terminal bash -c "omarchy-cmd-share clipboard" ;;
   *File*) terminal bash -c "omarchy-cmd-share file" ;;
   *Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
   *) back_to show_trigger_menu ;;
@@ -154,7 +154,12 @@ show_style_menu() {
 }
 
 show_theme_menu() {
-  omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
+  theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
+  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
+    back_to show_style_menu
+  else
+    omarchy-theme-set "$theme"
+  fi
 }
 
 show_font_menu() {
@@ -173,9 +178,15 @@ show_setup_menu() {
   options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) omarchy-launch-audio ;;
-  *Wifi*) omarchy-launch-wifi ;;
-  *Bluetooth*) omarchy-launch-bluetooth ;;
+  *Audio*) xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix ;;
+  *Wifi*)
+    rfkill unblock wifi
+    omarchy-launch-wifi
+    ;;
+  *Bluetooth*)
+    rfkill unblock bluetooth
+    blueberry
+    ;;
   *Power*) show_setup_power_menu ;;
   *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
   *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
@@ -252,7 +263,7 @@ show_install_editor_menu() {
   case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) present_terminal omarchy-install-vscode ;;
   *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;;
+  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
   *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
@@ -276,26 +287,24 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "  Dictation [AUR]\n󱚤  Claude Code\n󱚤  Copilot CLI [AUR]\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
-  *Dictation*) present_terminal "echo 'Installing Hyprwhspr from AUR...'; yay -S --noconfirm hyprwhspr && hyprwhspr setup" ;;
+  case $(menu "Install" "󱚤  Claude Code\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
   *Claude*) install "Claude Code" "claude-code" ;;
-  *Copilot*) aur_install "Copilot CLI" "github-copilot-cli" ;;
   *Cursor*) install "Cursor CLI" "cursor-cli" ;;
+  *OpenAI*) install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
-  *OpenAI*) install "OpenAI Codex" "openai-codex" ;;
   *Studio*) install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
+  *opencode*) install "opencode" "opencode" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
-  *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;
   esac
 }
@@ -303,19 +312,18 @@ show_install_gaming_menu() {
 show_install_style_menu() {
   case $(menu "Install" "󰸌  Theme\n  Background\n  Font") in
   *Theme*) present_terminal omarchy-theme-install ;;
-  *Background*) omarchy-theme-bg-install ;;
+  *Background*) nautilus ~/.config/omarchy/current/theme/backgrounds ;;
   *Font*) show_install_font_menu ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_font_menu() {
-  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--width 350") in
+  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono" "--width 350") in
   *Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
   *Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
   *Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
   *Bistream*) install_font "Bistream Vera Code" "ttf-bitstream-vera-mono-nerd" "BitstromWera Nerd Font" ;;
-  *Iosevka*) install_font "Iosevka" "ttf-iosevka-nerd" "Iosevka Nerd Font Mono" ;;
   *) show_install_menu ;;
   esac
 }
@@ -366,11 +374,10 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
   *Package*) terminal omarchy-pkg-remove ;;
   *Web*) present_terminal omarchy-webapp-remove ;;
   *TUI*) present_terminal omarchy-tui-remove ;;
-  *Development*) show_remove_development_menu ;;
   *Theme*) present_terminal omarchy-theme-remove ;;
   *Windows*) present_terminal "omarchy-windows-vm remove" ;;
   *Fingerprint*) present_terminal "omarchy-setup-fingerprint --remove" ;;
@@ -379,54 +386,9 @@ show_remove_menu() {
   esac
 }
 
-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
-  *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
-  *JavaScript*) show_remove_javascript_menu ;;
-  *Go*) present_terminal "omarchy-remove-dev-env go" ;;
-  *PHP*) show_remove_php_menu ;;
-  *Python*) present_terminal "omarchy-remove-dev-env python" ;;
-  *Elixir*) show_remove_elixir_menu ;;
-  *Zig*) present_terminal "omarchy-remove-dev-env zig" ;;
-  *Rust*) present_terminal "omarchy-remove-dev-env rust" ;;
-  *Java*) present_terminal "omarchy-remove-dev-env java" ;;
-  *NET*) present_terminal "omarchy-remove-dev-env dotnet" ;;
-  *OCaml*) present_terminal "omarchy-remove-dev-env ocaml" ;;
-  *Clojure*) present_terminal "omarchy-remove-dev-env clojure" ;;
-  *) show_remove_menu ;;
-  esac
-}
-
-show_remove_javascript_menu() {
-  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" ;;
-  *) show_remove_development_menu ;;
-  esac
-}
-
-show_remove_php_menu() {
-  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" ;;
-  *) show_remove_development_menu ;;
-  esac
-}
-
-show_remove_elixir_menu() {
-  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 ;;
-  esac
-}
-
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n󰔫  Channel\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
   *Omarchy*) present_terminal omarchy-update ;;
-  *Channel*) show_update_channel_menu ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
@@ -439,14 +401,6 @@ show_update_menu() {
   esac
 }
 
-show_update_channel_menu() {
-  case $(menu "Update channel" "🟢 Stable\n🟡 Edge\n🔴 Dev") in
-  *Stable*) present_terminal "omarchy-channel-set stable" ;;
-  *Edge*) present_terminal "omarchy-channel-set edge" ;;
-  *Dev*) present_terminal "omarchy-channel-set dev" ;;
-  *) show_update_menu ;;
-  esac
-}
 show_update_process_menu() {
   case $(menu "Restart" "  Hypridle\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
   *Hypridle*) omarchy-restart-hypridle ;;
@@ -490,11 +444,12 @@ show_update_password_menu() {
 }
 
 show_system_menu() {
-  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰜉  Restart\n󰐥  Shutdown") in
+  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n󰜉  Restart\n󰐥  Shutdown") in
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
-  *Restart*) omarchy-cmd-reboot ;;
-  *Shutdown*) omarchy-cmd-shutdown ;;
+  *Suspend*) systemctl suspend ;;
+  *Restart*) omarchy-state clear re*-required && systemctl reboot --no-wall ;;
+  *Shutdown*) omarchy-state clear re*-required && systemctl poweroff --no-wall ;;
   *) back_to show_main_menu ;;
   esac
 }
@@ -523,10 +478,6 @@ go_to_menu() {
   esac
 }
 
-# Allow user extensions and overrides
-USER_EXTENSIONS="$HOME/.config/omarchy/extensions/menu.sh"
-[[ -f $USER_EXTENSIONS ]] && source "$USER_EXTENSIONS"
-
 if [[ -n "$1" ]]; then
   BACK_TO_EXIT=true
   go_to_menu "$1"

bin/omarchy-menu-keybindings

@@ -89,7 +89,6 @@ dynamic_bindings() {
     jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' |
     sed -r \
       -e 's/null//' \
-      -e 's,~/.local/share/omarchy/bin/,,' \
       -e 's,uwsm app -- ,,' \
       -e 's,uwsm-app -- ,,' \
       -e 's/@0//' \
@@ -212,26 +211,18 @@ prioritize_entries() {
   cut -f2-
 }
 
-output_keybindings() {
-  build_keymap_cache
+monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
+menu_height=$((monitor_height * 40 / 100))
 
-  {
-    dynamic_bindings
-    static_bindings
-  } |
-    sort -u |
-    parse_keycodes |
-    parse_bindings |
-    prioritize_entries
-}
+build_keymap_cache
 
-if [[ "$1" == "--print" || "$1" == "-p" ]]; then
-  output_keybindings
-else
-  monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
-  menu_height=$((monitor_height * 40 / 100))
-
-  output_keybindings |
-    walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
-fi
+{
+  dynamic_bindings
+  static_bindings
+} |
+  sort -u |
+  parse_keycodes |
+  parse_bindings |
+  prioritize_entries |
+  walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
 

bin/omarchy-migrate

@@ -8,7 +8,7 @@ mkdir -p "$STATE_DIR"
 mkdir -p "$STATE_DIR/skipped"
 
 # Run any pending migrations
-for file in ~/.local/share/omarchy/migrations/*.sh; do
+for file in /usr/share/omarchy/migrations/*.sh; do
   filename=$(basename "$file")
 
   if [[ ! -f "$STATE_DIR/$filename" && ! -f "$STATE_DIR/skipped/$filename" ]]; then

bin/omarchy-pkg-ignored

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+IGNORED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.ignored"
+
+if [[ -f $IGNORED_PACKAGES_FILE ]]; then
+  tr '\r\n' ',' <"$IGNORED_PACKAGES_FILE" | sed 's/,$//'
+fi

bin/omarchy-pkg-pinned

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PINNED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.pinned"
+
+if [[ -f $PINNED_PACKAGES_FILE ]]; then
+  tr '\r\n' ',' <"$PINNED_PACKAGES_FILE" | sed 's/,$//'
+fi

bin/omarchy-refresh-applications

@@ -2,16 +2,12 @@
 
 # Copy and sync icon files
 mkdir -p ~/.local/share/icons/hicolor/48x48/apps/
-cp ~/.local/share/omarchy/applications/icons/*.png ~/.local/share/icons/hicolor/48x48/apps/
+cp /usr/share/omarchy/applications/icons/*.png ~/.local/share/icons/hicolor/48x48/apps/
 gtk-update-icon-cache ~/.local/share/icons/hicolor &>/dev/null
 
 # Copy .desktop declarations
 mkdir -p ~/.local/share/applications
-cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
-cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
-
-# Refresh the webapps
-bash $OMARCHY_PATH/install/packaging/icons.sh
-bash $OMARCHY_PATH/install/packaging/webapps.sh
+cp /usr/share/omarchy/applications/*.desktop ~/.local/share/applications/
+cp /usr/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
 
 update-desktop-database ~/.local/share/applications

bin/omarchy-refresh-chromium

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-CONFIG_FILE="$HOME/.config/chromium-flags.conf"
-INSTALL_GOOGLE_ACCOUNTS=false
-
-# Check if google accounts were installed
-if [[ -f "$CONFIG_FILE" ]] && \
-  grep -q -- "--oauth2-client-id" "$CONFIG_FILE" && \
-  grep -q -- "--oauth2-client-secret" "$CONFIG_FILE"; then
-  INSTALL_GOOGLE_ACCOUNTS=true
-fi
-
-# Refresh the Chromium configuration
-omarchy-refresh-config chromium-flags.conf
-
-# Re-install Google accounts if previously configured
-if [[ "$INSTALL_GOOGLE_ACCOUNTS" == true ]]; then
-  omarchy-install-chromium-google-account
-fi

bin/omarchy-refresh-config

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This script deploys ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z
+# This script deploys /etc/skel/.config/X/Y/Z -> ~/.config/X/Y/Z
 config_file=$1
 
 if [[ -z "$config_file" ]]; then
@@ -8,16 +8,16 @@ if [[ -z "$config_file" ]]; then
   Usage: $0 [config_file]
 
   Must provide a file path from the .config directory to be refreshed.
-  To copy ~/.local/share/omarchy/config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
-    
-    $0 hypr/hyprlock.conf     
+  To copy /etc/skel/.config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
+
+    $0 hypr/hyprlock.conf
 USAGE
   exit 1
 fi
 
 # Backup the destination file (with timestamp) to avoid clobbering (Ex: hyprlock.conf.bak.1753817951)
 user_config_file="${HOME}/.config/$config_file"
-default_config_file="${HOME}/.local/share/omarchy/config/$config_file"
+default_config_file="/etc/skel/.config/$config_file"
 backup_config_file="$user_config_file.bak.$(date +%s)"
 
 if [[ -f "$user_config_file" ]]; then

bin/omarchy-refresh-hyprland

@@ -2,6 +2,6 @@
 
 omarchy-refresh-config hypr/autostart.conf
 omarchy-refresh-config hypr/bindings.conf
+omarchy-refresh-config hypr/envs.conf
 omarchy-refresh-config hypr/input.conf
-omarchy-refresh-config hypr/looknfeel.conf
 omarchy-refresh-config hypr/hyprland.conf

bin/omarchy-refresh-limine

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ -f /boot/EFI/Linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi ]]; then
+if [[ -f /boot/EFI/linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/linux/$(cat /etc/machine-id)_linux.efi ]]; then
   echo "Cleanup extra UKI"
   sudo rm -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi
 fi

bin/omarchy-refresh-pacman

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Take backup of existing files
-sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak
-sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
-
-sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
-
-if [[ $1 == "edge" ]]; then
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf
-  echo "Setting channel to edge"
-else
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf
-  echo "Setting channel to stable"
-fi
-
-echo
-
-# Reset all package DBs and then update
-sudo pacman -Syyu --noconfirm

bin/omarchy-refresh-pacman-mirrorlist

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo cp -f /usr/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist

bin/omarchy-refresh-plymouth

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
+sudo cp /usr/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
 sudo plymouth-set-default-theme omarchy
 
 if command -v limine-mkinitcpio &>/dev/null; then

bin/omarchy-refresh-walker

@@ -1,10 +1,5 @@
 #!/bin/bash
 
-# Ensure walker is set to autostart
-mkdir -p ~/.config/autostart/
-cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
-systemctl --user daemon-reload
-
 omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml

bin/omarchy-reinstall

@@ -10,19 +10,15 @@ fi
 echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All changes to configs will be lost.\n"
 
 if gum confirm "Are you sure you want to reinstall and lose all config changes?"; then
-  echo "Resetting Omarchy repository"
-  git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
-  rm -rf $OMARCHY_PATH
-  mv ~/.local/share/omarchy-new $OMARCHY_PATH
+  echo "Reinstalling Omarchy Package"
+  sudo pacman -Syu --noconfirm --needed omarchy
 
   echo "Reinstalling missing Omarchy packages"
   mapfile -t packages < <(grep -v '^#' "$OMARCHY_PATH/install/omarchy-base.packages" | grep -v '^$')
   sudo pacman -Syu --noconfirm --needed "${packages[@]}"
 
   echo "Resetting all Omarchy configs"
-  cp -R ~/.local/share/omarchy/config/* ~/.config/
-  cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
-  echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null
+  cp -R /etc/skel/.config/* ~/.config/
 
   $(bash $OMARCHY_PATH/install/config/theme.sh)
   $(bash $OMARCHY_PATH/install/config/git.sh)

bin/omarchy-remove-dev-env

@@ -1,102 +0,0 @@
-#!/bin/bash
-
-if [[ -z "$1" ]]; then
-  echo "Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure>" >&2
-  exit 1
-fi
-
-remove_php() {
-  sudo pacman -Rns --noconfirm php composer php-sqlite xdebug 2>/dev/null || true
-}
-
-case "$1" in
-ruby)
-  echo -e "Removing Ruby...\n"
-  mise uninstall ruby --all
-  mise rm -g ruby
-  rm -f ~/.gemrc
-  ;;
-node)
-  echo -e "Removing Node.js...\n"
-  mise uninstall node --all
-  mise rm -g node
-  ;;
-bun)
-  echo -e "Removing Bun...\n"
-  mise uninstall bun --all
-  mise rm -g bun
-  ;;
-deno)
-  echo -e "Removing Deno...\n"
-  mise uninstall deno --all
-  mise rm -g deno
-  ;;
-go)
-  echo -e "Removing Go...\n"
-  mise uninstall go --all
-  mise rm -g go
-  ;;
-php)
-  echo -e "Removing PHP...\n"
-  remove_php
-  ;;
-laravel)
-  echo -e "Removing Laravel...\n"
-  composer global remove laravel/installer 2>/dev/null || true
-  ;;
-symfony)
-  echo -e "Removing Symfony CLI...\n"
-  sudo pacman -Rns --noconfirm symfony-cli 2>/dev/null || true
-  ;;
-python)
-  echo -e "Removing Python...\n"
-  mise uninstall python --all
-  mise rm -g python
-  rm -rf ~/.local/bin/uv ~/.local/bin/uvx ~/.cargo/bin/uv 2>/dev/null || true
-  ;;
-elixir|phoenix)
-  echo -e "Removing Elixir/Erlang...\n"
-  mise uninstall elixir --all
-  mise uninstall erlang --all
-  mise rm -g elixir
-  mise rm -g erlang
-  ;;
-zig)
-  echo -e "Removing Zig...\n"
-  mise uninstall zig --all
-  mise uninstall zls --all
-  mise rm -g zig
-  mise rm -g zls
-  ;;
-rust)
-  echo -e "Removing Rust...\n"
-  rustup self uninstall -y 2>/dev/null || true
-  ;;
-java)
-  echo -e "Removing Java...\n"
-  mise uninstall java --all
-  mise rm -g java
-  ;;
-dotnet)
-  echo -e "Removing .NET...\n"
-  mise uninstall dotnet --all
-  mise rm -g dotnet
-  ;;
-ocaml)
-  echo -e "Removing OCaml...\n"
-  opam switch remove default -y 2>/dev/null || true
-  rm -rf ~/.opam 2>/dev/null || true
-  sudo rm -f /usr/local/bin/opam 2>/dev/null || true
-  ;;
-clojure)
-  echo -e "Removing Clojure...\n"
-  mise uninstall clojure --all
-  mise rm -g clojure
-  ;;
-*)
-  echo "Unknown environment: $1"
-  exit 1
-  ;;
-esac
-
-echo -e "\nDone!"

bin/omarchy-restart-walker

@@ -1,22 +1,33 @@
 #!/bin/bash
 
-restart_services() {
-  if systemctl --user is-enabled elephant.service &>/dev/null; then
-    systemctl --user restart elephant.service
-  fi
-
-  if systemctl --user is-enabled app-walker@autostart.service &>/dev/null; then
-    systemctl --user restart app-walker@autostart.service
-  else
-    echo -e "\e[31mUnable to restart Walker -- RESTART MANUALLY\e[0m"
-  fi
-}
-
+# Detect if we're running as root (from pacman hook)
 if [[ $EUID -eq 0 ]]; then
-  SCRIPT_OWNER=$(stat -c '%U' "$0")
-  USER_UID=$(id -u "$SCRIPT_OWNER")
-  systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
-    bash -c "$(declare -f restart_services); restart_services"
+  # Find all logged-in users running Hyprland
+  for user_runtime in /run/user/*/; do
+    USER_UID=$(basename "$user_runtime")
+    USER_NAME=$(id -un "$USER_UID" 2>/dev/null)
+
+    # Skip if we can't resolve the username or if no Hyprland session
+    [[ -z "$USER_NAME" ]] && continue
+    [[ ! -S "${user_runtime}hypr/"*"/.socket.sock" ]] && continue
+
+    # Kill existing processes for this user
+    pkill -u "$USER_NAME" elephant
+    pkill -u "$USER_NAME" walker
+
+    # Restart services as this user
+    systemd-run --uid="$USER_NAME" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
+      bash -c "
+        setsid uwsm-app -- elephant &
+        setsid uwsm-app -- walker --gapplication-service &
+      "
+  done
 else
-  restart_services
+  # Running as user directly
+  pkill elephant
+  pkill walker
+
+  setsid uwsm-app -- elephant &
+  wait 2
+  setsid uwsm-app -- walker --gapplication-service &
 fi

bin/omarchy-set-user

@@ -0,0 +1,3 @@
+#!/bin/bash
+# Track active Omarchy user for package migrations
+echo "$USER:$HOME:$XDG_RUNTIME_DIR" > /tmp/omarchy-active-user

bin/omarchy-setup-fingerprint

@@ -51,16 +51,6 @@ EOF
   fi
 }
 
-add_hyprlock_fingerprint_icon() {
-  print_info "Adding fingerprint icon to hyprlock placeholder text..."
-  sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
-}
-
-remove_hyprlock_fingerprint_icon() {
-  print_info "Removing fingerprint icon from hyprlock placeholder text..."
-  sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
-}
-
 remove_pam_config() {
   # Remove from sudo
   if grep -q pam_fprintd.so /etc/pam.d/sudo; then
@@ -81,9 +71,6 @@ if [[ "--remove" == "$1" ]]; then
   # Remove PAM configuration
   remove_pam_config
 
-  # Remove fingerprint icon from hyprlock placeholder text
-  remove_hyprlock_fingerprint_icon
-
   # Uninstall packages
   print_info "Removing fingerprint packages..."
   sudo pacman -Rns --noconfirm fprintd
@@ -103,9 +90,6 @@ else
   # Configure PAM
   setup_pam_config
 
-  # Add fingerprint icon to hyprlock placeholder text
-  add_hyprlock_fingerprint_icon
-
   # Enroll first fingerprint
   print_success "\nLet's setup your right index finger as the first fingerprint."
   print_info "Keep moving the finger around on sensor until the process completes.\n"

bin/omarchy-show-logo

@@ -2,6 +2,6 @@
 
 clear
 echo -e "\033[32m"
-cat <~/.local/share/omarchy/logo.txt
+cat < /usr/share/omarchy/logo.txt
 echo -e "\033[0m"
 echo

bin/omarchy-theme-bg-install

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-CURRENT_THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name")
-THEME_USER_BACKGROUNDS="$HOME/.config/omarchy/backgrounds/$CURRENT_THEME_NAME"
-
-mkdir -p "$THEME_USER_BACKGROUNDS"
-nautilus "$THEME_USER_BACKGROUNDS"

bin/omarchy-theme-bg-next

@@ -2,12 +2,10 @@
 
 # Cycles through the background images available
 
-THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name" 2>/dev/null)
-THEME_BACKGROUNDS_PATH="$HOME/.config/omarchy/current/theme/backgrounds/"
-USER_BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME/"
+BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-mapfile -d '' -t BACKGROUNDS < <(find -L "$USER_BACKGROUNDS_PATH" "$THEME_BACKGROUNDS_PATH" -maxdepth 1 -type f -print0 2>/dev/null | sort -z)
+mapfile -d '' -t BACKGROUNDS < <(find -L "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
 TOTAL=${#BACKGROUNDS[@]}
 
 if [[ $TOTAL -eq 0 ]]; then

bin/omarchy-theme-current

@@ -1,9 +1,3 @@
 #!/bin/bash
 
-THEME_NAME_PATH="$HOME/.config/omarchy/current/theme.name"
-
-if [[ -f $THEME_NAME_PATH ]]; then
-  cat $THEME_NAME_PATH | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
-else
-  echo "Unknown"
-fi
+basename "$(realpath "$HOME/.config/omarchy/current/theme")" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'

bin/omarchy-theme-list

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-{
-  find ~/.config/omarchy/themes/ -mindepth 1 -maxdepth 1 \( -type d -o -type l \) -printf '%f\n'
-  find "$OMARCHY_PATH/themes/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'
-} | sort -u | while read -r name; do
-  echo "$name" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'
+find ~/.config/omarchy/themes/ -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | sort | while read -r path; do
+  echo "$(basename "$path" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g')"
 done

bin/omarchy-theme-next

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+THEMES_DIR="$HOME/.config/omarchy/themes/"
+CURRENT_THEME_LINK="$HOME/.config/omarchy/current/theme"
+
+THEMES=($(find "$THEMES_DIR" -mindepth 1 -maxdepth 1 | sort))
+TOTAL=${#THEMES[@]}
+
+# Get current theme from symlink
+if [[ -L "$CURRENT_THEME_LINK" ]]; then
+  CURRENT_THEME=$(realpath "$CURRENT_THEME_LINK")
+else
+  # Default to first theme if no symlink exists
+  CURRENT_THEME=$(realpath "${THEMES[0]}")
+fi
+
+# Find current theme index
+INDEX=0
+for i in "${!THEMES[@]}"; do
+  THEMES[$i]=$(realpath "${THEMES[$i]}")
+
+  if [[ "${THEMES[$i]}" == "$CURRENT_THEME" ]]; then
+    INDEX=$i
+    break
+  fi
+done
+
+# Get next theme (wrap around)
+NEXT_INDEX=$(((INDEX + 1) % TOTAL))
+NEW_THEME=${THEMES[$NEXT_INDEX]}
+NEW_THEME_NAME=$(basename "$NEW_THEME")
+
+omarchy-theme-set $NEW_THEME_NAME
+notify-send "Theme changed to $NEW_THEME_NAME" -t 2000

bin/omarchy-theme-remove

@@ -7,7 +7,7 @@ if [ -z "$1" ]; then
   mapfile -t extra_themes < <(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')
 
   if [[ ${#extra_themes[@]} -gt 0 ]]; then
-    THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
+    THEME_NAME=$(gum choose --header="Remove extra theme" "${extra_themes[@]}")
   else
     echo "No extra themes installed."
     exit 1
@@ -31,5 +31,10 @@ if [ ! -d "$THEME_PATH" ]; then
   exit 1
 fi
 
+# Move to the next theme if the current theme is the one being removed
+if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
+  omarchy-theme-next
+fi
+
 # Now remove the theme directory for THEME_NAME
 rm -rf "$THEME_PATH"

bin/omarchy-theme-set

@@ -1,42 +1,24 @@
 #!/bin/bash
 
-if [[ -z $1 ]]; then
+if [[ -z $1 && $1 != "CNCLD" ]]; then
   echo "Usage: omarchy-theme-set <theme-name>"
   exit 1
 fi
 
-CURRENT_THEME_PATH="$HOME/.config/omarchy/current/theme"
-NEXT_THEME_PATH="$HOME/.config/omarchy/current/next-theme"
-USER_THEMES_PATH="$HOME/.config/omarchy/themes"
-OMARCHY_THEMES_PATH="$OMARCHY_PATH/themes"
+THEMES_DIR="$HOME/.config/omarchy/themes/"
+CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
 
 THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
+THEME_PATH="$THEMES_DIR/$THEME_NAME"
 
-if [[ -d "$USER_THEMES_PATH/$THEME_NAME" ]]; then
-  THEME_PATH="$USER_THEMES_PATH/$THEME_NAME"
-elif [[ -d "$OMARCHY_THEMES_PATH/$THEME_NAME" ]]; then
-  THEME_PATH="$OMARCHY_THEMES_PATH/$THEME_NAME"
-else
-  echo "Theme '$THEME_NAME' does not exist"
+# Check if the theme entered exists
+if [[ ! -d "$THEME_PATH" ]]; then
+  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR"
   exit 1
 fi
 
-# Setup clean next theme directory (for atomic theme config swapping)
-rm -rf "$NEXT_THEME_PATH"
-mkdir -p "$NEXT_THEME_PATH"
-
-# Copy static configs
-cp -r "$THEME_PATH/"* "$NEXT_THEME_PATH/" 2>/dev/null
-
-# Generate dynamic configs
-omarchy-theme-set-templates
-
-# Swap next theme in as current
-rm -rf "$CURRENT_THEME_PATH"
-mv "$NEXT_THEME_PATH" "$CURRENT_THEME_PATH"
-
-# Store theme name for reference
-echo "$THEME_NAME" > "$HOME/.config/omarchy/current/theme.name"
+# Update theme symlinks
+ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
 # Change background with theme
 omarchy-theme-bg-next
@@ -46,17 +28,15 @@ if pgrep -x waybar >/dev/null; then
   omarchy-restart-waybar
 fi
 omarchy-restart-swayosd
-omarchy-restart-terminal
 hyprctl reload
 pkill -SIGUSR2 btop
-# pkill -SIGUSR2 opencode
 makoctl reload
 
-# Change app-specific themes
+# Change gnome, browser, vscode, cursor themes
+omarchy-theme-set-terminal
 omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode
-omarchy-theme-set-vscodium
 omarchy-theme-set-cursor
 omarchy-theme-set-obsidian
 

bin/omarchy-theme-set-browser

@@ -23,6 +23,11 @@ if omarchy-cmd-present chromium || omarchy-cmd-present helium-browser || omarchy
     fi
   fi
 
+  if omarchy-cmd-present helium-browser; then
+    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
+    helium-browser --no-startup-window --refresh-platform-policy
+  fi
+
   if omarchy-cmd-present brave; then
     echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/brave/policies/managed/color.json" >/dev/null
     brave --refresh-platform-policy --no-startup-window

bin/omarchy-theme-set-cursor

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # Call the VSCode theme setter with Cursor-specific parameters
-omarchy-theme-set-vscode cursor "$HOME/.config/Cursor/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-cursor-theme-changes"
+omarchy-theme-set-vscode cursor "$HOME/.config/Cursor/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-cursor-theme-changes" Cursor

bin/omarchy-theme-set-obsidian

@@ -391,7 +391,7 @@ extract_theme_data() {
   readarray -t color_slots < <(fill_color_slots "${unique_colors[@]}" | tr ' ' '\n')
 
   # Extract fonts
-  local monospace_font="JetBrainsMono Nerd Font"
+  local monospace_font="CaskaydiaMono Nerd Font"
   local ui_font="Liberation Sans"
 
   if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then

bin/omarchy-theme-set-templates

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-TEMPLATES_DIR="$OMARCHY_PATH/default/themed"
-NEXT_THEME_DIR="$HOME/.config/omarchy/current/next-theme"
-COLORS_FILE="$NEXT_THEME_DIR/colors.toml"
-
-# Convert hex color to decimal RGB (e.g., "#1e1e2e" -> "30,30,46")
-hex_to_rgb() {
-  local hex="${1#\#}"
-  printf "%d,%d,%d" "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
-}
-
-# 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 '"')
-    if [[ $value =~ ^# ]]; then
-      rgb=$(hex_to_rgb "$value")
-      echo "s|{{ ${key}_rgb }}|${rgb}|g" >> "$sed_script"
-    fi
-  done < "$COLORS_FILE"
-
-  shopt -s nullglob
-  for tpl in "$TEMPLATES_DIR"/*.tpl; do
-    filename=$(basename "$tpl" .tpl)
-    output_path="$NEXT_THEME_DIR/$filename"
-
-    # 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"
-    fi
-  done
-
-  rm "$sed_script"
-fi

bin/omarchy-theme-set-terminal

@@ -4,10 +4,5 @@ if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
   touch ~/.config/alacritty/alacritty.toml
 fi
 
-if pgrep -x kitty; then
-  killall -SIGUSR1 kitty
-fi
-
-if pgrep -x ghostty; then
-  killall -SIGUSR2 ghostty
-fi
+killall -SIGUSR1 kitty
+killall -SIGUSR2 ghostty

bin/omarchy-theme-set-vscode

@@ -7,6 +7,8 @@
 EDITOR_CMD="${1:-code}"
 SETTINGS_PATH="${2:-$HOME/.config/Code/User/settings.json}"
 SKIP_FLAG="${3:-$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes}"
+EDITOR_NAME="${4:-VS Code}"
+
 VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
 
 if omarchy-cmd-present "$EDITOR_CMD" && [[ ! -f "$SKIP_FLAG" ]]; then
@@ -14,7 +16,7 @@ if omarchy-cmd-present "$EDITOR_CMD" && [[ ! -f "$SKIP_FLAG" ]]; then
     theme_name=$(jq -r '.name' "$VS_CODE_THEME")
     extension=$(jq -r '.extension' "$VS_CODE_THEME")
 
-    # Install theme extension
+    # Install $EDITOR_NAME theme extension
     if [[ -n "$extension" ]] && ! "$EDITOR_CMD" --list-extensions | grep -Fxq "$extension"; then
       "$EDITOR_CMD" --install-extension "$extension" >/dev/null
     fi
@@ -37,7 +39,7 @@ if omarchy-cmd-present "$EDITOR_CMD" && [[ ! -f "$SKIP_FLAG" ]]; then
       "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
       "$SETTINGS_PATH"
   else
-    # Remove theme from settings.json when the theme doesn't have editor support
+    # Remove theme from settings.json when the theme doesn't have $EDITOR_NAME support
     if [[ -f "$SETTINGS_PATH" ]]; then
       sed -i --follow-symlinks -E 's/\"workbench\.colorTheme\"[[:space:]]*:[^,}]*,?//' "$SETTINGS_PATH"
     fi

bin/omarchy-theme-set-vscodium

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Call the VSCode theme setter with VSCodium-specific parameters
-omarchy-theme-set-vscode codium "$HOME/.config/VSCodium/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-codium-theme-changes"

bin/omarchy-tui-install

@@ -1,13 +1,11 @@
 #!/bin/bash
 
-set -e
-
 if [ "$#" -ne 4 ]; then
   echo -e "\e[32mLet's create a TUI shortcut you can start with the app launcher.\n\e[0m"
   APP_NAME=$(gum input --prompt "Name> " --placeholder "My TUI")
   APP_EXEC=$(gum input --prompt "Launch Command> " --placeholder "lazydocker or bash -c 'dust; read -n 1 -s'")
   WINDOW_STYLE=$(gum choose --header "Window style" float tile)
-  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG or SVG!)")
+  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
 else
   APP_NAME="$1"
   APP_EXEC="$2"
@@ -45,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=xdg-terminal-exec --app-id=$APP_CLASS -e $APP_EXEC
+Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
 Icon=$ICON_PATH

bin/omarchy-tui-remove

@@ -1,14 +1,12 @@
 #!/bin/bash
 
-set -e
-
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 
 if [ "$#" -eq 0 ]; then
   # Find all TUIs
   while IFS= read -r -d '' file; do
-    if grep -qE '^Exec=.*(\$TERMINAL|xdg-terminal-exec).*-e' "$file"; then
+    if grep -q '^Exec=.*$TERMINAL.*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
     fi
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)

bin/omarchy-update

@@ -4,8 +4,7 @@ set -e
 
 trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR
 
-if [[ $1 == "-y" ]] || omarchy-update-confirm; then
-  omarchy-snapshot create || [ $? -eq 127 ]
-  omarchy-update-git
-  omarchy-update-perform
-fi
+omarchy-update-confirm
+omarchy-snapshot create || [ $? -eq 127 ]
+omarchy-update-git
+omarchy-update-perform

bin/omarchy-update-confirm

@@ -1,16 +1,14 @@
 #!/bin/bash
 
+set -e
+
 gum style --border normal --border-foreground 6 --padding "1 2" \
-  "Ready to update?" \
+  "Ready to update Omarchy?" \
   "" \
   "• You cannot stop the update once you start!" \
-  "• Make sure you're connected to power or have a full battery" \
-  "" \
-  "What's new: https://github.com/basecamp/omarchy/releases"
-
-echo
+  "• Make sure you're connected to power or have a full battery"
 
 if ! gum confirm "Continue with update?"; then
   echo "Update cancelled"
-  exit 1
+  exit 0
 fi

bin/omarchy-update-git

@@ -5,4 +5,4 @@ set -e
 echo -e "\e[32mUpdate Omarchy\e[0m"
 
 git -C $OMARCHY_PATH pull --autostash
-git -C $OMARCHY_PATH --no-pager diff --check || git -C $OMARCHY_PATH reset --merge
+git -C $OMARCHY_PATH diff --check || git -C $OMARCHY_PATH reset --merge

bin/omarchy-update-keyring

@@ -5,8 +5,6 @@ if omarchy-pkg-missing omarchy-keyring || ! sudo pacman-key --list-keys 40DFB630
   sudo pacman-key --recv-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571 --keyserver keys.openpgp.org
   sudo pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571
 
-  # This is generally not a good idea, but this is a special case because we're going to be updating
-  # the full set of packages in omarchy-update-system-pkgs right after this (and it needs latest keyring)!
   sudo pacman -Sy
   omarchy-pkg-add omarchy-keyring
 

bin/omarchy-update-perform

@@ -2,10 +2,6 @@
 
 set -e
 
-# Ensure screensaver/sleep doesn't set in during updates
-hyprctl dispatch tagwindow +noidle &> /dev/null || true
-
-# Perform all update steps
 omarchy-update-time
 omarchy-update-keyring
 omarchy-update-available-reset
@@ -13,6 +9,3 @@ omarchy-update-system-pkgs
 omarchy-migrate
 omarchy-hook post-update
 omarchy-update-restart
-
-# Re-enable screensaver/sleep after updates
-hyprctl dispatch tagwindow -- -noidle &> /dev/null || true

bin/omarchy-update-restart

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
-  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-cmd-reboot
+  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-state clear re*-required && sudo reboot now
 
 elif [ -f "$HOME/.local/state/omarchy/reboot-required" ]; then
-  gum confirm "Updates require reboot. Ready?" && omarchy-cmd-reboot
+  gum confirm "Updates require reboot. Ready?" && omarchy-state clear re*-required && sudo reboot now
 fi
 
 for file in "$HOME"/.local/state/omarchy/restart-*-required; do

bin/omarchy-update-system-pkgs

@@ -2,14 +2,20 @@
 
 set -e
 
+# Used in package emergencies if a bad package has been pushed and we can't revoke.
+# Requires manually installing the good package using sudo pacman -U <url>
+ignored_packages=$(omarchy-pkg-ignored)
+
 echo -e "\e[32m\nUpdate system packages\e[0m"
-sudo pacman -Syyu --noconfirm
+[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
+sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
 
 # 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
+    [[ -n $ignored_packages ]] && echo "yay -Sua --noconfirm  --ignore \"$ignored_packages\""
+    yay -Sua --noconfirm --ignore "$ignored_packages"
     echo
   else
     echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"

bin/omarchy-update-without-idle

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# No-op now that omarchy-update-perform is responsible for idle management.
-# But this file can't be removed since it was referenced in old omarchy-update files,
-# which would fail if this file is missing.

bin/omarchy-version-channel

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if grep -q "https://stable-mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
-  mirror="stable"
-elif grep -q "https://mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
-  mirror="edge"
-else
-  mirror="unknown"
-fi
-
-if grep -q "https://pkgs.omarchy.org/stable/" /etc/pacman.conf; then
-  pkgs="stable"
-elif grep -q "https://pkgs.omarchy.org/edge/" /etc/pacman.conf; then
-  pkgs="edge"
-else
-  pkgs="unknown"
-fi
-
-if [[ $mirror == $pkgs ]]; then
-  echo $mirror
-else
-  echo "$mirror / $pkgs"
-fi

bin/omarchy-version-pkgs

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-date -d "$(grep upgraded /var/log/pacman.log | tail -1 | sed -E 's/\[([^]]+)\].*/\1/')" "+%A, %B %d %Y at %H:%M"

bin/omarchy-webapp-install

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 if [ "$#" -lt 3 ]; then
   echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
   APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")

bin/omarchy-webapp-remove

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 

bin/omarchy-windows-vm

@@ -327,7 +327,7 @@ To stop: omarchy-windows-vm stop"
     "$LIFECYCLE"
 
   # Detect display scale from Hyprland
-  HYPR_SCALE=$(hyprctl monitors -j | jq -r '.[] | select (.focused == true) | .scale')
+  HYPR_SCALE=$(hyprctl monitors -j | jq -r '.[0].scale')
   SCALE_PERCENT=$(echo "$HYPR_SCALE" | awk '{print int($1 * 100)}')
 
   RDP_SCALE=""

boot.sh

@@ -3,15 +3,15 @@
 # Set install mode to online since boot.sh is used for curl installations
 export OMARCHY_ONLINE_INSTALL=true
 
-ansi_art='                 ▄▄▄                                                   
- ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
+ansi_art='                 ▄▄▄
+ ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
 ███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
 ███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
 ███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀ 
+ ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀
                                        ███   █▀                                  '
 
 clear
@@ -19,21 +19,4 @@ echo -e "\n$ansi_art\n"
 
 sudo pacman -Syu --noconfirm --needed git
 
-# Use custom repo if specified, otherwise default to basecamp/omarchy
-OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
-
-echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
-rm -rf ~/.local/share/omarchy/
-git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
-
-# 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 "\nInstallation starting..."
-source ~/.local/share/omarchy/install.sh
+# FIXME: Update behavior or remove

config/alacritty/alacritty.toml

@@ -4,9 +4,9 @@ general.import = [ "~/.config/omarchy/current/theme/alacritty.toml" ]
 TERM = "xterm-256color"
 
 [font]
-normal = { family = "JetBrainsMono Nerd Font", style = "Regular" }
-bold = { family = "JetBrainsMono Nerd Font", style = "Bold" }
-italic = { family = "JetBrainsMono Nerd Font", style = "Italic" }
+normal = { family = "CaskaydiaMono Nerd Font", style = "Regular" }
+bold = { family = "CaskaydiaMono Nerd Font", style = "Bold" }
+italic = { family = "CaskaydiaMono Nerd Font", style = "Italic" }
 size = 9
 
 [window]

config/brave-flags.conf

@@ -1,6 +1,5 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
---load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
 # Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957
 --disable-features=WaylandWpColorManagerV1

config/chromium-flags.conf

@@ -1,6 +1,6 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
---load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
+--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url
 # Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957
 --disable-features=WaylandWpColorManagerV1

config/fastfetch/config.jsonc

@@ -74,12 +74,6 @@
       "keyColor": "blue",
       "text": "branch=$(omarchy-version-branch); echo \"$branch\""
     },
-    {
-      "type": "command",
-      "key": "│ ├󰔫",
-      "keyColor": "blue",
-      "text": "channel=$(omarchy-version-channel); echo \"$channel\""
-    },
     {
       "type": "kernel",
       "key": "│ ├",
@@ -128,25 +122,19 @@
     "break",
     {
       "type": "custom",
-      "format": "\u001b[90m┌────────────────Age / Uptime / Update───────────────┐"
+      "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
     },
     {
       "type": "command",
       "key": "󱦟 OS Age",
       "keyColor": "magenta",
-      "text": "echo $(( ($(date +%s) - $(stat -c %W /)) / 86400 )) days"
+      "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
     },
     {
       "type": "uptime",
       "key": "󱫐 Uptime",
       "keyColor": "magenta"
     },
-    {
-      "type": "command",
-      "key": " Update",
-      "keyColor": "magenta",
-      "text": "updated=$(omarchy-version-pkgs); echo \"$updated\""
-    },
     {
       "type": "custom",
       "format": "\u001b[90m└────────────────────────────────────────────────────┘"

config/fontconfig/fonts.conf

@@ -24,7 +24,7 @@
       <string>monospace</string>
     </test>
     <edit name="family" mode="assign" binding="strong">
-      <string>JetBrainsMono Nerd Font</string>
+      <string>CaskaydiaMono Nerd Font</string>
     </edit>
   </match>
 

config/ghostty/config

@@ -2,7 +2,7 @@
 config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
 
 # Font
-font-family = "JetBrainsMono Nerd Font"
+font-family = "CaskaydiaMono Nerd Font"
 font-style = Regular
 font-size = 9
 
@@ -25,10 +25,3 @@ shell-integration-features = no-cursor,ssh-env
 # Keyboard bindings
 keybind = shift+insert=paste_from_clipboard
 keybind = control+insert=copy_to_clipboard
-keybind = super+control+shift+alt+arrow_down=resize_split:down,100
-keybind = super+control+shift+alt+arrow_up=resize_split:up,100
-keybind = super+control+shift+alt+arrow_left=resize_split:left,100
-keybind = super+control+shift+alt+arrow_right=resize_split:right,100
-
-# Slowdown mouse scrolling
-mouse-scroll-multiplier = 0.95

config/hypr/bindings.conf

@@ -1,20 +1,23 @@
 # Application bindings
-bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
+$terminal = uwsm-app -- xdg-terminal-exec
+$browser = omarchy-launch-browser
+
+bindd = SUPER, RETURN, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
-bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
-bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-browser --private
+bindd = SUPER SHIFT, B, Browser, exec, $browser
+bindd = SUPER SHIFT ALT, B, Browser (private), exec, $browser --private
 bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify
 bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
-bindd = SUPER SHIFT, D, Docker, exec, omarchy-launch-tui lazydocker
-bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus ^signal$ "uwsm-app -- signal-desktop"
-bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus ^obsidian$ "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
+bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop
+bindd = SUPER SHIFT, D, Docker, exec, $terminal -e lazydocker
+bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"
+bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus "^obsidian$" "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
 bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
 bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
 
 # If your web app url contains #, type it as ## to prevent hyprland treating it as a comment
 bindd = SUPER SHIFT, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
 bindd = SUPER SHIFT ALT, A, Grok, exec, omarchy-launch-webapp "https://grok.com"
-bindd = SUPER SHIFT CTRL, A, opencode, exec, omarchy-launch-opencode
 bindd = SUPER SHIFT, C, Calendar, exec, omarchy-launch-webapp "https://app.hey.com/calendar/weeks/"
 bindd = SUPER SHIFT, E, Email, exec, omarchy-launch-webapp "https://app.hey.com"
 bindd = SUPER SHIFT, Y, YouTube, exec, omarchy-launch-webapp "https://youtube.com/"

config/hypr/envs.conf

@@ -0,0 +1,2 @@
+# Extra env variables
+# env = MY_GLOBAL_ENV,setting

config/hypr/hypridle.conf

@@ -11,7 +11,7 @@ listener {
 }
 
 listener {
-    timeout = 150                      # 5min
+    timeout = 300                      # 5min
     on-timeout = loginctl lock-session # lock screen when timeout has passed
 }
 

config/hypr/hyprland.conf

@@ -1,21 +1,22 @@
 # Learn how to configure Hyprland: https://wiki.hyprland.org/Configuring/
 
 # Use defaults Omarchy defaults (but don't edit these directly!)
-source = ~/.local/share/omarchy/default/hypr/autostart.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/clipboard.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/tiling-v2.conf
-source = ~/.local/share/omarchy/default/hypr/bindings/utilities.conf
-source = ~/.local/share/omarchy/default/hypr/envs.conf
-source = ~/.local/share/omarchy/default/hypr/looknfeel.conf
-source = ~/.local/share/omarchy/default/hypr/input.conf
-source = ~/.local/share/omarchy/default/hypr/windows.conf
+source = /usr/share/omarchy/default/hypr/autostart.conf
+source = /usr/share/omarchy/default/hypr/bindings/media.conf
+source = /usr/share/omarchy/default/hypr/bindings/clipboard.conf
+source = /usr/share/omarchy/default/hypr/bindings/tiling-v2.conf
+source = /usr/share/omarchy/default/hypr/bindings/utilities.conf
+source = /usr/share/omarchy/default/hypr/envs.conf
+source = /usr/share/omarchy/default/hypr/looknfeel.conf
+source = /usr/share/omarchy/default/hypr/input.conf
+source = /usr/share/omarchy/default/hypr/windows.conf
 source = ~/.config/omarchy/current/theme/hyprland.conf
 
 # Change your own setup in these files (and overwrite any settings from defaults!)
 source = ~/.config/hypr/monitors.conf
 source = ~/.config/hypr/input.conf
 source = ~/.config/hypr/bindings.conf
+source = ~/.config/hypr/envs.conf
 source = ~/.config/hypr/looknfeel.conf
 source = ~/.config/hypr/autostart.conf