Add menu option for updating drive encryption and user passwords

Icelandic was not being picked up by the clock on waybar, this issue
contains more information.

https://github.com/Alexays/Waybar/issues/2694#issuecomment-1837118050

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,23 @@
+name: Bug
+description: Report a problem
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Remember: Omarchy is an open source gift, not a product you bought from a vendor
+
+  - type: input
+    id: system-details
+    attributes:
+      label: System details
+      placeholder: e.g. AMD 9950X, NVIDIA 5090, Omarchy 2.1.0
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: What's wrong?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/documentation.yml

@@ -0,0 +1,15 @@
+name: Documentation
+description: New pages or changes to existing
+labels: [documentation]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Remember: Omarchy is an open source gift, not a product you bought from a vendor
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: What correction or addition do we need?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,15 @@
+name: Enhancement
+description: Feature or change
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Remember: Omarchy is an open source gift, not a product you bought from a vendor
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: What do you need?
+    validations:
+      required: true

bin/omarchy-cmd-screenrecord

@@ -8,15 +8,21 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
+if [[ $2 == "audio" ]]; then
+  AUDIO="--audio"
+else
+  AUDIO=""
+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 -Eqi 'nvidia|intel.*graphics'; then
-    wf-recorder -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@"
+    wf-recorder $AUDIO -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" "$@"
+    wl-screenrec $AUDIO -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@"
   fi
 }
 

bin/omarchy-cmd-screensaver

@@ -15,7 +15,7 @@ while true; do
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 2; then
+    if read -n 1 -t 3; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-screenshot

@@ -8,7 +8,7 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-pkill slurp || hyprshot -m ${1:-region} --raw |
+pkill slurp || hyprshot -m ${1:-region} --raw --freeze |
   satty --filename - \
     --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
     --early-exit \

bin/omarchy-cmd-terminal-cwd

@@ -5,7 +5,7 @@ terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
 shell_pid=$(pgrep -P "$terminal_pid" | head -n1)
 
 if [[ -n $shell_pid ]]; then
-  readlink -f "/proc/$shell_pid/cwd" 2>/dev/null
+  readlink -f "/proc/$shell_pid/cwd" 2>/dev/null || echo "$HOME"
 else
   echo "$HOME"
 fi

