Prepare for a first-run flow

Will fill in with the first stuff you should do after getting setup.
Teaching you how to do the basic commands.

applications/blueberry.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Bluetooth
+Comment=Configure Bluetooth settings
+Icon=bluetooth
+Exec=env GTK_THEME=Adwaita-dark blueberry
+Terminal=false
+Type=Application
+Categories=GTK;GNOME;Settings;HardwareSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
+StartupNotify=true
+NotShowIn=GNOME;KDE;Unity;

applications/mpv.desktop

@@ -1,51 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Media Player
-Name[ar]=مشغل وسائط mpv
-Name[ca]=Reproductor multimèdia mpv
-Name[cs]=mpv přehrávač
-Name[da]=mpv-medieafspiller
-Name[fr]=Lecteur multimédia mpv
-Name[it]=Lettore multimediale mpv
-Name[ja]=mpv メディアプレイヤー
-Name[pl]=Odtwarzacz mpv
-Name[ru]=Проигрыватель mpv
-Name[tr]=mpv Ortam Oynatıcı
-Name[zh_CN]=mpv 媒体播放器
-Name[zh_TW]=mpv 媒體播放器
-GenericName=Multimedia player
-GenericName[ar]=مُشَغِّل وسائط متعددة
-GenericName[cs]=Multimediální přehrávač
-GenericName[da]=Multimedieafspiller
-GenericName[fr]=Lecteur multimédia
-GenericName[it]=Lettore multimediale
-GenericName[ja]=マルチメディアプレイヤー
-GenericName[ru]=Мультимедийный проигрыватель
-GenericName[tr]=Çoklu ortam oynatıcı
-GenericName[zh_CN]=多媒体播放器
-GenericName[zh_TW]=多媒體播放器
-Comment=Play movies and songs
-Comment[ar]=شَغِّل الأفلام والأغاني
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[cs]=Přehrává filmy a hudbu
-Comment[da]=Afspil film og sange
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lire des vidéos et des musiques
-Comment[ja]=映画や音楽を再生する
-Comment[it]=Riproduci video e canzoni
-Comment[pl]=Odtwarzaj filmy i muzykę
-Comment[ru]=Воспроизведение фильмов и музыки
-Comment[tr]=Filmleri ve şarkıları oynatın
-Comment[zh_CN]=播放电影和歌曲
-Comment[zh_TW]=播放電影和歌曲
-Icon=mpv
-TryExec=mpv
-Exec=mpv --player-operation-mode=pseudo-gui -- %U
-Terminal=false
-Categories=AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/mxf;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/aiff;audio/x-aiff;audio/m4a;audio/x-m4a;application/x-extension-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/mpeg2;audio/mpeg3;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/musepack;audio/x-musepack;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg2;video/x-mpeg3;video/mp4v-es;video/x-m4v;video/mp4;application/x-extension-mp4;video/divx;video/vnd.divx;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;audio/x-ms-asf;application/vnd.ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/avi;video/x-flic;video/fli;video/x-flc;video/flv;video/x-flv;video/x-theora;video/x-theora+ogg;video/x-matroska;video/mkv;audio/x-matroska;application/x-matroska;video/webm;audio/webm;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;video/x-ogm;video/x-ogm+ogg;application/x-ogm;application/x-ogm-audio;application/x-ogm-video;application/x-shorten;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;audio/eac3;audio/amr-wb;video/mp2t;audio/flac;audio/mp4;application/x-mpegurl;video/vnd.mpegurl;application/vnd.apple.mpegurl;audio/x-pn-au;video/3gp;video/3gpp;video/3gpp2;audio/3gpp;audio/3gpp2;video/dv;audio/dv;audio/opus;audio/vnd.dts;audio/vnd.dts.hd;audio/x-adpcm;application/x-cue;audio/m3u;audio/vnd.wave;video/vnd.avi;
-X-KDE-Protocols=appending,file,ftp,hls,http,https,mms,mpv,rtmp,rtmps,rtmpt,rtmpts,rtp,rtsp,rtsps,sftp,srt,srtp,webdav,webdavs
-StartupWMClass=mpv
-Keywords=mpv;media;player;video;audio;tv;
-Keywords[ar]=mpv;إم بي في;ام بي في;وسائط;مشغل;فيديو;مرئية;صوتي;تلفاز;

applications/nvim.desktop

@@ -2,7 +2,7 @@
 Name=Neovim
 GenericName=Text Editor
 Comment=Edit text files
-Exec=alacritty --class=nvim --title=nvim -e nvim -- %F
+Exec=alacritty -e nvim -- %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;

applications/omarchy.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Omarchy
+Comment=Omarchy TUI
+Exec=alacritty --class=Omarchy --title=Omarchy -e bash -c '$HOME/.local/share/omarchy/bin/omarchy'
+Icon=Arch
+Terminal=false
+Categories=System;Utility;
+StartupNotify=false 

applications/org.pulseaudio.pavucontrol.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Volume Control
+Comment=Adjust the volume level
+Exec=env GTK_THEME=Adwaita-dark pavucontrol
+Icon=multimedia-volume-control
+StartupNotify=true
+Type=Application
+Categories=AudioVideo;Audio;Mixer;GTK;Settings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
+Keywords=pavucontrol;PulseAudio;Microphone;Volume;Fade;Balance;Headset;Speakers;Headphones;Audio;Mixer;Output;Input;Devices;Playback;Recording;System Sounds;Sound Card;Settings;Preferences;

applications/wiremix.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Audio Settings
-Comment=Using Wiremix
-Exec=alacritty --class=Wiremix --title=Wiremix -e wiremix
-Icon=audio-card
-Type=Application
-Terminal=false

bin/omarchy

@@ -0,0 +1,137 @@
+#!/bin/bash
+
+OMARCHY_VERSION=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null)
+PATH="$PATH:$HOME/.local/share/omarchy/bin"
+
+show_ascii_art() {
+  clear
+  cat <<'EOF'
+ ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
+███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
+███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
+███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
+ ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+                                          ███    ███                                    
+EOF
+  echo "                                                                                 $OMARCHY_VERSION"
+}
+
+main_menu() {
+  show_ascii_art
+
+  local options=("Theme" "Setup" "Update" "Manual" "Exit")
+  choice=$(printf "%s\n" "${options[@]}" | gum choose --header "") || exit 0
+  case "$choice" in
+  Theme) theme_menu ;;
+  Update) update_menu ;;
+  Setup) setup_menu ;;
+  Manual) open_manual ;;
+  Exit) clear && exit 0 ;;
+  esac
+}
+
+update_menu() {
+  show_ascii_art
+  local menu=("Omarchy" "Waybar" "Wofi" "Plymouth" "Desktop apps" "Back")
+  local commands=(
+    "omarchy-update"
+    "omarchy-refresh-waybar"
+    "omarchy-refresh-wofi"
+    "omarchy-refresh-plymouth"
+    "omarchy-refresh-applications"
+    "main_menu"
+  )
+  local choice
+  choice=$(printf "%s\n" "${menu[@]}" | gum choose --header="Update") || main_menu
+  for i in "${!menu[@]}"; do
+    if [[ "${menu[$i]}" == "$choice" ]]; then
+      if [[ "$choice" == "Back" ]]; then
+        main_menu
+      else
+        eval "${commands[$i]}"
+        ack_command
+        main_menu
+      fi
+      break
+    fi
+  done
+}
+
+theme_menu() {
+  show_ascii_art
+  local menu=("Install" "Remove" "Back")
+  local commands=(
+    "install_theme_prompt"
+    "remove_theme_prompt"
+    "main_menu"
+  )
+  local choice
+  choice=$(printf "%s\n" "${menu[@]}" | gum choose --header="Theme") || main_menu
+  for i in "${!menu[@]}"; do
+    if [[ "${menu[$i]}" == "$choice" ]]; then
+      if [[ "$choice" == "Back" ]]; then
+        main_menu
+      else
+        eval "${commands[$i]}"
+        ack_command
+        main_menu
+      fi
+      break
+    fi
+  done
+}
+
+install_theme_prompt() {
+  local url
+  url=$(gum input --placeholder="Git repo URL for theme" --header="")
+  if [[ -n "$url" ]]; then
+    omarchy-theme-install "$url"
+  fi
+  theme_menu
+}
+
+remove_theme_prompt() {
+  local theme
+  theme=$(gum input --placeholder="Theme name" --header="")
+  if [[ -n "$theme" ]]; then
+    omarchy-theme-remove "$theme"
+  fi
+  theme_menu
+}
+
+setup_menu() {
+  show_ascii_art
+  local menu=("Fingerprint sensor" "Back")
+  local commands=(
+    "omarchy-fingerprint-setup"
+    "main_menu"
+  )
+  local choice
+  choice=$(printf "%s\n" "${menu[@]}" | gum choose --header="Setup") || main_menu
+  for i in "${!menu[@]}"; do
+    if [[ "${menu[$i]}" == "$choice" ]]; then
+      if [[ "$choice" == "Back" ]]; then
+        main_menu
+      else
+        eval "${commands[$i]}"
+        ack_command
+        main_menu
+      fi
+      break
+    fi
+  done
+}
+
+open_manual() {
+  xdg-open "https://manuals.omamix.org/2/the-omarchy-manual"
+}
+
+ack_command() {
+  gum spin --spinner "globe" --title "Done!" -- sleep 1
+}
+
+main_menu
+

bin/omarchy-battery-monitor

@@ -14,7 +14,7 @@ get_battery_state() {
 }
 
 send_notification() {
-  notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000
+  notify-send -u critical "Battery Low" "Time to recharge! (battery is at ${1}%)" -i battery-caution
 }
 
 BATTERY_LEVEL=$(get_battery_percentage)

bin/omarchy-cmd-screenrecord

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
-OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
-
-if [[ ! -d "$OUTPUT_DIR" ]]; then
-  notify-send "Screen recording directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
-fi
-
-screenrecording() {
-  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
-  notify-send "Screen recording starting..." -t 1000
-  sleep 1
-
-  if lspci | grep -qi 'nvidia'; then
-    wf-recorder -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@"
-  else
-    wl-screenrec -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@"
-  fi
-}
-
-if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
-  pkill -x wl-screenrec
-  pkill -x wf-recorder
-  notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
-elif [[ "$1" == "output" ]]; then
-  screenrecording
-else
-  region=$(slurp) || exit 1
-  screenrecording -g "$region"
-fi

bin/omarchy-cmd-screensaver

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if command -v tte &>/dev/null; then
-  while true; do
-    effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
-    tte -i ~/.local/share/omarchy/logo.txt \
-      --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
-      "$effect" &
-
-    while pgrep tte >/dev/null; do
-      if read -n 1 -t 0.01; then
-        pkill tte 2>/dev/null
-        pkill -f "alacritty --class Screensaver" 2>/dev/null
-        exit 0
-      fi
-    done
-  done
-else
-  gum spin --title "Can't find tte. Try: pip install terminaltexteffects" -- sleep 2
-fi

bin/omarchy-cmd-screenshot

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
-OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
-
-if [[ ! -d "$OUTPUT_DIR" ]]; then
-  notify-send "Screenshot directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
-fi
-
-pkill slurp || hyprshot -m ${1:-region} --raw |
-  satty --filename - \
-    --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
-    --early-exit \
-    --actions-on-enter save-to-clipboard \
-    --save-after-copy \
-    --copy-command 'wl-copy'

bin/omarchy-cmd-tzupdate

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-sudo tzupdate
-new_timezone=$(timedatectl show -p Timezone --value)
-notify-send "Timezone has been set to $new_timezone"

bin/omarchy-dev-add-migration

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file
 nvim $migration_file
+echo -e "Run with:\nsource $migration_file"

bin/omarchy-dev-config-link

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Link all the key config files to omarchy's internal versions for quicker testing
+ln -nsf ~/.local/share/omarchy/config/hypr/hyprland.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/hypr/hypridle.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/
+ln -nsf ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/

