Merge current Quattro into sudo expiry fix
This commit is contained in:
commit
60ac419f8c
17 files changed
+227
-11
No files matched your search
@@ -0,0 +1,21 @@
|
||||
echo "Retire the stock user icon font missed by the Quattro upgrade"
|
||||
|
||||
legacy_font="$HOME/.local/share/fonts/omarchy.ttf"
|
||||
|
||||
# The upgrader treated this as ~/.config/omarchy.ttf and left the old family
|
||||
# registered alongside the packaged font. Preserve custom fonts and symlinks.
|
||||
if [[ -f $legacy_font && ! -L $legacy_font ]]; then
|
||||
legacy_hash=$(sha256sum "$legacy_font")
|
||||
if [[ ${legacy_hash%% *} == "e55e67119e82f56f92d90cbf54b7ccc1b2946b32c535a29370439d7ef5215966" ]]; then
|
||||
if [[ ! -f /usr/share/fonts/omarchy/omarchy.ttf ]]; then
|
||||
echo "Packaged Omarchy icon font is missing; keeping the legacy font." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
rm "$legacy_font"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Also refresh on retries after removal succeeded but the cache refresh failed.
|
||||
# The normal update restarts the shell, which reloads Qt's font database.
|
||||
fc-cache -f
|
||||
@@ -0,0 +1,20 @@
|
||||
echo "Expose the Elgato Cam Link 4K as a 16:9 virtual camera"
|
||||
|
||||
if omarchy-hw-elgato-camlink-4k; then
|
||||
source "$OMARCHY_PATH/install/hardware/fix-elgato-camlink-4k.sh"
|
||||
|
||||
sudo systemctl daemon-reload
|
||||
sudo udevadm control --reload
|
||||
|
||||
# Re-run the rules for the Cam Link that is plugged in now so it gets hidden
|
||||
# and relayed right away. The user ACL from its first plug survives a
|
||||
# re-trigger, so drop it here; a replug or reboot does the same on its own.
|
||||
sudo udevadm trigger --action=add --subsystem-match=video4linux
|
||||
sudo udevadm settle
|
||||
[[ -e /dev/camlink4k ]] && sudo setfacl -b /dev/camlink4k
|
||||
|
||||
# The trigger only starts the relay when the rule is new to the device.
|
||||
# Start it outright so a failed module build or loopback surfaces here,
|
||||
# with the raw camera hidden, rather than passing silently.
|
||||
sudo systemctl start v4l2-relayd@camlink.service
|
||||
fi
|
||||
Reference in new issue
Block a user