bin/omarchy-drive-info

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Drive, like /dev/nvme0, to display information about
+if (($# == 0)); then
+  echo "Usage: omarchy-drive-info [/dev/drive]"
+  exit 1
+else
+  drive="$1"
+fi
+
+# Find the root drive in case we are looking at partitions
+root_drive=$(lsblk -no PKNAME "$drive" 2>/dev/null | tail -n1)
+if [[ -n "$root_drive" ]]; then
+  root_drive="/dev/$root_drive"
+else
+  root_drive="$drive"
+fi
+
+# Get basic disk information
+size=$(lsblk -dno SIZE "$drive" 2>/dev/null)
+model=$(lsblk -dno MODEL "$root_drive" 2>/dev/null)
+
+# Format display string
+display="$drive"
+[[ -n "$size" ]] && display="$display ($size)"
+[[ -n "$model" ]] && display="$display - $model"
+
+echo "$display"

bin/omarchy-drive-select

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Select a drive from a list with info that includes space and brand
+
+if (($# == 0)); then
+  drives=$(lsblk -dpno NAME | grep -E '/dev/(sd|hd|vd|nvme|mmcblk|xv)')
+else
+  drives="$@"
+fi
+
+drives_with_info=""
+while IFS= read -r drive; do
+  [[ -n "$drive" ]] || continue
+  drives_with_info+="$(omarchy-drive-info "$drive")"$'\n'
+done <<<"$drives"
+
+selected_drive="$(printf "%s" "$drives_with_info" | gum choose --header "Select drive")" || exit 1
+printf "%s\n" "$selected_drive" | awk '{print $1}'

bin/omarchy-drive-set-password

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+encrypted_drives=$(blkid -t TYPE=crypto_LUKS -o device)
+
+if [[ -n $encrypted_drives ]]; then
+  if [[ $(wc -l <<<"$encrypted_drives") -eq 1 ]]; then
+    drive_to_change="$encrypted_drives"
+  else
+    drive_to_change="$(omarchy-drive-select "$encrypted_drives")"
+  fi
+
+  if [[ -n $drive_to_change ]]; then
+    echo "Changing full-disk encryption password for $drive_to_change"
+    sudo cryptsetup luksChangeKey --pbkdf argon2id --iter-time 2000 "$drive_to_change"
+  else
+    echo "No drive selected."
+  fi
+else
+  echo "No encrypted drives available."
+  exit 1
+fi

bin/omarchy-install-dev-env

@@ -6,7 +6,7 @@ if [[ -z "$1" ]]; then
 fi
 
 install_php() {
-  sudo pacman -S php composer php-sqlite --noconfirm
+  sudo pacman -S php composer php-sqlite xdebug --noconfirm
 
   # Install Path for Composer
   if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
@@ -28,6 +28,12 @@ install_php() {
     "pdo_mysql"
   )
 
+  # Enable Xdebug
+  sudo sed -i \
+    -e 's/^;zend_extension=xdebug.so/zend_extension=xdebug.so/' \
+    -e 's/^;xdebug.mode=debug/xdebug.mode=debug/' \
+    /etc/php/conf.d/xdebug.ini
+
   for ext in "${extensions_to_enable[@]}"; do
     sudo sed -i "s/^;extension=${ext}/extension=${ext}/" "$php_ini_path"
   done
@@ -75,7 +81,7 @@ laravel)
 symfony)
   echo -e "Installing PHP and Symfony...\n"
   install_php
-  yay -S symfony-cli --noconfirm
+  omarchy-pkg-add symfony-cli
   echo -e "\nYou can now run: symfony new --webapp myproject"
   ;;
 python)

bin/omarchy-install-docker-dbs

@@ -1,7 +1,12 @@
 #!/bin/bash
 
 options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB")
-choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
+
+if [[ "$#" -eq 0 ]]; then
+  choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
+else
+  choices="$@"
+fi
 
 if [[ -n "$choices" ]]; then
   for db in $choices; do

bin/omarchy-install-dropbox

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-# FIXME: Should not use AUR dependencies when we can avoid it
-echo "Installing all dependencies [from AUR]..."
-yay -S --noconfirm --needed \
-  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
+echo "Installing all dependencies..."
+omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."
 uwsm app -- dropbox-cli start &>/dev/null &

bin/omarchy-install-steam

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "Adding multilib repository for 32-bit compatibility"
-sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
+sudo sed -i '/^#\s*\[multilib\]/,/^#\s*Include/ s/^#\s*//' /etc/pacman.conf
 
 echo "Now pick dependencies matching your graphics card"
 sudo pacman -Syu --noconfirm steam

bin/omarchy-menu

@@ -200,19 +200,20 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
+  *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
+  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
-  *Cursor*) aur_install_and_launch "Cursor" "cursor-bin" "cursor" ;;
+  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
   *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
-  *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
+  *Sublime*) aur_install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
   *) show_install_menu ;;
@@ -226,14 +227,14 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
-  *Claude*) aur_install "Claude Code" "claude-code" ;;
+  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  *Claude*) install "Claude Code" "claude-code" ;;
   *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
-  *Studio*) aur_install "LM Studio" "lmstudio" ;;
+  *Studio*) install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
-  *Crush*) aur_install "Crush" "crush-bin" ;;
-  *opencode*) aur_install "opencode" "opencode-bin" ;;
+  *Crush*) install "Crush" "crush-bin" ;;
+  *opencode*) install "opencode" "opencode" ;;
   *) show_install_menu ;;
   esac
 }
@@ -242,7 +243,7 @@ show_install_gaming_menu() {
   case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
-  *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
+  *Minecraft*) aur_install_and_launch "Minecraft [AUR]" "minecraft-launcher" "minecraft-launcher" ;;
   *) show_install_menu ;;
   esac
 }
@@ -323,12 +324,14 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
+  *Hardware*) show_update_hardware_menu ;;
   *Timezone*) omarchy-cmd-tzupdate ;;
+  *Password*) show_update_password_menu ;;
   *) show_main_menu ;;
   esac
 }
