Omarchy 1.8.0 (#415 )

* Update location of sourced install script * Add OMARCHY_PATH for easy access * Formatting * Enable using finder in walker (#396) * Enable using finder in walker * capitalize name property * Hot reload theme for quick switching * Use fonts from AUR instead of downloading them directly like an animal * Include the common JetBrains substitution * Add a very basic font selector for terminal * Give the new font selector a bit of room to breathe * Swap Spotify GUI to TUI * Correct package name * Add theme update script (#391) * Move updating themes from Updates to theme menu Yeah, it could go in either spot, but since we have one entire category dedicated to themes, lets keep it there. * Revert "Correct package name" This reverts commit 4c46c2208a. * Revert "Swap Spotify GUI to TUI" This reverts commit b09d2d68cd. * Added backup timestamps to various omarchy-refresh-* files to prevent clobbering (#402) * Added backup timestamps to omarchy-refresh-[hyprlock|swayosd|walker|waybar] scripts to prevent data loss if ran multiple times * Added new script (omarchy-refresh-config) for refreshing various config files with automated backup creation * update plymouth logo (#406) * Track migrations via state files to avoid running migrations that have already been performed. (#411) * Just use set -e instead of manually checking for return values * Fix migration * Unused * Migrate fonts to packages * No longer needed * Use fd for better performance on walker finder * Add walker config refresh to enable the finder * Dropbox is now an optional setup --------- Co-authored-by: Shigeto Kumagai <shk@all.daynight.jp> Co-authored-by: Mohamedsayhii <63726183+Mohamedsayhii@users.noreply.github.com> Co-authored-by: Ryan Hughes <ryan@heyoodle.com> Co-authored-by: Andy Davis <developer.andy@gmail.com> Co-authored-by: Taha <paprikataha@gmail.com>
Merge pull request #383 from basecamp/dev
2025-07-30 23:44:27 +02:00 · 2025-07-28 14:13:59 +02:00 · 2025-07-28 13:14:35 +02:00 · 2025-07-28 13:01:02 +02:00 · 2025-07-28 12:58:57 +02:00 · 2025-07-28 12:57:23 +02:00
300 changed files with 4100 additions and 1427 deletions
@@ -1,11 +0,0 @@
 [Desktop Entry]
 Version=1.0
 Name=Basecamp
 Comment=Basecamp Project Management
 Exec=chromium --new-window --ozone-platform=wayland --app="https://launchpad.37signals.com" --name=Basecamp --class=Basecamp
 Terminal=false
 Type=Application
 Icon=Basecamp
 Categories=GTK;
 MimeType=text/html;text/xml;application/xhtml_xml;
 StartupNotify=true
@@ -1,11 +0,0 @@
 [Desktop Entry]
 Version=1.0
 Name=HEY
 Comment=HEY Email + Calendar
 Exec=chromium --new-window --ozone-platform=wayland --app="https://app.hey.com" --name=HEY --class=HEY
 Terminal=false
 Type=Application
 Icon=HEY
 Categories=GTK;
 MimeType=text/html;text/xml;application/xhtml_xml;
 StartupNotify=true
@@ -1,10 +0,0 @@
 [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;
@@ -0,0 +1,221 @@
 [Desktop Entry]
 Version=1.0
 Name=Chromium
 # Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
 # From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
 GenericName=Web Browser
 GenericName[ar]=متصفح الشبكة
 GenericName[bg]=Уеб браузър
 GenericName[ca]=Navegador web
 GenericName[cs]=WWW prohlížeč
 GenericName[da]=Browser
 GenericName[de]=Web-Browser
 GenericName[el]=Περιηγητής ιστού
 GenericName[en_GB]=Web Browser
 GenericName[es]=Navegador web
 GenericName[et]=Veebibrauser
 GenericName[fi]=WWW-selain
 GenericName[fr]=Navigateur Web
 GenericName[gu]=વેબ બ્રાઉઝર
 GenericName[he]=דפדפן אינטרנט
 GenericName[hi]=वेब ब्राउज़र
 GenericName[hu]=Webböngésző
 GenericName[it]=Browser Web
 GenericName[ja]=ウェブブラウザ
 GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
 GenericName[ko]=웹 브라우저
 GenericName[lt]=Žiniatinklio naršyklė
 GenericName[lv]=Tīmekļa pārlūks
 GenericName[ml]=വെബ് ബ്രൌസര്‍
 GenericName[mr]=वेब ब्राऊजर
 GenericName[nb]=Nettleser
 GenericName[nl]=Webbrowser
 GenericName[pl]=Przeglądarka WWW
 GenericName[pt]=Navegador Web
 GenericName[pt_BR]=Navegador da Internet
 GenericName[ro]=Navigator de Internet
 GenericName[ru]=Веб-браузер
 GenericName[sl]=Spletni brskalnik
 GenericName[sv]=Webbläsare
 GenericName[ta]=இணைய உலாவி
 GenericName[th]=เว็บเบราว์เซอร์
 GenericName[tr]=Web Tarayıcı
 GenericName[uk]=Навігатор Тенет
 GenericName[zh_CN]=网页浏览器
 GenericName[zh_HK]=網頁瀏覽器
 GenericName[zh_TW]=網頁瀏覽器
 # Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
 GenericName[bn]=ওয়েব ব্রাউজার
 GenericName[fil]=Web Browser
 GenericName[hr]=Web preglednik
 GenericName[id]=Browser Web
 GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
 GenericName[sk]=WWW prehliadač
 GenericName[sr]=Интернет прегледник
 GenericName[te]=మహాతల అన్వేషి
 GenericName[vi]=Bộ duyệt Web
 # Gnome and KDE 3 uses Comment.
 Comment=Access the Internet
 Comment[ar]=الدخول إلى الإنترنت
 Comment[bg]=Достъп до интернет
 Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
 Comment[ca]=Accedeix a Internet
 Comment[cs]=Přístup k internetu
 Comment[da]=Få adgang til internettet
 Comment[de]=Internetzugriff
 Comment[el]=Πρόσβαση στο Διαδίκτυο
 Comment[en_GB]=Access the Internet
 Comment[es]=Accede a Internet.
 Comment[et]=Pääs Internetti
 Comment[fi]=Käytä internetiä
 Comment[fil]=I-access ang Internet
 Comment[fr]=Accéder à Internet
 Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
 Comment[he]=גישה אל האינטרנט
 Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
 Comment[hr]=Pristup Internetu
 Comment[hu]=Internetelérés
 Comment[id]=Akses Internet
 Comment[it]=Accesso a Internet
 Comment[ja]=インターネットにアクセス
 Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
 Comment[ko]=인터넷 연결
 Comment[lt]=Interneto prieiga
 Comment[lv]=Piekļūt internetam
 Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
 Comment[mr]=इंटरनेटमध्ये प्रवेश करा
 Comment[nb]=Gå til Internett
 Comment[nl]=Verbinding maken met internet
 Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
 Comment[pl]=Skorzystaj z internetu
 Comment[pt]=Aceder à Internet
 Comment[pt_BR]=Acessar a internet
 Comment[ro]=Accesaţi Internetul
 Comment[ru]=Доступ в Интернет
 Comment[sk]=Prístup do siete Internet
 Comment[sl]=Dostop do interneta
 Comment[sr]=Приступите Интернету
 Comment[sv]=Gå ut på Internet
 Comment[ta]=இணையத்தை அணுகுதல்
 Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
 Comment[th]=เข้าถึงอินเทอร์เน็ต
 Comment[tr]=İnternet'e erişin
 Comment[uk]=Доступ до Інтернету
 Comment[vi]=Truy cập Internet
 Comment[zh_CN]=访问互联网
 Comment[zh_HK]=連線到網際網路
 Comment[zh_TW]=連線到網際網路
 Exec=/usr/bin/chromium --ozone-platform=wayland %U
 StartupNotify=true
 Terminal=false
 Icon=chromium
 Type=Application
 Categories=Network;WebBrowser;
 MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
 Actions=new-window;new-private-window;
 [Desktop Action new-window]
 Name=New Window
 Name[am]=አዲስ መስኮት
 Name[ar]=نافذة جديدة
 Name[bg]=Нов прозорец
 Name[bn]=নতুন উইন্ডো
 Name[ca]=Finestra nova
 Name[cs]=Nové okno
 Name[da]=Nyt vindue
 Name[de]=Neues Fenster
 Name[el]=Νέο Παράθυρο
 Name[en_GB]=New Window
 Name[es]=Nueva ventana
 Name[et]=Uus aken
 Name[fa]=پنجره جدید
 Name[fi]=Uusi ikkuna
 Name[fil]=New Window
 Name[fr]=Nouvelle fenêtre
 Name[gu]=નવી વિંડો
 Name[hi]=नई विंडो
 Name[hr]=Novi prozor
 Name[hu]=Új ablak
 Name[id]=Jendela Baru
 Name[it]=Nuova finestra
 Name[iw]=חלון חדש
 Name[ja]=新規ウインドウ
 Name[kn]=ಹೊಸ ವಿಂಡೊ
 Name[ko]=새 창
 Name[lt]=Naujas langas
 Name[lv]=Jauns logs
 Name[ml]=പുതിയ വിന്‍ഡോ
 Name[mr]=नवीन विंडो
 Name[nl]=Nieuw venster
 Name[no]=Nytt vindu
 Name[pl]=Nowe okno
 Name[pt]=Nova janela
 Name[pt_BR]=Nova janela
 Name[ro]=Fereastră nouă
 Name[ru]=Новое окно
 Name[sk]=Nové okno
 Name[sl]=Novo okno
 Name[sr]=Нови прозор
 Name[sv]=Nytt fönster
 Name[sw]=Dirisha Jipya
 Name[ta]=புதிய சாளரம்
 Name[te]=క్రొత్త విండో
 Name[th]=หน้าต่างใหม่
 Name[tr]=Yeni Pencere
 Name[uk]=Нове вікно
 Name[vi]=Cửa sổ Mới
 Name[zh_CN]=新建窗口
 Name[zh_TW]=開新視窗
 Exec=/usr/bin/chromium --ozone-platform=wayland --new-window
 [Desktop Action new-private-window]
 Name=New Incognito Window
 Name[ar]=نافذة جديدة للتصفح المتخفي
 Name[bg]=Нов прозорец „инкогнито“
 Name[bn]=নতুন ছদ্মবেশী উইন্ডো
 Name[ca]=Finestra d'incògnit nova
 Name[cs]=Nové anonymní okno
 Name[da]=Nyt inkognitovindue
 Name[de]=Neues Inkognito-Fenster
 Name[el]=Νέο παράθυρο για ανώνυμη περιήγηση
 Name[en_GB]=New Incognito window
 Name[es]=Nueva ventana de incógnito
 Name[et]=Uus inkognito aken
 Name[fa]=پنجره جدید حالت ناشناس
 Name[fi]=Uusi incognito-ikkuna
 Name[fil]=Bagong Incognito window
 Name[fr]=Nouvelle fenêtre de navigation privée
 Name[gu]=નવી છુપી વિંડો
 Name[hi]=नई गुप्त विंडो
 Name[hr]=Novi anoniman prozor
 Name[hu]=Új Inkognitóablak
 Name[id]=Jendela Penyamaran baru
 Name[it]=Nuova finestra di navigazione in incognito
 Name[iw]=חלון חדש לגלישה בסתר
 Name[ja]=新しいシークレット ウィンドウ
 Name[kn]=ಹೊಸ ಅಜ್ಞಾತ ವಿಂಡೋ
 Name[ko]=새 시크릿 창
 Name[lt]=Naujas inkognito langas
 Name[lv]=Jauns inkognito režīma logs
 Name[ml]=പുതിയ വേഷ പ്രച്ഛന്ന വിന്‍ഡോ
 Name[mr]=नवीन गुप्त विंडो
 Name[nl]=Nieuw incognitovenster
 Name[no]=Nytt inkognitovindu
 Name[pl]=Nowe okno incognito
 Name[pt]=Nova janela de navegação anónima
 Name[pt_BR]=Nova janela anônima
 Name[ro]=Fereastră nouă incognito
 Name[ru]=Новое окно в режиме инкогнито
 Name[sk]=Nové okno inkognito
 Name[sl]=Novo okno brez beleženja zgodovine
 Name[sr]=Нови прозор за прегледање без архивирања
 Name[sv]=Nytt inkognitofönster
 Name[ta]=புதிய மறைநிலைச் சாளரம்
 Name[te]=క్రొత్త అజ్ఞాత విండో
 Name[th]=หน้าต่างใหม่ที่ไม่ระบุตัวตน
 Name[tr]=Yeni Gizli pencere
 Name[uk]=Нове вікно в режимі анонімного перегляду
 Name[vi]=Cửa sổ ẩn danh mới
 Name[zh_CN]=新建隐身窗口
 Name[zh_TW]=新增無痕式視窗
 Exec=/usr/bin/chromium --ozone-platform=wayland --new-window --incognito
@@ -0,0 +1,2 @@
 [Desktop Entry]
 Hidden=true
@@ -0,0 +1,51 @@
 [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;إم بي في;ام بي في;وسائط;مشغل;فيديو;مرئية;صوتي;تلفاز;
@@ -2,7 +2,7 @@
 Name=Neovim
 GenericName=Text Editor
 Comment=Edit text files
-Exec=alacritty -e nvim -- %F
+Exec=alacritty --class=nvim --title=nvim -e nvim -- %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;
@@ -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 
@@ -1,10 +0,0 @@
 [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;
@@ -0,0 +1,7 @@
 [Desktop Entry]
 Name=Audio Settings
 Comment=Using Wiremix
 Exec=alacritty --class=Wiremix --title=Wiremix -e wiremix
 Icon=audio-card
 Type=Application
 Terminal=false
@@ -0,0 +1,2 @@
 [Desktop Entry]
 Hidden=true
@@ -0,0 +1,10 @@
 [Desktop Entry]
 Name=Typora
 GenericName=Markdown Editor
 Exec=typora --enable-wayland-ime %U
 Icon=typora
 Type=Application
 StartupNotify=true
 Categories=Office;WordProcessor;
 MimeType=text/markdown;text/x-markdown;
@@ -0,0 +1,157 @@
 #!/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
  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 640 --no-color expand
  echo "                                                                          $OMARCHY_VERSION"
 }
 main_menu() {
  show_ascii_art
  local options=("Theme" "Font" "Setup" "Update" "Manual" "Exit")
  choice=$(printf "%s\n" "${options[@]}" | gum choose --header "") || exit 0
  case "$choice" in
  Theme) theme_menu ;;
  Font)
    omarchy-font-menu
    ack_command
    main_menu
    ;;
  Update) update_menu ;;
  Setup) setup_menu ;;
  Manual) open_manual ;;
  Exit) clear && exit 0 ;;
  esac
 }
 update_menu() {
  show_ascii_art
  local menu=("Omarchy" "Waybar" "Walker" "Plymouth" "SwayOSD" "Desktop apps" "Back")
  local commands=(
    "omarchy-update"
    "omarchy-refresh-waybar"
    "omarchy-refresh-walker"
    "omarchy-refresh-plymouth"
    "omarchy-refresh-swayosd"
    "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=("Pick" "Install" "Update" "Remove" "Back")
  local commands=(
    "omarchy-theme-menu"
    "install_theme_prompt"
    "omarchy-theme-update"
    "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=("Dropbox" "Steam" "Docker DBs" "Fingerprint sensor" "Fido2 device" "Back")
  local commands=(
    "omarchy-setup-dropbox"
    "omarchy-setup-steam"
    "setup_docker_dbs"
    "omarchy-setup-fingerprint"
    "omarchy-setup-fido2"
    "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
 }
 setup_docker_dbs() {
  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
  main_menu
 }
 open_manual() {
  setsid chromium --new-window --ozone-platform=wayland --app="https://manuals.omamix.org/2/the-omarchy-manual" >/dev/null 2>&1 &
  clear
 }
 ack_command() {
  gum spin --spinner "globe" --title "Done!" -- sleep 1
 }
 main_menu
@@ -0,0 +1,30 @@
 #!/bin/bash
 # Designed to be run by systemd timer every 30 seconds and alerts if battery is low
 BATTERY_THRESHOLD=10
 NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified"
 get_battery_percentage() {
  upower -i $(upower -e | grep 'BAT') | grep -E "percentage" | grep -o '[0-9]\+%' | sed 's/%//'
 }
 get_battery_state() {
  upower -i $(upower -e | grep 'BAT') | grep -E "state" | awk '{print $2}'
 }
 send_notification() {
  notify-send -u critical "Battery Low" "Time to recharge! (battery is at ${1}%)" -i battery-caution
 }
 BATTERY_LEVEL=$(get_battery_percentage)
 BATTERY_STATE=$(get_battery_state)
 if [[ "$BATTERY_STATE" == "discharging" && "$BATTERY_LEVEL" -le "$BATTERY_THRESHOLD" ]]; then
  if [[ ! -f "$NOTIFICATION_FLAG" ]]; then
    send_notification "$BATTERY_LEVEL"
    touch "$NOTIFICATION_FLAG"
  fi
 else
  rm -f "$NOTIFICATION_FLAG"
 fi
@@ -0,0 +1,34 @@
 #!/bin/bash
 # Set recorder based on GPU
 [[ -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
@@ -0,0 +1,10 @@
 #!/bin/bash
 trap "exit" SIGINT
 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 0 --anchor-canvas c --anchor-text c \
    "$effect"
 done
@@ -0,0 +1,17 @@
 #!/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'
@@ -0,0 +1,5 @@
 #!/bin/bash
 sudo tzupdate
 new_timezone=$(timedatectl show -p Timezone --value)
 notify-send "Timezone has been set to $new_timezone"
@@ -1,7 +0,0 @@
 #!/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/waybar/config ~/.config/waybar/
 ln -nsf ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/
@@ -1,5 +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
@@ -1,36 +0,0 @@
 #!/bin/bash
 yay -S --noconfirm --needed fprintd usbutils
 if ! lsusb | grep -iq fingerprint; 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
@@ -0,0 +1,12 @@
 #!/bin/bash
 font=$(
  fc-list :spacing=100 -f "%{family[0]}\n" |
    grep -v -i -E 'emoji|signwriting' |
    sort -u |
    gum choose --header "Choose terminal font"
 )
 if [[ -n "$font" ]]; then
  sed -i "s/family = \".*\"/family = \"$font\"/g" ~/.config/alacritty/alacritty.toml
 fi
@@ -0,0 +1,5 @@
 #!/bin/bash
 pkill -f "alacritty --class Screensaver" ||
  alacritty --class Screensaver --title Screensaver -o 'colors.primary.background="#000000"' \
    -e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver
@@ -1,10 +1,13 @@
 #!/bin/bash
 # A script to display Hyprland keybindings defined in your configuration
-# using wofi for an interactive search menu.
+# using walker for an interactive search menu.
 USER_HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf"
-OMARCHY_BINDINGS_CONF="$HOME/.local/share/omarchy/default/hypr/bindings.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/media.conf"
 # Process the configuration file to extract and format keybindings
 # 1. `grep` finds all lines starting with 'bind' (allowing for leading spaces).
@@ -16,7 +19,10 @@ OMARCHY_BINDINGS_CONF="$HOME/.local/share/omarchy/default/hypr/bindings.conf"
 #    - 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" |
+grep -h '^[[:space:]]*bind' $USER_HYPRLAND_CONF $OMARCHY_BINDINGS_CONF |
  sed 's/#.*//' |
  sed '/^[[:space:]]*$/d' |
  sort -u |
  awk -F, '
 {
    # Strip trailing comments
@@ -45,7 +51,14 @@ grep -h '^[[:space:]]*bind' "$USER_HYPRLAND_CONF" "$OMARCHY_BINDINGS_CONF" |
    gsub(/[ \t]+/, " ", key_combo);  # Collapse multiple spaces to one
    if (action != "") {
        # Escape XML entities
        gsub(/&/, "\\&amp;", action);
        gsub(/</, "\\&lt;", action);
        gsub(/>/, "\\&gt;", action);
        gsub(/"/, "\\&quot;", action);
        gsub(/'"'"'/, "\\&apos;", 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\""
+  walker --dmenu --theme keybindings -p 'Keybindings'
@@ -0,0 +1,21 @@
 #!/bin/bash
 show_power_menu() {
  # The first characters are invisible sort keys.
  local menu_options="\u200B Lock
 \u200C󰤄 Suspend
 \u200D Relaunch
 \u2060󰜉 Restart
 \u2063󰐥 Shutdown"
  local selection=$(echo -e "$menu_options" | walker --dmenu --theme dmenu_150)
  case "$selection" in
  *Lock*) hyprlock ;;
  *Suspend*) systemctl suspend ;;
  *Relaunch*) uwsm stop ;;
  *Restart*) systemctl reboot ;;
  *Shutdown*) systemctl poweroff ;;
  esac
 }
 show_power_menu
@@ -1,25 +0,0 @@
 #!/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*) hyprctl dispatch exit ;;
  *Restart*) systemctl reboot ;;
  *Shutdown*) systemctl poweroff ;;
  esac
 }
 # Main execution
 show_power_menu
@@ -8,4 +8,11 @@ gtk-update-icon-cache ~/.local/share/icons/hicolor &>/dev/null
 # Copy .desktop declarations
 mkdir -p ~/.local/share/applications
 cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
 cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
 # Only copy xtras if user is not in bare mode
 if [[ ! -f ~/.local/state/omarchy/bare.mode ]] && [ -z "$OMARCHY_BARE" ]; then
  cp ~/.local/share/omarchy/applications/xtras/*.desktop ~/.local/share/applications/
 fi
 update-desktop-database ~/.local/share/applications
@@ -0,0 +1,30 @@
 #!/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)
 backup_file="${HOME}/.config/${config_file}.bak.$(date +%s)"
 cp -f "${HOME}/.config/${config_file}" "$backup_file" 2>/dev/null
 # Deploy the source file
 cp -f "${HOME}/.local/share/omarchy/config/${config_file}" "${HOME}/.config/${config_file}" 2>/dev/null
 # Compare and delete/inform accordingly
 if cmp -s "${HOME}/.config/${config_file}" "$backup_file"; then
  rm $backup_file
 else
  echo -e "\e[31mExisting "${HOME}/.config/${config_file}" replaced with new Omarchy default, but ${backup_file} file was made.\e[0m"
 fi
@@ -0,0 +1,4 @@
 #!/bin/bash
 # Overwrite local Hyprlock settings with the latest in Omarchy
 omarchy-refresh-config hypr/hyprlock.conf
@@ -1,6 +1,6 @@
 #!/bin/bash
-if gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
+if [[ "$1" == "-y" ]] || 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
@@ -0,0 +1,7 @@
 #!/bin/bash
 omarchy-refresh-config swayosd/config.toml
 omarchy-refresh-config swayosd/style.css
 pkill swayosd-server
 setsid uwsm app -- swayosd-server &>/dev/null &
@@ -0,0 +1,6 @@
 #!/bin/bash
 omarchy-refresh-config walker/config.toml
 pkill walker
 setsid uwsm app -- walker --gapplication-service &
@@ -1,11 +1,7 @@
 #!/bin/bash
-if gum confirm "Refresh Waybar config? This will replace your current Waybar settings with Omarchy defaults."; then
+omarchy-refresh-config waybar/config.jsonc
-  # Overwrite local waybar settings with the latest in Omarchy
+omarchy-refresh-config waybar/style.css
  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
+# Restart waybar
-  pkill waybar &>/dev/null
+pkill -SIGUSR2 waybar
  setsid waybar &>/dev/null &
 fi
@@ -0,0 +1,9 @@
 #!/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."
@@ -0,0 +1,33 @@
 #!/bin/bash
 if [[ "--remove" == "$1" ]]; then
  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
  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
      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
@@ -0,0 +1,43 @@
 #!/bin/bash
 if [[ "--remove" == "$1" ]]; then
  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
  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
@@ -0,0 +1,9 @@
 #!/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 &
@@ -0,0 +1,48 @@
 #!/bin/bash
 # Cycles through the background images available
 BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
 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 &
 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 &
 fi
@@ -0,0 +1,28 @@
 #!/bin/bash
 # omarchy-theme-install: Install a new theme from a git repo for Omarchy
 # Usage: omarchy-theme-install <git-repo-url>
 if [ -z "$1" ]; 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_PATH="$THEMES_DIR/$THEME_NAME"
 # Remove existing theme if present
 if [ -d "$THEME_PATH" ]; then
  rm -rf "$THEME_PATH"
 fi
 # Clone the repo directly to ~/.config/omarchy/themes
 if ! git clone "$REPO_URL" "$THEME_PATH"; then
  echo "Error: Failed to clone theme repo."
  exit 1
 fi
 # Apply the new theme with omarchy-theme-set
 omarchy-theme-set $THEME_NAME
@@ -0,0 +1,31 @@
 #!/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 \) | sort | 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
 )
 # Show Walker menu
 selection=$(printf '%s\n' "${themes[@]}" | walker --dmenu --theme dmenu_250 2>/dev/null)
 # 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"
@@ -3,20 +3,22 @@
 THEMES_DIR="$HOME/.config/omarchy/themes/"
 CURRENT_THEME_LINK="$HOME/.config/omarchy/current/theme"
-THEMES=($(find "$THEMES_DIR" -mindepth 1 | sort))
+THEMES=($(find "$THEMES_DIR" -mindepth 1 -maxdepth 1 | sort))
 TOTAL=${#THEMES[@]}
 # Get current theme from symlink
 if [[ -L "$CURRENT_THEME_LINK" ]]; then
-  CURRENT_THEME=$(readlink "$CURRENT_THEME_LINK")
+  CURRENT_THEME=$(realpath "$CURRENT_THEME_LINK")
 else
  # Default to first theme if no symlink exists
-  CURRENT_THEME=${THEMES[0]}
+  CURRENT_THEME=$(realpath "${THEMES[0]}")
 fi
 # Find current theme index
 INDEX=0
 for i in "${!THEMES[@]}"; do
  THEMES[$i]=$(realpath "${THEMES[$i]}")
  if [[ "${THEMES[$i]}" == "$CURRENT_THEME" ]]; then
    INDEX=$i
    break
@@ -28,22 +30,5 @@ NEXT_INDEX=$(((INDEX + 1) % TOTAL))
 NEW_THEME=${THEMES[$NEXT_INDEX]}
 NEW_THEME_NAME=$(basename "$NEW_THEME")
-# Set current theme
+"$HOME/.local/share/omarchy/bin/omarchy-theme-set" $NEW_THEME_NAME
 ln -nsf "$HOME/.config/omarchy/backgrounds/$NEW_THEME_NAME" "$HOME/.config/omarchy/current/backgrounds"
 ln -nsf "$NEW_THEME" "$HOME/.config/omarchy/current/theme"
 # Touch alacritty config to pickup the changed theme
 touch "$HOME/.config/alacritty/alacritty.toml"
 # Restart for new theme
 pkill -SIGUSR2 waybar
 makoctl reload
 hyprctl reload
 # Set new background
 ln -nsf $(find "$HOME/.config/omarchy/current/backgrounds/" -type f | head -n 1) "$HOME/.config/omarchy/current/background"
 pkill -x swaybg
 setsid swaybg -i "$HOME/.config/omarchy/current/background" -m fill &
 # Notify of the new theme
 notify-send "Theme changed to $NEW_THEME_NAME" -t 2000
@@ -0,0 +1,33 @@
 #!/bin/bash
 # omarchy-theme-remove: Remove a theme from Omarchy by name
 # Usage: omarchy-theme-remove <theme-name>
 if [ -z "$1" ]; 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
 # Use readlink -f to resolve symlinks and get the absolute path
 if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
  "$HOME/.local/share/omarchy/bin/omarchy-theme-next"
 fi
 # Now remove the theme directory and backgrounds for THEME_NAME
 rm -rf "$THEME_PATH"
 rm -rf "$BACKGROUND_PATH"
@@ -0,0 +1,47 @@
 #!/bin/bash
 # omarchy-theme-set: Set a theme, specified by its name.
 # Usage: omarchy-theme-set <theme-name>
 if [[ -z "$1" ]]; then
  echo "Usage: omarchy-theme-set <theme-name>" >&2
  exit 1
 fi
 THEMES_DIR="$HOME/.config/omarchy/themes/"
 CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
 THEME_NAME="$1"
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR" >&2
  exit 2
 fi
 # Update theme symlinks
 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
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"
 # Restart components to apply new theme
 pkill -SIGUSR2 btop
 pkill -SIGUSR2 waybar
 pkill swayosd-server
 setsid uwsm app -- swayosd-server &>/dev/null &
 makoctl reload
 hyprctl reload
 # Set new background
 "$HOME/.local/share/omarchy/bin/omarchy-theme-bg-next"
@@ -0,0 +1,4 @@
 #!/bin/bash
 for dir in ~/.config/omarchy/themes/*/; do
    [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
 done
@@ -1,9 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/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
-  setsid hypridle &> /dev/null &
+  uwsm app -- hypridle >/dev/null 2>&1 &
  notify-send "Now locking computer when idle"
 fi
@@ -1,31 +1,36 @@
 #!/bin/bash
 # Exit immediately if a command exits with a non-zero status
 set -e
 STATE_DIR="$HOME/.local/state/omarchy/migrations"
 cd ~/.local/share/omarchy
-if [[ $1 == "all" ]]; then
+# Create the migrations state directory, we will store an empty file for each migration that has already been performed.
-  # Run all migrations
+mkdir -p "$STATE_DIR"
  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
+# Get the latest while trying to preserve any modifications
-git pull
+git pull --autostash
 git diff --check || git reset --merge
 # 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
+  # Migration already applied, to re-run it simply delete the state file and try again
-    echo -e "\e[32m\nRunning migration ($migrate_at)\e[0m"
+  [ -e "${STATE_DIR}/$filename" ] && continue
-    source $file
+
-  fi
+  echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
  source $file
  touch "${STATE_DIR}/$filename"
 done
 # Update system packages
 echo -e "\e[32m\nUpdate system packages\e[0m"
 yay -Syu --noconfirm
 # Back to where we came from
 cd - >/dev/null
 echo -e "\e[32m\nUpdating system packages\e[0m"
 yay -Syu
@@ -1,37 +0,0 @@
 #!/bin/bash
 # Cycles through the background images available
 BACKGROUNDS_DIR="$HOME/.config/omarchy/current/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 BACKGROUNDS=($(find "$BACKGROUNDS_DIR" -type f | sort))
 TOTAL=${#BACKGROUNDS[@]}
 # 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=${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 &
@@ -1,16 +1,20 @@
-ascii_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+#!/bin/bash
 ███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
 ███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
 ███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
 ███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
 ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
                                          ███    ███                                    '
-echo -e "\n$ascii_art\n"
+ansi_art='                 ▄▄▄                                                   
 ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
 ███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
 ███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
 ███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
 ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀ 
                                       ███   █▀                                  '
-pacman -Q git &>/dev/null || sudo pacman -Sy --noconfirm --needed git
+clear
 echo -e "\n$ansi_art\n"
 sudo pacman -Sy --noconfirm --needed git
 echo -e "\nCloning Omarchy..."
 rm -rf ~/.local/share/omarchy/
@@ -1,5 +1,4 @@
 INPUT_METHOD=fcitx
 GTK_IM_MODULE=fcitx
 QT_IM_MODULE=fcitx
 XMODIFIERS=@im=fcitx
 SDL_IM_MODULE=fcitx
@@ -1,144 +1,149 @@
 {
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
+  "logo": {
-        "padding": {
+    "padding": {
-            "top": 5,
+      "top": 5,
-            "right": 6
+      "right": 6
-        }
+    }
  },
  "modules": [
    "break",
    {
      "type": "custom",
      "format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
    },
-    "modules": [
+    {
-        "break",
+      "type": "host",
-        {
+      "key": " PC",
-            "type": "custom",
+      "keyColor": "green"
-            "format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
+    },
-        },
+    {
-        {
+      "type": "cpu",
-            "type": "host",
+      "key": "│ ├",
-            "key": " PC",
+      "showPeCoreCount": true,
-            "keyColor": "green"
+      "keyColor": "green"
-        },
+    },
-        {
+    {
-            "type": "cpu",
+      "type": "gpu",
-            "key": "│ ├",
+      "key": "│ ├",
-            "showPeCoreCount": true,
+      "detectionMethod": "pci",
-            "keyColor": "green"
+      "keyColor": "green"
-        },
+    },
-        {
+    {
-            "type": "gpu",
+      "type": "display",
-            "key": "│ ├",
+      "key": "│ ├󱄄",
-            "detectionMethod": "pci",
+      "keyColor": "green"
-            "keyColor": "green"
+    },
-        },
+    {
-        {
+      "type": "disk",
-            "type": "display",
+      "key": "│ ├󰋊",
-            "key": "│ ├󱄄",
+      "keyColor": "green"
-            "keyColor": "green"
+    },
-        },
+    {
-        {
+      "type": "memory",
-            "type": "disk",
+      "key": "│ ├",
-            "key": "│ ├󰋊",
+      "keyColor": "green"
-            "keyColor": "green"
+    },
-        },
+    {
-        {
+      "type": "swap",
-            "type": "memory",
+      "key": "└ └󰓡 ",
-            "key": "│ ├",
+      "keyColor": "green"
-            "keyColor": "green"
+    },
-        },
+    {
-        {
+      "type": "custom",
-            "type": "swap",
+      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-            "key": "└ └󰓡 ",
+    },
-            "keyColor": "green",
+    "break",
-        },
+    {
-        {
+      "type": "custom",
-            "type": "custom",
+      "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+    },
-        },
+    {
-        "break",
+      "type": "os",
-        {
+      "key": " OS",
-            "type": "custom",
+      "keyColor": "yellow"
-            "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
+    },
-        },
+    {
-        {
+      "type": "kernel",
-            "type": "os",
+      "key": "│ ├",
-            "key": " OS",
+      "keyColor": "yellow"
-            "keyColor": "yellow"
+    },
-        },
+    {
-        {
+      "type": "packages",
-            "type": "kernel",
+      "key": "│ ├󰏖",
-            "key": "│ ├",
+      "keyColor": "yellow"
-            "keyColor": "yellow"
+    },
-        },
+    {
-        {
+      "type": "shell",
-            "type": "packages",
+      "key": "└ └",
-            "key": "│ ├󰏖",
+      "keyColor": "yellow"
-            "keyColor": "yellow"
+    },
-        },
+    "break",
-        {
+    {
-            "type": "shell",
+      "type": "command",
-            "key": "└ └",
+      "key": "│ ├Ø",
-            "keyColor": "yellow"
+      "keyColor": "blue",
-        },
+      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
-        "break",
+    },
-        {
+    {
-            "type": "de",
+      "type": "de",
-            "key": " DE",
+      "key": " DE",
-            "keyColor": "blue"
+      "keyColor": "blue"
-        },
+    },
-        {
+    {
-            "type": "wm",
+      "type": "wm",
-            "key": "│ ├",
+      "key": "│ ├",
-            "keyColor": "blue"
+      "keyColor": "blue"
-        },
+    },
-        {
+    {
-            "type": "wmtheme",
+      "type": "wmtheme",
-            "key": "│ ├󰉼",
+      "key": "│ ├󰉼",
-            "keyColor": "blue"
+      "keyColor": "blue"
-        },
+    },
-        {
+    {
-            "type": "icons",
+      "type": "icons",
-            "key": "│ ├󰀻",
+      "key": "│ ├󰀻",
-            "keyColor": "blue",
+      "keyColor": "blue"
-        },
+    },
-        {
+    {
-            "type": "cursor",
+      "type": "cursor",
-            "key": "│ ├",
+      "key": "│ ├",
-            "keyColor": "blue",
+      "keyColor": "blue"
-        },
+    },
-        {
+    {
-            "type": "terminalfont",
+      "type": "terminalfont",
-            "key": "│ ├",
+      "key": "│ ├",
-            "keyColor": "blue",
+      "keyColor": "blue"
-        },
+    },
-        {
+    {
-            "type": "terminal",
+      "type": "terminal",
-            "key": "└ └",
+      "key": "└ └",
-            "keyColor": "blue"
+      "keyColor": "blue"
-        },
+    },
-        {
+    {
-            "type": "custom",
+      "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
+    },
-        "break",
+    "break",
-        {
+    {
-            "type": "custom",
+      "type": "custom",
-            "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
+      "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
-        },
+    },
-        {
+    {
-            "type": "command",
+      "type": "command",
-            "key": "  OS Age ",
+      "key": "  OS Age ",
-            "keyColor": "magenta",
+      "keyColor": "magenta",
-            "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
+      "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
-        },
+    },
-        {
+    {
-            "type": "uptime",
+      "type": "uptime",
-            "key": "  Uptime ",
+      "key": "  Uptime ",
-            "keyColor": "magenta"
+      "keyColor": "magenta"
-        },
+    },
-        {
+    {
-            "type": "custom",
+      "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
+      "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
+    },
-        "break",
+    "break"
-    ]
+  ]
 }
@@ -0,0 +1,58 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
  <match target="pattern">
    <test name="family" qual="any">
      <string>sans-serif</string>
    </test>
    <edit name="family" mode="assign" binding="strong">
      <string>Liberation Sans</string>
    </edit>
  </match>
  <match target="pattern">
    <test name="family" qual="any">
      <string>serif</string>
    </test>
    <edit name="family" mode="assign" binding="strong">
      <string>Liberation Serif</string>
    </edit>
  </match>
  <match target="pattern">
    <test name="family" qual="any">
      <string>monospace</string>
    </test>
    <edit name="family" mode="assign" binding="strong">
      <string>CaskaydiaMono Nerd Font</string>
    </edit>
  </match>
  <alias>
    <family>system-ui</family>
    <prefer>
      <family>Liberation Sans</family>
    </prefer>
  </alias>
  <alias>
    <family>ui-monospace</family>
    <default>
      <family>monospace</family>
    </default>
  </alias>
  <alias>
    <family>-apple-system</family>
    <prefer>
      <family>Liberation Sans</family>
    </prefer>
  </alias>
  <alias>
    <family>BlinkMacSystemFont</family>
    <prefer>
      <family>Liberation Sans</family>
    </prefer>
  </alias>
 </fontconfig>
@@ -2,6 +2,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_unlock_cmd = pkill -SIGUSR2 waybar       # prevent stacking of waybar when waking
 }
 listener {
@@ -1,33 +1,39 @@
 # Learn how to configure Hyprland: https://wiki.hyprland.org/Configuring/
 # 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
 # Default applications
 $terminal = alacritty
 $fileManager = nautilus --new-window
 $browser = chromium --new-window --ozone-platform=wayland
 $music = spotify
 $passwordManager = 1password
 $messenger = signal-desktop
 $webapp = $browser --app
 # Use defaults Omarchy defaults
 source = ~/.local/share/omarchy/default/hypr/autostart.conf
-source = ~/.local/share/omarchy/default/hypr/bindings.conf
+source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
 source = ~/.local/share/omarchy/default/hypr/bindings/tiling.conf
 source = ~/.local/share/omarchy/default/hypr/bindings/utilities.conf
 source = ~/.local/share/omarchy/default/hypr/envs.conf
 source = ~/.local/share/omarchy/default/hypr/looknfeel.conf
 source = ~/.local/share/omarchy/default/hypr/input.conf
 source = ~/.local/share/omarchy/default/hypr/windows.conf
 source = ~/.config/omarchy/current/theme/hyprland.conf
-# Extra autostart processes (uncomment to run Dropbox)
+# Application bindings
-# exec-once = dropbox-cli start
+$terminal = uwsm app -- alacritty
 $browser = uwsm app -- chromium --new-window --ozone-platform=wayland
 $webapp = $browser --app
-# Extra env variables
+bind = SUPER, return, exec, $terminal
-# env = MY_GLOBAL_ENV,setting
+bind = SUPER, F, exec, uwsm app -- nautilus --new-window
 bind = SUPER, B, exec, $browser
 bind = SUPER, M, exec, uwsm app -- 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, uwsm app -- signal-desktop
 bind = SUPER, O, exec, uwsm app -- obsidian -disable-gpu
 bind = SUPER, slash, exec, uwsm app -- 1password
 # Extra bindings (overwrite existing binding with: unbind = SUPER, O)
 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/"
@@ -38,12 +44,19 @@ bind = SUPER ALT, G, exec, $webapp="https://messages.google.com/web/conversation
 bind = SUPER, X, exec, $webapp="https://x.com/"
 bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post"
 # Extra autostart processes
 # exec-once = uwsm app -- my-service
 # 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
+  kb_options = compose:caps # ,grp:alt_space_toggle
  # Change speed of keyboard repeat
  repeat_rate = 40
@@ -1,15 +1,8 @@
-# ────────────────────────────────────────────────────────────
+source = ~/.config/omarchy/current/theme/hyprlock.conf
 #  Hyprlock — minimal blur with ringed input
 # ────────────────────────────────────────────────────────────
 general {
    disable_loading_bar = true
    no_fade_in = false
 }
 background {
    monitor =
-    color = rgba(26,27,38,1.0)  # #1a1b26 solid color
+    color = $color
 }
 animations {
@@ -23,18 +16,16 @@ input-field {
    halign = center
    valign = center
-    inner_color = rgba(26,27,38,0.8)  # #1a1b26 with opacity
+    inner_color = $inner_color
-    outer_color = rgba(205,214,244,1.0)  # #cdd6f4
+    outer_color = $outer_color
    outline_thickness = 4
    font_family = CaskaydiaMono Nerd Font
-    font_size = 32
+    font_color = $font_color
    font_color = rgba(205,214,244,1.0)
    placeholder_color = rgba(205,214,244,0.6)
    placeholder_text =   Enter Password 󰈷 
-    check_color = rgba(68, 157, 171, 1.0)
+    check_color = $check_color
-    fail_text = Wrong
+    fail_text = <i>$PAMFAIL ($ATTEMPTS)</i>
    rounding = 0
    shadow_passes = 0
@@ -1,16 +1,20 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
-
+# List current monitors and resolutions possible: hyprctl monitors
 # Change to 1 if on a 1x display (then change last "auto" to 1 in monitor=)
 # Change to 1.75 for fractional scaling
 env = GDK_SCALE,2
 # Use single default monitor (see all monitors with: 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.
 env = GDK_SCALE,2
 monitor=,preferred,auto,auto
-# Exmaple for fractional scaling that works well with GDK_SCALE,1.75
+# Good compromise for 27" or 32" 4K monitors (but fractional!)
 # env = 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.00, auto, 2
+# monitor = DP-5, 6016x3384@60, auto, 2
-# monitor = eDP-1, 2880x1920@120.00, auto, 2
+# monitor = eDP-1, 2880x1920@120, auto, 2
@@ -0,0 +1,4 @@
 [server]
 show_percentage = true
 max_volume = 150
 style = "./style.css"
@@ -0,0 +1,28 @@
@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', monospace;
  font-size: 11pt;
  color: @label;
 }
 image {
  color: @image;
 }
 progressbar {
  border-radius: 0;
 }
 progress {
  background-color: @progress;
 }
@@ -0,0 +1,8 @@
 [Unit]
 Description=Omarchy Battery Monitor Check
 After=graphical-session.target
 [Service]
 Type=oneshot
 ExecStart=%h/.local/share/omarchy/bin/omarchy-battery-monitor
 Environment=DISPLAY=:0
@@ -0,0 +1,11 @@
 [Unit]
 Description=Omarchy Battery Monitor Timer
 Requires=omarchy-battery-monitor.service
 [Timer]
 OnBootSec=1min
 OnUnitActiveSec=30sec
 AccuracySec=10sec
 [Install]
 WantedBy=timers.target
@@ -0,0 +1,293 @@
 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 = 50
 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
@@ -1,104 +0,0 @@
 {
  "layer": "top",
    "position": "top",
    "spacing": 0,
    "height": 26,
    "modules-left": [
      "hyprland/workspaces"
    ],
    "modules-center": [
      "clock"
    ],
    "modules-right": [
      "bluetooth",
      "network",
      "pulseaudio",
      "cpu",
      "battery"
    ],
    "hyprland/workspaces": {
      "on-click": "activate",
      "format": "{icon}",
      "format-icons": {
        "default": "",
        "1": "1",
        "2": "2",
        "3": "3",
        "4": "4",
        "5": "5",
        "6": "6",
        "7": "7",
        "8": "8",
        "9": "9",
        "active": "󱓻"
      },
      "persistent-workspaces": {
        "1": [],
        "2": [],
        "3": [],
        "4": [],
        "5": []
      }
    },
    "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": "Charged ",
      "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"]
    }
 }
@@ -0,0 +1,128 @@
 {
  "reload_style_on_change": true,
  "layer": "top",
  "position": "top",
  "spacing": 0,
  "height": 26,
  "modules-left": [
    "hyprland/workspaces"
  ],
  "modules-center": [
    "clock"
  ],
  "modules-right": [
    "group/tray-expander",
    "bluetooth",
    "network",
    "pulseaudio",
    "cpu",
    "battery"
  ],
  "hyprland/workspaces": {
    "on-click": "activate",
    "format": "{icon}",
    "format-icons": {
      "default": "",
      "1": "1",
      "2": "2",
      "3": "3",
      "4": "4",
      "5": "5",
      "6": "6",
      "7": "7",
      "8": "8",
      "9": "9",
      "active": "󱓻"
    },
    "persistent-workspaces": {
      "1": [],
      "2": [],
      "3": [],
      "4": [],
      "5": []
    }
  },
  "cpu": {
    "interval": 5,
    "format": "󰍛",
    "on-click": "alacritty -e btop"
  },
  "clock": {
    "format": "{:%A %H:%M}",
    "format-alt": "{:%d %B W%V %Y}",
    "tooltip": false,
    "on-click-right": "~/.local/share/omarchy/bin/omarchy-cmd-tzupdate"
  },
  "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": "blueberry"
  },
  "pulseaudio": {
    "format": "{icon}",
    "on-click": "alacritty --class=Wiremix -e wiremix",
    "on-click-right": "pamixer -t",
    "tooltip-format": "Playing at {volume}%",
    "scroll-step": 5,
    "format-muted": "󰝟",
    "format-icons": {
      "default": ["", "", ""]
    }
  },
  "group/tray-expander": {
    "orientation": "inherit",
    "drawer": {
      "transition-duration": 600,
      "children-class": "tray-group-item"
    },
    "modules": [
      "custom/expand-icon",
    "tray"
    ]
  },
  "custom/expand-icon": {
    "format": " ",
    "tooltip": false
  },
  "tray": {
    "icon-size": 12,
    "spacing": 12
  }
 }
@@ -1,22 +1,32 @@
@import "../omarchy/current/theme/waybar.css";
 * {
  background-color: @background;
  color: @foreground;
  border: none;
  border-radius: 0;
  min-height: 0;
-  font-family: CaskaydiaMono Nerd Font;
+  font-family: CaskaydiaMono Nerd Font Propo;
  font-size: 12px;
 }
-#workspaces {
+.modules-left {
-  margin-left: 7px;
+  margin-left: 8px;
 }
 .modules-right {
  margin-right: 8px;
 }
 #workspaces button {
  all: initial;
-  padding: 2px 6px;
+  padding: 0 6px;
-  margin-right: 3px;
+  margin: 0 1.5px;
  min-width: 9px;
 }
-#custom-dropbox,
+#tray,
 #cpu,
 #battery,
 #network,
@@ -25,15 +35,13 @@
 #clock,
 #custom-power-menu {
  min-width: 12px;
-  margin-right: 13px;
+  margin: 0 7.5px;
 }
 #custom-expand-icon {
  margin-right: 12px;
 }
 tooltip {
  padding: 2px;
 }
 tooltip label {
  padding: 2px;
 }
@import "../omarchy/current/theme/waybar.css";
@@ -1,15 +0,0 @@
 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
@@ -1,65 +0,0 @@
@define-color	selected-text #7dcfff;
@define-color	text #cfc9c2;
@define-color	base #1a1b26;
 * {
    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;
 }
 #scroll {
    margin: 0;
    padding: 0;
    border: none;
    background-color: @base;
 }
 #input {
    display: none;
    opacity: 0;
    margin-top: -200px;
 }
 #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);
 }
