Refactor share menu to remove terminal command

This reverts commit 03cbbd2f7f.

applications/Alacritty.desktop

@@ -1,21 +0,0 @@
-[Desktop Entry]
-Type=Application
-TryExec=alacritty
-Exec=alacritty
-Icon=Alacritty
-Terminal=false
-Categories=System;TerminalEmulator;
-Name=Alacritty
-GenericName=Terminal
-Comment=A fast, cross-platform, OpenGL terminal emulator
-StartupNotify=true
-StartupWMClass=Alacritty
-Actions=New;
-X-TerminalArgExec=-e
-X-TerminalArgAppId=--class=
-X-TerminalArgTitle=--title=
-X-TerminalArgDir=--working-directory=
-
-[Desktop Action New]
-Name=New Terminal
-Exec=alacritty

bin/omarchy-cmd-screenrecord

@@ -62,7 +62,7 @@ start_screenrecording() {
   # Merge audio tracks into one - separate tracks only play one at a time in most players
   [[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input"
 
-  gpu-screen-recorder -w "$@" -f 60 -c mp4 -o "$filename" $audio_args &
+  gpu-screen-recorder -w "$@" -f 60 -c mp4 $audio_args -ac aac -o "$filename" &
   toggle_screenrecording_indicator
 }
 

bin/omarchy-cmd-screensaver

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 screensaver_in_focus() {
-  hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
+  hyprctl activewindow -j | jq -e '.class == "com.omarchy.Screensaver"' >/dev/null 2>&1
 }
 
 exit_screensaver() {
   hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
-  pkill -f "alacritty --class Screensaver" 2>/dev/null
+  pkill -f com.omarchy.Screensaver 2>/dev/null
   exit 0
 }
 
@@ -18,7 +18,7 @@ hyprctl keyword cursor:invisible true &>/dev/null
 while true; do
   effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
   tte -i ~/.config/omarchy/branding/screensaver.txt \
-    --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
+    --frame-rate 240 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c --no-eol \
     "$effect" &
 
   while pgrep -x tte >/dev/null; do

bin/omarchy-font-set

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

bin/omarchy-install-dev-env

@@ -50,6 +50,7 @@ ruby)
   omarchy-pkg-add libyaml
   mise use --global ruby@latest
   mise settings add idiomatic_version_file_enable_tools ruby
+  echo "gem: --no-document" > ~/.gemrc
   mise x ruby -- gem install rails --no-document
   echo -e "\nYou can now run: rails new myproject"
   ;;

bin/omarchy-install-terminal

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

bin/omarchy-launch-or-focus

@@ -7,7 +7,7 @@ fi
 
 WINDOW_PATTERN="$1"
 LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
-WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
+WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "^$WINDOW_PATTERN$" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
 
 if [[ -n $WINDOW_ADDRESS ]]; then
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"

bin/omarchy-launch-screensaver

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

bin/omarchy-launch-webapp

@@ -3,7 +3,7 @@
 browser=$(xdg-settings get default-web-browser)
 
 case $browser in
-google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;;
+google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium*) ;;
 *) browser="chromium.desktop" ;;
 esac
 

bin/omarchy-launch-wifi

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

bin/omarchy-lock-screen

@@ -9,4 +9,4 @@ if pgrep -x "1password" >/dev/null; then
 fi
 
 # Avoid running screensaver when locked
-pkill -f "alacritty --class Screensaver"
+pkill -f com.omarchy.Screensaver

bin/omarchy-menu

@@ -33,7 +33,7 @@ menu() {
     fi
   fi
 
-  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 600 -p "$prompt…" "${args[@]}" 2>/dev/null
+  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 630 -p "$prompt…" "${args[@]}" 2>/dev/null
 }
 
 terminal() {
@@ -124,7 +124,7 @@ show_screenrecord_menu() {
 
 show_share_menu() {
   case $(menu "Share" "  Clipboard\n  File \n  Folder") in
-  *Clipboard*) terminal bash -c "omarchy-cmd-share clipboard" ;;
+  *Clipboard*) omarchy-cmd-share clipboard ;;
   *File*) terminal bash -c "omarchy-cmd-share file" ;;
   *Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
   *) back_to show_trigger_menu ;;

bin/omarchy-refresh-hyprland

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

bin/omarchy-refresh-pacman-mirrorlist

@@ -1,3 +1,7 @@
 #!/bin/bash
 
-sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
+if [[ $1 == "edge" ]]; then
+  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
+else
+  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
+fi

bin/omarchy-restart-terminal

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

bin/omarchy-setup-fingerprint

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

bin/omarchy-theme-set

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

bin/omarchy-theme-set-obsidian

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

bin/omarchy-tui-install

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

bin/omarchy-update

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

bin/omarchy-update-confirm

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 gum style --border normal --border-foreground 6 --padding "1 2" \
   "Ready to update Omarchy?" \
   "" \
@@ -10,5 +8,5 @@ gum style --border normal --border-foreground 6 --padding "1 2" \
 
 if ! gum confirm "Continue with update?"; then
   echo "Update cancelled"
-  exit 0
+  exit 1
 fi

bin/omarchy-windows-vm

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

config/alacritty/alacritty.toml

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

config/fontconfig/fonts.conf

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

config/ghostty/config

@@ -2,7 +2,7 @@
 config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
 
 # Font
-font-family = "CaskaydiaMono Nerd Font"
+font-family = "JetBrainsMono Nerd Font"
 font-style = Regular
 font-size = 9
 
@@ -25,3 +25,6 @@ shell-integration-features = no-cursor,ssh-env
 # Keyboard bindings
 keybind = shift+insert=paste_from_clipboard
 keybind = control+insert=copy_to_clipboard
+
+# Slowdown mouse scrolling
+mouse-scroll-multiplier = 0.95

config/hypr/bindings.conf

@@ -2,7 +2,7 @@
 $terminal = uwsm-app -- xdg-terminal-exec
 $browser = omarchy-launch-browser
 
-bindd = SUPER, RETURN, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
+bindd = SUPER, RETURN, Terminal, exec, $terminal --dir="$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
 bindd = SUPER SHIFT, B, Browser, exec, $browser
 bindd = SUPER SHIFT ALT, B, Browser (private), exec, $browser --private
@@ -11,7 +11,7 @@ bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
 bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop
 bindd = SUPER SHIFT, D, Docker, exec, $terminal -e lazydocker
 bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"
-bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus "^obsidian$" "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
+bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
 bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
 bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
 

config/hypr/envs.conf

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

config/hypr/hyprland.conf

@@ -16,7 +16,6 @@ source = ~/.config/omarchy/current/theme/hyprland.conf
 source = ~/.config/hypr/monitors.conf
 source = ~/.config/hypr/input.conf
 source = ~/.config/hypr/bindings.conf
-source = ~/.config/hypr/envs.conf
 source = ~/.config/hypr/looknfeel.conf
 source = ~/.config/hypr/autostart.conf
 

config/hypr/hyprlock.conf