@@ -340,7 +343,7 @@ show_update_process_menu() {
   *Swayosd*) omarchy-restart-swayosd ;;
   *Walker*) omarchy-restart-walker ;;
   *Waybar*) omarchy-restart-waybar ;;
-  *) show_main_menu ;;
+  *) show_update_menu ;;
   esac
 }
 
@@ -354,7 +357,23 @@ show_update_config_menu() {
   *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
   *Walker*) present_terminal omarchy-refresh-walker ;;
   *Waybar*) present_terminal omarchy-refresh-waybar ;;
-  *) show_main_menu ;;
+  *) show_update_menu ;;
+  esac
+}
+
+show_update_hardware_menu() {
+  case $(menu "Restart" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
+  *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
+  *) show_update_menu ;;
+  esac
+}
+
+show_update_password_menu() {
+  case $(menu "Update Password" "  Drive Encryption\n  User") in
+  *Drive*) present_terminal omarchy-drive-set-password ;;
+  *User*) present_terminal passwd ;;
+  *) show_update_menu ;;
   esac
 }
 

bin/omarchy-pkg-add

@@ -1,7 +1,9 @@
 #!/bin/bash
 
 for pkg in "$@"; do
-  pacman -Q "$pkg" &>/dev/null
+  if ! pacman -Q "$pkg" &>/dev/null; then
+    sudo pacman -S --noconfirm "$pkg" || exit 1
+  fi
 done
 
 exit 0

bin/omarchy-refresh-pacman-mirrorlist

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

bin/omarchy-restart-bluetooth

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rfkill unblock bluetooth
+rfkill list bluetooth

bin/omarchy-restart-wifi

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rfkill unblock wifi
+rfkill list wifi

bin/omarchy-update-system-pkgs

@@ -1,17 +1,24 @@
 #!/bin/bash
 
-echo -e "\e[32m\nUpdate system packages\e[0m"
-echo "sudo pacman -Syu --noconfirm --ignore \"$(omarchy-pkg-ignored)\""
-sudo pacman -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)"
+# Used in package emergencies if a bad package has been pushed and we can't revoke.
+# Requires manually installing the good package using sudo pacman -U <url>
+ignored_packages=$(omarchy-pkg-ignored)
 
