Merge quattro into USB authorization branch
This commit is contained in:
acrogenesis committed
commit
27bbbb2fe9
121 files changed
+2208
-1118
No files matched your search
@@ -1,3 +1 @@
|
||||
echo "Install native video wallpaper playback dependencies"
|
||||
|
||||
omarchy-pkg-add qt6-multimedia qt6-multimedia-ffmpeg
|
||||
echo "Native video dependencies are superseded by the OWE migration"
|
||||
@@ -0,0 +1,18 @@
|
||||
echo "Replace Satty and Tensaku with Omasnap"
|
||||
|
||||
omarchy-pkg-add omasnap
|
||||
|
||||
# The old source installer left a NoDisplay entry that overrides the packaged launcher.
|
||||
rm -f "$HOME/.local/share/applications/omasnap.desktop"
|
||||
|
||||
imv_config="$HOME/.config/imv/config"
|
||||
if [[ -f $imv_config ]]; then
|
||||
sed -i --follow-symlinks \
|
||||
-e 's/^# Edit the current image in Tensaku and quit the viewer$/# Edit the current image in Omasnap and quit the viewer/' \
|
||||
-e 's/^# Edit the current image in Satty and quit the viewer$/# Edit the current image in Omasnap and quit the viewer/' \
|
||||
-e 's|^<Ctrl+e> = exec tensaku-edit "$imv_current_file" & ; quit$|<Ctrl+e> = exec omasnap "$imv_current_file" \& ; quit|' \
|
||||
-e 's|^<Ctrl+e> = exec satty --filename "$imv_current_file" & ; quit$|<Ctrl+e> = exec omasnap "$imv_current_file" \& ; quit|' \
|
||||
"$imv_config"
|
||||
fi
|
||||
|
||||
omarchy-pkg-drop satty tensaku
|
||||
@@ -0,0 +1,99 @@
|
||||
echo "Remove automatic project bin directories from PATH"
|
||||
|
||||
work_dir="$HOME/Work"
|
||||
mise_config="$work_dir/.mise.toml"
|
||||
# install/user/mise-work.sh as shipped in Omarchy 4.0.3.
|
||||
stock_sha="bd04f191d63bbde86920f44f76f0989fad980afc84e268e8474c201ec7149245"
|
||||
cwd_bin='\{\{[[:space:]]*cwd[[:space:]]*\}\}/bin'
|
||||
unsafe_path="^[[:space:]]*_[.]path[[:space:]]*=[[:space:]]*(\"$cwd_bin\"|'$cwd_bin')[[:space:]]*(#.*)?$"
|
||||
env_section='^[[:space:]]*\[[[:space:]]*env[[:space:]]*\][[:space:]]*(#.*)?$'
|
||||
any_section='^[[:space:]]*\[\[?.*\]\]?[[:space:]]*(#.*)?$'
|
||||
|
||||
remove_empty_work_dir=false
|
||||
if [[ ! -e $work_dir ]]; then
|
||||
mkdir -p "$work_dir"
|
||||
remove_empty_work_dir=true
|
||||
fi
|
||||
|
||||
was_ignored=false
|
||||
if [[ -d $work_dir ]]; then
|
||||
mise_state_dir=${MISE_STATE_DIR:-${XDG_STATE_HOME:-$HOME/.local/state}/mise}
|
||||
ignored_configs_dir="$mise_state_dir/ignored-configs"
|
||||
work_target=$(readlink -m "$work_dir")
|
||||
config_path_target="$work_target/.mise.toml"
|
||||
config_target=$(readlink -m "$mise_config")
|
||||
|
||||
if [[ -d $ignored_configs_dir ]]; then
|
||||
for ignored_entry in "$ignored_configs_dir"/*; do
|
||||
[[ -L $ignored_entry ]] || continue
|
||||
ignored_target=$(readlink "$ignored_entry")
|
||||
if [[ $ignored_target == $work_target || $ignored_target == $config_path_target || $ignored_target == $config_target ]]; then
|
||||
was_ignored=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ $was_ignored == "false" ]]; then
|
||||
# Normal Mise trust is recorded against the config-root directory, while
|
||||
# paranoid trust is recorded against the file and its contents. Stage an
|
||||
# empty, inert config when the legacy file is gone so either trust mode can
|
||||
# resolve and revoke the original grant.
|
||||
remove_empty_mise_config=false
|
||||
if [[ ! -e $mise_config && ! -L $mise_config ]]; then
|
||||
if (set -o noclobber; : >"$mise_config") 2>/dev/null; then
|
||||
remove_empty_mise_config=true
|
||||
fi
|
||||
fi
|
||||
|
||||
untrust_target="$work_dir"
|
||||
if [[ -f $mise_config ]]; then
|
||||
untrust_target="$mise_config"
|
||||
fi
|
||||
|
||||
if mise trust --untrust "$untrust_target"; then
|
||||
:
|
||||
else
|
||||
if [[ $remove_empty_mise_config == "true" ]]; then
|
||||
rm -f -- "$mise_config"
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ $remove_empty_mise_config == "true" ]]; then
|
||||
rm -f -- "$mise_config"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -f $mise_config ]]; then
|
||||
if [[ ! -L $mise_config && $(sha256sum "$mise_config" | cut -d ' ' -f 1) == $stock_sha ]]; then
|
||||
rm -f -- "$mise_config"
|
||||
else
|
||||
unsafe_env_paths=$(sed -n -E "\\%$env_section%,\\%$any_section% { \\%$unsafe_path%p; }" "$mise_config")
|
||||
if [[ -n $unsafe_env_paths ]]; then
|
||||
backup=$(mktemp "$mise_config.bak.XXXXXX")
|
||||
cp -p -- "$mise_config" "$backup"
|
||||
sed --follow-symlinks -i -E "\\%$env_section%,\\%$any_section% { \\%$unsafe_path%d; }" "$mise_config"
|
||||
|
||||
printf '\n%s\n' \
|
||||
"Automatic project bin directories were removed from your Mise PATH." \
|
||||
"Your other Mise settings were preserved."
|
||||
printf '\nBackup saved to:\n %s\n' "$backup"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -f $mise_config ]]; then
|
||||
if [[ $was_ignored == "true" ]]; then
|
||||
printf '\n%s\n' "This custom config remains ignored by Mise."
|
||||
else
|
||||
printf '\n%s\n %s\n' \
|
||||
"Mise trust for this custom config was revoked. Review it before trusting it again:" \
|
||||
"mise trust $mise_config"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $remove_empty_work_dir == "true" ]]; then
|
||||
rmdir "$work_dir" 2>/dev/null || true
|
||||
fi
|
||||
@@ -0,0 +1,11 @@
|
||||
echo "Switch TCP congestion control to BBR with fq pacing"
|
||||
|
||||
# Boot applies the shipped file regardless; this only makes new connections
|
||||
# use BBR now. Setting the sysctls autoloads tcp_bbr and sch_fq. Qdiscs
|
||||
# already attached to interfaces stay until they are recreated, normally at
|
||||
# reboot.
|
||||
if [[ $(sysctl -n net.ipv4.tcp_congestion_control) == "bbr" && $(sysctl -n net.core.default_qdisc) == "fq" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
sudo sysctl -p /etc/sysctl.d/99-omarchy-sysctl.conf >/dev/null || omarchy-state set reboot-required
|
||||
@@ -0,0 +1,10 @@
|
||||
echo "Install missing headers for the Omarchy or T2 kernel"
|
||||
|
||||
# Fresh ISO installs mark earlier migrations complete, so the kernel migration
|
||||
# cannot repair headers omitted by those installers. Package installation is
|
||||
# idempotent when another user has already applied this repair.
|
||||
for kernel in linux-omarchy linux-t2; do
|
||||
if omarchy-pkg-present "$kernel"; then
|
||||
omarchy-pkg-add "$kernel-headers"
|
||||
fi
|
||||
done
|
||||
@@ -0,0 +1,14 @@
|
||||
echo "Install Elsewhen, the world clock plugin"
|
||||
|
||||
omarchy-pkg-add elsewhen
|
||||
|
||||
# Dev checkouts do not contain plugins installed by system packages.
|
||||
packaged_plugin="/usr/share/omarchy/shell/plugins/omacom.elsewhen"
|
||||
user_plugin="$HOME/.config/omarchy/plugins/omacom.elsewhen"
|
||||
if [[ ! $OMARCHY_PATH -ef /usr/share/omarchy && -d $packaged_plugin && ! -e $user_plugin && ! -L $user_plugin ]]; then
|
||||
mkdir -p "${user_plugin%/*}"
|
||||
ln -s "$packaged_plugin" "$user_plugin"
|
||||
fi
|
||||
|
||||
omarchy-shell shell rescanPlugins
|
||||
omarchy-bar put omacom.elsewhen --before omarchy.clock
|
||||
@@ -0,0 +1,17 @@
|
||||
echo "Enable OWE desktop video backgrounds and lock feed"
|
||||
|
||||
omarchy-pkg-add owe owe-lockfeed
|
||||
omarchy-hook-install theme-set /usr/share/owe/10-owe-sync
|
||||
|
||||
systemctl --user daemon-reload >/dev/null 2>&1 || true
|
||||
if ! systemctl --user enable owed.service; then
|
||||
wants_dir="$HOME/.config/systemd/user/graphical-session.target.wants"
|
||||
mkdir -p "$wants_dir"
|
||||
ln -sfn /usr/lib/systemd/user/owed.service "$wants_dir/owed.service"
|
||||
fi
|
||||
|
||||
# A TTY update enables the next graphical login without starting a renderer
|
||||
# against a missing Wayland session. A failed live start leaves this pending.
|
||||
if [[ ${OMARCHY_UPGRADE_TO_QUATTRO_LIVE:-0} != 1 ]] && systemctl --user is-active --quiet graphical-session.target; then
|
||||
systemctl --user start owed.service
|
||||
fi
|
||||
Reference in new issue
Block a user