Drop bluetui and impala in favor of shell controls
This commit is contained in:
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -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" }, center = true })
|
||||||
hl.window_rule({ match = { tag = "floating-window" }, size = { 875, 600 } })
|
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({
|
||||||
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" })
|
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 })
|
hl.window_rule({ match = { class = "org.gnome.Calculator" }, float = true })
|
||||||
|
|
||||||
-- Fullscreen screensaver.
|
-- 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" })
|
hl.window_rule({ match = { class = "org.omarchy.screensaver" }, animation = "slide" })
|
||||||
|
|
||||||
-- No transparency on media windows.
|
-- 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({
|
||||||
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" })
|
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.
|
-- Popped window rounding.
|
||||||
hl.window_rule({ match = { tag = "pop" }, rounding = 8 })
|
hl.window_rule({ match = { tag = "pop" }, rounding = 8 })
|
||||||
|
|||||||
@@ -120,8 +120,6 @@
|
|||||||
|
|
||||||
// Setup
|
// Setup
|
||||||
"setup.audio": {"icon":"","label":"Audio","keywords":"sound","action":"omarchy-launch-audio"},
|
"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.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": {"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"},
|
"setup.sleep.suspend-enable": {"icon":"","label":"Enable Suspend","when":"omarchy-toggle-enabled suspend-off","action":"omarchy-toggle-suspend"},
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ notify_update() {
|
|||||||
|
|
||||||
notify_wifi() {
|
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=$(notify-send -a omarchy-action -u critical --hint=string:omarchy-glyph: "Click to Setup Wi-Fi" -A "default=Setup")
|
||||||
[[ $action == "default" ]] && omarchy-launch-wifi
|
[[ $action == "default" ]] && omarchy-shell networkPanel toggle
|
||||||
) >/dev/null 2>&1 &
|
) >/dev/null 2>&1 &
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ asdcontrol
|
|||||||
avahi
|
avahi
|
||||||
bash-completion
|
bash-completion
|
||||||
bat
|
bat
|
||||||
bluetui
|
|
||||||
bolt
|
bolt
|
||||||
brightnessctl
|
brightnessctl
|
||||||
btop
|
btop
|
||||||
@@ -58,7 +57,6 @@ hyprlock
|
|||||||
hyprpicker
|
hyprpicker
|
||||||
hyprsunset
|
hyprsunset
|
||||||
imagemagick
|
imagemagick
|
||||||
impala
|
|
||||||
imv
|
imv
|
||||||
inetutils
|
inetutils
|
||||||
inxi
|
inxi
|
||||||
|
|||||||
@@ -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"
|
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
|
if systemctl is-enabled --quiet bluetooth.service && systemctl is-active --quiet bluetooth.service; then
|
||||||
# Bluetooth is already enabled, nothing to change
|
# Bluetooth is already enabled, nothing to change
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
echo "Install Impala as new wifi selection TUI"
|
|
||||||
|
|
||||||
if omarchy-cmd-missing impala; then
|
|
||||||
omarchy-pkg-add impala
|
|
||||||
fi
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
echo "Replace bluetooth GUI with TUI"
|
echo "Drop bluetooth GUI"
|
||||||
|
|
||||||
omarchy-pkg-add bluetui
|
|
||||||
omarchy-pkg-drop blueberry
|
omarchy-pkg-drop blueberry
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
echo "Remove bluetui and impala packages"
|
||||||
|
|
||||||
|
omarchy-pkg-drop bluetui impala
|
||||||
@@ -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
|
implicitWidth: button.implicitWidth
|
||||||
implicitHeight: button.implicitHeight
|
implicitHeight: button.implicitHeight
|
||||||
|
|
||||||
@@ -661,8 +653,7 @@ fi
|
|||||||
rightExtraMargin: 2
|
rightExtraMargin: 2
|
||||||
|
|
||||||
onPressed: function(b) {
|
onPressed: function(b) {
|
||||||
if (b === Qt.RightButton) root.launchImpala()
|
if (root.popupOpen) root.closePopout()
|
||||||
else if (root.popupOpen) root.closePopout()
|
|
||||||
else { root.popupOpen = true; root.refresh() }
|
else { root.popupOpen = true; root.refresh() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user