-if omarchy-pkg-aur-accessible; then
-  echo -e "\e[32m\nUpdate AUR packages\e[0m"
-  echo "yay -Sua --noconfirm  --ignore \"$(omarchy-pkg-ignored)\""
-  yay -Sua --noconfirm --ignore "$(omarchy-pkg-ignored)"
-  echo
-else
-  echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
-  echo
+echo -e "\e[32m\nUpdate system packages\e[0m"
+[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
+sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
+
+# Update AUR packages if any are installed
+if pacman -Qem >/dev/null; then
+  if omarchy-pkg-aur-accessible; then
+    echo -e "\e[32m\nUpdate AUR packages\e[0m"
+    [[ -n $ignored_packages ]] && echo "yay -Sua --noconfirm  --ignore \"$ignored_packages\""
+    yay -Sua --noconfirm --ignore "$ignored_packages"
+    echo
+  else
+    echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
+    echo
+  fi
 fi
 
 orphans=$(pacman -Qtdq)

config/hypr/bindings.conf

@@ -2,7 +2,7 @@
 $terminal = uwsm app -- alacritty
 $browser = omarchy-launch-browser
 
-bindd = SUPER, return, Terminal, exec, $terminal --working-directory=$(omarchy-cmd-terminal-cwd)
+bindd = SUPER, return, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
 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

config/hypr/input.conf

@@ -9,6 +9,9 @@ input {
   repeat_rate = 40
   repeat_delay = 600
 
+  # Start with numlock on by default
+  numlock_by_default = true
+
   # Increase sensitity for mouse/trackpack (default: 0)
   # sensitivity = 0.35
 

config/waybar/config.jsonc

@@ -57,8 +57,8 @@
     "on-click": "alacritty -e btop"
   },
   "clock": {
-    "format": "{:%A %H:%M}",
-    "format-alt": "{:%d %B W%V %Y}",
+    "format": "{:L%A %H:%M}",
+    "format-alt": "{:L%d %B W%V %Y}",
     "tooltip": false,
     "on-click-right": "omarchy-cmd-tzupdate"
   },

default/hypr/apps.conf

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

default/hypr/apps/bitwarden.conf

@@ -0,0 +1 @@
+windowrule = noscreenshare, class:^(Bitwarden)$

default/hypr/apps/browser.conf

@@ -1,6 +1,6 @@
 # Browser types
 windowrule = tag +chromium-based-browser, class:([cC]hrom(e|ium)|[bB]rave-browser|Microsoft-edge|Vivaldi-stable)
-windowrule = tag +firefox-based-browser, class:(Firefox|zen|librewolf)
+windowrule = tag +firefox-based-browser, class:([fF]irefox|zen|librewolf)
 
 # Force chromium-based browsers into a tile to deal with --app bug
 windowrule = tile, tag:chromium-based-browser
@@ -10,4 +10,4 @@ windowrule = opacity 1 0.97, tag:chromium-based-browser
 windowrule = opacity 1 0.97, tag:firefox-based-browser
 
 # Some video sites should never have opacity applied to them
-windowrule = opacity 1.0 1.0, initialTitle:(youtube\.com_/|app\.zoom\.us_/wc/home)
+windowrule = opacity 1.0 1.0, initialTitle:((?i)(?:[a-z0-9-]+\.)*youtube\.com_/|app\.zoom\.us_/wc/home)

default/hypr/apps/qemu.conf

@@ -0,0 +1 @@
+windowrule = opacity 1 1, class:qemu

default/hypr/apps/retroarch.conf

@@ -1,3 +1,4 @@
 windowrule = fullscreen, class:com.libretro.RetroArch
 windowrule = opacity 1 1, class:com.libretro.RetroArch
+windowrule = idleinhibit fullscreen, class:com.libretro.RetroArch
 

default/hypr/apps/steam.conf

@@ -4,3 +4,4 @@ windowrule = center, class:steam, title:Steam
 windowrule = opacity 1 1, class:steam
 windowrule = size 1100 700, class:steam, title:Steam
 windowrule = size 460 800, class:steam, title:Friends List
+windowrule = idleinhibit fullscreen, class:steam

default/hypr/bindings/utilities.conf

@@ -7,7 +7,7 @@ bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
 bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings
 
 # Aesthetics
-bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, pkill -SIGUSR1 waybar
+bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, omarchy-toggle-waybar
 bindd = SUPER CTRL, SPACE, Next background in theme, exec, omarchy-theme-bg-next
 bindd = SUPER SHIFT CTRL, SPACE, Pick new theme, exec, omarchy-menu theme
 
@@ -33,8 +33,10 @@ bindd = SHIFT, PRINT, Screenshot of window, exec, omarchy-cmd-screenshot window
 bindd = CTRL, PRINT, Screenshot of display, exec, omarchy-cmd-screenshot output
 
 # Screen recordings
-bindd = ALT, PRINT, Screen record a region, exec, omarchy-cmd-screenrecord
+bindd = ALT, PRINT, Screen record a region, exec, omarchy-cmd-screenrecord region
+bindd = ALT SHIFT, PRINT, Screen record a region with audio, exec, omarchy-cmd-screenrecord region audio
 bindd = CTRL ALT, PRINT, Screen record display, exec, omarchy-cmd-screenrecord output
+bindd = CTRL ALT SHIFT, PRINT, Screen record display with audio, exec, omarchy-cmd-screenrecord output audio
 
 # Color picker
 bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a

default/hypr/envs.conf

@@ -10,6 +10,11 @@ env = SDL_VIDEODRIVER,wayland
 env = MOZ_ENABLE_WAYLAND,1
 env = ELECTRON_OZONE_PLATFORM_HINT,wayland
 env = OZONE_PLATFORM,wayland
+env = XDG_SESSION_TYPE,wayland
+
+# Allow better support for screen sharing (Google Meet, Discord, etc)
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_DESKTOP,Hyprland
 
 xwayland {
   force_zero_scaling = true

default/hypr/windows.conf

@@ -7,8 +7,5 @@ windowrule = opacity 0.97 0.9, class:.*
 # Fix some dragging issues with XWayland
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
-# Prevent screensaver/lock while running apps fullscreen
-windowrule = idleinhibit fullscreen, class:.*
-
 # App-specific tweaks
 source = ~/.local/share/omarchy/default/hypr/apps.conf

default/pacman/mirrorlist

@@ -0,0 +1,3 @@
+Server = https://mirror.omarchy.org/$repo/os/$arch
+Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch

default/pacman/pacman.conf

@@ -0,0 +1,30 @@
+# See the pacman.conf(5) manpage for option and repository directives
+
+[options]
+Color
+ILoveCandy
+VerbosePkgLists
+HoldPkg = pacman glibc
+Architecture = auto
+CheckSpace
+ParallelDownloads = 5
+DownloadUser = alpm
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel = Required DatabaseOptional
+LocalFileSigLevel = Optional
+
+# pacman searches repositories in the order defined here
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+# [multilib]
+# Include = /etc/pacman.d/mirrorlist
+
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/$arch

install.sh

@@ -3,21 +3,21 @@
 # Exit immediately if a command exits with a non-zero status
 set -eE
 
-export PATH="$HOME/.local/share/omarchy/bin:$PATH"
-OMARCHY_INSTALL=~/.local/share/omarchy/install
+OMARCHY_PATH="$HOME/.local/share/omarchy"
+OMARCHY_INSTALL="$OMARCHY_PATH/install"
+export PATH="$OMARCHY_PATH/bin:$PATH"
 
 # Preparation
 source $OMARCHY_INSTALL/preflight/show-env.sh
 source $OMARCHY_INSTALL/preflight/trap-errors.sh
 source $OMARCHY_INSTALL/preflight/guard.sh
 source $OMARCHY_INSTALL/preflight/chroot.sh
-source $OMARCHY_INSTALL/preflight/repositories.sh
+source $OMARCHY_INSTALL/preflight/pacman.sh
 source $OMARCHY_INSTALL/preflight/migrations.sh
 source $OMARCHY_INSTALL/preflight/first-run-mode.sh
 
 # Packaging
 source $OMARCHY_INSTALL/packages.sh
-source $OMARCHY_INSTALL/packaging/asdcontrol.sh
 source $OMARCHY_INSTALL/packaging/fonts.sh
 source $OMARCHY_INSTALL/packaging/lazyvim.sh
 source $OMARCHY_INSTALL/packaging/webapps.sh
@@ -39,6 +39,7 @@ source $OMARCHY_INSTALL/config/mise-ruby.sh
 source $OMARCHY_INSTALL/config/docker.sh
 source $OMARCHY_INSTALL/config/mimetypes.sh
 source $OMARCHY_INSTALL/config/localdb.sh
+source $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
 source $OMARCHY_INSTALL/config/hardware/network.sh
 source $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
 source $OMARCHY_INSTALL/config/hardware/bluetooth.sh
@@ -46,22 +47,12 @@ source $OMARCHY_INSTALL/config/hardware/printer.sh
 source $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
 source $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
 source $OMARCHY_INSTALL/config/hardware/nvidia.sh
+source $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
 
 # Login
 source $OMARCHY_INSTALL/login/plymouth.sh
 source $OMARCHY_INSTALL/login/limine-snapper.sh
 source $OMARCHY_INSTALL/login/alt-bootloaders.sh
 
-# Reboot
-clear
-tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
-echo
-echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
-
-if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
-  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
-  echo -e "\nRemember to remove USB installer!\n\n"
-fi
-
-sleep 5
-reboot
+# Finishing
+source $OMARCHY_INSTALL/reboot.sh

install/config/git.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Ensure git settings live under ~/.config
+mkdir -p ~/.config/git
+touch ~/.config/git/config
+
 # Set common git aliases
 git config --global alias.co checkout
 git config --global alias.br branch

install/config/hardware/fix-f13-amd-audio-input.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+AMD_AUDIO_CARD=$(pactl list cards | grep -B20 "Family 17h/19h" | grep "Name: " | awk '{print $2}')
+
+if [[ -n $AMD_AUDIO_CARD ]]; then
+  pactl set-card-profile "$AMD_AUDIO_CARD" "HiFi (Mic1, Mic2, Speaker)" 2>/dev/null || true
+fi

install/config/hardware/network.sh

@@ -1,11 +1,7 @@
 #!/bin/bash
 
-# Install iwd explicitly if it wasn't included in archinstall
-# This can happen if archinstall used ethernet
-if ! command -v iwctl &>/dev/null; then
-  sudo pacman -S --noconfirm --needed iwd
-  sudo systemctl enable iwd.service
-fi
+# Ensure iwd service will be started
+sudo systemctl enable iwd.service
 
 # Prevent systemd-networkd-wait-online timeout on boot
 sudo systemctl disable systemd-networkd-wait-online.service

install/config/hardware/nvidia.sh

@@ -32,7 +32,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
 
   # Enable multilib repository for 32-bit libraries
   if ! grep -q "^\[multilib\]" /etc/pacman.conf; then
-    sudo sed -i '/^#\[multilib\]/,/^#Include/ s/^#//' /etc/pacman.conf
+    sudo sed -i '/^#\s*\[multilib\]/,/^#\s*Include/ s/^#\s*//' /etc/pacman.conf
   fi
 
   # force package database refresh

install/config/sudoless-asdcontrol.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Setup sudo-less controls for controlling brightness on Apple Displays
+echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
+sudo chmod 440 /etc/sudoers.d/asdcontrol

install/first-run/firewall.sh

@@ -17,6 +17,9 @@ sudo ufw allow in proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'al
 # Turn on the firewall
 sudo ufw --force enable
 
+# Enable UFW systemd service to start on boot
+sudo systemctl enable ufw
+
 # Turn on Docker protections
 sudo ufw-docker install
 sudo ufw reload

install/packages.sh

@@ -1,6 +1,9 @@
+#!/bin/bash
+
 sudo pacman -S --noconfirm --needed \
   1password-beta \
   1password-cli \
+  asdcontrol-git \
   alacritty \
   avahi \
   bash-completion \
@@ -26,6 +29,7 @@ sudo pacman -S --noconfirm --needed \
   fcitx5-qt \
   fd \
   ffmpegthumbnailer \
+  fontconfig \
   fzf \
   gcc14 \
   github-cli \
@@ -46,6 +50,7 @@ sudo pacman -S --noconfirm --needed \
   impala \
   imv \
   inetutils \
+  iwd \
   jq \
   kdenlive \
   kvantum-qt5 \
@@ -83,6 +88,7 @@ sudo pacman -S --noconfirm --needed \
   python-gobject \
   python-poetry-core \
   python-terminaltexteffects \
+  qt5-wayland \
   ripgrep \
   satty \
   signal-desktop \

install/packaging/asdcontrol.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Install asdcontrol for controlling brightness on Apple Displays
-if ! command -v asdcontrol &>/dev/null; then
-  git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol
-  cd /tmp/asdcontrol
-  make
-  sudo make install
-  cd -
-  rm -rf /tmp/asdcontrol
-
-  # Setup sudo-less controls
-  echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
-  sudo chmod 440 /etc/sudoers.d/asdcontrol
-fi

install/preflight/pacman.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Install build tools
+sudo pacman -S --needed --noconfirm base-devel
+
+# Configure pacman
+sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
+sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
+
+# Refresh all repos
+sudo pacman -Syu --noconfirm

install/preflight/repositories.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Install build tools
-sudo pacman -S --needed --noconfirm base-devel
-
-# Add fun and color and verbosity to the pacman installer
-if ! grep -q "ILoveCandy" /etc/pacman.conf; then
-  sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
-fi
-
-# Add the Omarchy repository
-if ! grep -q "omarchy" /etc/pacman.conf; then
-  sudo tee -a /etc/pacman.conf >/dev/null <<'EOF'
-
-[omarchy]
-SigLevel = Optional TrustAll
-Server = https://pkgs.omarchy.org/$arch
-EOF
-fi
-
-# Set mirrors to global ones only
-sudo tee /etc/pacman.d/mirrorlist >/dev/null <<'EOF'
-Server = https://mirror.omarchy.org/$repo/os/$arch
-Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
-Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
-EOF
-
-# Refresh all repos
-sudo pacman -Syu --noconfirm

install/preflight/trap-errors.sh

@@ -24,7 +24,11 @@ catch_errors() {
   echo "    ▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀  ▀ ▀▀▀▀▀▀    "
   echo "                                 "
 
-  echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
+  if command -v gum >/dev/null && gum confirm "Retry installation?"; then
+    bash ~/.local/share/omarchy/install.sh
+  else
+    echo "You can retry later by running: bash ~/.local/share/omarchy/install.sh"
+  fi
 }
 
 trap catch_errors ERR

install/reboot.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+clear
+tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
+echo
+echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
+
+if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
+  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
+  echo -e "\nRemember to remove USB installer!\n\n"
+fi
+
+sleep 5
+reboot

migrations/1751134560.sh

@@ -9,6 +9,7 @@ omarchy-refresh-config uwsm/env
 echo -e "\n\e[31mOmarchy bins have been added to PATH (and OMARCHY_PATH is now system-wide).\nYou must immediately relaunch Hyprland or most Omarchy cmds won't work.\nPlease run Omarchy > Update again after the quick relaunch is complete.\e[0m"
 echo
 
+mkdir -p ~/.local/state/omarchy/migrations
 gum confirm "Ready to relaunch Hyprland? (All applications will be closed)" &&
   touch ~/.local/state/omarchy/migrations/1751134560.sh &&
   uwsm stop

migrations/1751134561.sh

@@ -1,5 +1,7 @@
 echo "Add Omarchy Package Repository"
 
+omarchy-refresh-pacman-mirrorlist
+
 if ! grep -q "omarchy" /etc/pacman.conf; then
   sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\n' /etc/pacman.conf
   sudo systemctl restart systemd-timesyncd

migrations/1755164105.sh

@@ -1,15 +1,15 @@
 echo "Switch to Omarchy Chromium for synchronized theme switching"
 
-set_theme_colors() {
-  if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then
-    chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
-  else
-    # Use a default, neutral grey if theme doesn't have a color
-    chromium --no-startup-window --set-theme-color="28,32,39"
-  fi
-}
-
 if omarchy-cmd-present chromium; then
+  set_theme_colors() {
+    if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
+      chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
+    else
+      # Use a default, neutral grey if theme doesn't have a color
+      chromium --no-startup-window --set-theme-color="28,32,39"
+    fi
+  }
+
   omarchy-pkg-drop chromium
   omarchy-pkg-add omarchy-chromium
 

migrations/1756411333.sh

@@ -1,7 +1,3 @@
 echo "Use new Omarchy mirror as default"
 
-sudo tee /etc/pacman.d/mirrorlist >/dev/null <<'EOF'
-Server = https://mirror.omarchy.org/$repo/os/$arch
-Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
-Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
-EOF
+omarchy-refresh-pacman-mirrorlist

migrations/1756629295.sh

@@ -0,0 +1,3 @@
+echo "Ensure qt5-wayland is installed so KeepassXC, Nextcloud, Sqlite Browser, and other apps display correctly"
+
+omarchy-pkg-add qt5-wayland

migrations/1756642681.sh

@@ -0,0 +1,3 @@
+echo "Fix audio input on AMD Framework laptops"
+
+source $OMARCHY_PATH/install/config/hardware/fix-f13-amd-audio-input.sh || true

migrations/1756650507.sh

@@ -0,0 +1,5 @@
+echo "Fix JetBrains font setting"
+
+if [[ $(omarchy-font-current) == JetBrains* ]]; then
+  omarchy-font-set "JetBrainsMono Nerd Font"
+fi

migrations/1756911131.sh

@@ -0,0 +1,11 @@
+echo "Enable UFW systemd service for existing installations"
+
+if omarchy-cmd-present ufw; then
+    if sudo ufw status | grep -q "Status: active\|22/tcp\|53317"; then
+        if ! systemctl is-enabled ufw >/dev/null 2>&1; then
+            sudo systemctl enable ufw --now
+            echo "UFW systemd service enabled"
+        fi
+    fi
+fi
+

themes/ristretto/alacritty.toml

@@ -22,7 +22,7 @@ white   = "#f1e5e7"
 
 [colors.cursor]
 cursor = '#c3b7b8'
-text = '#c3b7b8'
+text = '#2c2525'
 
 [colors.primary]
 background = '#2c2525'