Add hyprland-preview-share-picker

The following options are no longer recognized by Kitty and caused warnings during startup:

window_padding_height

show_window_resize_notification

single_instance

They have been removed to keep the configuration compatible with current Kitty versions.

autostart/walker.desktop

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

bin/omarchy-branch-set

@@ -0,0 +1,14 @@
+#!/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

@@ -0,0 +1,15 @@
+#!/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

bin/omarchy-cmd-first-run

@@ -12,6 +12,7 @@ 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

@@ -0,0 +1,6 @@
+#!/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,15 +8,17 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-SCOPE=""
-AUDIO="false"
+DESKTOP_AUDIO="false"
+MICROPHONE_AUDIO="false"
 WEBCAM="false"
+STOP_RECORDING="false"
 
 for arg in "$@"; do
   case "$arg" in
-    --with-audio) AUDIO="true" ;;
+    --with-desktop-audio) DESKTOP_AUDIO="true" ;;
+    --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
     --with-webcam) WEBCAM="true" ;;
-    output|region) SCOPE="$arg" ;;
+    --stop-recording) STOP_RECORDING="true"
   esac
 done
 
@@ -57,27 +59,35 @@ start_webcam_overlay() {
 
 start_screenrecording() {
   local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  local audio_devices=""
   local audio_args=""
 
-  # 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"
+  [[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"
 
-  gpu-screen-recorder -w "$@" -f 60 -c mp4 -o "$filename" $audio_args &
+  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 &
   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
@@ -92,51 +102,19 @@ toggle_screenrecording_indicator() {
 }
 
 screenrecording_active() {
-  pgrep -f "gpu-screen-recorder" >/dev/null || pgrep -x slurp >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
+  pgrep -f "^gpu-screen-recorder" >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
 }
 
 if screenrecording_active; 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
+  if pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "^gpu-screen-recorder" >/dev/null; then
     cleanup_webcam
   else
     stop_screenrecording
   fi
-elif [[ "$SCOPE" == "output" ]]; then
+elif [[ "$STOP_RECORDING" == "false" ]]; then
   [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
 
-  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"
+  start_screenrecording || cleanup_webcam
 else
-  [[ "$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"
+  exit 1
 fi

bin/omarchy-cmd-screensaver

@@ -1,28 +1,35 @@
 #!/bin/bash
 
 screensaver_in_focus() {
-  hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
+  hyprctl activewindow -j | jq -e '.class == "org.omarchy.screensaver"' >/dev/null 2>&1
 }
 
 exit_screensaver() {
   hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
-  pkill -f "alacritty --class Screensaver" 2>/dev/null
+  pkill -f org.omarchy.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 '\e[?1000h\e[?1003h' # Enable mouse tracking (clicks: 1000, movement: 1003)
+while read -rsn1 -t 0.1; do :; done # Flush any pending input
+
+printf '\033]11;rgb:00/00/00\007'  # Set background color to black
 
 hyprctl keyword cursor:invisible true &>/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 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
-    "$effect" &
+tty=$(tty 2>/dev/null)
 
-  while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 3 || ! screensaver_in_focus; then
+while true; do
+  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 &
+
+  while pgrep -t "${tty#/dev/}" -x tte >/dev/null; do
+    if read -rsn1 -t 1 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-shutdown

@@ -0,0 +1,6 @@
+#!/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,8 +6,10 @@ 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)
 
-  if [[ -d $cwd ]]; then
+  # Check if $shell is a valid shell and $cwd is a directory.
+  if grep -qs "$shell" /etc/shells && [[ -d $cwd ]]; then
     echo "$cwd"
   else
     echo "$HOME"

bin/omarchy-dev-add-migration

@@ -1,6 +1,5 @@
 #!/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

@@ -1,344 +0,0 @@
-#!/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,6 +18,7 @@ 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 \
@@ -27,7 +28,10 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
 
     omarchy-restart-waybar
     omarchy-restart-swayosd
-    omarchy-restart-walker
+
+    if pgrep -x ghostty; then
+      notify-send "    You must restart Ghostty to see font change"
+    fi
 
     omarchy-hook font-set "$font_name"
   else

bin/omarchy-hyprland-window-pop

@@ -2,21 +2,45 @@
 
 # Toggle to pop-out a tile to stay fixed on a display basis.
 
-active=$(hyprctl activewindow -j)
-pinned=$(echo "$active" | jq .pinned)
-addr=$(echo "$active" | jq -r  ".address")
-[ -z "$addr" ] && { echo "No active window"; exit 0; }
+# 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.
 
-if [ "$pinned" = "true" ]; then
+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")
+
+if [[ $pinned == "true" ]]; then
   hyprctl -q --batch \
-  "dispatch pin address:$addr;" \
-  "dispatch togglefloating address:$addr;" \
-  "dispatch tagwindow -pop address:$addr;"
-else
+    "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
+
   hyprctl -q --batch \
-  "dispatch togglefloating address:$addr;" \
-  "dispatch centerwindow address:$addr;" \
-  "dispatch pin address:$addr;" \
-  "dispatch alterzorder top address:$addr;" \
-  "dispatch tagwindow +pop address:$addr;"
+    "dispatch pin address:$addr;" \
+    "dispatch alterzorder top address:$addr;" \
+    "dispatch tagwindow +pop address:$addr;"
 fi

bin/omarchy-install

@@ -1,258 +0,0 @@
-#!/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

@@ -50,6 +50,7 @@ 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-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

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

bin/omarchy-install-terminal

@@ -9,31 +9,43 @@ 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
-  # Set as default terminal
-  echo "Setting $package as new default terminal..."
-  sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
-
   # Copy custom desktop entry for alacritty with X-TerminalArg* keys
-  if [ "$package" = "alacritty" ]; then
+  if [[ $package == "alacritty" ]]; then
     mkdir -p ~/.local/share/applications
-    cp "$OMARCHY_PATH/applications/Alacritty.desktop" ~/.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=
+
+[Desktop Action New]
+Name=New Terminal
+Exec=alacritty
+EOF
   fi
 
   # Update xdg-terminals.list to prioritize the proper terminal

bin/omarchy-install-xbox-controllers

@@ -0,0 +1,17 @@
+#!/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 setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Omarchy -e bash -c 'fastfetch; read -n 1 -s'
+exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"

bin/omarchy-launch-bluetooth

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

bin/omarchy-launch-browser

@@ -3,8 +3,10 @@
 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) ]]; then
+if [[ $browser_exec =~ (firefox|zen|librewolf|mullvad) ]]; then
   private_flag="--private-window"
+elif [[ $browser_exec =~ edge ]]; then
+  private_flag="--inprivate"
 else
   private_flag="--incognito"
 fi

bin/omarchy-launch-editor

@@ -4,7 +4,7 @@ omarchy-cmd-present "$EDITOR" || EDITOR=nvim
 
 case "$EDITOR" in
 nvim | vim | nano | micro | hx | helix)
-  exec setsid uwsm-app -- xdg-terminal-exec "$EDITOR" "$@"
+  exec omarchy-launch-tui "$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=com.omarchy.Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"

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 $LAUNCH_COMMAND
+  eval exec setsid $LAUNCH_COMMAND
 fi

bin/omarchy-launch-or-focus-tui

@@ -0,0 +1,6 @@
+#!/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,7 +6,7 @@ if ! command -v tte &>/dev/null; then
 fi
 
 # Exit early if screensave is already running
-pgrep -f "alacritty --class Screensaver" && exit 0
+pgrep -f org.omarchy.screensaver && exit 0
 
 # Allow screensaver to be turned off but also force started
 if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
@@ -14,15 +14,36 @@ if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]
 fi
 
 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
 
-  # 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
+  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
 done
 
 hyprctl dispatch focusmonitor $focused

bin/omarchy-launch-tui

@@ -0,0 +1,3 @@
+#!/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-browser*) ;;
+google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium*) ;;
 *) browser="chromium.desktop" ;;
 esac
 

bin/omarchy-launch-wifi

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

bin/omarchy-lock-screen

@@ -3,10 +3,13 @@
 # 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 "alacritty --class Screensaver"
+pkill -f org.omarchy.screensaver

bin/omarchy-menu

@@ -33,11 +33,11 @@ menu() {
     fi
   fi
 
-  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 600 -p "$prompt…" "${args[@]}" 2>/dev/null
+  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 630 -p "$prompt…" "${args[@]}" 2>/dev/null
 }
 
 terminal() {
-  xdg-terminal-exec --app-id=com.omarchy.Omarchy "$@"
+  xdg-terminal-exec --app-id=org.omarchy.terminal "$@"
 }
 
 present_terminal() {
@@ -112,19 +112,19 @@ show_screenshot_menu() {
 }
 
 show_screenrecord_menu() {
-  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 ;;
+  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 ;;
   *) back_to show_capture_menu ;;
   esac
 }
 
 show_share_menu() {
   case $(menu "Share" "  Clipboard\n  File \n  Folder") in
-  *Clipboard*) terminal bash -c "omarchy-cmd-share clipboard" ;;
+  *Clipboard*) 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,12 +154,7 @@ show_style_menu() {
 }
 
 show_theme_menu() {
-  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
+  omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
 }
 
 show_font_menu() {
@@ -178,15 +173,9 @@ show_setup_menu() {
   options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix ;;
-  *Wifi*)
-    rfkill unblock wifi
-    omarchy-launch-wifi
-    ;;
-  *Bluetooth*)
-    rfkill unblock bluetooth
-    blueberry
-    ;;
+  *Audio*) omarchy-launch-or-focus-tui wiremix ;;
+  *Wifi*) omarchy-launch-wifi ;;
+  *Bluetooth*) omarchy-launch-bluetooth ;;
   *Power*) show_setup_power_menu ;;
   *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
   *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