@@ -22,10 +22,10 @@ input-field {
     outer_color = $outer_color
     outline_thickness = 4
 
-    font_family = CaskaydiaMono Nerd Font Propo
+    font_family = JetBrainsMono Nerd Font
     font_color = $font_color
 
-    placeholder_text = Enter Password 󰈷
+    placeholder_text = Enter Password
     check_color = $check_color
     fail_text = <i>$FAIL ($ATTEMPTS)</i>
 

config/hypr/input.conf

@@ -3,7 +3,7 @@
 input {
   # Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
   # kb_layout = us,dk,eu
-  kb_options = compose:caps # ,grp:shifts_toggle
+  kb_options = compose:caps # ,grp:alts_toggle
 
   # Change speed of keyboard repeat
   repeat_rate = 40

config/imv/config

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

config/kitty/kitty.conf

@@ -1,7 +1,7 @@
 include ~/.config/omarchy/current/theme/kitty.conf
 
 # Font
-font_family CaskaydiaMono Nerd Font
+font_family JetBrainsMono Nerd Font
 bold_italic_font auto
 font_size        9.0
 

config/swayosd/style.css

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

config/walker/config.toml

@@ -1,6 +1,6 @@
-force_keyboard_focus = true                                                 # forces keyboard forcus to stay in Walker
+force_keyboard_focus = true # forces keyboard forcus to stay in Walker
-selection_wrap = true                                                       # wrap list if at bottom or top
+selection_wrap = true       # wrap list if at bottom or top
-theme = "omarchy-default"                                                   # theme to use
+theme = "omarchy-default"   # theme to use
 additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
 
 [placeholders]
@@ -10,6 +10,7 @@ additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
 quick_activate = []
 
 [providers]
+max_results = 256 # 256 should be enough for everyone
 default = [
   "desktopapplications",
   "menus",

config/waybar/style.css

@@ -7,7 +7,7 @@
   border: none;
   border-radius: 0;
   min-height: 0;
-  font-family: 'CaskaydiaMono Nerd Font';
+  font-family: 'JetBrainsMono Nerd Font';
   font-size: 12px;
 }
 

config/xdg-terminals.list

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

default/bash/functions

@@ -25,14 +25,21 @@ format-drive() {
   else
     echo "WARNING: This will completely erase all data on $1 and label it '$2'."
     read -rp "Are you sure you want to continue? (y/N): " confirm
+
     if [[ "$confirm" =~ ^[Yy]$ ]]; then
       sudo wipefs -a "$1"
       sudo dd if=/dev/zero of="$1" bs=1M count=100 status=progress
       sudo parted -s "$1" mklabel gpt
-      sudo parted -s "$1" mkpart primary ext4 1MiB 100%
+      sudo parted -s "$1" mkpart primary 1MiB 100%
-      sudo mkfs.ext4 -L "$2" "$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
+
-      sudo chmod -R 777 "/run/media/$USER/$2"
+      partition="$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
-      echo "Drive $1 formatted and labeled '$2'."
+      sudo partprobe "$1" || true
+      sudo udevadm settle || true
+
+      omarchy-pkg-add exfatprogs
+      sudo mkfs.exfat -n "$2" "$partition"
+
+      echo "Drive $1 formatted as exFAT and labeled '$2'."
     fi
   fi
 }

default/bash/init

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

default/bash/prompt

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

default/bash/rc

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

default/hypr/apps/1password.conf

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

default/hypr/apps/browser.conf

@@ -1,5 +1,5 @@
 # Browser types
-windowrule = tag +chromium-based-browser, class:((google-)?[cC]hrom(e|ium)|[bB]rave-browser|Microsoft-edge|Vivaldi-stable|helium)
+windowrule = tag +chromium-based-browser, class:((google-)?[cC]hrom(e|ium)|[bB]rave-browser|[mM]icrosoft-edge|Vivaldi-stable|helium)
 windowrule = tag +firefox-based-browser, class:([fF]irefox|zen|librewolf)
 
 # Force chromium-based browsers into a tile to deal with --app bug

default/hypr/apps/davinci-resolve.conf

@@ -0,0 +1,2 @@
+# Focus floating DaVinci Resolve dialog windows
+windowrule = stayfocused, class:.*[Rr]esolve.*, floating:1

default/hypr/apps/jetbrains.conf

@@ -1,9 +1,19 @@
-# JetBrains windows default size
+# Fix splash screen showing in weird places and prevent annoying focus takeovers
-windowrule = size 50% 50%, class:(.*jetbrains.*)$, title:^$
+windowrule = tag +jetbrains-splash, class:^(jetbrains-.*)$, title:^(splash)$, floating:1
+windowrule = center, tag:jetbrains-splash
+windowrule = nofocus, tag:jetbrains-splash
+windowrule = noborder, tag:jetbrains-splash
 
-# Fix tab dragging (tab titles are just one space)
+# Center popups/find windows
-windowrule = noinitialfocus, class:^(.*jetbrains.*)$, title:^\\s$
+windowrule = tag +jetbrains, class:^(jetbrains-.*), title:^()$, floating:1
+windowrule = center, tag:jetbrains
 
-# Allow dialogs (like "Send usage statistics") to be focusable and clickable
+# Enabling this makes it possible to provide input in popup dialogs (search window, new file, etc.)
-windowrule = unset,nofocus,class:^(.*jetbrains.*)$,title:^$
+windowrule = stayfocused, tag:jetbrains
-windowrule = unset,noinitialfocus,class:^(.*jetbrains.*)$,title:^$
+windowrule = noborder, tag:jetbrains
+
+# For some reason tag:jetbrains does not work for size rule
+windowrule = size >50% >50%, class:^(jetbrains-.*), title:^()$, floating:1
+
+# Disable window flicker when autocomplete or tooltips appear
+windowrule = noinitialfocus, class:^(jetbrains-.*)$, title:^(win.*)$, floating:1

default/hypr/apps/pip.conf

@@ -1,5 +1,5 @@
 # Picture-in-picture overlays
-windowrule = tag +pip, title:(Picture.{0,1}in.{0,1}[Pp]icture)
+windowrule = tag +pip, title:(Picture.?in.?[Pp]icture)
 windowrule = float, tag:pip
 windowrule = pin, tag:pip
 windowrule = size 600 338, tag:pip

default/hypr/apps/system.conf

@@ -8,7 +8,7 @@ windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|De
 windowrule = float, class:org.gnome.Calculator
 
 # Fullscreen screensaver
-windowrule = fullscreen, class:Screensaver
+windowrule = fullscreen, class:com.omarchy.Screensaver
 
 # No transparency on media windows
 windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$

default/hypr/bindings/tiling-v2.conf

@@ -48,6 +48,10 @@ bindd = SUPER, TAB, Next workspace, workspace, e+1
 bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1
 bindd = SUPER CTRL, TAB, Former workspace, workspace, previous
 
+# Move workspaces to other monitors
+bindd = SUPER SHIFT ALT, LEFT, Move workspace to left monitor, movecurrentworkspacetomonitor, l
+bindd = SUPER SHIFT ALT, RIGHT, Move workspace to right monitor, movecurrentworkspacetomonitor, r
+
 # Swap active window with the one next to it with SUPER + SHIFT + arrow keys
 bindd = SUPER SHIFT, LEFT, Swap window to the left, swapwindow, l
 bindd = SUPER SHIFT, RIGHT, Swap window to the right, swapwindow, r
@@ -87,14 +91,14 @@ bindd = SUPER ALT, DOWN, Move window to group on bottom, moveintogroup, d
 # Navigate a single set of grouped windows
 bindd = SUPER ALT, TAB, Next window in group, changegroupactive, f
 bindd = SUPER ALT SHIFT, TAB, Previous window in group, changegroupactive, b
-
+bindd = SUPER ALT, page_up, Next window in group, changegroupactive, f
-# Scroll through a set of grouped windows with SUPER + ALT + scroll
+bindd = SUPER ALT, page_down, Previous window in group, changegroupactive, b
 bindd = SUPER ALT, mouse_down, Next window in group, changegroupactive, f
 bindd = SUPER ALT, mouse_up, Previous window in group, changegroupactive, b
 
 # Activate window in a group by number
-bindd = SUPER ALT, 1, Switch to group window 1, changegroupactive, 1
+bindd = SUPER ALT, code:10, Switch to group window 1, changegroupactive, 1
-bindd = SUPER ALT, 2, Switch to group window 2, changegroupactive, 2
+bindd = SUPER ALT, code:11, Switch to group window 2, changegroupactive, 2
-bindd = SUPER ALT, 3, Switch to group window 3, changegroupactive, 3
+bindd = SUPER ALT, code:12, Switch to group window 3, changegroupactive, 3
-bindd = SUPER ALT, 4, Switch to group window 4, changegroupactive, 4
+bindd = SUPER ALT, code:13, Switch to group window 4, changegroupactive, 4
-bindd = SUPER ALT, 5, Switch to group window 5, changegroupactive, 5
+bindd = SUPER ALT, code:14, Switch to group window 5, changegroupactive, 5

default/hypr/bindings/utilities.conf

@@ -18,6 +18,7 @@ bindd = SUPER SHIFT, BACKSPACE, Toggle workspace gaps, exec, omarchy-hyprland-wo
 bindd = SUPER, COMMA, Dismiss last notification, exec, makoctl dismiss
 bindd = SUPER SHIFT, COMMA, Dismiss all notifications, exec, makoctl dismiss --all
 bindd = SUPER CTRL, COMMA, Toggle silencing notifications, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
+bindd = SUPER ALT, COMMA, Invoke last notification, exec, makoctl invoke
 
 # Toggle idling
 bindd = SUPER CTRL, I, Toggle locking on idle, exec, omarchy-toggle-idle

default/hypr/input.conf

@@ -14,3 +14,8 @@ input {
         natural_scroll = false
     }
 }
+
+misc {
+    key_press_enables_dpms = true  # key press will trigger wake
+    mouse_move_enables_dpms = true # mouse move will trigger wake
+}

default/hypr/looknfeel.conf

@@ -38,8 +38,11 @@ decoration {
     # https://wiki.hyprland.org/Configuring/Variables/#blur
     blur {
         enabled = true
-        size = 3
+        size = 2
-        passes = 3
+        passes = 2
+        special = true
+        brightness = 0.60
+        contrast = 0.75
     }
 }
 

default/pacman/mirrorlist

@@ -1,3 +0,0 @@
-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/mirrorlist-edge

@@ -0,0 +1 @@
+Server = https://mirror.omarchy.org/$repo/os/$arch

default/pacman/mirrorlist-stable

@@ -0,0 +1 @@
+Server = https://stable-mirror.omarchy.org/$repo/os/$arch

install/config/mise-work.sh

@@ -1,6 +1,8 @@
-# Add ./bin to path for all items in ~/Work
+# Setup default work directory (and tries)
 mkdir -p "$HOME/Work"
+mkdir -p "$HOME/Work/tries"
 
+# Add ./bin to path for all items in ~/Work
 cat >"$HOME/Work/.mise.toml" <<'EOF'
 [env]
 _.path = "{{ cwd }}/bin"

install/first-run/wifi.sh

@@ -1,6 +1,6 @@
 if ! ping -c3 -W1 1.1.1.1 >/dev/null 2>&1; then
-  notify-send "󰖩    Click to Setup Wi-Fi" "Tab to navigate, Space to select, ? for help." -u critical -t 30000
   notify-send "    Update System" "When you have internet, click to update the system." -u critical
+  notify-send "󰖩    Click to Setup Wi-Fi" "Tab to navigate, Space to select, ? for help." -u critical
 else
   notify-send "    Update System" "Click to update the system." -u critical
 fi

install/login/limine-snapper.sh

@@ -78,6 +78,11 @@ term_background_bright: 24283b
 
 EOF
 
+  # Remove the original config file if it's not /boot/limine.conf
+  if [[ "$limine_config" != "/boot/limine.conf" ]] && [[ -f "$limine_config" ]]; then
+    sudo rm "$limine_config"
+  fi
+
 
   # Match Snapper configs if not installing from the ISO
   if [[ -z ${OMARCHY_CHROOT_INSTALL:-} ]]; then

install/omarchy-base.packages

@@ -4,7 +4,6 @@
 1password-beta
 1password-cli
 aether
-alacritty
 asdcontrol
 avahi
 bash-completion
@@ -12,7 +11,6 @@ bat
 blueberry
 brightnessctl
 btop
-cargo
 clang
 cups
 cups-browsed
@@ -33,6 +31,7 @@ fd
 ffmpegthumbnailer
 fontconfig
 fzf
+ghostty
 github-cli
 gnome-calculator
 gnome-keyring
@@ -45,7 +44,7 @@ gvfs-nfs
 gvfs-smb
 hypridle
 hyprland
-hyprland-qtutils
+hyprland-guiutils
 hyprlock
 hyprpicker
 hyprsunset
@@ -64,12 +63,12 @@ less
 libsecret
 libyaml
 libqalculate
-libreoffice
+libreoffice-fresh
 llvm
 localsend
 luarocks
 mako
-man
+man-db
 mariadb-libs
 mise
 mpv
@@ -99,6 +98,8 @@ python-poetry-core
 python-terminaltexteffects
 qt5-wayland
 ripgrep
+ruby
+rust
 satty
 sddm
 signal-desktop
@@ -111,6 +112,7 @@ swayosd
 system-config-printer
 tldr
 tree-sitter-cli
+tobi-try
 ttf-cascadia-mono-nerd
 ttf-ia-writer
 ttf-jetbrains-mono-nerd
@@ -119,6 +121,7 @@ tzupdate
 ufw
 ufw-docker
 unzip
+usage
 uwsm
 waybar
 wayfreeze

install/omarchy-other.packages

@@ -35,7 +35,6 @@ pipewire
 pipewire-alsa
 pipewire-jack
 pipewire-pulse
-qt5-remoteobjects
 qt6-wayland
 sassc
 snapper

install/post-install/pacman.sh

@@ -1,6 +1,6 @@
 # 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
+sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
 
 if lspci -nn | grep -q "106b:180[12]"; then
   cat <<EOF | sudo tee -a /etc/pacman.conf >/dev/null

migrations/1762121828.sh

@@ -12,15 +12,9 @@ omarchy-pkg-add xdg-terminal-exec
 # Set up xdg-terminals.list based on current $TERMINAL
 if [ -n "$TERMINAL" ]; then
   case "$TERMINAL" in
-    alacritty)
+  alacritty) desktop_id="Alacritty.desktop" ;;
-      desktop_id="Alacritty.desktop"
+  ghostty) desktop_id="com.mitchellh.ghostty.desktop" ;;
-      ;;
+  kitty) desktop_id="kitty.desktop" ;;
-    ghostty)
-      desktop_id="com.mitchellh.ghostty.desktop"
-      ;;
-    kitty)
-      desktop_id="kitty.desktop"
-      ;;
   esac
 
   if [ -n "$desktop_id" ]; then

