From 1de4a49ab00c320d665c332843be2d85686a95c1 Mon Sep 17 00:00:00 2001 From: robert stringer <62722976+pipetogrep@users.noreply.github.com> Date: Tue, 9 Sep 2025 13:41:41 +0100 Subject: [PATCH] feat: Notification settings persist across theme changes (#1484) * Added a core.ini file for setting persistent notification settings * migration * remove: max-icon-size from core.ini * rearranging mako files * moving core.ini mako config inside omarchy * added core.ini to migration * We don't actually need this Mako is already loaded. The new config will get picked up automatically on next reboot. * Don't change * No change required here --------- Co-authored-by: robert stringer Co-authored-by: xz Co-authored-by: David Heinemeier Hansson --- default/mako/core.ini | 16 ++++++++++++++++ install/config/theme.sh | 1 + themes/catppuccin-latte/mako.ini | 21 +++------------------ themes/catppuccin/mako.ini | 20 +++----------------- themes/everforest/mako.ini | 20 +++----------------- themes/gruvbox/mako.ini | 20 +++----------------- themes/kanagawa/mako.ini | 20 +++----------------- themes/matte-black/mako.ini | 20 +++----------------- themes/nord/mako.ini | 20 +++----------------- themes/osaka-jade/mako.ini | 20 +++----------------- themes/ristretto/mako.ini | 20 +++----------------- themes/rose-pine/mako.ini | 20 +++----------------- themes/tokyo-night/mako.ini | 20 +++----------------- 13 files changed, 50 insertions(+), 188 deletions(-) create mode 100644 default/mako/core.ini diff --git a/default/mako/core.ini b/default/mako/core.ini new file mode 100644 index 0000000..0301e82 --- /dev/null +++ b/default/mako/core.ini @@ -0,0 +1,16 @@ +anchor=top-right +default-timeout=5000 +width=420 +height=110 + +[app-name=Spotify] +invisible=1 + +[mode=do-not-disturb] +invisible=true + +[mode=do-not-disturb app-name=notify-send] +invisible=false + +[urgency=critical] +default-timeout=0 \ No newline at end of file diff --git a/install/config/theme.sh b/install/config/theme.sh index 4bc7e32..17cda3c 100755 --- a/install/config/theme.sh +++ b/install/config/theme.sh @@ -26,3 +26,4 @@ ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current mkdir -p ~/.config/mako ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config + diff --git a/themes/catppuccin-latte/mako.ini b/themes/catppuccin-latte/mako.ini index ce8b8f3..6461da0 100644 --- a/themes/catppuccin-latte/mako.ini +++ b/themes/catppuccin-latte/mako.ini @@ -1,25 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#4c4f69 border-color=#1e66f5 background-color=#eff1f5 -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file diff --git a/themes/catppuccin/mako.ini b/themes/catppuccin/mako.ini index e1caf53..dc5f9c6 100644 --- a/themes/catppuccin/mako.ini +++ b/themes/catppuccin/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#cad3f5 border-color=#c6d0f5 background-color=#24273a -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file diff --git a/themes/everforest/mako.ini b/themes/everforest/mako.ini index a083610..05b50e8 100644 --- a/themes/everforest/mako.ini +++ b/themes/everforest/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#d3c6aa border-color=#d3c6aa background-color=#2d353b -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file diff --git a/themes/gruvbox/mako.ini b/themes/gruvbox/mako.ini index 2d70b15..669c6f5 100644 --- a/themes/gruvbox/mako.ini +++ b/themes/gruvbox/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#d4be98 border-color=#a89984 background-color=#282828 -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file diff --git a/themes/kanagawa/mako.ini b/themes/kanagawa/mako.ini index d3ad11c..fe944d8 100644 --- a/themes/kanagawa/mako.ini +++ b/themes/kanagawa/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#dcd7ba border-color=#dcd7ba background-color=#1f1f28 -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file diff --git a/themes/matte-black/mako.ini b/themes/matte-black/mako.ini index 1af552e..a0e6653 100644 --- a/themes/matte-black/mako.ini +++ b/themes/matte-black/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#8a8a8d border-color=#8A8A8D background-color=#1e1e1e -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 diff --git a/themes/nord/mako.ini b/themes/nord/mako.ini index 8c3c319..2976506 100644 --- a/themes/nord/mako.ini +++ b/themes/nord/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#d8dee9 border-color=#D8DEE9 background-color=#2e3440 -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file diff --git a/themes/osaka-jade/mako.ini b/themes/osaka-jade/mako.ini index c45635d..4489799 100644 --- a/themes/osaka-jade/mako.ini +++ b/themes/osaka-jade/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#C1C497 border-color=#214237 background-color=#11221C -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 12 -anchor=top-right -outer-margin=5 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=5 \ No newline at end of file diff --git a/themes/ristretto/mako.ini b/themes/ristretto/mako.ini index 7af1812..a88e281 100644 --- a/themes/ristretto/mako.ini +++ b/themes/ristretto/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#e6d9db border-color=#e6d9db background-color=#2c2525 -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file diff --git a/themes/rose-pine/mako.ini b/themes/rose-pine/mako.ini index 65aef34..10f76e5 100644 --- a/themes/rose-pine/mako.ini +++ b/themes/rose-pine/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#575279 border-color=#575279 background-color=#faf4ed -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file diff --git a/themes/tokyo-night/mako.ini b/themes/tokyo-night/mako.ini index bf76a33..c0fae2e 100644 --- a/themes/tokyo-night/mako.ini +++ b/themes/tokyo-night/mako.ini @@ -1,24 +1,10 @@ +include=~/.local/share/omarchy/default/mako/core.ini + text-color=#a9b1d6 border-color=#33ccff background-color=#1a1b26 -width=420 -height=110 padding=10 border-size=2 font=Liberation Sans 11 -anchor=top-right -outer-margin=20 -default-timeout=5000 max-icon-size=32 - -[app-name=Spotify] -invisible=1 - -[mode=do-not-disturb] -invisible=true - -[mode=do-not-disturb app-name=notify-send] -invisible=false - -[urgency=critical] -default-timeout=0 +outer-margin=20 \ No newline at end of file