@@ -263,7 +252,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*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
+  *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch 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 ;;
@@ -301,10 +290,11 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
+  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") 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
 }
@@ -319,11 +309,12 @@ show_install_style_menu() {
 }
 
 show_install_font_menu() {
-  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono" "--width 350") in
+  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--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
 }
@@ -444,12 +435,11 @@ show_update_password_menu() {
 }
 
 show_system_menu() {
-  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n󰜉  Restart\n󰐥  Shutdown") in
+  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰜉  Restart\n󰐥  Shutdown") in
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
-  *Suspend*) systemctl suspend ;;
-  *Restart*) omarchy-state clear re*-required && systemctl reboot --no-wall ;;
-  *Shutdown*) omarchy-state clear re*-required && systemctl poweroff --no-wall ;;
+  *Restart*) omarchy-cmd-reboot ;;
+  *Shutdown*) omarchy-cmd-shutdown ;;
   *) back_to show_main_menu ;;
   esac
 }

bin/omarchy-menu-keybindings

@@ -89,6 +89,7 @@ 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//' \

bin/omarchy-migrate

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

bin/omarchy-pkg-ignored

@@ -1,7 +0,0 @@
-#!/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-refresh-applications

@@ -2,12 +2,16 @@
 
 # Copy and sync icon files
 mkdir -p ~/.local/share/icons/hicolor/48x48/apps/
