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

Merge pull request #1845 from djordje/fix-omarchy-tui-install
Fix omarchy-tui-install
2026-02-17 15:25:37 +00:00 · 2025-09-28 15:18:25 -04:00 · 2025-09-28 15:01:17 -04:00 · 2025-09-28 14:56:47 -04:00 · 2025-09-28 14:55:55 -04:00 · 2025-09-25 19:37:18 -05:00
8 changed files with 49 additions and 13 deletions
--- a/bin/omarchy-cmd-screenrecord
+++ b/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"
--- a/bin/omarchy-install-dev-env
+++ b/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
--- a/bin/omarchy-theme-set-terminal
+++ b/bin/omarchy-theme-set-terminal
@@ -3,12 +3,5 @@
 case "$TERMINAL" in
 "alacritty") touch ~/.config/alacritty/alacritty.toml ;;
 "kitty") killall -SIGUSR1 kitty ;;
-"ghostty")
-  # Use a default theme if none exists
-  if [[ ! -f ~/.config/omarchy/current/theme/ghostty.conf ]]; then
-    echo "theme = Spacegray" >~/.config/omarchy/current/theme/ghostty.conf
-  fi
-
-  killall -USRSIG2 ghostty
-  ;;
+"ghostty") killall -SIGUSR2 ghostty ;;
 esac
--- a/bin/omarchy-tui-install
+++ b/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
--- a/config/ghostty/config
+++ b/config/ghostty/config
@@ -1,5 +1,5 @@
 # Dynamic theme colors
-config-file = "~/.config/omarchy/current/theme/ghostty.conf"
+config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"

 # Font
 font-family = "CaskaydiaMono Nerd Font"
--- a/migrations/1757021485.sh
+++ b/migrations/1757021485.sh
--- a/migrations/1758436991.sh
+++ b/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
+
--- a/themes/osaka-jade/ghostty.conf
+++ b/themes/osaka-jade/ghostty.conf
@@ -1 +1,25 @@
-theme = TokyoNight
+# primary
+background = #111c18
+foreground = #C1C497
+cursor-color = #D7C995
+cursor-text = #000000
+
+# normal colors
+palette = 0=#23372B
+palette = 1=#FF5345
+palette = 2=#549e6a
+palette = 3=#459451
+palette = 4=#509475
+palette = 5=#D2689C
+palette = 6=#2DD5B7
+palette = 7=#F6F5DD
+
+# bright colors
+palette = 8=#53685B
+palette = 9=#db9f9c
+palette = 10=#143614
+palette = 11=#E5C736
+palette = 12=#ACD4CF
+palette = 13=#75bbb3
+palette = 14=#8CD3CB
+palette = 15=#9eebb3
Author	SHA1	Message	Date
Ryan Hughes	796ef67ede	Revert "Fix for '(null)' display on AirPod source selection"	2025-09-28 15:18:25 -04:00
Ryan Hughes	076da663f5	Merge pull request #1845 from djordje/fix-omarchy-tui-install Fix omarchy-tui-install	2025-09-28 15:01:17 -04:00
Ryan Hughes	b92ebff29b	Merge pull request #1859 from shawnyeager/audio-switch-fix Fix for '(null)' display on AirPod source selection	2025-09-28 14:56:47 -04:00
Ryan Hughes	8e5b59995a	Merge pull request #1920 from iamobservable/iamobservable/bug/screen-recording-no-longer-works-after-updating Use output display or region geometry to record	2025-09-28 14:55:55 -04:00
observable	d4b0ba5d94	Use output display or region geometry to record The previous code did not identify the output display correctly, leading to wf-recorder asking the user to select the region when the user requested the display output to be selected. With this change the bash script will use slurp with the -o flag to identify the display output. This has not been tested with wl-screenrec as no change has been made to its call signature in omarchy-cmd-screenrecord and the wl-screenrec binary is not included in the default omarchy installation.	2025-09-25 19:37:18 -05:00
Djordje Kovacevic	4d9f932e6c	Replace "--class" with "--class="	2025-09-23 22:52:58 +02:00
Shawn Yeager	38d536ba9d	Fix for '(null)' display on AirPod source selection	2025-09-21 16:18:12 -05:00
Kostas	2df8c5f7e0	Install libyaml before attempting to install ruby (#1835 ) * Install libyaml before attempting to install ruby * Use omarchy helper And unsafe -Sy --------- Co-authored-by: David Heinemeier Hansson <david@hey.com>	2025-09-21 07:56:56 -04:00
Djordje Kovacevic	441ee10d70	Add migration to fix Docker and Disk Usage TUIs	2025-09-21 09:29:44 +02:00
Djordje Kovacevic	45465d3e7c	Fix TUI install script - $TERMINAL should remain variable	2025-09-21 08:40:48 +02:00
David Heinemeier Hansson	83ab85799b	Fix permissions	2025-09-17 23:02:23 +02:00
David Heinemeier Hansson	ffe7cd5099	Fix osaka jade theme for ghostty	2025-09-17 21:03:52 +02:00
David Heinemeier Hansson	cf41ecaaa5	Merge pull request #1568 from basecamp/dev Omarchy 3.0	2025-09-17 20:47:41 +02:00
David Heinemeier Hansson	9aef0ffab6	Use conditional theme file instead and send correct signal	2025-09-17 20:45:02 +02:00