bin/omarchy-fingerprint-setup

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+yay -S --noconfirm --needed fprintd usbutils
+
+if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
+  echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
+else
+  # Add fingerprint authentication as an option for sudo
+  if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
+    sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
+  fi
+
+  # Add fingerprint authentication as an option for hyprpolkitagent
+  if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
+    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+auth      required pam_unix.so
+auth      optional pam_fprintd.so
+
+account   required pam_unix.so
+password  required pam_unix.so
+session   required pam_unix.so
+EOF
+  fi
+
+  # Enroll the first finger
+  echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
+  sudo fprintd-enroll $USER
+
+  echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
+
+  if fprintd-verify; then
+    echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
+  else
+    echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+  fi
+fi

bin/omarchy-first-run

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ ! -f ~/.local/state/omarchy/first-run.marker ]]; then
+  chromium --new-window --app=file://$HOME/.local/share/omarchy/first-run/index.html
+  mkdir -p ~/.local/state/omarchy
+  touch ~/.local/state/omarchy/first-run.marker
+fi

bin/omarchy-font-current

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-grep -oP 'family\s*=\s*"\K[^"]+' ~/.config/alacritty/alacritty.toml | head -n1

bin/omarchy-font-list

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting' | sort -u

bin/omarchy-font-set

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-font_name="$1"
-
-if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
-  if fc-list | grep -iq "$font_name"; then
-    sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
-    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 \
-      -u '//match[@target="pattern"][test/string="monospace"]/edit[@name="family"]/string' \
-      -v "$font_name" \
-      ~/.config/fontconfig/fonts.conf
-
-    ~/.local/share/omarchy/bin/omarchy-restart-waybar
-    ~/.local/share/omarchy/bin/omarchy-restart-swayosd
-  else
-    echo "Font '$font_name' not found."
-    exit 1
-  fi
-else
-  echo "Usage: omarchy-font-set <font-name>"
-fi

bin/omarchy-install-docker-dbs

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-options=("MariaDB" "MySQL" "Redis" "PostgreSQL")
-choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
-
-if [[ -n "$choices" ]]; then
-  for db in $choices; do
-    case $db in
-    MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;
-    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres16 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16 ;;
-    MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;;
-    Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;;
-    esac
-  done
-fi

bin/omarchy-install-dropbox

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo "Installing all dependencies..."
-yay -S --noconfirm --needed \
-  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
-
-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."

bin/omarchy-install-steam

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo "Adding multilib repository for 32-bit compatibility"
-sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
-sudo pacman -Sy
-
-echo "Now pick dependencies matching your graphics card"
-yay -S steam
-gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-launch-screensaver

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Exit early if screensave is already running
-pgrep -f "alacritty --class Screensaver" && exit 0
-
-focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
-
-for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
-  hyprctl dispatch focusmonitor $m
-  hyprctl dispatch exec -- \
-    alacritty --class Screensaver \
-    --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
-    -e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver
-done
-
-hyprctl dispatch focusmonitor $focused

bin/omarchy-menu

@@ -1,312 +0,0 @@
-#!/bin/bash
-
-OMARCHY_BIN_PATH=~/.local/share/omarchy/bin
-
-menu() {
-  local prompt="$1"
-  local options="$2"
-  local extra="$3"
-  local preselect="$4"
-
-  read -r -a args <<<"$extra"
-
-  if [[ -n "$preselect" ]]; then
-    local index
-    index=$(echo -e "$options" | grep -nxF "$preselect" | cut -d: -f1)
-    if [[ -n "$index" ]]; then
-      args+=("-a" "$index")
-    fi
-  fi
-
-  echo -e "$options" | walker --dmenu --theme dmenu_250 -p "$prompt…" "${args[@]}"
-}
-
-terminal() {
-  alacritty --class Omarchy -e $1
-}
-
-present_terminal() {
-  alacritty --class Omarchy -e bash -c "~/.local/share/omarchy/bin/omarchy-show-logo; eval \"$1\"; ~/.local/share/omarchy/bin/omarchy-show-done;"
-}
-
-edit_in_nvim() {
-  notify-send "Editing config file" "$1"
-  alacritty -e nvim "$1"
-}
-
-open_web() {
-  setsid chromium --new-window --app="$1" &
-}
-
-install() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm $2"
-}
-
-install_and_launch() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm $2 && gtk-launch $3"
-}
-
-install_font() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm --needed $2 && sleep 2 && ~/.local/share/omarchy/bin/omarchy-font-set '$3'"
-}
-
-show_learn_menu() {
-  case $(menu "Learn" "  Keybindings\n  Omarchy\n  Hyprland\n󰣇  Arch\n  Neovim\n󱆃  Bash") in
-  *Keybindings*) $OMARCHY_BIN_PATH/omarchy-menu-keybindings ;;
-  *Omarchy*) open_web "https://manuals.omamix.org/2/the-omarchy-manual" ;;
-  *Hyprland*) open_web "https://wiki.hypr.land/" ;;
-  *Arch*) open_web "https://wiki.archlinux.org/title/Main_page" ;;
-  *Bash*) open_web "https://devhints.io/bash" ;;
-  *Neovim*) open_web "https://www.lazyvim.org/keymaps" ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_style_menu() {
-  case $(menu "Style" "󰸌  Theme\n  Font\n  Background") in
-  *Theme*) show_theme_menu ;;
-  *Font*) show_font_menu ;;
-  *Background*) $OMARCHY_BIN_PATH/omarchy-theme-bg-next ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_theme_menu() {
-  theme=$(menu "Theme" "$($OMARCHY_BIN_PATH/omarchy-theme-list)" "" "$($OMARCHY_BIN_PATH/omarchy-theme-current)")
-  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    show_main_menu
-  else
-    $OMARCHY_BIN_PATH/omarchy-theme-set "$theme"
-  fi
-}
-
-show_font_menu() {
-  theme=$(menu "Font" "$($OMARCHY_BIN_PATH/omarchy-font-list)" "-w 350" "$($OMARCHY_BIN_PATH/omarchy-font-current)")
-  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    show_main_menu
-  else
-    $OMARCHY_BIN_PATH/omarchy-font-set "$theme"
-  fi
-}
-
-show_capture_menu() {
-  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
-  *Screenshot*) show_screenshot_menu ;;
-  *Screenrecord*) show_screenrecord_menu ;;
-  *Color*) pkill hyprpicker || hyprpicker -a ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_screenshot_menu() {
-  case $(menu "Screenshot" "  Region\n  Window\n  Display") in
-  *Region*) $OMARCHY_BIN_PATH/omarchy-cmd-screenshot ;;
-  *Window*) $OMARCHY_BIN_PATH/omarchy-cmd-screenshot window ;;
-  *Display*) $OMARCHY_BIN_PATH/omarchy-cmd-screenshot output ;;
-  *) show_capture_menu ;;
-  esac
-}
-
-show_screenrecord_menu() {
-  case $(menu "Screenrecord" "  Region\n  Display") in
-  *Region*) $OMARCHY_BIN_PATH/omarchy-cmd-screenrecord ;;
-  *Display*) $OMARCHY_BIN_PATH/omarchy-cmd-screenrecord output ;;
-  *) show_capture_menu ;;
-  esac
-}
-
-show_toggle_menu() {
-  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
-  *Screensaver*) $OMARCHY_BIN_PATH/omarchy-launch-screensaver ;;
-  *Nightlight*) $OMARCHY_BIN_PATH/omarchy-toggle-nightlight ;;
-  *Idle*) $OMARCHY_BIN_PATH/omarchy-toggle-idle ;;
-  *Bar*) pkill -SIGUSR1 waybar ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_setup_menu() {
-  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
-  [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
-  [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n  Config\n󰈷  Fingerprint\n  Fido2"
-
-  case $(menu "Setup" "$options") in
-  *Audio*) alacritty --class=Wiremix -e wiremix ;;
-  *Wifi*) alacritty --class=Impala -e impala ;;
-  *Bluetooth*) blueberry ;;
-  *Power*) show_setup_power_menu ;;
-  *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
-  *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
-  *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
-  *Config*) show_setup_config_menu ;;
-  *Fingerprint*) present_terminal $OMARCHY_BIN_PATH/omarchy-setup-fingerprint ;;
-  *Fido2*) present_terminal $OMARCHY_BIN_PATH/omarchy-setup-fido2 ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_setup_power_menu() {
-  profile=$(menu "Power Profile" "$($OMARCHY_BIN_PATH/omarchy-powerprofiles-list)" "" "$(powerprofilesctl get)")
-
-  if [[ "$profile" == "CNCLD" || -z "$profile" ]]; then
-    show_main_menu
-  else
-    powerprofilesctl set "$profile"
-  fi
-}
-
-show_setup_config_menu() {
-  case $(menu "Setup" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
-  *Hyprland*) edit_in_nvim ~/.config/hypr/hyprland.conf ;;
-  *Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && ~/.local/share/omarchy/bin/omarchy-restart-hypridle ;;
-  *Hyprlock*) edit_in_nvim ~/.config/hypr/hyprlock.conf ;;
-  *Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && ~/.local/share/omarchy/bin/omarchy-restart-hyprsunset ;;
-  *Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && ~/.local/share/omarchy/bin/omarchy-restart-swayosd ;;
-  *Walker*) edit_in_nvim ~/.config/walker/config.toml && ~/.local/share/omarchy/bin/omarchy-restart-walker ;;
-  *Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && ~/.local/share/omarchy/bin/omarchy-restart-waybar ;;
-  *XCompose*) edit_in_nvim ~/.XCompose && ~/.local/share/omarchy/bin/omarchy-restart-xcompose ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n  Web App\n  Style\n  Editor\n󱚤  AI\n  Dropbox\n  Steam\n  Docker DB") in
-  *Package*) terminal $OMARCHY_BIN_PATH/omarchy-pkg-install ;;
-  *Web*) present_terminal $OMARCHY_BIN_PATH/omarchy-webapp-install ;;
-  *Style*) show_install_style_menu ;;
-  *Editor*) show_install_editor_menu ;;
-  *AI*) show_install_ai_menu ;;
-  *Dropbox*) present_terminal $OMARCHY_BIN_PATH/omarchy-install-dropbox ;;
-  *Steam*) present_terminal $OMARCHY_BIN_PATH/omarchy-install-steam ;;
-  *Docker*) present_terminal $OMARCHY_BIN_PATH/omarchy-install-docker-dbs ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\n  Zed") in
-  *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
-  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor-cursor" ;;
-  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_ai_menu() {
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  Open Code") in
-  *Claude*) install "Claude Code" "claude-code" ;;
-  *Gemini*) install "Gemini" "gemini-cli-bin" ;;
-  *Studio*) install "LM Studio" "lmstudio" ;;
-  *Ollama*) install "Ollama" "ollama" ;;
-  *Crush*) install "Crush" "crush-bin" ;;
-  *Code*) install "Open Code" "opencode-bin" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_style_menu() {
-  case $(menu "Install" "󰸌  Theme\n  Background\n  Font") in
-  *Theme*) present_terminal $OMARCHY_BIN_PATH/omarchy-theme-install ;;
-  *Background*) nautilus ~/.config/omarchy/current/theme/backgrounds ;;
-  *Font*) show_install_font_menu ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_install_font_menu() {
-  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono" "-w 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" ;;
-  *) show_install_menu ;;
-  esac
-}
-
-show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n󰸌  Theme\n󰈷  Fingerprint\n  Fido2") in
-  *Package*) terminal $OMARCHY_BIN_PATH/omarchy-pkg-remove ;;
-  *Web*) present_terminal $OMARCHY_BIN_PATH/omarchy-webapp-remove ;;
-  *Theme*) present_terminal $OMARCHY_BIN_PATH/omarchy-theme-remove ;;
-  *Fingerprint*) present_terminal "$OMARCHY_BIN_PATH/omarchy-setup-fingerprint --remove" ;;
-  *Fido2*) present_terminal "$OMARCHY_BIN_PATH/omarchy-setup-fido2 --remove" ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_update_menu() {
-  case $(menu "Update" "󰣇  Omarchy\n  Config\n  Process\n󰸌  Themes\n  Timezone") in
-  *Omarchy*) present_terminal $OMARCHY_BIN_PATH/omarchy-update ;;
-  *Config*) show_update_config_menu ;;
-  *Process*) show_update_process_menu ;;
-  *Themes*) present_terminal $OMARCHY_BIN_PATH/omarchy-theme-update ;;
-  *Timezone*) $OMARCHY_BIN_PATH/omarchy-cmd-tzupdate ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_update_process_menu() {
-  case $(menu "Restart" "  Hypridle\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
-  *Hypridle*) $OMARCHY_BIN_PATH/omarchy-restart-hypridle ;;
-  *Hyprsunset*) $OMARCHY_BIN_PATH/omarchy-restart-hyprsunset ;;
-  *Swayosd*) $OMARCHY_BIN_PATH/omarchy-restart-swayosd ;;
-  *Walker*) $OMARCHY_BIN_PATH/omarchy-restart-walker ;;
-  *Waybar*) $OMARCHY_BIN_PATH/omarchy-restart-waybar ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_update_config_menu() {
-  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
-  *Hyprland*) present_terminal $OMARCHY_BIN_PATH/omarchy-refresh-hyprland ;;
-  *Hypridle*) present_terminal $OMARCHY_BIN_PATH/omarchy-refresh-hypridle ;;
-  *Hyprlock*) present_terminal $OMARCHY_BIN_PATH/omarchy-refresh-hyprlock ;;
-  *Hyprsunset*) present_terminal $OMARCHY_BIN_PATH/omarchy-refresh-hyprsunset ;;
-  *Plymouth*) present_terminal $OMARCHY_BIN_PATH/omarchy-refresh-plymouth ;;
-  *Swayosd*) present_terminal $OMARCHY_BIN_PATH/omarchy-refresh-swayosd ;;
-  *Walker*) present_terminal $OMARCHY_BIN_PATH/omarchy-refresh-walker ;;
-  *Waybar*) present_terminal $OMARCHY_BIN_PATH/omarchy-refresh-waybar ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_system_menu() {
-  case $(menu "System" "  Lock\n󰤄  Suspend\n  Relaunch\n󰜉  Restart\n󰐥  Shutdown") in
-  *Lock*) hyprlock ;;
-  *Suspend*) systemctl suspend ;;
-  *Relaunch*) uwsm stop ;;
-  *Restart*) systemctl reboot ;;
-  *Shutdown*) systemctl poweroff ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_main_menu() {
-  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n  Capture\n󰔎  Toggle\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
-}
-
-go_to_menu() {
-  case "${1,,}" in
-  *apps*) walker -p "Launch…" ;;
-  *learn*) show_learn_menu ;;
-  *style*) show_style_menu ;;
-  *theme*) show_theme_menu ;;
-  *capture*) show_capture_menu ;;
-  *screenshot*) show_screenshot_menu ;;
-  *screenrecord*) show_screenrecord_menu ;;
-  *toggle*) show_toggle_menu ;;
-  *setup*) show_setup_menu ;;
-  *install*) show_install_menu ;;
-  *remove*) show_remove_menu ;;
-  *update*) show_update_menu ;;
-  *system*) show_system_menu ;;
-  *about*) gtk-launch About.desktop ;;
-  esac
-}
-
-if [[ -n "$1" ]]; then
-  go_to_menu "$1"
-else
-  show_main_menu
-fi