-cp /usr/share/omarchy/applications/icons/*.png ~/.local/share/icons/hicolor/48x48/apps/
+cp ~/.local/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 /usr/share/omarchy/applications/*.desktop ~/.local/share/applications/
-cp /usr/share/omarchy/applications/hidden/*.desktop ~/.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
 
 update-desktop-database ~/.local/share/applications

bin/omarchy-refresh-config

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This script deploys /etc/skel/.config/X/Y/Z -> ~/.config/X/Y/Z
+# This script deploys ~/.local/share/omarchy/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 /etc/skel/.config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
-
-    $0 hypr/hyprlock.conf
+  To copy ~/.local/share/omarchy/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="/etc/skel/.config/$config_file"
+default_config_file="${HOME}/.local/share/omarchy/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-pacman

@@ -0,0 +1,25 @@
+#!/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
+
+# Offer a reboot if a new kernel was installed
+omarchy-update-restart

bin/omarchy-refresh-pacman-mirrorlist

@@ -1,3 +0,0 @@
-#!/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 /usr/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
+sudo cp ~/.local/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,5 +1,9 @@
 #!/bin/bash
 
+# Ensure walker is set to autostart
+mkdir -p ~/.config/autostart/
+cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
+
 omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml

bin/omarchy-reinstall

@@ -10,15 +10,19 @@ 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 "Reinstalling Omarchy Package"
-  sudo pacman -Syu --noconfirm --needed omarchy
+  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 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 /etc/skel/.config/* ~/.config/
+  cp -R ~/.local/share/omarchy/config/* ~/.config/
+  cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
+  echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null
 
   $(bash $OMARCHY_PATH/install/config/theme.sh)
   $(bash $OMARCHY_PATH/install/config/git.sh)

bin/omarchy-restart-terminal

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

bin/omarchy-restart-walker

@@ -1,33 +1,22 @@
 #!/bin/bash
 
+pkill elephant
+pkill walker
+
 # Detect if we're running as root (from pacman hook)
 if [[ $EUID -eq 0 ]]; then
-  # 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)
+  # Get the owner of this script to determine which user to run as
+  SCRIPT_OWNER=$(stat -c '%U' "$0")
+  USER_UID=$(id -u "$SCRIPT_OWNER")
 
-    # 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
+  # Restart services as the script owner
+  systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
+    bash -c "
+      systemctl --user restart elephant.service
+      setsid walker --gapplication-service &
+    "
 else
-  # Running as user directly
-  pkill elephant
-  pkill walker
-
-  setsid uwsm-app -- elephant &
-  wait 2
-  setsid uwsm-app -- walker --gapplication-service &
+  elephant service enable 2>/dev/null
+  systemctl --user restart elephant.service
+  setsid walker --gapplication-service &
 fi

bin/omarchy-set-user

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

bin/omarchy-setup-fingerprint

@@ -51,6 +51,16 @@ 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
@@ -71,6 +81,9 @@ 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
@@ -90,6 +103,9 @@ 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 < /usr/share/omarchy/logo.txt
+cat <~/.local/share/omarchy/logo.txt
 echo -e "\033[0m"
 echo

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=$(gum choose --header="Remove extra theme" "${extra_themes[@]}")
+    THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
   else
     echo "No extra themes installed."
     exit 1

bin/omarchy-theme-set

@@ -28,12 +28,12 @@ if pgrep -x waybar >/dev/null; then
   omarchy-restart-waybar
 fi
 omarchy-restart-swayosd
+omarchy-restart-terminal
 hyprctl reload
 pkill -SIGUSR2 btop
 makoctl reload
 
 # Change gnome, browser, vscode, cursor themes
-omarchy-theme-set-terminal
 omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode

bin/omarchy-theme-set-browser

@@ -23,11 +23,6 @@ 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-obsidian

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

bin/omarchy-tui-install

@@ -5,7 +5,7 @@ if [ "$#" -ne 4 ]; then
   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!)")
+  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG or SVG!)")
 else
   APP_NAME="$1"
   APP_EXEC="$2"
@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
+Exec=xdg-terminal-exec --app-id=$APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
 Icon=$ICON_PATH

bin/omarchy-tui-remove

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

bin/omarchy-update

@@ -4,7 +4,8 @@ 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
 
-omarchy-update-confirm
-omarchy-snapshot create || [ $? -eq 127 ]
-omarchy-update-git
-omarchy-update-perform
+if omarchy-update-confirm; then
+  omarchy-snapshot create || [ $? -eq 127 ]
+  omarchy-update-git
+  omarchy-update-perform
+fi

bin/omarchy-update-confirm

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

bin/omarchy-update-keyring

@@ -5,6 +5,8 @@ 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-system-pkgs

@@ -2,20 +2,14 @@
 
 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"
-[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
-sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
+sudo pacman -Syyu --noconfirm
 
 # Update AUR packages if any are installed
 if pacman -Qem >/dev/null; then
   if omarchy-pkg-aur-accessible; then
     echo -e "\e[32m\nUpdate AUR packages\e[0m"
-    [[ -n $ignored_packages ]] && echo "yay -Sua --noconfirm  --ignore \"$ignored_packages\""
-    yay -Sua --noconfirm --ignore "$ignored_packages"
+    yay -Sua --noconfirm
     echo
   else
     echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"

bin/omarchy-version-channel

@@ -0,0 +1,23 @@
+#!/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

@@ -0,0 +1,3 @@
+#!/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-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 '.[0].scale')
+  HYPR_SCALE=$(hyprctl monitors -j | jq -r '.[] | select (.focused == true) | .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,4 +19,21 @@ echo -e "\n$ansi_art\n"
 
 sudo pacman -Syu --noconfirm --needed git
 
-# FIXME: Update behavior or remove
+# 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

config/alacritty/alacritty.toml

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

config/brave-flags.conf

@@ -1,5 +1,6 @@
 --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=/usr/share/omarchy/default/chromium/extensions/copy-url
+--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/fastfetch/config.jsonc

@@ -74,6 +74,12 @@
       "keyColor": "blue",
       "text": "branch=$(omarchy-version-branch); echo \"$branch\""
     },
+    {
+      "type": "command",
+      "key": "│ ├󰔫",
+      "keyColor": "blue",
+      "text": "channel=$(omarchy-version-channel); echo \"$channel\""
+    },
     {
       "type": "kernel",
       "key": "│ ├",
@@ -122,19 +128,25 @@
     "break",
     {
       "type": "custom",
-      "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
+      "format": "\u001b[90m┌────────────────Age / Uptime / Update───────────────┐"
     },
     {
       "type": "command",
       "key": "󱦟 OS Age",
       "keyColor": "magenta",
-      "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
+      "text": "echo $(( ($(date +%s) - $(stat -c %W /)) / 86400 )) 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>CaskaydiaMono Nerd Font</string>
+      <string>JetBrainsMono Nerd Font</string>
     </edit>
   </match>
 

config/ghostty/config

@@ -2,7 +2,7 @@
 config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
 
 # Font
-font-family = "CaskaydiaMono Nerd Font"
+font-family = "JetBrainsMono Nerd Font"
 font-style = Regular
 font-size = 9
 
@@ -25,3 +25,10 @@ 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,17 +1,14 @@
 # Application bindings
-$terminal = uwsm-app -- xdg-terminal-exec
-$browser = omarchy-launch-browser
-
-bindd = SUPER, RETURN, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
+bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
-bindd = SUPER SHIFT, B, Browser, exec, $browser
-bindd = SUPER SHIFT ALT, B, Browser (private), exec, $browser --private
+bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
+bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-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, 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, T, Activity, exec, omarchy-launch-tui btop
+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, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
 bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
 

config/hypr/envs.conf

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

config/hypr/hyprland.conf

@@ -1,22 +1,21 @@
 # Learn how to configure Hyprland: https://wiki.hyprland.org/Configuring/
 
 # Use defaults Omarchy defaults (but don't edit these directly!)
-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 = ~/.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 = ~/.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
 

config/hypr/hyprlock.conf

@@ -1,5 +1,9 @@
 source = ~/.config/omarchy/current/theme/hyprlock.conf
 
+general {
+    ignore_empty_input = true
+}
+
 background {
     monitor =
     color = $color
@@ -22,10 +26,10 @@ input-field {
     outer_color = $outer_color
     outline_thickness = 4
 
-    font_family = CaskaydiaMono Nerd Font Propo
+    font_family = JetBrainsMono Nerd Font
     font_color = $font_color
 
-    placeholder_text = Enter Password 󰈷
+    placeholder_text = Enter Password
     check_color = $check_color
     fail_text = <i>$FAIL ($ATTEMPTS)</i>
 

config/hypr/input.conf

@@ -3,7 +3,7 @@
 input {
   # Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
   # kb_layout = us,dk,eu
-  kb_options = compose:caps # ,grp:shifts_toggle
+  kb_options = compose:caps # ,grp:alts_toggle
 
   # Change speed of keyboard repeat
   repeat_rate = 40
@@ -24,6 +24,9 @@ input {
 
     # Control the speed of your scrolling
     scroll_factor = 0.4
+
+    # Left-click-and-drag with three fingers
+    # drag_3fg = 1
   }
 }
 

config/hypr/monitors.conf

@@ -8,7 +8,7 @@ monitor=,preferred,auto,auto
 
 # Good compromise for 27" or 32" 4K monitors (but fractional!)
 # env = GDK_SCALE,1.75
-# monitor=,preferred,auto,1.666667
+# monitor=,preferred,auto,1.6
 
 # Straight 1x setup for low-resolution displays like 1080p or 1440p
 # env = GDK_SCALE,1

config/hypr/xdph.conf

@@ -0,0 +1,4 @@
+screencopy {
+    allow_token_by_default = true
+    custom_picker_binary = hyprland-preview-share-picker
+}

config/hyprland-preview-share-picker/config.yaml

@@ -0,0 +1,71 @@
+# paths to stylesheets on the filesystem which should be applied to the application
+#
+# relative paths are resolved relative to the location of the config file
+stylesheets: ["../omarchy/current/theme/hyprland-preview-share-picker.css"]
+# default page selected when the picker is opened
+default_page: windows
+
+window:
+  # height of the application window
+  height: 500
+  # width of the application window
+  width: 1000
+
+image:
+  # size to which the images should be internally resized to reduce the memory footprint
+  resize_size: 500
+  # target size of the longer side of the image widget
+  widget_size: 150
+
+classes:
+  # css classname of the window
+  window: window
+  # css classname of the card containing an image and a label
+  image_card: card
+  # css classname of the card containing an image and a label when the image is still being loaded
+  image_card_loading: card-loading
+  # css classname of the image inside the card
+  image: image
+  # css classname of the label inside the card
+  image_label: image-label
+  # css classname of the notebook containing all pages
+  notebook: notebook
+  # css classname of a label of the notebook
+  tab_label: tab-label
+  # css classname of a notebook page (e.g. windows container)
+  notebook_page: page
+  # css classname of the region selection button
+  region_button: region-button
+  # css classname of the button containing the session restore checkbox and label
+  restore_button: restore-button
+
+windows:
+  # minimum amount of image cards per row on the windows page
+  min_per_row: 3
+  # maximum amount of image cards per row on the windows page
+  max_per_row: 999
+  # number of clicks needed to select a window
+  clicks: 1
+  # spacing in pixels between the window cards
+  spacing: 12
+
+outputs:
+  # number of clicks needed to select an output
+  clicks: 1
+  # spacing in pixels between the outputs in the layout
+  # note: the spacing is applied from both sides (the gap is `spacing * 2`)
+  spacing: 6
+  # show the label with the output name
+  show_label: false
+  # size the output cards respectively to their scaling
+  respect_output_scaling: true
+
+region:
+  # command to run for region selection
+  # the output needs to be in the <output>@<x>,<y>,<w>,<h> (e.g. DP-3@2789,436,756,576) format
+  command: slurp -f '%o@%x,%y,%w,%h'
+
+# hide the token restore checkbox and use the default value instead
+hide_token_restore: true
+# enable debug logs by default
+debug: false

config/imv/config

@@ -1,2 +1,13 @@
 [binds]
-<Ctrl+p> = exec lp $imv_current_file
+
+# Print the current image file
+<Ctrl+p> = exec lp "$imv_current_file"
+
+# Delete the current image and quit the viewer
+<Ctrl+x> = exec rm "$imv_current_file"; quit
+
+# Delete the current image and move to the next one
+<Ctrl+Shift+X> = exec rm "$imv_current_file"; close
+
+# Rotate the currently open image by 90 degrees
+<Ctrl+r> = exec mogrify -rotate 90 "$imv_current_file"

config/kitty/kitty.conf

@@ -1,15 +1,13 @@
 include ~/.config/omarchy/current/theme/kitty.conf
 
 # Font
-font_family CaskaydiaMono Nerd Font
+font_family JetBrainsMono Nerd Font
 bold_italic_font auto
 font_size        9.0
 
 # Window
 window_padding_width 14
-window_padding_height 14
 hide_window_decorations yes
-show_window_resize_notification no
 confirm_os_window_close 0
 
 # Keybindings
@@ -17,7 +15,6 @@ map ctrl+insert copy_to_clipboard
 map shift+insert paste_from_clipboard
 
 # Allow remote access
-single_instance yes
 allow_remote_control yes
 
 # Aesthetics

config/mimeapps.list

@@ -1,36 +0,0 @@
-[Default Applications]
-image/png=imv.desktop
-image/jpeg=imv.desktop
-image/gif=imv.desktop
-image/webp=imv.desktop
-image/bmp=imv.desktop
-image/tiff=imv.desktop
-application/pdf=org.gnome.Evince.desktop
-x-scheme-handler/http=chromium.desktop
-x-scheme-handler/https=chromium.desktop
-text/html=chromium.desktop
-video/mp4=mpv.desktop
-video/x-msvideo=mpv.desktop
-video/x-matroska=mpv.desktop
-video/x-flv=mpv.desktop
-video/x-ms-wmv=mpv.desktop
-video/mpeg=mpv.desktop
-video/ogg=mpv.desktop
-video/webm=mpv.desktop
-video/quicktime=mpv.desktop
-video/3gpp=mpv.desktop
-video/3gpp2=mpv.desktop
-video/x-ms-asf=mpv.desktop
-video/x-ogm+ogg=mpv.desktop
-video/x-theora+ogg=mpv.desktop
-application/ogg=mpv.desktop
-x-scheme-handler/mailto=HEY.desktop
-
-[Added Associations]
-image/png=imv.desktop;
-image/jpeg=imv.desktop;
-image/gif=imv.desktop;
-image/webp=imv.desktop;
-text/html=chromium.desktop;
-x-scheme-handler/http=chromium.desktop;
-x-scheme-handler/https=chromium.desktop;

config/omarchy/branding/about.txt

@@ -1,26 +0,0 @@
-██████████████████████████████████████████████████████
-██████████████████████████████████████████████████████
-████                     ████                     ████
-████                     ████                     ████
-████    █████████████████████         ████████    ████
-████    █████████████████████         ████████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████████████                              ████    ████
-████████████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ████                              ████    ████
-████    ██████████████████████████████████████    ████
-████    ██████████████████████████████████████    ████
-████                     ████                     ████
-████                     ████                     ████
-█████████████████████████████     ████████████████████
-█████████████████████████████     ████████████████████

config/omarchy/branding/screensaver.txt

@@ -1,10 +0,0 @@
-                 ▄▄▄
- ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
-███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
-███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
-███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀
-                                       ███   █▀

config/swayosd/style.css

@@ -9,7 +9,7 @@ window {
 }
 
 label {
-  font-family: 'CaskaydiaMono Nerd Font';
+  font-family: 'JetBrainsMono Nerd Font';
   font-size: 11pt;
 
   color: @label;

config/uwsm/env

@@ -1,7 +1,8 @@
 # Changes require a restart to take effect.
 
-# Set default OMARCHY_PATH
-export OMARCHY_PATH=/usr/share/omarchy
+# Ensure Omarchy bins are in the path
+export OMARCHY_PATH=$HOME/.local/share/omarchy
+export PATH=$OMARCHY_PATH/bin:$PATH
 
 # Set default terminal and editor
 source ~/.config/uwsm/default

config/walker/config.toml

@@ -1,6 +1,8 @@
 force_keyboard_focus = true                                                 # forces keyboard forcus to stay in Walker
 selection_wrap = true                                                       # wrap list if at bottom or top
 theme = "omarchy-default"                                                   # theme to use
+additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
+hide_action_hints = true                                                    # globally hide the action hints
 
 [placeholders]
 "default" = { input = " Search...", list = "No Results" } # placeholders for input and empty list, key is the providers name, so f.e. "desktopapplications" or "menus:other"
@@ -8,12 +10,15 @@ theme = "omarchy-default"                                                   # th
 [keybinds]
 quick_activate = []
 
+[columns]
+symbols = 1 # providers to be queried by default
+
 [providers]
+max_results = 256 # 256 should be enough for everyone
 default = [
   "desktopapplications",
-  "menus",
   "websearch",
-] # providers to be queried by default
+]
 
 [[providers.prefixes]]
 prefix = "/"

config/waybar/config.jsonc

@@ -28,6 +28,7 @@
       "7": "7",
       "8": "8",
       "9": "9",
+      "10": "0",
       "active": "󱓻"
     },
     "persistent-workspaces": {
@@ -56,7 +57,7 @@
   "cpu": {
     "interval": 5,
     "format": "󰍛",
-    "on-click": "xdg-terminal-exec btop"
+    "on-click": "omarchy-launch-or-focus-tui btop"
   },
   "clock": {
     "format": "{:L%A %H:%M}",
@@ -99,13 +100,14 @@
   "bluetooth": {
     "format": "",
     "format-disabled": "󰂲",
-    "format-connected": "",
+    "format-connected": "󰂱",
+    "format-no-controller": "",
     "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "blueberry"
+    "on-click": "omarchy-launch-bluetooth"
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix",
+    "on-click": "omarchy-launch-or-focus-tui wiremix",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
@@ -123,7 +125,7 @@
     "modules": ["custom/expand-icon", "tray"]
   },
   "custom/expand-icon": {
-    "format": "",
+    "format": "",
     "tooltip": false
   },
   "custom/screenrecording-indicator": {

config/waybar/style.css

@@ -7,7 +7,7 @@
   border: none;
   border-radius: 0;
   min-height: 0;
-  font-family: 'CaskaydiaMono Nerd Font';
+  font-family: 'JetBrainsMono Nerd Font';
   font-size: 12px;
 }
 
@@ -53,7 +53,7 @@
 }
 
 #custom-expand-icon {
-  margin-right: 20px;
+  margin-right: 18px;
 }
 
 tooltip {

config/xdg-terminals.list

@@ -0,0 +1,3 @@
+# Terminal emulator preference order for xdg-terminal-exec
+# The first found and valid terminal will be used
+com.mitchellh.ghostty.desktop

default/bash/functions

@@ -15,7 +15,7 @@ iso2sd() {
   fi
 }
 
-# Format an entire drive for a single partition using ext4
+# Format an entire drive for a single partition using exFAT
 format-drive() {
   if [ $# -ne 2 ]; then
     echo "Usage: format-drive <device> <name>"
@@ -25,14 +25,20 @@ format-drive() {
   else
     echo "WARNING: This will completely erase all data on $1 and label it '$2'."
     read -rp "Are you sure you want to continue? (y/N): " confirm
+
     if [[ "$confirm" =~ ^[Yy]$ ]]; then
       sudo wipefs -a "$1"
       sudo dd if=/dev/zero of="$1" bs=1M count=100 status=progress
       sudo parted -s "$1" mklabel gpt
-      sudo parted -s "$1" mkpart primary ext4 1MiB 100%
-      sudo mkfs.ext4 -L "$2" "$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
-      sudo chmod -R 777 "/run/media/$USER/$2"
-      echo "Drive $1 formatted and labeled '$2'."
+      sudo parted -s "$1" mkpart primary 1MiB 100%
+
+      partition="$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
+      sudo partprobe "$1" || true
+      sudo udevadm settle || true
+
+      sudo mkfs.exfat -n "$2" "$partition"
+
+      echo "Drive $1 formatted as exFAT and labeled '$2'."
     fi
   fi
 }
@@ -49,19 +55,28 @@ transcode-video-4K() {
 
 # Transcode any image to JPG image that's great for shrinking wallpapers
 img2jpg() {
-  magick $1 -quality 95 -strip ${1%.*}.jpg
+  img="$1"
+  shift
+
+  magick "$img" $@ -quality 95 -strip ${img%.*}-optimized.jpg
 }
 
 # Transcode any image to JPG image that's great for sharing online without being too big
 img2jpg-small() {
-  magick $1 -resize 1080x\> -quality 95 -strip ${1%.*}.jpg
+  img="$1"
+  shift
+
+  magick "$img" $@ -resize 1080x\> -quality 95 -strip ${img%.*}-optimized.jpg
 }
 
 # Transcode any image to compressed-but-lossless PNG
 img2png() {
-  magick "$1" -strip -define png:compression-filter=5 \
+  img="$1"
+  shift
+
+  magick "$img" $@ -strip -define png:compression-filter=5 \
     -define png:compression-level=9 \
     -define png:compression-strategy=1 \
     -define png:exclude-chunk=all \
-    "${1%.*}.png"
+    "${img%.*}-optimized.png"
 }

default/bash/init

@@ -10,6 +10,10 @@ if command -v zoxide &> /dev/null; then
   eval "$(zoxide init bash)"
 fi
 
+if command -v try &> /dev/null; then
+  eval "$(try init ~/Work/tries)"
+fi
+
 if command -v fzf &> /dev/null; then
   if [[ -f /usr/share/fzf/completion.bash ]]; then
     source /usr/share/fzf/completion.bash

default/bash/prompt

@@ -1,7 +0,0 @@
-# Technicolor dreams
-force_color_prompt=yes
-color_prompt=yes
-
-# Simple prompt with path in the window/pane title and caret for typing line
-PS1=$'\uf0a9 '
-PS1="\[\e]0;\w\a\]$PS1"

default/bash/rc

@@ -1,7 +1,6 @@
-source /usr/share/omarchy/default/bash/shell
-source /usr/share/omarchy/default/bash/aliases
-source /usr/share/omarchy/default/bash/functions
-source /usr/share/omarchy/default/bash/prompt
-source /usr/share/omarchy/default/bash/init
-source /usr/share/omarchy/default/bash/envs
-[[ $- == *i* ]] && bind -f /usr/share/omarchy/default/bash/inputrc
+source ~/.local/share/omarchy/default/bash/shell
+source ~/.local/share/omarchy/default/bash/aliases
+source ~/.local/share/omarchy/default/bash/functions
+source ~/.local/share/omarchy/default/bash/init
+source ~/.local/share/omarchy/default/bash/envs
+[[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc

default/bashrc

@@ -3,7 +3,7 @@
 
 # All the default Omarchy aliases and functions
 # (don't mess with these directly, just overwrite them here!)
-source /usr/share/omarchy/default/bash/rc
+source ~/.local/share/omarchy/default/bash/rc
 
 # Add your own exports, aliases, and functions here.
 #

default/elephant/omarchy_themes.lua

@@ -0,0 +1,70 @@
+--
+-- Dynamic Omarchy Theme Menu for Elephant/Walker
+--
+Name = "omarchythemes"
+NamePretty = "Omarchy Themes"
+
+-- The main function elephant will call
+function GetEntries()
+  local entries = {}
+  local theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
+
+  -- First, get all theme directories
+  local find_dirs_cmd = "find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null"
+
+  local handle = io.popen(find_dirs_cmd)
+  if not handle then
+    return entries
+  end
+
+  for theme_path in handle:lines() do
+    local theme_name = theme_path:match(".*/(.+)$")
+
+    if theme_name then
+      -- find preview image
+      local find_preview_cmd = "find -L '"
+        .. theme_path
+        .. "' -maxdepth 1 -type f \\( -name 'preview.png' -o -name 'preview.jpg' \\) 2>/dev/null | head -n 1"
+      local preview_handle = io.popen(find_preview_cmd)
+      local preview_path = nil
+
+      if preview_handle then
+        preview_path = preview_handle:read("*l")
+        preview_handle:close()
+      end
+
+      -- If no preview found, use first image from backgrounds folder
+      if not preview_path or preview_path == "" then
+        local bg_cmd = "find -L '"
+          .. theme_path
+          .. "/backgrounds' -maxdepth 1 -type f \\( -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \\) 2>/dev/null | head -n 1"
+        local bg_handle = io.popen(bg_cmd)
+        if bg_handle then
+          preview_path = bg_handle:read("*l")
+          bg_handle:close()
+        end
+      end
+
+      if preview_path and preview_path ~= "" then
+        local display_name = theme_name:gsub("_", " "):gsub("%-", " ")
+        display_name = display_name:gsub("(%a)([%w_']*)", function(first, rest)
+          return first:upper() .. rest:lower()
+        end)
+        display_name = display_name .. "  "
+
+        table.insert(entries, {
+          Text = display_name,
+          Preview = preview_path,
+          PreviewType = "file",
+          Actions = {
+            activate = "omarchy-theme-set " .. theme_name,
+          },
+        })
+      end
+    end
+  end
+
+  handle:close()
+  return entries
+end
+