@@ -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'
@@ -69,5 +69,5 @@ web2app-remove() {
 # Ensure changes to ~/.XCompose are immediately available
 refresh-xcompose() {
  pkill fcitx5
-  setsid fcitx5 &>/dev/null &
+  uwsm app -- fcitx5 >/dev/null 2>&1 &
 }
@@ -7,8 +7,8 @@ if command -v zoxide &> /dev/null; then
 fi
 if command -v fzf &> /dev/null; then
-  if [[ -f /usr/share/bash-completion/completions/fzf ]]; then
+  if [[ -f /usr/share/fzf/completion.bash ]]; then
-    source /usr/share/bash-completion/completions/fzf
+    source /usr/share/fzf/completion.bash
  fi
  if [[ -f /usr/share/fzf/key-bindings.bash ]]; then
    source /usr/share/fzf/key-bindings.bash
@@ -28,14 +28,12 @@ set completion-query-items 200
 # Show extra file information when completing, like `ls -F` does
 set visible-stats on
-$if Bash
+# Be more intelligent when autocompleting by also looking at the text after
-  # Be more intelligent when autocompleting by also looking at the text after
+# the cursor. For example, when the current line is "cd ~/src/mozil", and
-  # the cursor. For example, when the current line is "cd ~/src/mozil", and
+# the cursor is on the "z", pressing Tab will not autocomplete it to "cd
-  # the cursor is on the "z", pressing Tab will not autocomplete it to "cd
+# ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
-  # ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
+# Readline used by Bash 4.)
-  # Readline used by Bash 4.)
+set skip-completed-text on
  set skip-completed-text on
-  # Coloring for Bash 4 tab completions.
+# Coloring for Bash 4 tab completions.
-  set colored-stats on
+set colored-stats on
 $endif
@@ -4,3 +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
@@ -12,3 +12,6 @@ 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"
@@ -0,0 +1,14 @@
 # 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"
@@ -0,0 +1,7 @@
 keyserver hkps://keyserver.ubuntu.com
 keyserver hkps://pgp.surfnet.nl
 keyserver hkps://keys.mailvelope.com
 keyserver hkps://keyring.debian.org
 keyserver hkps://pgp.mit.edu
 connect-quick-timeout 4
@@ -1,4 +1,9 @@
-exec-once = hypridle & mako & waybar & fcitx5
+exec-once = uwsm app -- hypridle
-exec-once = swaybg -i ~/.config/omarchy/current/background -m fill
+exec-once = uwsm app -- mako
 exec-once = uwsm app -- waybar
 exec-once = uwsm app -- fcitx5
 exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = uwsm app -- swayosd-server
 exec-once = uwsm app -- walker --gapplication-service
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec-once = wl-clip-persist --clipboard regular
+exec-once = wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'
@@ -1,4 +1,5 @@
-# Start default apps
+# Deprecated bindings file. New installations include everything directly.
 bind = SUPER, return, exec, $terminal
 bind = SUPER, F, exec, $fileManager
 bind = SUPER, B, exec, $browser
@@ -10,104 +11,6 @@ bind = SUPER, G, exec, $messenger
 bind = SUPER, O, exec, obsidian -disable-gpu
 bind = SUPER, slash, exec, $passwordManager
-bind = SUPER, space, exec, pkill wofi || wofi --show drun --sort-order=alphabetical --style="$HOME/.local/share/omarchy/default/wofi/search.css"
+source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
-
+source = ~/.local/share/omarchy/default/hypr/bindings/tiling.conf
-bind = SUPER SHIFT, SPACE, exec, pkill -SIGUSR1 waybar
+source = ~/.local/share/omarchy/default/hypr/bindings/utilities.conf
 bind = SUPER CTRL, SPACE, exec, ~/.local/share/omarchy/bin/swaybg-next
 bind = SUPER SHIFT CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-next
 bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-show-keybindings
 # Notifications
 bind = SUPER, comma, exec, makoctl dismiss
 bind = SUPER SHIFT, comma, exec, makoctl dismiss --all
 bind = SUPER CTRL, comma, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
 bind = SUPER, W, killactive,
 # Power menu controls lock, suspend, relaunch, restart, shutdown
 bind = SUPER, ESCAPE, exec, ~/.local/share/omarchy/bin/omarchy-power-menu
 # Toggle idling
 bind = SUPER CTRL, I, exec, ~/.local/share/omarchy/bin/omarchy-toggle-idle
 # Control tiling
 bind = SUPER, J, togglesplit, # dwindle
 bind = SUPER, P, pseudo, # dwindle
 bind = SUPER, V, togglefloating,
 # Move focus with mainMod + arrow keys
 bind = SUPER, left, movefocus, l
 bind = SUPER, right, movefocus, r
 bind = SUPER, up, movefocus, u
 bind = SUPER, down, movefocus, d
 # Switch workspaces with mainMod + [0-9]
 bind = SUPER, code:10, workspace, 1
 bind = SUPER, code:11, workspace, 2
 bind = SUPER, code:12, workspace, 3
 bind = SUPER, code:13, workspace, 4
 bind = SUPER, code:14, workspace, 5
 bind = SUPER, code:15, workspace, 6
 bind = SUPER, code:16, workspace, 7
 bind = SUPER, code:17, workspace, 8
 bind = SUPER, code:18, workspace, 9
 bind = SUPER, code:19, workspace, 10
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
 bind = SUPER SHIFT, code:10, movetoworkspace, 1
 bind = SUPER SHIFT, code:11, movetoworkspace, 2
 bind = SUPER SHIFT, code:12, movetoworkspace, 3
 bind = SUPER SHIFT, code:13, movetoworkspace, 4
 bind = SUPER SHIFT, code:14, movetoworkspace, 5
 bind = SUPER SHIFT, code:15, movetoworkspace, 6
 bind = SUPER SHIFT, code:16, movetoworkspace, 7
 bind = SUPER SHIFT, code:17, movetoworkspace, 8
 bind = SUPER SHIFT, code:18, movetoworkspace, 9
 bind = SUPER SHIFT, code:19, movetoworkspace, 10
 # Swap active window with the one next to it with mainMod + SHIFT + arrow keys
 bind = SUPER SHIFT, left, swapwindow, l
 bind = SUPER SHIFT, right, swapwindow, r
 bind = SUPER SHIFT, up, swapwindow, u
 bind = SUPER SHIFT, down, swapwindow, d
 # Resize active window
 bind = SUPER, minus, resizeactive, -100 0
 bind = SUPER, equal, resizeactive, 100 0
 bind = SUPER SHIFT, minus, resizeactive, 0 -100
 bind = SUPER SHIFT, equal, resizeactive, 0 100
 # Scroll through existing workspaces with mainMod + scroll
 bind = SUPER, mouse_down, workspace, e+1
 bind = SUPER, mouse_up, workspace, e-1
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = SUPER, mouse:272, movewindow
 bindm = SUPER, mouse:273, resizewindow
 # Laptop multimedia keys for volume and LCD brightness
 bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
 bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
 bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
 bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
 bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
 # Control Apple Display brightness
 bind = CTRL, F1, exec, ~/.local/share/omarchy/bin/apple-display-brightness -5000
 bind = CTRL, F2, exec, ~/.local/share/omarchy/bin/apple-display-brightness +5000
 bind = SHIFT CTRL, F2, exec, ~/.local/share/omarchy/bin/apple-display-brightness +60000
 # Requires playerctl
 bindl = , XF86AudioNext, exec, playerctl next
 bindl = , XF86AudioPause, exec, playerctl play-pause
 bindl = , XF86AudioPlay, exec, playerctl play-pause
 bindl = , XF86AudioPrev, exec, playerctl previous
 # Screenshots
 bind = , PRINT, exec, hyprshot -m region
 bind = SHIFT, PRINT, exec, hyprshot -m window
 bind = CTRL, PRINT, exec, hyprshot -m output
 # Color picker
 bind = SUPER, PRINT, exec, hyprpicker -a
@@ -0,0 +1,16 @@
 # Only display the OSD on the currently focused monitor
 $osdclient = swayosd-client --monitor "$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
 # Laptop multimedia keys for volume and LCD brightness (with OSD)
 bindel = ,XF86AudioRaiseVolume, exec, $osdclient --output-volume raise
 bindel = ,XF86AudioLowerVolume, exec, $osdclient --output-volume lower
 bindel = ,XF86AudioMute, exec, $osdclient --output-volume mute-toggle
 bindel = ,XF86AudioMicMute, exec, $osdclient --input-volume mute-toggle
 bindel = ,XF86MonBrightnessUp, exec, $osdclient --brightness raise
 bindel = ,XF86MonBrightnessDown, exec, $osdclient --brightness lower
 # Requires playerctl
 bindl = , XF86AudioNext, exec, $osdclient --playerctl next
 bindl = , XF86AudioPause, exec, $osdclient --playerctl play-pause
 bindl = , XF86AudioPlay, exec, $osdclient --playerctl play-pause
 bindl = , XF86AudioPrev, exec, $osdclient --playerctl previous