migrations/1762352101.sh

@@ -0,0 +1,5 @@
+echo "Increase Walker limit on how many entries can be shown to 256"
+
+if ! grep -q "max_results" ~/.config/walker/config.toml; then
+  sed -i '/^\[providers\]$/a max_results = 256' ~/.config/walker/config.toml
+fi

migrations/1762446739.sh

@@ -0,0 +1,12 @@
+echo "Remove alternative limine.conf files"
+
+if omarchy-cmd-present limine; then
+  if [ ! -f /boot/limine.conf ]; then
+    echo "Error: /boot/limine.conf does not exist. Do not reboot without resolving this issue!"
+    exit 1
+  fi
+
+  sudo rm -f /boot/EFI/limine/limine.conf
+  sudo rm -f /boot/EFI/BOOT/limine.conf
+  sudo rm -f /boot/limine/limine.conf
+fi

migrations/1762684663.sh

@@ -0,0 +1,12 @@
+echo "Update hyprlock font to match current system font"
+
+font_name=$(omarchy-font-current)
+
+if [[ -n "$font_name" ]]; then
+  cp ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak.$(date +%s)
+
+  echo "Found font '$font_name', updating hyprlock"
+  sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
+else
+  echo "No font found, skipping migration"
+fi

migrations/1762685081.sh