bin/omarchy-menu-keybindings

@@ -1,86 +0,0 @@
-#!/bin/bash
-
-# A script to display Hyprland keybindings defined in your configuration
-# using walker for an interactive search menu.
-
-# Fetch dynamic keybindings from Hyprland
-#
-# Also do some pre-processing:
-# - Remove standard Omarchy bin path prefix
-# - Remove uwsm prefix
-# - Map numeric modifier key mask to a textual rendition
-# - Output comma-separated values that the parser can understand
-dynamic_bindings() {
-  hyprctl -j binds | \
-    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/@0//' \
-        -e 's/,@/,code:/' \
-        -e 's/^0,/,/' \
-        -e 's/^1,/SHIFT,/' \
-        -e 's/^4,/CTRL,/' \
-        -e 's/^5,/SHIFT CTRL,/' \
-        -e 's/^8,/ALT,/' \
-        -e 's/^9,/SHIFT ALT,/' \
-        -e 's/^12,/CTRL ALT,/' \
-        -e 's/^13,/SHIFT CTRL ALT,/' \
-        -e 's/^64,/SUPER,/' \
-        -e 's/^65,/SUPER SHIFT,/' \
-        -e 's/^68,/SUPER CTRL,/' \
-        -e 's/^69,/SUPER SHIFT CTRL,/' \
-        -e 's/^72,/SUPER ALT,/'
-}
-
-# Parse and format keybindings
-#
-# `awk` does the heavy lifting:
-# - Set the field separator to a comma ','.
-# - Joins the key combination (e.g., "SUPER + Q").
-# - Joins the command that the key executes.
-# - Prints everything in a nicely aligned format.
-parse_bindings() {
-  awk -F, '
-{
-    # Combine the modifier and key (first two fields)
-    key_combo = $1 " + " $2;
-
-    # Clean up: strip leading "+" if present, trim spaces
-    gsub(/^[ \t]*\+?[ \t]*/, "", key_combo);
-    gsub(/[ \t]+$/, "", key_combo);
-
-    # Use description, if set
-    action = $3;
-
-    if (action == "") {
-        # Reconstruct the command from the remaining fields
-        for (i = 4; i <= NF; i++) {
-            action = action $i (i < NF ? "," : "");
-        }
-
-        # Clean up trailing commas, remove leading "exec, ", and trim
-        sub(/,$/, "", action);
-        gsub(/(^|,)[[:space:]]*exec[[:space:]]*,?/, "", action);
-        gsub(/^[ \t]+|[ \t]+$/, "", action);
-        gsub(/[ \t]+/, " ", key_combo);  # Collapse multiple spaces to one
-
-        # Escape XML entities
-        gsub(/&/, "\\&amp;", action);
-        gsub(/</, "\\&lt;", action);
-        gsub(/>/, "\\&gt;", action);
-        gsub(/"/, "\\&quot;", action);
-        gsub(/'"'"'/, "\\&apos;", action);
-    }
-
-    if (action != "") {
-        printf "%-35s → %s\n", key_combo, action;
-    }
-}'
-}
-
-dynamic_bindings | \
-  sort -u | \
-  parse_bindings | \
-  walker --dmenu --theme keybindings -p 'Keybindings'

bin/omarchy-migrate

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Where we store an empty file for each migration that has already been performed.
-STATE_DIR="$HOME/.local/state/omarchy/migrations"
-mkdir -p "$STATE_DIR"
-
-# Run any pending migrations
-for file in ~/.local/share/omarchy/migrations/*.sh; do
-  filename=$(basename "$file")
-
-  if [[ ! -f "$STATE_DIR/$filename" ]]; then
-    echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
-    source $file
-    touch "$STATE_DIR/$filename"
-  fi
-done

bin/omarchy-pkg-install

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-pkg_name=$(yay -Slq | fzf --multi --preview 'yay -Sii {1}' --preview-window=down:75%)
-
-if [[ -n "$pkg_name" ]]; then
-  yay -Sy --noconfirm "$pkg_name"
-  sudo updatedb
-  ~/.local/share/omarchy/bin/omarchy-show-done
-fi

bin/omarchy-pkg-remove

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-pkg_name=$(yay -Qqe | fzf --multi --preview 'yay -Qi {1}' --preview-window=down:75%)
-
-if [[ -n "$pkg_name" ]]; then
-  yay -Rns --noconfirm "$pkg_name"
-  sudo updatedb
-  ~/.local/share/omarchy/bin/omarchy-show-done
-fi

bin/omarchy-power-menu

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Power menu for Omarchy
+# Provides power off, restart, and sleep options
+
+# Function to show power menu. The first characters are invisible sort keys.
+show_power_menu() {
+  local menu_options="\u200B Lock
+\u200C󰤄 Suspend
+\u200D Relaunch
+\u2060󰜉 Restart
+\u2063󰐥 Shutdown"
+  local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 150 --height 195 -O alphabetical --style ~/.local/share/omarchy/default/wofi/select.css)
+
+  case "$selection" in
+  *Lock*) hyprlock ;;
+  *Suspend*) systemctl suspend ;;
+  *Relaunch*) uwsm stop ;;
+  *Restart*) systemctl reboot ;;
+  *Shutdown*) systemctl poweroff ;;
+  esac
+}
+
+# Main execution
+show_power_menu

bin/omarchy-powerprofiles-list

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-powerprofilesctl list |
-  awk '/^\s*[* ]\s*[a-zA-Z0-9\-]+:$/ { gsub(/^[*[:space:]]+|:$/,""); print }' |
-  tac

bin/omarchy-refresh-applications

@@ -10,8 +10,7 @@ mkdir -p ~/.local/share/applications
 cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
 cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
 
-# Only copy xtras if user is not in bare mode
-if [[ ! -f ~/.local/state/omarchy/bare.mode ]] && [ -z "$OMARCHY_BARE" ]; then
+if [ -z "$OMARCHY_BARE" ]; then
   cp ~/.local/share/omarchy/applications/xtras/*.desktop ~/.local/share/applications/
 fi
 

bin/omarchy-refresh-config

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# This script deploys ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z
-config_file=$1
-
-if [[ -z "$config_file" ]]; then
-  cat <<USAGE
-  Usage: $0 [config_file]
-
-  Must provide a file path from the .config directory to be refreshed.
-  To copy ~/.local/share/omarchy/config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
-    
-    $0 hypr/hyprlock.conf     
-USAGE
-  exit 1
-fi
-
-# Backup the destination file (with timestamp) to avoid clobbering (Ex: hyprlock.conf.bak.1753817951)
-user_config_file="${HOME}/.config/$config_file"
-default_config_file="${HOME}/.local/share/omarchy/config/$config_file"
-backup_config_file="$user_config_file.bak.$(date +%s)"
-
-if [[ -f "$user_config_file" ]]; then
-  # Create preliminary backup
-  cp -f "$user_config_file" "$backup_config_file" 2>/dev/null
-
-  # Replace config with new default
-  cp -f "$default_config_file" "$user_config_file" 2>/dev/null
-
-  # Compare and delete/inform accordingly
-  if cmp -s "$user_config_file" "$backup_config_file"; then
-    rm "$backup_config_file"
-  else
-    echo -e "\e[31mReplaced $user_config_file with new Omarchy default.\nSaved backup as ${backup_config_file}.\n\n\e[32mChanges:\e[0m"
-    diff "$user_config_file" "$backup_config_file" || true
-  fi
-else
-  # Config file did not exist already
-  cp -f "$default_config_file" "$user_config_file" 2>/dev/null
-fi

bin/omarchy-refresh-hypridle

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-refresh-config hypr/hypridle.conf
-~/.local/share/omarchy/bin/omarchy-restart-hypridle

bin/omarchy-refresh-hyprland

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-refresh-config hypr/autostart.conf
-~/.local/share/omarchy/bin/omarchy-refresh-config hypr/bindings.conf
-~/.local/share/omarchy/bin/omarchy-refresh-config hypr/envs.conf
-~/.local/share/omarchy/bin/omarchy-refresh-config hypr/input.conf
-~/.local/share/omarchy/bin/omarchy-refresh-config hypr/hyprland.conf

bin/omarchy-refresh-hyprlock

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-refresh-config hypr/hyprlock.conf

bin/omarchy-refresh-hyprsunset

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-refresh-config hypr/hyprsunset.conf
-~/.local/share/omarchy/bin/omarchy-restart-hyprsunset

bin/omarchy-refresh-plymouth

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ "$1" == "-y" ]] || gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
+if gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
   sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
   sudo plymouth-set-default-theme -R omarchy
 fi

bin/omarchy-refresh-swayosd

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-refresh-config swayosd/config.toml
-~/.local/share/omarchy/bin/omarchy-refresh-config swayosd/style.css
-~/.local/share/omarchy/bin/omarchy-restart-swayosd

bin/omarchy-refresh-walker

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-refresh-config walker/config.toml
-~/.local/share/omarchy/bin/omarchy-restart-walker

bin/omarchy-refresh-waybar

@@ -1,5 +1,11 @@
 #!/bin/bash
 
-~/.local/share/omarchy/bin/omarchy-refresh-config waybar/config.jsonc
-~/.local/share/omarchy/bin/omarchy-refresh-config waybar/style.css
-~/.local/share/omarchy/bin/omarchy-restart-waybar
+if gum confirm "Refresh Waybar config? This will replace your current settings with Omarchy defaults."; then
+  # Overwrite local waybar settings with the latest in Omarchy
+  cp -f ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/ 2>/dev/null
+  cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
+
+  # Restart waybar
+  pkill waybar &>/dev/null
+  setsid waybar &>/dev/null &
+fi

bin/omarchy-refresh-wofi

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if gum confirm "Refresh Wofi config? This will replace your current settings with Omarchy defaults."; then
+  # Overwrite local waybar settings with the latest in Omarchy
+  cp -f ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/ 2>/dev/null
+  cp -f ~/.local/share/omarchy/config/wofi/style.css ~/.config/wofi/ 2>/dev/null
+fi

bin/omarchy-restart-app

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-pkill -x $1
-setsid uwsm app -- $1 >/dev/null 2>&1 &

bin/omarchy-restart-hypridle

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-restart-app hypridle

bin/omarchy-restart-hyprsunset

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-restart-app hyprsunset

bin/omarchy-restart-swayosd

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-restart-app swayosd-server

bin/omarchy-restart-walker

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-pkill walker
-setsid uwsm app -- walker --gapplication-service &

bin/omarchy-restart-waybar

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-restart-app waybar

bin/omarchy-restart-xcompose

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-~/.local/share/omarchy/bin/omarchy-restart-app fcitx5

bin/omarchy-setup-fido2

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-if [[ "--remove" == "$1" ]]; then
-  echo -e "\e[32mLet's remove your Fido2 device from sudo authentication.\n\e[0m"
-  yay -Rns --noconfirm libfido2 pam-u2f
-  sudo rm -rf /etc/fido2
-  sudo sed -i '\|^auth[[:space:]]\+sufficient[[:space:]]\+pam_u2f\.so[[:space:]]\+cue[[:space:]]\+authfile=/etc/fido2/fido2$|d' /etc/pam.d/sudo
-  echo -e "\e[32m\nYou've successfully removed the fido2 device setup.\e[0m"
-else
-  echo -e "\e[32mLet's setup your Fido2 device for sudo authentication.\n\e[0m"
-  yay -S --noconfirm --needed libfido2 pam-u2f
-
-  tokens=$(fido2-token -L)
-
-  if [ -z "$tokens" ]; then
-    echo -e "\e[31m\nNo fido2 device detected. Plug it in, you may have to unlock it as well\e[0m"
-  else
-    # Create the pamu2fcfg file
-    if [ ! -f /etc/fido2/fido2 ]; then
-      sudo mkdir -p /etc/fido2
-      echo -e "\e[32m\nLet's setup your device by confirming on the device now.\e[0m"
-      pamu2fcfg >/tmp/fido2 # This needs to run as the user
-      if [ $? -ne 0 ]; then
-        echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-        exit 1
-      fi
-      sudo mv /tmp/fido2 /etc/fido2/fido2
-    fi
-
-    # Add fido2 auth as an option for sudo
-    if ! grep -q pam_u2f.so /etc/pam.d/sudo; then
-      sudo sed -i '1i auth    sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/sudo
-    fi
-
-    if ! sudo echo -e "\e[32m\nPerfect! Now you can use your fido2 device for sudo.\e[0m"; then
-      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-    fi
-  fi
-fi

bin/omarchy-setup-fingerprint

@@ -1,45 +0,0 @@
-#!/bin/bash
-
-if [[ "--remove" == "$1" ]]; then
-  echo -e "\e[32mLet's remove your fingerprint scanner from authentication.\n\e[0m"
-  yay -Rns --noconfirm fprintd
-  sudo rm -rf /etc/pam.d/polkit-1
-  sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/sudo
-  echo -e "\e[32mYou've successfully removed the fingerprint setup.\e[0m"
-else
-  echo -e "\e[32mLet's setup your fingerprint scanner for authentication.\n\e[0m"
-  yay -S --noconfirm --needed fprintd usbutils
-
-  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix'; then
-    echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
-  else
-    # Add fingerprint authentication as an option for sudo
-    if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
-      sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
-    fi
-
-    # Add fingerprint authentication as an option for hyprpolkitagent
-    if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
-      sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
-auth      required pam_unix.so
-auth      optional pam_fprintd.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-    fi
-
-    # Enroll the first finger
-    echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
-    sudo fprintd-enroll $USER
-
-    echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
-
-    if fprintd-verify; then
-      echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
-    else
-      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-    fi
-  fi
-fi

bin/omarchy-show-done

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo
-gum spin --spinner "globe" --title "Done! Press any key to close..." -- bash -c 'read -n 1 -s'

bin/omarchy-show-keybindings

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# A script to display Hyprland keybindings defined in your configuration
+# using wofi for an interactive search menu.
+
+USER_HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf"
+OMARCHY_BINDINGS_CONF="$HOME/.local/share/omarchy/default/hypr/bindings.conf $HOME/.local/share/omarchy/default/hypr/bindings/tiling.conf $HOME/.local/share/omarchy/default/hypr/bindings/utilities.conf $HOME/.local/share/omarchy/default/hypr/bindings.conf $HOME/.local/share/omarchy/default/hypr/media.conf"
+
+OMARCHY_BINDINGS_CONF="$HOME/.local/share/omarchy/default/hypr/bindings.conf \
+$HOME/.local/share/omarchy/default/hypr/bindings/tiling.conf \
+$HOME/.local/share/omarchy/default/hypr/bindings/utilities.conf \
+$HOME/.local/share/omarchy/default/hypr/media.conf"
+
+# Process the configuration file to extract and format keybindings
+# 1. `grep` finds all lines starting with 'bind' (allowing for leading spaces).
+# 2. The first `sed` removes comments (anything after a '#').
+# 3. `awk` does the heavy lifting of formatting the output.
+#    - It sets the field separator to a comma ','.
+#    - It removes the 'bind... =' part from the beginning of the line.
+#    - It joins the key combination (e.g., "SUPER + Q").
+#    - It joins the command that the key executes.
+#    - It prints everything in a nicely aligned format.
+# 4. The final `sed` cleans up any leftover commas from the end of lines.
+grep -h '^[[:space:]]*bind' $USER_HYPRLAND_CONF $OMARCHY_BINDINGS_CONF |
+  sed 's/#.*//' |
+  sed '/^[[:space:]]*$/d' |
+  sort -u |
+  awk -F, '
+{
+    # Strip trailing comments
+    sub(/#.*/, "");
+
+    # Remove the "bind... =" part and surrounding whitespace
+    sub(/^[[:space:]]*bind[^=]*=(\+[[:space:]])?(exec, )?[[:space:]]*/, "", $1);
+
+    # Combine the modifier and key (first two fields)
+    key_combo = $1 " + " $2;
+
+    # Clean up: strip leading "+" if present, trim spaces
+    gsub(/^[ \t]*\+?[ \t]*/, "", key_combo);
+    gsub(/[ \t]+$/, "", key_combo);
+
+    # Reconstruct the command from the remaining fields
+    action = "";
+    for (i = 3; i <= NF; i++) {
+        action = action $i (i < NF ? "," : "");
+    }
+
+    # Clean up trailing commas, remove leading "exec, ", and trim
+    sub(/,$/, "", action);
+    gsub(/(^|,)[[:space:]]*exec[[:space:]]*,?/, "", action);
+    gsub(/^[ \t]+|[ \t]+$/, "", action);
+    gsub(/[ \t]+/, " ", key_combo);  # Collapse multiple spaces to one
+
+    if (action != "") {
+        printf "%-35s → %s\n", key_combo, action;
+    }
+}' |
+  flock --nonblock /tmp/.wofi.lock -c "wofi -dmenu -i --width 60% --height 70% -p 'Hyprland Keybindings' -O alphabetical  --style=\"$HOME/.local/share/omarchy/default/wofi/search.css\""

bin/omarchy-show-logo

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-clear
-echo -e "\033[32m"
-cat <~/.local/share/omarchy/logo.txt
-echo -e "\033[0m"
-echo

bin/omarchy-theme-bg-next

@@ -2,47 +2,36 @@
 
 # Cycles through the background images available
 
-BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
+BACKGROUNDS_DIR="$HOME/.config/omarchy/current/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+BACKGROUNDS=($(find "$BACKGROUNDS_DIR" -type f | sort))
 TOTAL=${#BACKGROUNDS[@]}
 
-if [[ $TOTAL -eq 0 ]]; then
-  notify-send "No background was found for theme" -t 2000
-  pkill -x swaybg
-  setsid uwsm app -- swaybg --color '#000000' >/dev/null 2>&1 &
+# Get current background from symlink
+if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
+  CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
 else
-  # Get current background from symlink
-  if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
-    CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
-  else
-    # Default to first background if no symlink exists
-    CURRENT_BACKGROUND=""
-  fi
-
-  # Find current background index
-  INDEX=-1
-  for i in "${!BACKGROUNDS[@]}"; do
-    if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
-      INDEX=$i
-      break
-    fi
-  done
-
-  # Get next background (wrap around)
-  if [[ $INDEX -eq -1 ]]; then
-    # Use the first background when no match was found
-    NEW_BACKGROUND="${BACKGROUNDS[0]}"
-  else
-    NEXT_INDEX=$(((INDEX + 1) % TOTAL))
-    NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
-  fi
-
-  # Set new background symlink
-  ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
-
-  # Relaunch swaybg
-  pkill -x swaybg
-  setsid uwsm app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 &
+  # Default to first background if no symlink exists
+  CURRENT_BACKGROUND=${BACKGROUNDS[0]}
 fi
+
+# Find current background index
+INDEX=0
+for i in "${!BACKGROUNDS[@]}"; do
+  if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
+    INDEX=$i
+    break
+  fi
+done
+
+# Get next background (wrap around)
+NEXT_INDEX=$(((INDEX + 1) % TOTAL))
+NEW_BACKGROUND=${BACKGROUNDS[$NEXT_INDEX]}
+
+# Set new background symlink
+ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
+
+# Relaunch swaybg
+pkill -x swaybg
+setsid swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&2 &

bin/omarchy-theme-current

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-basename "$(realpath "$HOME/.config/omarchy/current/theme")" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g'

bin/omarchy-theme-install

@@ -4,19 +4,17 @@
 # Usage: omarchy-theme-install <git-repo-url>
 
 if [ -z "$1" ]; then
-  echo -e "\e[32mSee https://manuals.omamix.org/2/the-omarchy-manual/90/extra-themes\n\e[0m"
-  REPO_URL=$(gum input --placeholder="Git repo URL for theme" --header="")
-else
-  REPO_URL="$1"
-fi
-
-if [ -z "$REPO_URL" ]; then
+  echo "Usage: omarchy-theme-install <git-repo-url>"
   exit 1
 fi
 
+REPO_URL="$1"
 THEMES_DIR="$HOME/.config/omarchy/themes"
-THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//')
+THEME_NAME=$(basename "$REPO_URL" .git)
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
+THEME_BACKGROUND_PATH="$THEME_PATH/backgrounds"
+BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds"
+BACKGROUNDS_THEME_PATH="$BACKGROUNDS_PATH/$THEME_NAME"
 
 # Remove existing theme if present
 if [ -d "$THEME_PATH" ]; then
@@ -29,5 +27,12 @@ if ! git clone "$REPO_URL" "$THEME_PATH"; then
   exit 1
 fi
 
+# Copy backgrounds if present
+if [ -d $THEME_BACKGROUND_PATH ]; then
+  mkdir -p $BACKGROUNDS_THEME_PATH
+  cp $THEME_BACKGROUND_PATH/* $BACKGROUNDS_THEME_PATH/
+fi
+
 # Apply the new theme with omarchy-theme-set
-~/.local/share/omarchy/bin/omarchy-theme-set $THEME_NAME
+omarchy-theme-set $THEME_NAME
+

bin/omarchy-theme-list

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

bin/omarchy-theme-menu

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+THEMES_DIR="$HOME/.config/omarchy/themes/"
+CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
+CURRENT_THEME_NAME=$(basename "$(realpath "$CURRENT_THEME_DIR")")
+
+# Build themes list with pretty display names
+mapfile -t themes < <(
+  find "$THEMES_DIR" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | while read -r path; do
+    filename=$(basename "$path")
+    display_name=$(echo "$filename" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g')
+
+    if [[ "$filename" == "$CURRENT_THEME_NAME" ]]; then
+      echo "<i>$display_name</i>"
+    else
+      echo "$display_name"
+    fi
+  done | sort
+)
+
+# Show Wofi menu (with markup support)
+selection=$(printf '%s\n' "${themes[@]}" | wofi \
+  --show dmenu \
+  --allow-markup \
+  --width 150 \
+  --height 300 \
+  -O alphabetical \
+  --style ~/.local/share/omarchy/default/wofi/select.css)
+
+# Remove any Pango markup before converting back to filename
+clean_selection=$(echo "$selection" | sed -E 's/<[^>]+>//g')
+
+# Convert to lowercase and dash-separated: "Tokyo Night" -> "tokyo-night"
+selected_theme=$(echo "$clean_selection" | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
+
+# Apply the selected theme
+"$HOME/.local/share/omarchy/bin/omarchy-theme-set" "$selected_theme"
+

bin/omarchy-theme-next

@@ -30,5 +30,5 @@ NEXT_INDEX=$(((INDEX + 1) % TOTAL))
 NEW_THEME=${THEMES[$NEXT_INDEX]}
 NEW_THEME_NAME=$(basename "$NEW_THEME")
 
-~/.local/share/omarchy/bin/omarchy-theme-set $NEW_THEME_NAME
+omarchy-theme-set $NEW_THEME_NAME
 notify-send "Theme changed to $NEW_THEME_NAME" -t 2000

bin/omarchy-theme-remove

@@ -4,37 +4,30 @@
 # Usage: omarchy-theme-remove <theme-name>
 
 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[@]}")
-  else
-    echo "No extra themes installed."
-    exit 1
-  fi
-else
-  THEME_NAME="$1"
-fi
-
-THEMES_DIR="$HOME/.config/omarchy/themes"
-CURRENT_DIR="$HOME/.config/omarchy/current"
-THEME_PATH="$THEMES_DIR/$THEME_NAME"
-
-# Ensure a theme was set
-if [ -z "$THEME_NAME" ]; then
+  echo "Usage: omarchy-theme-remove <theme-name>"
   exit 1
 fi
 
+THEME_NAME="$1"
+THEMES_DIR="$HOME/.config/omarchy/themes"
+BACKGROUND_DIR="$HOME/.config/omarchy/backgrounds"
+CURRENT_DIR="$HOME/.config/omarchy/current"
+
+THEME_PATH="$THEMES_DIR/$THEME_NAME"
+BACKGROUND_PATH="$BACKGROUND_DIR/$THEME_NAME"
+
 # Check if theme exists before attempting removal
 if [ ! -d "$THEME_PATH" ]; then
   echo "Error: Theme '$THEME_NAME' not found."
   exit 1
 fi
 
-# Move to the next theme if the current theme is the one being removed
+# Use readlink -f to resolve symlinks and get the absolute path
 if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
-  ~/.local/share/omarchy/bin/omarchy-theme-next
+  "$HOME/.local/share/omarchy/bin/omarchy-theme-next"
 fi
 
-# Now remove the theme directory for THEME_NAME
+# Now remove the theme directory and backgrounds for THEME_NAME
 rm -rf "$THEME_PATH"
+rm -rf "$BACKGROUND_PATH"
+

bin/omarchy-theme-set

@@ -3,7 +3,7 @@
 # omarchy-theme-set: Set a theme, specified by its name.
 # Usage: omarchy-theme-set <theme-name>
 
-if [[ -z "$1" && "$1" != "CNCLD" ]]; then
+if [[ -z "$1" ]]; then
   echo "Usage: omarchy-theme-set <theme-name>" >&2
   exit 1
 fi
@@ -11,8 +11,9 @@ fi
 THEMES_DIR="$HOME/.config/omarchy/themes/"
 CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
 
-THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
+THEME_NAME="$1"
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
+BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"
 
 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
@@ -21,33 +22,21 @@ if [[ ! -d "$THEME_PATH" ]]; then
 fi
 
 # Update theme symlinks
+ln -nsf "$BACKGROUND_PATH" "$HOME/.config/omarchy/current/backgrounds"
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
-# Change gnome modes
-if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
-else
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
-fi
-
-# Change gnome icon theme color
-if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
-  gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
-else
-  gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
-fi
-
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"
 
 # Restart components to apply new theme
-pkill -SIGUSR2 btop
-~/.local/share/omarchy/bin/omarchy-restart-waybar
-~/.local/share/omarchy/bin/omarchy-restart-swayosd
+pkill -SIGUSR2 waybar
 makoctl reload
 hyprctl reload
 
 # Set new background
-~/.local/share/omarchy/bin/omarchy-theme-bg-next
+first_bg=$(find "$HOME/.config/omarchy/current/backgrounds/" -type f | head -n 1)
+if [[ -n "$first_bg" ]]; then
+  ln -nsf "$first_bg" "$HOME/.config/omarchy/current/background"
+  pkill -x swaybg
+  setsid swaybg -i "$HOME/.config/omarchy/current/background" -m fill >/dev/null &
+fi

bin/omarchy-theme-update

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-for dir in ~/.config/omarchy/themes/*/; do
-  [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
-done

bin/omarchy-toggle-idle

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-if pgrep -x hypridle >/dev/null; then
+if pgrep -x hypridle > /dev/null; then
   pkill -x hypridle
   notify-send "Stop locking computer when idle"
 else
-  uwsm app -- hypridle >/dev/null 2>&1 &
+  setsid hypridle &> /dev/null &
   notify-send "Now locking computer when idle"
 fi

bin/omarchy-toggle-nightlight

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Default temperature values
-ON_TEMP=4000
-OFF_TEMP=6000
-
-# Ensure hyprsunset is running
-if ! pgrep -x hyprsunset; then
-  setsid uwsm app -- hyprsunset &
-  sleep 1 # Give it time to register
-fi
-
-# Query the current temperature
-CURRENT_TEMP=$(hyprctl hyprsunset temperature 2>/dev/null | grep -oE '[0-9]+')
-
-restart_nightlighted_waybar() {
-  if grep -q "custom/nightlight" ~/.config/waybar/config.jsonc; then
-    omarchy-restart-waybar # restart waybar in case user has waybar module for hyprsunset
-  fi
-}
-
-if [[ "$CURRENT_TEMP" == "$OFF_TEMP" ]]; then
-  hyprctl hyprsunset temperature $ON_TEMP
-  notify-send "  Nightlight screen temperature"
-  restart_nightlighted_waybar
-else
-  hyprctl hyprsunset temperature $OFF_TEMP
-  notify-send "   Daylight screen temperature"
-  restart_nightlighted_waybar
-fi

bin/omarchy-update

@@ -1,21 +1,31 @@
 #!/bin/bash
 
-# Exit immediately if a command exits with a non-zero status
-set -e
+cd ~/.local/share/omarchy
 
-# Get the latest while trying to preserve any modifications
-omarchy_path=~/.local/share/omarchy
-git -C $omarchy_path pull --autostash
-git -C $omarchy_path diff --check || git -C $omarchy_path reset --merge
-
-# Run migrations
-~/.local/share/omarchy/bin/omarchy-migrate
-
-# Update system packages
-echo -e "\e[32m\nUpdate system packages\e[0m"
-yay -Syu --noconfirm
-
-# Offer to reboot if the kernel has been changed
-if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
-  gum confirm "Linux kernel has been updated. Reboot?" && sudo reboot now
+if [[ $1 == "all" ]]; then
+  # Run all migrations
+  last_updated_at=1
+else
+  # Remember the version we're at before upgrading
+  last_updated_at=$(git log -1 --format=%cd --date=unix)
 fi
+
+# Get the latest
+git pull
+
+# Run any pending migrations
+for file in migrations/*.sh; do
+  filename=$(basename "$file")
+  migrate_at="${filename%.sh}"
+
+  if [ $migrate_at -gt $last_updated_at ]; then
+    echo -e "\e[32m\nRunning migration ($migrate_at)\e[0m"
+    source $file
+  fi
+done
+
+# Back to where we came from
+cd - >/dev/null
+
+echo -e "\e[32m\nUpdating system packages\e[0m"
+yay -Syu --noconfirm

bin/omarchy-update-available

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-omarchy_path="$HOME/.local/share/omarchy"
-
-# Ensure remote is reachable
-if ! git -C "$omarchy_path" ls-remote &>/dev/null; then
-  echo "Error: Unable to reach remote repository."
-  exit 1
-fi
-
-latest_tag=$(git -C "$omarchy_path" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
-current_tag=$(git -C "$omarchy_path" describe --tags $(git -C "$omarchy_path" rev-list --tags --max-count=1))
-
-if [[ "$current_tag" != "$latest_tag" ]]; then
-  echo "Omarchy update available ($latest_tag)"
-  exit 0
-else
-  echo "Omarchy is up to date ($current_tag)"
-  exit 1
-fi

bin/omarchy-webapp-install

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-if [ "$#" -ne 3 ]; then
-  echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
-  APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")
-  APP_URL=$(gum input --prompt "URL> " --placeholder "https://example.com")
-  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
-else
-  APP_NAME="$1"
-  APP_URL="$2"
-  ICON_URL="$3"
-fi
-
-if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_URL" ]]; then
-  echo "You must set app name, app URL, and icon URL!"
-  exit 1
-fi
-
-ICON_DIR="$HOME/.local/share/applications/icons"
-DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-ICON_PATH="$ICON_DIR/$APP_NAME.png"
-
-mkdir -p "$ICON_DIR"
-
-if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
-  echo "Error: Failed to download icon."
-  return 1
-fi
-
-cat >"$DESKTOP_FILE" <<EOF
-[Desktop Entry]
-Version=1.0
-Name=$APP_NAME
-Comment=$APP_NAME
-Exec=chromium --new-window --ozone-platform=wayland --app="$APP_URL" --name="$APP_NAME" --class="$APP_NAME"
-Terminal=false
-Type=Application
-Icon=$ICON_PATH
-StartupNotify=true
-EOF
-
-chmod +x "$DESKTOP_FILE"
-
-if [ "$#" -ne 3 ]; then
-  echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
-fi

bin/omarchy-webapp-remove

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-ICON_DIR="$HOME/.local/share/applications/icons"
-DESKTOP_DIR="$HOME/.local/share/applications/"
-
-if [ "$#" -ne 1 ]; then
-  # Find all web apps
-  while IFS= read -r -d '' file; do
-    if grep -q '^Exec=.*chromium.*--app' "$file"; then
-      WEB_APPS+=("$(basename "${file%.desktop}")")
-    fi
-  done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)
-
-  if ((${#WEB_APPS[@]})); then
-    IFS=$'\n' SORTED_WEB_APPS=($(sort <<<"${WEB_APPS[*]}"))
-    unset IFS
-    APP_NAME=$(gum choose --header "Select web app to remove..." "${SORTED_WEB_APPS[@]}")
-  else
-    echo "No web apps to remove."
-    exit 1
-  fi
-else
-  APP_NAME="$1"
-fi
-
-if [[ -z "$APP_NAME" ]]; then
-  echo "You must provide web app name."
-  exit 1
-fi
-
-rm "$DESKTOP_DIR/$APP_NAME.desktop"
-rm "$ICON_DIR/$APP_NAME.png"
-
-if [ "$#" -ne 1 ]; then
-  echo -e "Removed $APP_NAME\n"
-fi

boot.sh

@@ -1,27 +1,20 @@
-#!/bin/bash
+ascii_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
+███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
+███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
+███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
+ ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+                                          ███    ███                                    '
 
-ansi_art='                 ▄▄▄                                                   
- ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
-███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
-███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
-███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
-███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
- ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀ 
-                                       ███   █▀                                  '
+echo -e "\n$ascii_art\n"
 
-clear
-echo -e "\n$ansi_art\n"
+pacman -Q git &>/dev/null || sudo pacman -Sy --noconfirm --needed git
 
-sudo pacman -Sy --noconfirm --needed git
-
-# Use custom repo if specified, otherwise default to basecamp/omarchy
-OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
-
-echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
+echo -e "\nCloning Omarchy..."
 rm -rf ~/.local/share/omarchy/
-git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
+git clone https://github.com/basecamp/omarchy.git ~/.local/share/omarchy >/dev/null
 
 # Use custom branch if instructed
 if [[ -n "$OMARCHY_REF" ]]; then

config/chromium-flags.conf

@@ -1,3 +0,0 @@
---ozone-platform=wayland
---ozone-platform-hint=wayland
---enable-features=TouchpadOverscrollHistoryNavigation

config/fastfetch/config.jsonc

@@ -1,149 +1,144 @@
 {
-  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-  "logo": {
-    "padding": {
-      "top": 5,
-      "right": 6
-    }
-  },
-  "modules": [
-    "break",
-    {
-      "type": "custom",
-      "format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "padding": {
+            "top": 5,
+            "right": 6
+        }
     },
-    {
-      "type": "host",
-      "key": " PC",
-      "keyColor": "green"
-    },
-    {
-      "type": "cpu",
-      "key": "│ ├",
-      "showPeCoreCount": true,
-      "keyColor": "green"
-    },
-    {
-      "type": "gpu",
-      "key": "│ ├",
-      "detectionMethod": "pci",
-      "keyColor": "green"
-    },
-    {
-      "type": "display",
-      "key": "│ ├󱄄",
-      "keyColor": "green"
-    },
-    {
-      "type": "disk",
-      "key": "│ ├󰋊",
-      "keyColor": "green"
-    },
-    {
-      "type": "memory",
-      "key": "│ ├",
-      "keyColor": "green"
-    },
-    {
-      "type": "swap",
-      "key": "└ └󰓡 ",
-      "keyColor": "green"
-    },
-    {
-      "type": "custom",
-      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-    },
-    "break",
-    {
-      "type": "custom",
-      "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
-    },
-    {
-      "type": "os",
-      "key": "󰣇 OS",
-      "keyColor": "yellow"
-    },
-    {
-      "type": "kernel",
-      "key": "│ ├",
-      "keyColor": "yellow"
-    },
-    {
-      "type": "packages",
-      "key": "│ ├󰏖",
-      "keyColor": "yellow"
-    },
-    {
-      "type": "shell",
-      "key": "└ └",
-      "keyColor": "yellow"
-    },
-    "break",
-    {
-      "type": "command",
-      "key": "│ ├Ø",
-      "keyColor": "blue",
-      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
-    },
-    {
-      "type": "de",
-      "key": " DE",
-      "keyColor": "blue"
-    },
-    {
-      "type": "wm",
-      "key": "│ ├",
-      "keyColor": "blue"
-    },
-    {
-      "type": "wmtheme",
-      "key": "│ ├󰉼",
-      "keyColor": "blue"
-    },
-    {
-      "type": "icons",
-      "key": "│ ├󰀻",
-      "keyColor": "blue"
-    },
-    {
-      "type": "cursor",
-      "key": "│ ├",
-      "keyColor": "blue"
-    },
-    {
-      "type": "terminalfont",
-      "key": "│ ├",
-      "keyColor": "blue"
-    },
-    {
-      "type": "terminal",
-      "key": "└ └",
-      "keyColor": "blue"
-    },
-    {
-      "type": "custom",
-      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-    },
-    "break",
-    {
-      "type": "custom",
-      "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
-    },
-    {
-      "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"
-    },
-    {
-      "type": "uptime",
-      "key": "  Uptime ",
-      "keyColor": "magenta"
-    },
-    {
-      "type": "custom",
-      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-    },
-    "break"
-  ]
+    "modules": [
+        "break",
+        {
+            "type": "custom",
+            "format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
+        },
+        {
+            "type": "host",
+            "key": " PC",
+            "keyColor": "green"
+        },
+        {
+            "type": "cpu",
+            "key": "│ ├",
+            "showPeCoreCount": true,
+            "keyColor": "green"
+        },
+        {
+            "type": "gpu",
+            "key": "│ ├",
+            "detectionMethod": "pci",
+            "keyColor": "green"
+        },
+        {
+            "type": "display",
+            "key": "│ ├󱄄",
+            "keyColor": "green"
+        },
+        {
+            "type": "disk",
+            "key": "│ ├󰋊",
+            "keyColor": "green"
+        },
+        {
+            "type": "memory",
+            "key": "│ ├",
+            "keyColor": "green"
+        },
+        {
+            "type": "swap",
+            "key": "└ └󰓡 ",
+            "keyColor": "green",
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+        },
+        "break",
+        {
+            "type": "custom",
+            "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
+        },
+        {
+            "type": "os",
+            "key": " OS",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "kernel",
+            "key": "│ ├",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "packages",
+            "key": "│ ├󰏖",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "shell",
+            "key": "└ └",
+            "keyColor": "yellow"
+        },
+        "break",
+        {
+            "type": "de",
+            "key": " DE",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wm",
+            "key": "│ ├",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wmtheme",
+            "key": "│ ├󰉼",
+            "keyColor": "blue"
+        },
+        {
+            "type": "icons",
+            "key": "│ ├󰀻",
+            "keyColor": "blue",
+        },
+        {
+            "type": "cursor",
+            "key": "│ ├",
+            "keyColor": "blue",
+        },
+        {
+            "type": "terminalfont",
+            "key": "│ ├",
+            "keyColor": "blue",
+        },
+        {
+            "type": "terminal",
+            "key": "└ └",
+            "keyColor": "blue"
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+        },
+        "break",
+        {
+            "type": "custom",
+            "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
+        },
+        {
+            "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"
+        },
+        {
+            "type": "uptime",
+            "key": "  Uptime ",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+        },
+        "break",
+    ]
 }
+

config/hypr/autostart.conf

@@ -1,2 +0,0 @@
-# Extra autostart processes
-# exec-once = uwsm app -- my-service

config/hypr/bindings.conf

@@ -1,25 +0,0 @@
-# Application bindings
-$terminal = uwsm app -- alacritty
-$browser = uwsm app -- chromium --new-window --ozone-platform=wayland
-$webapp = $browser --app
-
-bindd = SUPER, return, Terminal, exec, $terminal
-bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
-bindd = SUPER, B, Browser, exec, $browser
-bindd = SUPER, M, Music, exec, uwsm app -- spotify
-bindd = SUPER, N, Neovim, exec, $terminal -e nvim
-bindd = SUPER, T, Activity, exec, $terminal -e btop
-bindd = SUPER, D, Docker, exec, $terminal -e lazydocker
-bindd = SUPER, G, Signal, exec, uwsm app -- signal-desktop
-bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu
-bindd = SUPER, slash, Passwords, exec, uwsm app -- 1password
-
-bindd = SUPER, A, ChatGPT, exec, $webapp="https://chatgpt.com"
-bindd = SUPER SHIFT, A, Grok, exec, $webapp="https://grok.com"
-bindd = SUPER, C, Calendar, exec, $webapp="https://app.hey.com/calendar/weeks/"
-bindd = SUPER, E, Email, exec, $webapp="https://app.hey.com"
-bindd = SUPER, Y, YouTube, exec, $webapp="https://youtube.com/"
-bindd = SUPER SHIFT, G, WhatsApp, exec, $webapp="https://web.whatsapp.com/"
-bindd = SUPER ALT, G, Google Messages, exec, $webapp="https://messages.google.com/web/conversations"
-bindd = SUPER, X, X, exec, $webapp="https://x.com/"
-bindd = SUPER SHIFT, X, X Post, exec, $webapp="https://x.com/compose/post"

config/hypr/envs.conf

@@ -1,3 +0,0 @@
-# Extra env variables
-# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
-# env = MY_GLOBAL_ENV,setting

config/hypr/hypridle.conf

@@ -1,14 +1,7 @@
 general {
-    lock_cmd = pidof hyprlock || hyprlock                  # avoid starting multiple hyprlock instances.
-    before_sleep_cmd = loginctl lock-session               # lock before suspend.
-    after_sleep_cmd = hyprctl dispatch dpms on             # to avoid having to press a key twice to turn on the display.
-    on_lock_cmd = pkill -f "alacritty --class Screensaver" # avoid running screensaver when locked
-    on_unlock_cmd = omarchy-restart-waybar                 # prevent stacking of waybar when waking
-}
-
-listener {
-    timeout = 150                                             # 2.5min
-    on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
+    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
+    before_sleep_cmd = loginctl lock-session    # lock before suspend.
+    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
 }
 
 listener {

config/hypr/hyprland.conf

@@ -1,6 +1,13 @@
 # Learn how to configure Hyprland: https://wiki.hyprland.org/Configuring/
 
-# Use defaults Omarchy defaults (but don't edit these directly!)
+# You're encouraged to tailor your Hyprland config in this file by adding or overwriting any settings.
+# But don't change anything that lives in ~/.local/share/omarchy, if you can help it!
+# Those files are overwritten when Omarchy is updated.
+
+# Change your personal monitor setup in here to keep the main config portable
+source = ~/.config/hypr/monitors.conf
+
+# Use defaults Omarchy defaults
 source = ~/.local/share/omarchy/default/hypr/autostart.conf
 source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
 source = ~/.local/share/omarchy/default/hypr/bindings/tiling.conf
@@ -11,9 +18,64 @@ 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/autostart.conf
+# Application bindings
+$terminal = alacritty
+$browser = chromium --new-window --ozone-platform=wayland
+$webapp = $browser --app
+
+bind = SUPER, return, exec, $terminal
+bind = SUPER, F, exec, nautilus --new-window
+bind = SUPER, B, exec, $browser
+bind = SUPER, M, exec, spotify
+bind = SUPER, N, exec, $terminal -e nvim
+bind = SUPER, T, exec, $terminal -e btop
+bind = SUPER, D, exec, $terminal -e lazydocker
+bind = SUPER, G, exec, signal-desktop
+bind = SUPER, O, exec, obsidian -disable-gpu
+bind = SUPER, slash, exec, 1password
+
+bind = SUPER, A, exec, $webapp="https://chatgpt.com"
+bind = SUPER SHIFT, A, exec, $webapp="https://grok.com"
+bind = SUPER, C, exec, $webapp="https://app.hey.com/calendar/weeks/"
+bind = SUPER, E, exec, $webapp="https://app.hey.com"
+bind = SUPER, Y, exec, $webapp="https://youtube.com/"
+bind = SUPER SHIFT, G, exec, $webapp="https://web.whatsapp.com/"
+bind = SUPER ALT, G, exec, $webapp="https://messages.google.com/web/conversations"
+bind = SUPER, X, exec, $webapp="https://x.com/"
+bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post"
+
+# Extra autostart processes
+# exec-once = dropbox-cli start
+
+# Extra env variables
+# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
+# env = MY_GLOBAL_ENV,setting
+
+# Control your input devices
+# See https://wiki.hypr.land/Configuring/Variables/#input
+input {
+  # Use multiple keyboard layouts and switch between them with Alt + Space
+  # kb_layout = us,dk
+  # kb_options = compose:caps,grp:alt_space_toggle
+
+  # Change speed of keyboard repeat
+  repeat_rate = 40
+  repeat_delay = 600
+
+  # Increase sensitity for mouse/trackpack (default: 0)
+  # sensitivity = 0.35
+
+  touchpad {
+    # Use natural (inverse) scrolling
+    # natural_scroll = true
+
+    # Use two-finger clicks for right-click instead of lower-right corner
+    # clickfinger_behavior = true
+
+    # Control the speed of your scrolling
+    scroll_factor = 0.4
+  }
+}
+
+# Scroll faster in the terminal
+windowrule = scrolltouchpad 1.5, class:Alacritty

config/hypr/hyprlock.conf

@@ -1,5 +1,14 @@
+# ────────────────────────────────────────────────────────────
+#  Hyprlock — minimal blur with ringed input
+# ────────────────────────────────────────────────────────────
+
 source = ~/.config/omarchy/current/theme/hyprlock.conf
 
+general {
+    disable_loading_bar = true
+    no_fade_in = false
+}
+
 background {
     monitor =
     color = $color
@@ -21,11 +30,13 @@ input-field {
     outline_thickness = 4
 
     font_family = CaskaydiaMono Nerd Font
+    font_size = 32
     font_color = $font_color
 
+    placeholder_color = $placeholder_color
     placeholder_text =   Enter Password 󰈷 
     check_color = $check_color
-    fail_text = <i>$PAMFAIL ($ATTEMPTS)</i>
+    fail_text = Wrong
 
     rounding = 0
     shadow_passes = 0

config/hypr/hyprsunset.conf

@@ -1,6 +0,0 @@
-# Makes hyprsunset do nothing to the screen by default
-# Without this, the default applies some tint to the monitor
-profile {
-    time = 00:00
-    identity = true
-}

config/hypr/input.conf

@@ -1,28 +0,0 @@
-# Control your input devices
-# See https://wiki.hypr.land/Configuring/Variables/#input
-input {
-  # Use multiple keyboard layouts and switch between them with Alt + Space
-  # kb_layout = us,dk
-  kb_options = compose:caps # ,grp:alt_space_toggle
-
-  # Change speed of keyboard repeat
-  repeat_rate = 40
-  repeat_delay = 600
-
-  # Increase sensitity for mouse/trackpack (default: 0)
-  # sensitivity = 0.35
-
-  touchpad {
-    # Use natural (inverse) scrolling
-    # natural_scroll = true
-
-    # Use two-finger clicks for right-click instead of lower-right corner
-    # clickfinger_behavior = true
-
-    # Control the speed of your scrolling
-    scroll_factor = 0.4
-  }
-}
-
-# Scroll faster in the terminal
-windowrule = scrolltouchpad 1.5, class:Alacritty

config/hypr/monitors.conf

@@ -1,20 +1,17 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
-# List current monitors and resolutions possible: hyprctl monitors
-# Format: monitor = [port], resolution, position, scale
-# You must relaunch Hyprland after changing any envs (use Super+Esc, then Relaunch)
 
-# Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
+# Change to 1 if on a 1x display (then change last "auto" to 1 in monitor=)
+# Change to something like 1.75 for fractional scaling (can work well with 1.66667 monitor scaling)
+# Note: You must relaunch Hyprland after changing any env like this (use Super+Esc, then Relaunch)
 env = GDK_SCALE,2
+
+# Use single default monitor (see all monitors with: hyprctl monitors)
+# Format: monitor = [port], resolution, position, scale
 monitor=,preferred,auto,auto
 
-# Good compromise for 27" or 32" 4K monitors (but fractional!)
-# env = GDK_SCALE,1.75
+# Exmaple for fractional scaling that works well with GDK_SCALE,1.75
 # monitor=,preferred,auto,1.666667
 
-# Straight 1x setup for low-resolution displays like 1080p or 1440p
-# env = GDK_SCALE,1
-# monitor=,preferred,auto,1
-
 # Example for Framework 13 w/ 6K XDR Apple display
-# monitor = DP-5, 6016x3384@60, auto, 2
-# monitor = eDP-1, 2880x1920@120, auto, 2
+# monitor = DP-5, 6016x3384@60.00, auto, 2
+# monitor = eDP-1, 2880x1920@120.00, auto, 2

config/swayosd/config.toml

@@ -1,4 +0,0 @@
-[server]
-show_percentage = true
-max_volume = 100
-style = "./style.css"

config/swayosd/style.css

@@ -1,28 +0,0 @@
-@import "../omarchy/current/theme/swayosd.css";
-
-window {
-  border-radius: 0;
-  opacity: 0.97;
-  border: 2px solid @border-color;
-
-  background-color: @background-color;
-}
-
-label {
-  font-family: 'CaskaydiaMono Nerd Font';
-  font-size: 11pt;
-
-  color: @label;
-}
-
-image {
-  color: @image;
-}
-
-progressbar {
-  border-radius: 0;
-}
-
-progress {
-  background-color: @progress;
-}

config/walker/config.toml

@@ -1,293 +0,0 @@
-app_launch_prefix = "uwsm app -- "
-terminal_title_flag = ""
-locale = ""
-close_when_open = true                                             # Toggle on reopen
-theme = "omarchy-default"
-theme_base = []
-theme_location = ["~/.local/share/omarchy/default/walker/themes/"]
-monitor = ""
-hotreload_theme = true
-as_window = false
-timeout = 0
-disable_click_to_close = false
-force_keyboard_focus = true
-
-[keys]
-accept_typeahead = ["tab"]
-trigger_labels = "lalt"
-next = ["down"]
-prev = ["up"]
-close = ["esc"]
-remove_from_history = ["shift backspace"]
-resume_query = ["ctrl r"]
-toggle_exact_search = ["ctrl m"]
-
-[keys.activation_modifiers]
-keep_open = "shift"
-alternate = "alt"
-
-[keys.ai]
-clear_session = ["ctrl x"]
-copy_last_response = ["ctrl c"]
-resume_session = ["ctrl r"]
-run_last_responstruee = ["ctrl e"]
-
-[events]
-on_activate = ""
-on_selection = ""
-on_exit = ""
-on_launch = ""
-on_query_change = ""
-
-[list]
-dynamic_sub = true
-keyboard_scroll_style = "emacs"
-max_entries = 200
-show_initial_entries = true
-single_click = true
-visibility_threshold = 20
-placeholder = "No Results"
-
-[search]
-argument_delimiter = "#"
-placeholder = " Search..."
-delay = 0
-resume_last_query = false
-
-[activation_mode]
-labels = "jkl;asdf"
-
-[builtins.hyprland_keybinds]
-show_sub_when_single = true
-path = "~/.config/hypr/hyprland.conf"
-weight = 5
-name = "hyprland_keybinds"
-placeholder = "Hyprland Keybinds"
-switcher_only = true
-hidden = true
-
-[builtins.applications]
-weight = 5
-name = "applications"
-placeholder = " Search..."
-prioritize_new = false
-hide_actions_with_empty_query = true
-context_aware = false
-refresh = true
-show_sub_when_single = false
-show_icon_when_single = true
-show_generic = true
-history = false
-icon = ""
-hidden = true
-
-[builtins.applications.actions]
-enabled = false
-hide_category = true
-hide_without_query = true
-
-[builtins.bookmarks]
-weight = 5
-placeholder = "Bookmarks"
-name = "bookmarks"
-icon = "bookmark"
-switcher_only = true
-hidden = true
-
-[[builtins.bookmarks.entries]]
-label = "Walker"
-url = "https://github.com/abenz1267/walker"
-keywords = ["walker", "github"]
-
-[[builtins.bookmarks.entries]]
-label = "Omarchy - Github"
-url = "https://github.com/basecamp/omarchy"
-keywords = ["omarchy", "github"]
-
-[[builtins.bookmarks.entries]]
-label = "Omarchy Manual"
-url = "https://manuals.omamix.org/2/the-omarchy-manual"
-keywords = ["omarchy"]
-
-[builtins.xdph_picker]
-hidden = true
-weight = 5
-placeholder = "Screen/Window Picker"
-show_sub_when_single = true
-name = "xdphpicker"
-switcher_only = true
-
-[builtins.ai]
-weight = 5
-placeholder = "AI"
-name = "ai"
-icon = "help-browser"
-switcher_only = true
-show_sub_when_single = true
-
-[[builtins.ai.anthropic.prompts]]
-model = "claude-3-7-sonnet-20250219"
-temperature = 1
-max_tokens = 1_000
-label = "General Assistant"
-prompt = "You are a helpful general assistant. Keep your answers short and precise."
-
-[builtins.calc]
-require_number = true
-weight = 5
-name = "Calculator"
-icon = "accessories-calculator"
-placeholder = "Calculator"
-min_chars = 3                   # Min chars to calculate. 3 allows "3+3"
-prefix = "="
-
-[builtins.windows]
-weight = 5
-icon = "view-restore"
-name = "windows"
-placeholder = "Windows"
-show_icon_when_single = true
-switcher_only = true
-hidden = true
-
-[builtins.clipboard]
-always_put_new_on_top = true
-exec = "wl-copy"
-weight = 5
-name = "clipboard"
-avoid_line_breaks = true
-placeholder = "Clipboard"
-image_height = 300
-max_entries = 10
-switcher_only = true
-hidden = true
-
-[builtins.commands]
-weight = 5
-icon = "utilities-terminal"
-switcher_only = true
-name = "commands"
-placeholder = "Commands"
-hidden = true
-
-[builtins.custom_commands]
-weight = 5
-icon = "utilities-terminal"
-name = "custom_commands"
-placeholder = "Custom Commands"
-hidden = true
-
-[builtins.emojis]
-exec = "wl-copy"
-weight = 5
-name = "Emojis"
-placeholder = "Emojis"
-switcher_only = true
-history = true
-typeahead = true
-show_unqualified = false
-prefix = ":"
-
-[builtins.symbols]
-after_copy = ""
-weight = 5
-name = "symbols"
-placeholder = "Symbols"
-switcher_only = true
-history = true
-typeahead = true
-hidden = true
-
-[builtins.finder]
-use_fd = true
-fd_flags = "--ignore-vcs --type file --type directory"
-cmd_alt = "xdg-open $(dirname ~/%RESULT%)"
-weight = 5
-icon = "file"
-name = "Finder"
-placeholder = "Finder"
-switcher_only = true
-ignore_gitignore = true
-refresh = true
-concurrency = 8
-show_icon_when_single = true
-preview_images = true
-hidden = false
-prefix = "."
-
-[builtins.runner]
-eager_loading = true
-weight = 5
-icon = "utilities-terminal"
-name = "runner"
-placeholder = "Runner"
-typeahead = true
-history = true
-generic_entry = false       # Generic command runner
-shell_config = ""           # Path to shell to parse for aliases
-refresh = true
-use_fd = false
-switcher_only = true
-hidden = true
-
-[builtins.ssh]
-weight = 5
-icon = "preferences-system-network"
-name = "ssh"
-placeholder = "SSH"
-switcher_only = true
-history = true
-refresh = true
-hidden = true
-
-[builtins.switcher]
-weight = 5
-name = "switcher"
-placeholder = "Switcher"
-prefix = "/"
-
-[builtins.websearch]
-keep_selection = true
-weight = 5
-icon = "applications-internet"
-name = "websearch"
-placeholder = "Websearch"
-switcher_only = true
-hidden = true
-
-[[builtins.websearch.entries]]
-name = "Google"
-url = "https://www.google.com/search?q=%TERM%"
-
-[[builtins.websearch.entries]]
-name = "DuckDuckGo"
-url = "https://duckduckgo.com/?q=%TERM%"
-switcher_only = true
-
-[[builtins.websearch.entries]]
-name = "Ecosia"
-url = "https://www.ecosia.org/search?q=%TERM%"
-switcher_only = true
-
-[[builtins.websearch.entries]]
-name = "Yandex"
-url = "https://yandex.com/search/?text=%TERM%"
-switcher_only = true
-
-[builtins.dmenu]
-hidden = true
-weight = 5
-name = "dmenu"
-placeholder = "Dmenu"
-switcher_only = true
-show_icon_when_single = true
-
-[builtins.translation]
-delay = 1000
-weight = 5
-name = "translation"
-icon = "accessories-dictionary"
-placeholder = "Translation"
-switcher_only = true
-provider = "googlefree"
-hidden = true

config/waybar/config

@@ -5,20 +5,18 @@
   "spacing": 0,
   "height": 26,
   "modules-left": [
-    "custom/omarchy",
     "hyprland/workspaces"
   ],
   "modules-center": [
-    "clock",
-    "custom/update"
+    "clock"
   ],
   "modules-right": [
     "group/tray-expander",
-    "bluetooth",
-    "network",
-    "pulseaudio",
-    "cpu",
-    "battery"
+  "bluetooth",
+  "network",
+  "pulseaudio",
+  "cpu",
+  "battery"
   ],
   "hyprland/workspaces": {
     "on-click": "activate",
@@ -44,17 +42,6 @@
       "5": []
     }
   },
-  "custom/omarchy": {
-    "format": "",
-    "on-click": "~/.local/share/omarchy/bin/omarchy-menu",
-    "tooltip-format": "SUPER + ALT + SPACE"
-  },
-  "custom/update": {
-    "format": "",
-    "exec": "~/.local/share/omarchy/bin/omarchy-update-available",
-    "on-click": "alacritty --class Omarchy --title Omarchy -e ~/.local/share/omarchy/bin/omarchy-update",
-    "interval": 3600
-  },
   "cpu": {
     "interval": 5,
     "format": "󰍛",
@@ -63,8 +50,7 @@
   "clock": {
     "format": "{:%A %H:%M}",
     "format-alt": "{:%d %B W%V %Y}",
-    "tooltip": false,
-    "on-click-right": "~/.local/share/omarchy/bin/omarchy-cmd-tzupdate"
+    "tooltip": false
   },
   "network": {
     "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
@@ -106,11 +92,11 @@
     "format-disabled": "󰂲",
     "format-connected": "",
     "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "blueberry"
+    "on-click": "GTK_THEME=Adwaita-dark blueberry"
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "alacritty --class=Wiremix -e wiremix",
+    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
@@ -138,4 +124,66 @@
     "icon-size": 12,
     "spacing": 12
   }
+},
+  "cpu": {
+    "interval": 5,
+    "format": "󰍛",
+    "on-click": "alacritty -e btop"
+  },
+  "clock": {
+    "format": "{:%A %H:%M}",
+    "format-alt": "{:%d %B W%V %Y}",
+    "tooltip": false
+  },
+  "network": {
+    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
+    "format" : "{icon}",
+    "format-wifi" : "{icon}",
+    "format-ethernet" : "󰀂",
+    "format-disconnected" : "󰖪",
+    "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
+    "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
+    "tooltip-format-disconnected": "Disconnected",
+    "interval": 3,
+    "nospacing": 1,
+    "on-click": "alacritty --class=Impala -e impala"
+  },
+  "battery": {
+    "format": "{capacity}% {icon}",
+    "format-discharging": "{icon}",
+    "format-charging":    "{icon}",
+    "format-plugged":     "",
+    "format-icons": {
+      "charging": [
+        "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
+      ],
+      "default": [
+        "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
+      ]
+    },
+    "format-full": "󰂅",
+    "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
+    "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
+    "interval": 5,
+    "states": {
+      "warning": 20,
+      "critical": 10
+    }
+  },
+  "bluetooth": {
+    "format": "",
+    "format-disabled": "󰂲",
+    "format-connected": "",
+    "tooltip-format": "Devices connected: {num_connections}",
+    "on-click": "GTK_THEME=Adwaita-dark blueberry"
+  },
+  "pulseaudio": {
+    "format": "",
+    "format-muted": "󰝟",
+    "scroll-step": 5,
+    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
+    "tooltip-format": "Playing at {volume}%",
+    "on-click-right": "pamixer -t",
+    "ignored-sinks": ["Easy Effects Sink"]
+  }
 }

config/waybar/style.css

@@ -7,7 +7,7 @@
   border: none;
   border-radius: 0;
   min-height: 0;
-  font-family: CaskaydiaMono Nerd Font;
+  font-family: CaskaydiaMono Nerd Font Propo;
   font-size: 12px;
 }
 
@@ -23,11 +23,6 @@
   all: initial;
   padding: 0 6px;
   margin: 0 1.5px;
-  min-width: 9px;
-}
-
-#workspaces button.empty {
-  opacity: 0.5;
 }
 
 #tray,
@@ -37,13 +32,13 @@
 #bluetooth,
 #pulseaudio,
 #clock,
-#custom-omarchy {
+#custom-power-menu {
   min-width: 12px;
   margin: 0 7.5px;
 }
 
 #custom-expand-icon {
-  margin-right: 7px;
+  margin-right: 12px;
 }
 
 tooltip {

config/wofi/config

@@ -0,0 +1,15 @@
+width=600
+height=350
+location=center
+show=drun
+prompt=Search...
+filter_rate=100
+allow_markup=true
+no_actions=true
+halign=fill
+orientation=vertical
+content_halign=fill
+insensitive=true
+allow_images=true
+image_size=40
+gtk_dark=true

config/wofi/style.css

@@ -0,0 +1,73 @@
+/* Colors are defined by theme files and can be referenced via @base, @text, @selected-text, and @border */
+
+* {
+  font-family: 'CaskaydiaMono Nerd Font', monospace;
+  font-size: 18px;
+}
+
+window {
+  margin: 0px;
+  padding: 20px;
+  background-color: @base;
+  opacity: 0.95;
+}
+
+#inner-box {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#outer-box {
+  margin: 0;
+  padding: 20px;
+  border: none;
+  background-color: @base;
+  border: 2px solid @border;
+}
+
+#scroll {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#input {
+  margin: 0;
+  padding: 10px;
+  border: none;
+  background-color: @base;
+  color: @text;
+}
+
+#input:focus {
+  outline: none;
+  box-shadow: none;
+  border: none;
+}
+
+#text {
+  margin: 5px;
+  border: none;
+  color: @text;
+}
+
+#entry {
+  background-color: @base;
+}
+
+#entry:selected {
+  outline: none;
+  border: none;
+}
+
+#entry:selected #text {
+  color: @selected-text;
+}
+
+#entry image {
+  -gtk-icon-transform: scale(0.7);
+}
+