default/ghostty/screensaver

@@ -0,0 +1,3 @@
+window-padding-x = 0
+window-padding-y = 0
+window-padding-color = "extend-always"

default/hypr/apps.conf

@@ -1,15 +1,15 @@
 # App-specific tweaks
-source = /usr/share/omarchy/default/hypr/apps/1password.conf
-source = /usr/share/omarchy/default/hypr/apps/bitwarden.conf
-source = /usr/share/omarchy/default/hypr/apps/browser.conf
-source = /usr/share/omarchy/default/hypr/apps/hyprshot.conf
-source = /usr/share/omarchy/default/hypr/apps/jetbrains.conf
-source = /usr/share/omarchy/default/hypr/apps/localsend.conf
-source = /usr/share/omarchy/default/hypr/apps/pip.conf
-source = /usr/share/omarchy/default/hypr/apps/qemu.conf
-source = /usr/share/omarchy/default/hypr/apps/retroarch.conf
-source = /usr/share/omarchy/default/hypr/apps/steam.conf
-source = /usr/share/omarchy/default/hypr/apps/system.conf
-source = /usr/share/omarchy/default/hypr/apps/terminals.conf
-source = /usr/share/omarchy/default/hypr/apps/walker.conf
-source = /usr/share/omarchy/default/hypr/apps/webcam-overlay.conf
+source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
+source = ~/.local/share/omarchy/default/hypr/apps/bitwarden.conf
+source = ~/.local/share/omarchy/default/hypr/apps/browser.conf
+source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.conf
+source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
+source = ~/.local/share/omarchy/default/hypr/apps/localsend.conf
+source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
+source = ~/.local/share/omarchy/default/hypr/apps/qemu.conf
+source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
+source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
+source = ~/.local/share/omarchy/default/hypr/apps/system.conf
+source = ~/.local/share/omarchy/default/hypr/apps/terminals.conf
+source = ~/.local/share/omarchy/default/hypr/apps/walker.conf
+source = ~/.local/share/omarchy/default/hypr/apps/webcam-overlay.conf

default/hypr/apps/1password.conf

@@ -1 +1,2 @@
-windowrule = noscreenshare, class:^(1Password)$
+windowrule = noscreenshare, class:^(1[p|P]assword)$
+windowrule = tag +floating-window, class:^(1[p|P]assword)$

default/hypr/apps/bitwarden.conf

@@ -1 +1,2 @@
 windowrule = noscreenshare, class:^(Bitwarden)$
+windowrule = tag +floating-window, class:^(Bitwarden)$