From a5814e0bfd9124fb87e5533c9e8914acd05f18cd Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 31 Aug 2025 15:35:43 +0200 Subject: [PATCH] Revert "Make fixing the F13 AMD audio input just a thing that happens" This reverts commit c6cd49a0aab4faff3ba3cc06bebf515a1d7cf965. --- bin/omarchy-menu | 3 ++- bin/omarchy-restart-amd-audio | 10 ++++++++++ install.sh | 1 - install/config/hardware/fix-f13-amd-audio-input.sh | 7 ------- migrations/1756642681.sh | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) create mode 100755 bin/omarchy-restart-amd-audio delete mode 100755 install/config/hardware/fix-f13-amd-audio-input.sh diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 7cbbbad8..a93e159f 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -361,9 +361,10 @@ show_update_config_menu() { } show_update_hardware_menu() { - case $(menu "Restart" "󱚾 Wi-Fi\n󰂯 Bluetooth") in + case $(menu "Restart" "󱚾 Wi-Fi\n󰂯 Bluetooth\n AMD Audio (F13)") in *Wi-Fi*) present_terminal omarchy-restart-wifi ;; *Bluetooth*) present_terminal omarchy-restart-bluetooth ;; + *Audio*) present_terminal omarchy-restart-amd-audio ;; *) show_update_menu ;; esac } diff --git a/bin/omarchy-restart-amd-audio b/bin/omarchy-restart-amd-audio new file mode 100755 index 00000000..b93f7c18 --- /dev/null +++ b/bin/omarchy-restart-amd-audio @@ -0,0 +1,10 @@ +#!/bin/bash + +CARD=$(pactl list cards | grep -B20 "Family 17h/19h" | grep "Name: " | awk '{print $2}') + +if [[ -n $CARD ]]; then + pactl set-card-profile "$CARD" "HiFi (Mic1, Mic2, Speaker)" 2>/dev/null +else + echo "AMD audio card not found" + exit 1 +fi diff --git a/install.sh b/install.sh index e3afaf3d..9c2d7e49 100755 --- a/install.sh +++ b/install.sh @@ -47,7 +47,6 @@ 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 diff --git a/install/config/hardware/fix-f13-amd-audio-input.sh b/install/config/hardware/fix-f13-amd-audio-input.sh deleted file mode 100755 index 32ac686a..00000000 --- a/install/config/hardware/fix-f13-amd-audio-input.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/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 diff --git a/migrations/1756642681.sh b/migrations/1756642681.sh index d0117d2d..2f3dfd44 100644 --- a/migrations/1756642681.sh +++ b/migrations/1756642681.sh @@ -1,3 +1,3 @@ echo "Fix audio input on AMD Framework laptops" -source $OMARCHY_PATH/install/config/hardware/fix-f13-amd-audio-input.sh || true +omarchy-restart-amd-audio || true