Revert "Fix for '(null)' display on AirPod source selection"

Fix omarchy-tui-install

bin/omarchy-cmd-screenrecord

@@ -15,7 +15,7 @@ SCOPE="$1"
 AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
 
 start_screenrecording() {
-  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
 
   if lspci | grep -qi 'nvidia'; then
     wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
@@ -47,7 +47,8 @@ screenrecording_active() {
 if screenrecording_active; then
   stop_screenrecording
 elif [[ "$SCOPE" == "output" ]]; then
-  start_screenrecording
+  output=$(slurp -o) || exit 1
+  start_screenrecording -g "$output"
 else
   region=$(slurp) || exit 1
   start_screenrecording -g "$region"

bin/omarchy-install-dev-env

@@ -47,6 +47,7 @@ install_node() {
 case "$1" in
 ruby)
   echo -e "Installing Ruby on Rails...\n"
+  omarchy-pkg-add libyaml
   mise use --global ruby@latest
   mise settings add idiomatic_version_file_enable_tools ruby
   mise x ruby -- gem install rails --no-document

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+" "+.title)|test($p;"i"))|.address' | head -n1)
 
 if [[ -n $WINDOW_ADDRESS ]]; then
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"

bin/omarchy-menu

@@ -430,8 +430,7 @@ show_update_config_menu() {
 }
 
 show_update_hardware_menu() {
-  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth") in
-  *Audio*) present_terminal omarchy-restart-pipewire ;;
+  case $(menu "Restart" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
   *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
   *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
   *) show_update_menu ;;

bin/omarchy-restart-bluetooth

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-echo -e "Unblocking bluetooth...\n"
 rfkill unblock bluetooth
 rfkill list bluetooth

bin/omarchy-restart-pipewire

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo -e "Restarting pirewire audio service...\n"
-systemctl --user restart pipewire.service

bin/omarchy-restart-wifi

@@ -1,5 +1,4 @@
 #!/bin/bash
 
-echo -e "Unblocking wifi...\n"
 rfkill unblock wifi
 rfkill list wifi

bin/omarchy-theme-set-vscode

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments),
-# which jq doesn’t support.
-
 VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
 VS_CODE_SETTINGS="$HOME/.config/Code/User/settings.json"
 VS_CODE_SKIP_FLAG="$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes"
@@ -18,29 +15,12 @@ if omarchy-cmd-present code && [[ ! -f "$VS_CODE_SKIP_FLAG" ]]; then
       code --install-extension "$extension" >/dev/null
     fi
 
-    # Create config file if there isn't already one
-    mkdir -p "$(dirname "$VS_CODE_SETTINGS")"
-    if [[ ! -f "$VS_CODE_SETTINGS" ]]; then
-      printf '{\n}\n' > "$VS_CODE_SETTINGS"
-    fi
-
-    # Create a `workbench.colorTheme` entry in settings.  
-    if ! grep -q '"workbench.colorTheme"' "$VS_CODE_SETTINGS"; then
-      # Insert `"workbench.colorTheme": "",` immediately after the first `{`
-      # Use sed's first-match range (0,/{/) to only replace the first `{`
-      sed -i --follow-symlinks -E '0,/\{/{s/\{/{\
-  "workbench.colorTheme": "",/}' "$VS_CODE_SETTINGS"
-    fi
-
-    # Update theme
-    sed -i --follow-symlinks -E \
-      "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
-      "$VS_CODE_SETTINGS"
+    # Update theme in settings.json
+    jq -n --arg t "$theme_name" '(input? // {}) | .["workbench.colorTheme"] = $t' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new"
   else
     # Remove theme from settings.json when the theme doesn't have vscode support
-    if [[ -f "$VS_CODE_SETTINGS" ]]; then
-      sed -i --follow-symlinks -E '/"workbench\.colorTheme"[[:space:]]*:[^,}]*,?/d' "$VS_CODE_SETTINGS"
-
-    fi
+    jq 'del(.["workbench.colorTheme"])' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new"
   fi
+
+  mv "${VS_CODE_SETTINGS}.new" "$VS_CODE_SETTINGS"
 fi

bin/omarchy-tui-install

