Merge upstream quattro for the Qt 6.12 palette fix (#14553)
Qt 6.12 shadows the bare Color singleton, so the bar and every Color role read undefined on fresh installs. Keep our I18n text in the four conflicting files, qualify #14433's notification button color, give the new dictation menu rows and notifications Chinese, and drop table entries for the removed Voxtype and FIDO2 texts.
This commit is contained in:
commit
fcd681c099
239 files changed
+3996
-616
No files matched your search
@@ -0,0 +1,26 @@
|
||||
echo "Re-stage the active theme with packaged intro videos"
|
||||
|
||||
theme_name_path="$HOME/.local/state/omarchy/current/theme.name"
|
||||
|
||||
[[ -s $theme_name_path ]] || exit 0
|
||||
|
||||
theme_name=$(<"$theme_name_path")
|
||||
[[ $theme_name =~ ^[[:alnum:]_][[:alnum:].+_-]*$ ]] || exit 0
|
||||
[[ -d $OMARCHY_PATH/themes/$theme_name/backgrounds/intros ]] || exit 0
|
||||
|
||||
omarchy-theme-refresh
|
||||
|
||||
state_dir="$HOME/.local/state/omarchy"
|
||||
marker="$state_dir/background-intro.session-id"
|
||||
session_id=${OMARCHY_SESSION_ID:-${HYPRLAND_INSTANCE_SIGNATURE:-}}
|
||||
if [[ -z $session_id ]]; then
|
||||
hypr_dir=$(find "${XDG_RUNTIME_DIR:-/run/user/$UID}/hypr" -mindepth 1 -maxdepth 1 -type d -printf '%T@ %p\n' 2>/dev/null | sort -n | tail -n 1 | cut -d' ' -f2- || true)
|
||||
session_id=${hypr_dir##*/}
|
||||
fi
|
||||
[[ -n $session_id ]] || exit 0
|
||||
mkdir -p "$state_dir"
|
||||
marker_staged=$(mktemp "$state_dir/.background-intro.session-id.XXXXXX")
|
||||
trap 'rm -f "$marker_staged"' EXIT
|
||||
printf '%s\n' "$session_id" >"$marker_staged"
|
||||
mv -f "$marker_staged" "$marker"
|
||||
trap - EXIT
|
||||
@@ -0,0 +1,15 @@
|
||||
echo "Enable overlay scrollbars in Chromium-based browsers"
|
||||
|
||||
for flags_file in "$HOME"/.config/{chromium,chrome,microsoft-edge-stable,brave,brave-origin}-flags.conf; do
|
||||
[[ -f $flags_file ]] || continue
|
||||
grep -Eq -- '^--enable-features=([^,]+,)*OverlayScrollbar([,:]|$)' "$flags_file" && continue
|
||||
|
||||
if grep -q -- '^--enable-features=' "$flags_file"; then
|
||||
sed -i --follow-symlinks \
|
||||
-e '/^--enable-features=/ s/$/,OverlayScrollbar/' \
|
||||
-e '/^--enable-features=/ s/=,/=/' "$flags_file"
|
||||
else
|
||||
[[ -n $(tail -c1 "$flags_file") ]] && echo >>"$flags_file"
|
||||
echo '--enable-features=OverlayScrollbar' >>"$flags_file"
|
||||
fi
|
||||
done
|
||||
@@ -0,0 +1,28 @@
|
||||
echo "Prioritize the Omarchy package repository over Arch repositories"
|
||||
|
||||
# Move the existing section rather than replacing pacman.conf so channel URLs,
|
||||
# custom repositories, and administrator options survive the migration.
|
||||
pacman_config=$(mktemp)
|
||||
trap 'rm -f "$pacman_config"' EXIT
|
||||
|
||||
awk '
|
||||
/^[[:space:]]*\[[^]]+\]/ {
|
||||
section = $0
|
||||
sub(/^[[:space:]]*\[/, "", section)
|
||||
sub(/\].*$/, "", section)
|
||||
if (section != "options") repositories = 1
|
||||
}
|
||||
!repositories { prefix = prefix $0 "\n"; next }
|
||||
section == "omarchy" { omarchy = omarchy $0 "\n"; next }
|
||||
{ others = others $0 "\n" }
|
||||
END { printf "%s%s%s", prefix, omarchy, others }
|
||||
' /etc/pacman.conf >"$pacman_config"
|
||||
|
||||
if ! cmp -s /etc/pacman.conf "$pacman_config"; then
|
||||
sudo cp -a /etc/pacman.conf /etc/pacman.conf.bak
|
||||
sudo install -m 644 -o root -g root "$pacman_config" /etc/pacman.conf
|
||||
fi
|
||||
|
||||
# Refresh databases and upgrade against the new repository priority. Run this
|
||||
# even when the config is already ordered so a failed upgrade can be retried.
|
||||
omarchy-update-system-pkgs
|
||||
@@ -0,0 +1,9 @@
|
||||
echo "Preserve Voxtype as the default for existing dictation users"
|
||||
|
||||
backend_config="${XDG_CONFIG_HOME:-$HOME/.config}/omarchy/defaults/dictation"
|
||||
if [[ ! -e $backend_config ]] && omarchy-pkg-present voxtype-bin; then
|
||||
mkdir -p "${backend_config%/*}"
|
||||
temporary=$(mktemp "$backend_config.XXXXXX")
|
||||
printf '%s\n' voxtype > "$temporary"
|
||||
mv -f "$temporary" "$backend_config"
|
||||
fi
|
||||
Reference in new issue
Block a user