No longer need wiremix

2026-08-01 20:28:16 +02:00 · 2026-05-19 18:51:05 +02:00
parent 7ea4e1ab04
commit a157b98d5b
14 changed files with 23 additions and 33 deletions
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Launch the Omarchy audio controls TUI (provided by wiremix).
-
-omarchy-launch-or-focus-tui wiremix
@@ -1,5 +0,0 @@
-# overwrites default wiremix configuration
-# defaults: https://github.com/tsowell/wiremix/blob/main/wiremix.toml
-
-[char_sets.default]
-default_device = "⮞"
@@ -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",
 })
@@ -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"},
@@ -131,7 +131,6 @@ usage
 uwsm
 whois
 wireless-regdb
-wiremix
 wireplumber
 wl-clipboard
 woff2-font-awesome
@@ -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
@@ -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
@@ -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
@@ -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/
@@ -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
@@ -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`)

@@ -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
    }

@@ -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) {