@@ -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=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
 Icon=$ICON_PATH

bin/omarchy-webapp-handler-hey

@@ -1,11 +0,0 @@
-#!/bin/bash
-url="$1"
-web_url="https://app.hey.com"
-
-# Handle mailto: URLs
-if [[ $url =~ ^mailto: ]]; then
-  email=$(echo "$url" | sed 's/mailto://')
-  web_url="https://app.hey.com/messages/new?to=$email"
-fi
-
-exec omarchy-launch-webapp "$web_url"

config/hypr/input.conf

@@ -27,9 +27,8 @@ input {
   }
 }
 
-# Scroll nicely in the terminal
-windowrule = scrolltouchpad 1.5, class:(Alacritty|kitty)
-windowrule = scrolltouchpad 0.2, class:com.mitchellh.ghostty
+# Scroll faster in the terminal
+windowrule = scrolltouchpad 1.5, tag:terminal
 
 # Enable touchpad gestures for changing workspaces
 # See https://wiki.hyprland.org/Configuring/Gestures/

default/hypr/apps/system.conf

@@ -4,7 +4,7 @@ windowrule = center, tag:floating-window
 windowrule = size 800 600, tag:floating-window
 
 windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
-windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files)
+windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open Folder|Save.*Files?|Save.*As|Save|All Files)
 
 # Fullscreen screensaver
 windowrule = fullscreen, class:Screensaver

default/hypr/looknfeel.conf

@@ -87,8 +87,3 @@ misc {
     disable_splash_rendering  = true
     focus_on_activate = true
 }
-
-# https://wiki.hypr.land/Configuring/Variables/#cursor
-cursor {
-    hide_on_key_press = true
-}

install/config/mimetypes.sh

@@ -33,6 +33,3 @@ xdg-mime default mpv.desktop video/x-ms-asf
 xdg-mime default mpv.desktop video/x-ogm+ogg
 xdg-mime default mpv.desktop video/x-theora+ogg
 xdg-mime default mpv.desktop application/ogg
-
-# Use Hey for mailto: links
-xdg-mime default HEY.desktop x-scheme-handler/mailto

install/packaging/webapps.sh

@@ -1,4 +1,4 @@
-omarchy-webapp-install "HEY" https://app.hey.com HEY.png "omarchy-webapp-handler-hey %u" "x-scheme-handler/mailto"
+omarchy-webapp-install "HEY" https://app.hey.com HEY.png
 omarchy-webapp-install "Basecamp" https://launchpad.37signals.com Basecamp.png
 omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ WhatsApp.png
 omarchy-webapp-install "Google Photos" https://photos.google.com/ "Google Photos.png"

migrations/1758318253.sh

@@ -1,3 +0,0 @@
-echo "Ensure libyaml is available for installing Ruby"
-
-omarchy-pkg-add libyaml

migrations/1758436991.sh

@@ -0,0 +1,17 @@
+echo "Fix Disk Usage and Docker TUIs"
+
+APP_DIR="$HOME/.local/share/applications"
+ICON_DIR="$APP_DIR/icons"
+
+# Don't use omarchy-tui-remove to preserve icons
+
+if [[ -f "$APP_DIR/Docker.desktop" ]]; then
+  rm "$APP_DIR/Docker.desktop"
+  omarchy-tui-install "Docker" "lazydocker" tile "$ICON_DIR/Docker.png"
+fi
+
+if [[ -f "$APP_DIR/Disk Usage.desktop" ]]; then
+  rm "$APP_DIR/Disk Usage.desktop" 
+  omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float "$ICON_DIR/Disk Usage.png"
+fi
+

themes/matte-black/ghostty.conf

@@ -1,12 +1,3 @@
-background = #121212
-foreground = #BEBEBE
-
-cursor-color = #EAEAEA
-cursor-text = #121212
-
-selection-background = #333333
-selection-foreground = #EAEAEA
-
 # normal colors
 palette = 0=#333333
 palette = 1=#D35F5F

themes/matte-black/vscode.json

@@ -1,4 +1,4 @@
 {
-  "name": "Matte Black",
+  "name": "MatteBlack",
   "extension": "TahaYVR.matteblack"
 }