diff --git a/applications/hidden/wiremix.desktop b/applications/hidden/wiremix.desktop deleted file mode 100644 index e1e3e173..00000000 --- a/applications/hidden/wiremix.desktop +++ /dev/null @@ -1,2 +0,0 @@ -[Desktop Entry] -Hidden=true diff --git a/bin/omarchy-launch-audio b/bin/omarchy-launch-audio deleted file mode 100755 index c3d2592c..00000000 --- a/bin/omarchy-launch-audio +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# omarchy:summary=Launch the Omarchy audio controls TUI (provided by wiremix). - -omarchy-launch-or-focus-tui wiremix diff --git a/config/wiremix/wiremix.toml b/config/wiremix/wiremix.toml deleted file mode 100644 index 07f9747c..00000000 --- a/config/wiremix/wiremix.toml +++ /dev/null @@ -1,5 +0,0 @@ -# overwrites default wiremix configuration -# defaults: https://github.com/tsowell/wiremix/blob/main/wiremix.toml - -[char_sets.default] -default_device = "⮞" diff --git a/default/hypr/apps/system.lua b/default/hypr/apps/system.lua index 8d14e882..ccf99bbe 100644 --- a/default/hypr/apps/system.lua +++ b/default/hypr/apps/system.lua @@ -5,7 +5,7 @@ hl.window_rule({ match = { tag = "floating-window" }, size = { 875, 600 } }) hl.window_rule({ match = { - class = "(org.omarchy.wiremix|org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.codeberg.dnkl.foot|org.gnome.NautilusPreviewer|org.gnome.Evince|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)", + class = "(org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.codeberg.dnkl.foot|org.gnome.NautilusPreviewer|org.gnome.Evince|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)", }, tag = "+floating-window", }) diff --git a/default/omarchy/omarchy-menu.jsonc b/default/omarchy/omarchy-menu.jsonc index 01abdfa1..7b626f10 100644 --- a/default/omarchy/omarchy-menu.jsonc +++ b/default/omarchy/omarchy-menu.jsonc @@ -119,7 +119,7 @@ "style.install.font.iosevka": {"icon":"","label":"Iosevka","action":"omarchy-install-font Iosevka ttf-iosevka-nerd 'Iosevka Nerd Font Mono'"}, // Setup - "setup.audio": {"icon":"","label":"Audio","keywords":"sound","action":"omarchy-launch-audio"}, + "setup.audio": {"icon":"","label":"Audio","keywords":"sound","action":"omarchy-shell audioPanel toggle"}, "setup.power": {"icon":"󱐋","label":"Power Profile","aliases":["power","power-profile","power-profiles"],"keywords":"performance battery","provider":"power-profiles"}, "setup.sleep": {"icon":"","label":"System Sleep","keywords":"suspend hibernate"}, "setup.sleep.suspend-enable": {"icon":"󰒲","label":"Enable Suspend","when":"omarchy-toggle-enabled suspend-off","action":"omarchy-toggle-suspend"}, diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages index 5a8f0a57..ccd8989b 100644 --- a/install/omarchy-base.packages +++ b/install/omarchy-base.packages @@ -131,7 +131,6 @@ usage uwsm whois wireless-regdb -wiremix wireplumber wl-clipboard woff2-font-awesome diff --git a/migrations/1752896442.sh b/migrations/1752896442.sh index 0edb42c5..be8bf58d 100644 --- a/migrations/1752896442.sh +++ b/migrations/1752896442.sh @@ -1,7 +1,6 @@ -echo "Replace volume control GUI with a TUI" +echo "Remove old PulseAudio volume control GUI" -if omarchy-cmd-missing wiremix; then - omarchy-pkg-add wiremix +if omarchy-pkg-present pavucontrol; then omarchy-pkg-drop pavucontrol omarchy-refresh-applications fi diff --git a/migrations/1756203383.sh b/migrations/1756203383.sh index a21e2aa6..8bb2edd6 100644 --- a/migrations/1756203383.sh +++ b/migrations/1756203383.sh @@ -1,5 +1,4 @@ -echo "Remove old About, Activity, Audio Settings apps that are in Omarchy Menu or hotkey" +echo "Remove old About and Activity apps that are in Omarchy Menu or hotkey" rm -f ~/.local/share/applications/About.desktop rm -f ~/.local/share/applications/Activity.desktop -rm -f ~/.local/share/applications/wiremix.desktop diff --git a/migrations/1769964367.sh b/migrations/1769964367.sh deleted file mode 100644 index 487f4d32..00000000 --- a/migrations/1769964367.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "Improve audio controls icon for default selection" - -if [[ ! -f ~/.config/wiremix/wiremix.toml ]]; then - mkdir -p ~/.config/wiremix - cp -f $OMARCHY_PATH/config/wiremix/wiremix.toml ~/.config/wiremix/ -fi diff --git a/migrations/1771651931.sh b/migrations/1771651931.sh index 2baba8fe..95f27a5c 100644 --- a/migrations/1771651931.sh +++ b/migrations/1771651931.sh @@ -1,4 +1,4 @@ -echo "Hide wiremix and limine-snapper-restore from app launcher" +echo "Hide limine-snapper-restore from app launcher" -cp $OMARCHY_PATH/applications/hidden/wiremix.desktop ~/.local/share/applications/ -cp $OMARCHY_PATH/applications/hidden/limine-snapper-restore.desktop ~/.local/share/applications/ +mkdir -p ~/.local/share/applications +cp "$OMARCHY_PATH/applications/hidden/limine-snapper-restore.desktop" ~/.local/share/applications/ diff --git a/migrations/1779203294.sh b/migrations/1779203294.sh new file mode 100644 index 00000000..29335b12 --- /dev/null +++ b/migrations/1779203294.sh @@ -0,0 +1,12 @@ +echo "Remove Wiremix audio mixer" + +if omarchy-pkg-present wiremix; then + omarchy-pkg-drop wiremix +fi + +rm -rf "$HOME/.config/wiremix" +rm -f "$HOME/.local/share/applications/wiremix.desktop" + +if omarchy-cmd-present update-desktop-database; then + update-desktop-database "$HOME/.local/share/applications" >/dev/null 2>&1 || true +fi diff --git a/shell/plugins/bar/README.md b/shell/plugins/bar/README.md index 0d6c048f..e7212b63 100644 --- a/shell/plugins/bar/README.md +++ b/shell/plugins/bar/README.md @@ -54,7 +54,7 @@ Example `shell.json` (bar subtree only shown): | Name | What it does | Interactions | |---|---|---| | `media` | MPRIS now-playing — scrolling track + artist, cover-art popup | left = play/pause · middle = next · scroll = prev/next · right = popup | -| `audioPanel` | Volume icon + popup with master slider, output-device picker, per-app mixer | left = popup · right = mute · middle = audio TUI · scroll = volume | +| `audioPanel` | Volume icon + popup with master slider, output-device picker, per-app mixer | left = popup · right = mute · middle = popup · scroll = volume | | `networkPanel` | Wi-Fi/Ethernet icon + popup with Wi-Fi scan, signal, connect, DNS provider selection | left = popup · right = nmtui | | `powerPanel` | Battery/AC icon + popup with battery stats, power profiles, and system info | left = popup | | `bluetoothPanel` | Bluetooth icon + popup with device list, connect/disconnect, battery | left = popup · right = toggle radio · middle = bluetoothctl TUI | @@ -63,7 +63,7 @@ Example `shell.json` (bar subtree only shown): | `systemStats` | Inline CPU + memory sparklines, popup with detail | left = popup · right = terminal | | `weather` | Weather icon + popup with forecast | left = popup · right = full notification | | `idleInhibitor` | Coffee-cup that toggles `omarchy-toggle-idle` | left = toggle | -| `microphone` | Mic icon + scroll volume | left = mute toggle · middle = audio TUI · scroll = source volume | +| `microphone` | Mic icon + scroll volume | left = mute toggle · middle = audio panel · scroll = source volume | ### Built-in base modules (in `Bar.qml`) diff --git a/shell/plugins/bar/widgets/audioPanel.qml b/shell/plugins/bar/widgets/audioPanel.qml index 681d602f..dca97277 100644 --- a/shell/plugins/bar/widgets/audioPanel.qml +++ b/shell/plugins/bar/widgets/audioPanel.qml @@ -481,7 +481,6 @@ for block in re.split(r"(?m)^Sink #", sys.stdin.read())[1:]: fontSize: Style.font.body onPressed: function(b) { if (b === Qt.RightButton) root.toggleOutputMute() - else if (b === Qt.MiddleButton) root.bar.run("omarchy-launch-audio") else root.popupOpen = !root.popupOpen } diff --git a/shell/plugins/bar/widgets/microphone.qml b/shell/plugins/bar/widgets/microphone.qml index 4b122c42..ae22e617 100644 --- a/shell/plugins/bar/widgets/microphone.qml +++ b/shell/plugins/bar/widgets/microphone.qml @@ -44,7 +44,7 @@ Item { active: root.inUse tooltipText: root.muted ? "Microphone muted" : (root.inUse ? "Microphone in use" : "Microphone live") onPressed: function(b) { - if (b === Qt.MiddleButton) root.bar.run("omarchy-launch-audio") + if (b === Qt.MiddleButton) root.bar.run("omarchy-shell audioPanel toggle") else root.toggleMute() } onWheelMoved: function(delta) {