default/alacritty/screensaver.toml

@@ -1,11 +0,0 @@
-[colors.primary]
-background = "0x000000"
-
-[colors.cursor]
-cursor = "0x000000"
-
-[font]
-size = 18.0
-
-[window]
-opacity = 1.0

default/bash/aliases

@@ -15,7 +15,7 @@ zd() {
   fi
 }
 open() {
-  xdg-open "$@" >/dev/null 2>&1 &
+  xdg-open "$@" >/dev/null 2>&1
 }
 
 # Directories
@@ -24,10 +24,10 @@ alias ...='cd ../..'
 alias ....='cd ../../..'
 
 # Tools
+alias n='nvim'
 alias g='git'
 alias d='docker'
 alias r='rails'
-n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }
 
 # Git
 alias gcm='git commit -m'

default/bash/envs

@@ -1,4 +1,3 @@
 # Editor used by CLI
 export EDITOR="nvim"
 export SUDO_EDITOR="$EDITOR"
-export BAT_THEME=ansi

default/bash/functions

@@ -15,38 +15,59 @@ iso2sd() {
   fi
 }
 
-# Format an entire drive for a single partition using ext4
-format-drive() {
-  if [ $# -ne 2 ]; then
-    echo "Usage: format-drive <device> <name>"
-    echo "Example: format-drive /dev/sda 'My Stuff'"
-    echo -e "\nAvailable drives:"
-    lsblk -d -o NAME -n | awk '{print "/dev/"$1}'
-  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")"
-      echo "Drive $1 formatted and labeled '$2'."
-    fi
+# Create a desktop launcher for a web app
+web2app() {
+  if [ "$#" -ne 3 ]; then
+    echo "Usage: web2app <AppName> <AppURL> <IconURL> (IconURL must be in PNG -- use https://dashboardicons.com)"
+    return 1
   fi
+
+  local APP_NAME="$1"
+  local APP_URL="$2"
+  local ICON_URL="$3"
+  local ICON_DIR="$HOME/.local/share/applications/icons"
+  local DESKTOP_FILE="$HOME/.local/share/applications/${APP_NAME}.desktop"
+  local ICON_PATH="${ICON_DIR}/${APP_NAME}.png"
+
+  mkdir -p "$ICON_DIR"
+
+  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+    echo "Error: Failed to download icon."
+    return 1
+  fi
+
+  cat > "$DESKTOP_FILE" <<EOF
+[Desktop Entry]
+Version=1.0
+Name=$APP_NAME
+Comment=$APP_NAME
+Exec=chromium --new-window --ozone-platform=wayland --app="$APP_URL" --name="$APP_NAME" --class="$APP_NAME"
+Terminal=false
+Type=Application
+Icon=$ICON_PATH
+StartupNotify=true
+EOF
+
+  chmod +x "$DESKTOP_FILE"
 }
 
-# Transcode a video to a good-balance 1080p that's great for sharing online
-transcode-video-1080p() {
-  ffmpeg -i $1 -vf scale=1920:1080 -c:v libx264 -preset fast -crf 23 -c:a copy ${1%.*}-1080p.mp4
+web2app-remove() {
+  if [ "$#" -ne 1 ]; then
+    echo "Usage: web2app-remove <AppName>"
+    return 1
+  fi
+
+  local APP_NAME="$1"
+  local ICON_DIR="$HOME/.local/share/applications/icons"
+  local DESKTOP_FILE="$HOME/.local/share/applications/${APP_NAME}.desktop"
+  local ICON_PATH="${ICON_DIR}/${APP_NAME}.png"
+
+  rm "$DESKTOP_FILE"
+  rm "$ICON_PATH"
 }
 
-# Transcode a video to a good-balance 4K that's great for sharing online
-transcode-video-4K() {
-  ffmpeg -i $1 -c:v libx265 -preset slow -crf 24 -c:a aac -b:a 192k ${1%.*}-optimized.mp4
-}
-
-# Transcode PNG to JPG image that's great for shrinking wallpapers
-transcode-png2jpg() {
-  magick $1 -quality 95 -strip ${1%.*}.jpg
+# Ensure changes to ~/.XCompose are immediately available
+refresh-xcompose() {
+  pkill fcitx5
+  setsid fcitx5 &>/dev/null &
 }

default/bash/init

@@ -7,8 +7,8 @@ if command -v zoxide &> /dev/null; then
 fi
 
 if command -v fzf &> /dev/null; then
-  if [[ -f /usr/share/fzf/completion.bash ]]; then
-    source /usr/share/fzf/completion.bash
+  if [[ -f /usr/share/bash-completion/completions/fzf ]]; then
+    source /usr/share/bash-completion/completions/fzf
   fi
   if [[ -f /usr/share/fzf/key-bindings.bash ]]; then
     source /usr/share/fzf/key-bindings.bash

default/bash/rc

@@ -4,4 +4,4 @@ source ~/.local/share/omarchy/default/bash/functions
 source ~/.local/share/omarchy/default/bash/prompt
 source ~/.local/share/omarchy/default/bash/init
 source ~/.local/share/omarchy/default/bash/envs
-[[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc
+bind -f ~/.local/share/omarchy/default/bash/inputrc

default/bash/shell

@@ -12,6 +12,3 @@ fi
 # Set complete path
 export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omarchy/bin:$PATH"
 set +h
-
-# Omarchy path
-export OMARCHY_PATH="/home/$USER/.local/share/omarchy"

default/bashrc

@@ -1,14 +0,0 @@
-# All the default Omarchy aliases and functions
-# (don't mess with these directly, just overwrite them here!)
-source ~/.local/share/omarchy/default/bash/rc
-
-# Add your own exports, aliases, and functions here.
-#
-# Make an alias for invoking commands you use constantly
-# alias p='python'
-#
-# Use VSCode instead of neovim as your default editor
-# export EDITOR="code"
-#
-# Set a custom prompt with the directory revealed (alternatively use https://starship.rs)
-# PS1="\W \[\e]0;\w\a\]$PS1"

default/hypr/apps.conf

@@ -1,8 +0,0 @@
-# App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
-source = ~/.local/share/omarchy/default/hypr/apps/chromium.conf
-source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.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/walker.conf

default/hypr/apps/chromium.conf

@@ -1,6 +0,0 @@
-# Force chromium into a tile to deal with --app bug
-windowrule = tile, class:^(Chromium)$
-
-# Only slight opacity when unfocused
-windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
-windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube

default/hypr/apps/hyprshot.conf

@@ -1,2 +0,0 @@
-# Remove 1px border around hyprshot screenshots
-layerrule = noanim, selection

default/hypr/apps/pip.conf

@@ -1,9 +0,0 @@
-# Picture-in-picture overlays
-windowrule = tag +pip, title:(Picture.{0,1}in.{0,1}[Pp]icture)
-windowrule = float, tag:pip
-windowrule = pin, tag:pip
-windowrule = size 600 338, tag:pip
-windowrule = keepaspectratio, tag:pip
-windowrule = noborder, tag:pip
-windowrule = opacity 1 1, tag:pip
-windowrule = move 100%-w-40 4%, tag:pip