diff --git a/bin/omarchy-launch-bluetooth b/bin/omarchy-launch-bluetooth deleted file mode 100755 index 8c450261..00000000 --- a/bin/omarchy-launch-bluetooth +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# omarchy:summary=Launch the Omarchy bluetooth controls TUI (provided by bluetui). - -rfkill unblock bluetooth -exec omarchy-launch-or-focus-tui bluetui diff --git a/bin/omarchy-launch-wifi b/bin/omarchy-launch-wifi deleted file mode 100755 index e22b7083..00000000 --- a/bin/omarchy-launch-wifi +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# omarchy:summary=Launch the Omarchy wifi controls (provided by the Impala TUI). - -rfkill unblock wifi -omarchy-launch-or-focus-tui impala diff --git a/default/hypr/apps/system.lua b/default/hypr/apps/system.lua index 71e828fe..8d14e882 100644 --- a/default/hypr/apps/system.lua +++ b/default/hypr/apps/system.lua @@ -3,8 +3,19 @@ hl.window_rule({ match = { tag = "floating-window" }, float = true }) hl.window_rule({ match = { tag = "floating-window" }, center = true }) hl.window_rule({ match = { tag = "floating-window" }, size = { 875, 600 } }) -hl.window_rule({ match = { class = "(org.omarchy.bluetui|org.omarchy.impala|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)" }, tag = "+floating-window" }) -hl.window_rule({ match = { 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|.*wants to [open|save].*|[C|c]hoose.*)" }, tag = "+floating-window" }) +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)", + }, + tag = "+floating-window", +}) +hl.window_rule({ + match = { + 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|.*wants to [open|save].*|[C|c]hoose.*)", + }, + tag = "+floating-window", +}) hl.window_rule({ match = { class = "org.gnome.Calculator" }, float = true }) -- Fullscreen screensaver. @@ -13,8 +24,18 @@ hl.window_rule({ match = { class = "org.omarchy.screensaver" }, float = true }) hl.window_rule({ match = { class = "org.omarchy.screensaver" }, animation = "slide" }) -- No transparency on media windows. -hl.window_rule({ match = { class = "^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$" }, tag = "-default-opacity" }) -hl.window_rule({ match = { class = "^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$" }, opacity = "1 1" }) +hl.window_rule({ + match = { + class = "^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$", + }, + tag = "-default-opacity", +}) +hl.window_rule({ + match = { + class = "^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$", + }, + opacity = "1 1", +}) -- Popped window rounding. hl.window_rule({ match = { tag = "pop" }, rounding = 8 }) diff --git a/default/omarchy/omarchy-menu.jsonc b/default/omarchy/omarchy-menu.jsonc index 479c944b..431c9585 100644 --- a/default/omarchy/omarchy-menu.jsonc +++ b/default/omarchy/omarchy-menu.jsonc @@ -120,8 +120,6 @@ // Setup "setup.audio": {"icon":"","label":"Audio","keywords":"sound","action":"omarchy-launch-audio"}, - "setup.wifi": {"icon":"","label":"Wifi","keywords":"wireless network","action":"omarchy-launch-wifi"}, - "setup.bluetooth": {"icon":"󰂯","label":"Bluetooth","action":"omarchy-launch-bluetooth"}, "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/first-run/wifi.sh b/install/first-run/wifi.sh index 9d6667d1..ff26872c 100644 --- a/install/first-run/wifi.sh +++ b/install/first-run/wifi.sh @@ -7,8 +7,8 @@ notify_update() { notify_wifi() { ( - action=$(notify-send -a omarchy-action -u critical --hint=string:omarchy-glyph:󰖩 "Click to Setup Wi-Fi" "Tab to navigate, Space to select, ? for help." -A "default=Setup") - [[ $action == "default" ]] && omarchy-launch-wifi + action=$(notify-send -a omarchy-action -u critical --hint=string:omarchy-glyph:󰖩 "Click to Setup Wi-Fi" -A "default=Setup") + [[ $action == "default" ]] && omarchy-shell networkPanel toggle ) >/dev/null 2>&1 & } diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages index 8cc80eec..b59fc395 100644 --- a/install/omarchy-base.packages +++ b/install/omarchy-base.packages @@ -9,7 +9,6 @@ asdcontrol avahi bash-completion bat -bluetui bolt brightnessctl btop @@ -58,7 +57,6 @@ hyprlock hyprpicker hyprsunset imagemagick -impala imv inetutils inxi diff --git a/migrations/1751134568.sh b/migrations/1751134568.sh index 99cd600f..14c8f414 100644 --- a/migrations/1751134568.sh +++ b/migrations/1751134568.sh @@ -1,4 +1,4 @@ -# Turn on bluetooth service so blueberry or bluetui works out the box +# Turn on bluetooth service so blueberry works out the box echo "Let's turn on Bluetooth service so the controls work" if systemctl is-enabled --quiet bluetooth.service && systemctl is-active --quiet bluetooth.service; then # Bluetooth is already enabled, nothing to change diff --git a/migrations/1751887718.sh b/migrations/1751887718.sh deleted file mode 100644 index 6a94fc7c..00000000 --- a/migrations/1751887718.sh +++ /dev/null @@ -1,5 +0,0 @@ -echo "Install Impala as new wifi selection TUI" - -if omarchy-cmd-missing impala; then - omarchy-pkg-add impala -fi diff --git a/migrations/1762417304.sh b/migrations/1762417304.sh index 8b53a6c0..3678ffd5 100644 --- a/migrations/1762417304.sh +++ b/migrations/1762417304.sh @@ -1,4 +1,3 @@ -echo "Replace bluetooth GUI with TUI" +echo "Drop bluetooth GUI" -omarchy-pkg-add bluetui omarchy-pkg-drop blueberry diff --git a/migrations/1779137438.sh b/migrations/1779137438.sh new file mode 100644 index 00000000..eb9e5eb5 --- /dev/null +++ b/migrations/1779137438.sh @@ -0,0 +1,3 @@ +echo "Remove bluetui and impala packages" + +omarchy-pkg-drop bluetui impala diff --git a/shell/plugins/bar/widgets/networkPanel.qml b/shell/plugins/bar/widgets/networkPanel.qml index 52cb7327..98da14da 100644 --- a/shell/plugins/bar/widgets/networkPanel.qml +++ b/shell/plugins/bar/widgets/networkPanel.qml @@ -483,14 +483,6 @@ iwctl known-networks ${quotedSsid} forget `) } - function launchImpala() { - if (!bar) return - var quotedPath = bar.shellQuote(bar.omarchyPath) - var quotedBin = bar.shellQuote(bar.omarchyPath + "/bin/omarchy-launch-wifi") - var quotedFullPath = bar.shellQuote(bar.omarchyPath + "/bin:" + (Quickshell.env("PATH") || "")) - bar.run("OMARCHY_PATH=" + quotedPath + " PATH=" + quotedFullPath + " " + quotedBin) - } - implicitWidth: button.implicitWidth implicitHeight: button.implicitHeight @@ -661,8 +653,7 @@ fi rightExtraMargin: 2 onPressed: function(b) { - if (b === Qt.RightButton) root.launchImpala() - else if (root.popupOpen) root.closePopout() + if (root.popupOpen) root.closePopout() else { root.popupOpen = true; root.refresh() } } }