Merge branch 'quattro' into add-default-agent
# Conflicts: # migrations/1785633225.sh
This commit is contained in:
@@ -31,7 +31,9 @@ option_bool() {
|
||||
local signature="$2"
|
||||
local option="$3"
|
||||
|
||||
hyprctl_instance "$runtime_dir" "$signature" -j getoption "$option" 2>/dev/null | jq -r '.bool'
|
||||
# A dead instance makes hyprctl print "Couldn't connect ..." on stdout, so
|
||||
# silence jq too and let the failed pipeline skip the instance.
|
||||
hyprctl_instance "$runtime_dir" "$signature" -j getoption "$option" 2>/dev/null | jq -r '.bool' 2>/dev/null
|
||||
}
|
||||
|
||||
instances() {
|
||||
|
||||
+16
-2
@@ -2,11 +2,25 @@
|
||||
|
||||
# omarchy:summary=Generate a Wi-Fi QR matrix for the shell
|
||||
# omarchy:group=network
|
||||
# omarchy:args=<interface>
|
||||
# omarchy:args=[interface]
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
interface=${1:?Usage: omarchy-network-qr <interface>}
|
||||
interface=${1:-}
|
||||
if [[ -z $interface ]]; then
|
||||
# Prefer the default-route device: it is the connection the panel and the
|
||||
# menu's visibility gate describe. Fall back to the first connected Wi-Fi
|
||||
# device. nmcli localizes state names, so pin the locale, and the prefix
|
||||
# match accepts states like "connected (externally)".
|
||||
route_device=$(ip route get 1.1.1.1 2>/dev/null | awk '{ for (i = 1; i <= NF; i++) if ($i == "dev") { print $(i + 1); exit } }')
|
||||
if [[ -n $route_device && -d /sys/class/net/$route_device/wireless ]]; then
|
||||
interface=$route_device
|
||||
else
|
||||
interface=$(LC_ALL=C nmcli -t -f DEVICE,TYPE,STATE device status 2>/dev/null |
|
||||
awk -F: '$2 == "wifi" && $3 ~ /^connected/ { print $1; exit }')
|
||||
fi
|
||||
fi
|
||||
[[ -n $interface ]] || { echo "No active Wi-Fi connection" >&2; exit 1; }
|
||||
uuid=$(nmcli --get-values GENERAL.CON-UUID device show "$interface" | head -n 1)
|
||||
[[ -n $uuid && $uuid != "--" ]] || { echo "No active Wi-Fi connection" >&2; exit 1; }
|
||||
|
||||
|
||||
@@ -42,3 +42,9 @@ for file in "$HOME"/.local/state/omarchy/restart-*-required; do
|
||||
omarchy-restart-"$service"
|
||||
fi
|
||||
done
|
||||
|
||||
# Updates routinely replace the shell's QML, and a stale process can lazy-load
|
||||
# new files into old code. A restart failure (locked session, ssh, TTY) only
|
||||
# prints its reason: the next update or login gets a fresh shell anyway.
|
||||
echo "Restarting shell"
|
||||
omarchy-restart-shell || true
|
||||
|
||||
Reference in New Issue
Block a user