@@ -0,0 +1,12 @@
+echo "Update hyprlock placeholder text based on fingerprint setup status"
+
+cp ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak.$(date +%s)
+
+# Check if fprintd is installed and has enrolled fingerprints
+if command -v fprintd-list &>/dev/null && fprintd-list "$USER" 2>/dev/null | grep -q "Fingerprints for user"; then
+  echo "Fingerprint detected, updating placeholder text with fingerprint icon"
+  sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
+else
+  echo "No fingerprint enrolled, updating placeholder text without fingerprint icon"
+  sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
+fi

migrations/1762711005.sh

@@ -0,0 +1,3 @@
+echo "Add usage package to provide tab completion for mise"
+
+omarchy-pkg-add usage

migrations/1762768186.sh

@@ -0,0 +1,3 @@
+echo "Ensure config/uwsm/default uses generic terminal exec"
+
+sed -i 's/export TERMINAL=.*/export TERMINAL=xdg-terminal-exec/' ~/.config/uwsm/default

migrations/1762770442.sh

@@ -0,0 +1,5 @@
+echo "Slow down Ghostty mouse scrolling to match Alacritty"
+
+if ! grep -q "mouse-scroll-multiplier" ~/.config/ghostty/config; then
+  echo -e "\n# Slowdown mouse scrolling\nmouse-scroll-multiplier = 0.95" >> ~/.config/ghostty/config
+fi

migrations/1762770815.sh

@@ -0,0 +1,3 @@
+echo "Pull packages from stable Arch mirror"
+
+omarchy-refresh-pacman-mirrorlist stable

migrations/1762781907.sh

@@ -0,0 +1,4 @@
+echo "Add try command for managing quick code experiments"
+
+omarchy-pkg-add ruby tobi-try
+mkdir -p ~/Work/tries

migrations/1762802472.sh

@@ -0,0 +1,4 @@
+echo "Update imv config with new keybindings"
+
+mkdir -p ~/.config/imv
+cp $OMARCHY_PATH/config/imv/config ~/.config/imv/

themes/matte-black/swayosd.css

@@ -1,6 +1,6 @@
 @define-color background-color #121212;
-@define-color border-color #8A8A8D;
+@define-color border-color #CCCCCC;
-@define-color label #8A8A8D;
+@define-color label #CCCCCC;
-@define-color image #8A8A8D;
+@define-color image #CCCCCC;
-@define-color progress #8A8A8D;
+@define-color progress #CCCCCC;
 

version

@@ -1 +1 @@
-3.1.5
+3.1.7