Merge branch 'quattro' into add-default-agent

# Conflicts:
#	migrations/1785633225.sh
This commit is contained in:
David Heinemeier Hansson
2026-08-04 05:33:49 -07:00
30 changed files with 759 additions and 194 deletions
-1
View File
@@ -5,5 +5,4 @@ if ! omarchy-pkg-present quickshell-git; then
# quickshell package in place; packages depending on quickshell stay
# satisfied through the provides.
sudo pacman -S --noconfirm --ask 4 quickshell-git
omarchy-state set restart-shell-required
fi
-2
View File
@@ -37,5 +37,3 @@ if [[ -s $config_file ]]; then
.bar.layout.center |= place_indicators_before_clock
' "$config_file" >"$tmp" && mv "$tmp" "$config_file" || rm -f "$tmp"
fi
omarchy-restart-shell
-4
View File
@@ -118,7 +118,3 @@ if [[ -s $config_file ]] && grep -q 'TmuxAlert' "$config_file"; then
rm -f "$tmp"
fi
# Nothing to restart from a TTY or over ssh, and that is no reason to stop the
# rest of the queue: hand it to the post-update restart instead.
omarchy-restart-shell >/dev/null 2>&1 || omarchy-state set restart-shell-required
-2
View File
@@ -45,5 +45,3 @@ if [[ -s $config_file ]] && omarchy-cmd-present jq; then
end
' "$config_file" >"$tmp" && mv "$tmp" "$config_file" || rm -f "$tmp"
fi
omarchy-restart-shell
+18 -7
View File
@@ -1,9 +1,20 @@
echo "Install default coding agent mise wrappers"
echo "Speed up mouse scrolling in foot"
if [[ ! -f $HOME/.local/state/omarchy/preinstalls-removed ]]; then
omarchy-mise-install github:can1357/oh-my-pi omp
omarchy-mise-install npm:@xai-official/grok grok
omarchy-mise-install crush
elif [[ -f $HOME/.local/bin/omp ]] && grep -Fq 'mise use -g "oh-my-pi"' "$HOME/.local/bin/omp"; then
rm -f "$HOME/.local/bin/omp"
foot_config="$HOME/.config/foot/foot.ini"
if [[ -f $foot_config ]] && ! grep -q '^multiplier=' "$foot_config"; then
if grep -qxF '[scrollback]' "$foot_config"; then
tmp=$(mktemp)
awk '
{ print }
!inserted && $0 == "[scrollback]" {
print "multiplier=7.0"
inserted = 1
}
' "$foot_config" >"$tmp"
cat "$tmp" >"$foot_config"
rm -f "$tmp"
else
printf '\n[scrollback]\nmultiplier=7.0\n' >>"$foot_config"
fi
fi
+4
View File
@@ -0,0 +1,4 @@
echo "Replace GNOME Calculator with Omacalc"
omarchy-pkg-add omacalc
omarchy-pkg-drop gnome-calculator
+9
View File
@@ -0,0 +1,9 @@
echo "Install default coding agent mise wrappers"
if [[ ! -f $HOME/.local/state/omarchy/preinstalls-removed ]]; then
omarchy-mise-install github:can1357/oh-my-pi omp
omarchy-mise-install npm:@xai-official/grok grok
omarchy-mise-install crush
elif [[ -f $HOME/.local/bin/omp ]] && grep -Fq 'mise use -g "oh-my-pi"' "$HOME/.local/bin/omp"; then
rm -f "$HOME/.local/bin/omp"
fi