Ryan Hughes
c101591284
Adds first-party omarchy.notifications service plugin that hosts a freedesktop notification server and renders popups + a history popup inside the shell. Uninstalls mako and retargets every helper, keybind, indicator, and migration entry to the new daemon. Plugin (default/quickshell/omarchy-shell/plugins/notifications/): - Service.qml: NotificationServer, popupModel + pendingModel + pastModel (two-tier history, see below), DND via PersistentProperties + cache-file backstop, image cache for /tmp screenshots, IpcHandler with toggleDnd/setDnd/isDnd/showHistory/clear/clearPending/markAllSeen/ dismissAll/dismissOne/invokeLast/dismiss, per-theme override file ~/.config/omarchy/current/theme/notifications.json honoring borderColor/backgroundColor/textColor/countdownColor. - components/NotificationCard.qml: theme-driven card (Color.foreground/ background/border tokens from Commons/Color.qml), 32x32 icon slot, Nerd Font glyph fallback via omarchy-glyph hint, hero image strip for screenshot/image-path notifications, hover-pause progress bar, uses bar.fontFamily so all surfaces share one font. Filtering and DND: - transient hint and CLI-style senders (app_name in notify-send / omarchy-action) bypass history but still pop. - DND only allows omarchy-action toasts and notify-send -u critical through; real-app urgency=critical (Discord, Slack, Vesktop) is silenced and lands in pending instead. - Pending vs past split surfaced via tabs in the bar widget popup; past tab is auto-pruned at the 15-minute mark. - Click-to-jump: notifications without a libnotify default action focus the matching Hyprland window via class lookup. Shell host: - shell.qml: generic first-party service loader (mirrors the existing noctalia-compat path) and an alias for the bar so plugins can read barSize / barHidden / position for anchoring. - Commons/Color.qml: parses the theme's hyprland.conf for $activeBorderColor so notifications match Hyprland window borders; picks the explicit accent= key over the color4= alias. Bar widget rebase (plugins/bar/widgets/notificationCenter.qml): - Drops the chunk-1 stub server, binds count/dnd state to the service, hosts the history popup via PopupCard so it drops down from the notification glyph the same way Quick Settings does. - Pending/Past tabs, dismiss-individual close X, mark-all-as-seen and clear-recent action buttons, theme-driven palette. Quick Settings rework (plugins/bar/widgets/controlCenter.qml): - DND tile binds directly to service.doNotDisturb for instant feedback. - Drops the volume slider (already in audioPanel) and the no-op Theme tile; adds a Bluetooth toggle bound to Quickshell.Bluetooth. - Bigger 44x44 wallet was scaled back to 32x32 for tighter rows. Notification scripts (bin/omarchy-*): - omarchy-notification-send: passes glyph as a custom hint instead of prepending to the summary; adds -a omarchy-action and -u urgency automatically; supports -e/--transient passthrough. - User-action toasts in the capture / toggle / hyprland / default-* scripts and bindings/utilities.lua now tag themselves -a omarchy-action so DND treats them as intent-based bypass. - omarchy-toggle-notification-silencing, omarchy-notification-dismiss, default/waybar/indicators/notification-silencing.sh, and the Hyprland comma-keybinds all route through omarchy-shell-ipc notifications. - omarchy-capture-screenshot / -screenrecording set the image-path hint properly so the hero-image rendering kicks in. Mako removal (migrations/1778743515.sh): - pkill -x mako, systemctl --user stop mako.service, pacman -Rns mako (uninstalling deletes /usr/lib/systemd/user/mako.service so D-Bus activation can't respawn it). Removes ~/.config/mako/ and the legacy toggle file. Restarts quickshell so it claims the bus name. - Drops mako from install/omarchy-base.packages, autostart.lua, install/config/theme.sh + toggles.sh, default/themed/mako.ini.tpl, default/mako/, the omarchy-menu Mako restart row, bin/omarchy GROUP_DESCRIPTIONS, the settings panel catalogue, and the default/omarchy-skill paths table. - Removed scripts: bin/omarchy-restart-mako, bin/omarchy-style-corners-mako. - bin/omarchy-style-corners summary updated; corner radius for the notification card reads ~/.local/state/omarchy/toggles/quickshell-menu.json alongside the rest of the shell.
73 lines
2.4 KiB
Bash
Executable File
73 lines
2.4 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Set the system monospace font
|
|
# omarchy:args=<font-name>
|
|
# omarchy:examples=omarchy font list | omarchy font set "CaskaydiaMono Nerd Font"
|
|
|
|
font_name="$1"
|
|
|
|
if [[ -n $font_name ]]; then
|
|
if fc-list | grep -iq "$font_name"; then
|
|
if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
|
|
sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
|
|
fi
|
|
|
|
if [[ -f ~/.config/kitty/kitty.conf ]]; then
|
|
sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
|
|
pkill -USR1 kitty
|
|
fi
|
|
|
|
if [[ -f ~/.config/ghostty/config ]]; then
|
|
sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
|
|
pkill -SIGUSR2 ghostty
|
|
fi
|
|
|
|
if [[ -f ~/.config/foot/foot.ini ]]; then
|
|
sed -i "s/^font=.*/font=$font_name:size=9/g" ~/.config/foot/foot.ini
|
|
fi
|
|
|
|
sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
|
|
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
|
|
mkdir -p "$HOME/.config/omarchy"
|
|
shell_config="$HOME/.config/omarchy/shell.json"
|
|
tmp=$(mktemp)
|
|
|
|
if [[ -s $shell_config ]] && jq -e 'type == "object"' "$shell_config" >/dev/null 2>&1; then
|
|
jq --arg font_name "$font_name" '
|
|
.version = 1 |
|
|
.bar = ((.bar // {}) | if type == "object" then . else {} end) |
|
|
.bar.fontFamily = $font_name
|
|
' "$shell_config" >"$tmp"
|
|
else
|
|
jq -n --arg font_name "$font_name" '{ version: 1, bar: { fontFamily: $font_name } }' >"$tmp"
|
|
fi
|
|
|
|
mv "$tmp" "$shell_config"
|
|
sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
|
|
xmlstarlet ed -L \
|
|
-u '//match[@target="pattern"][test/string="monospace"]/edit[@name="family"]/string' \
|
|
-v "$font_name" \
|
|
~/.config/fontconfig/fonts.conf
|
|
|
|
if pgrep -x waybar >/dev/null; then
|
|
omarchy-restart-waybar
|
|
fi
|
|
omarchy-restart-swayosd
|
|
|
|
if pgrep -x ghostty; then
|
|
notify-send -a omarchy-action -u low " You must restart Ghostty to see font change"
|
|
fi
|
|
|
|
if pgrep -x foot; then
|
|
notify-send -a omarchy-action -u low " You must restart Foot to see font change"
|
|
fi
|
|
|
|
omarchy-hook font-set "$font_name"
|
|
else
|
|
echo "Font '$font_name' not found."
|
|
exit 1
|
|
fi
|
|
else
|
|
echo "Usage: omarchy-font-set <font-name>"
|
|
fi
|