Skip to content

Conversation

pipetogrep
Copy link
Contributor

This PR separates the theme values from common settings in each theme's mako.ini.
Common values are set in ~/config/mako/core.ini and then included per theme.

The main motivation for this was having a central location to set app specific mako preferences, and having them persist when changing themes.

@ryanrhughes ryanrhughes changed the base branch from master to dev September 6, 2025 21:34
@ryanrhughes
Copy link
Collaborator

@pipetogrep This is nice to clean up some of those common elements. Looks like we just need a migration for this one though if you don't mind adding that.

@dhh
Copy link
Member

dhh commented Sep 7, 2025

I can't believe I missed this! I had it in my head that mako didn't have includes? Or maybe it was AI that put that there!

@dhh
Copy link
Member

dhh commented Sep 7, 2025

Given that we can do this, I think we should actually put all of this inside Omarchy. The ~/.config/mako/config file should just have includes to the files inside of ~/.config/omarchy/current/theme/mako.ini, then that file can include ~/.local/share/omarchy/default/mako/core.ini.

@pipetogrep pipetogrep marked this pull request as draft September 7, 2025 19:37
@pipetogrep
Copy link
Contributor Author

I've tested this locally and ran the migration to simulate an upgrade, everything seems ok. Would appreciate further testing :)

My test involves seeing if my addition of silencing Plexamp notifications in core.ini works after a theme change.

Useful commands:

pkill mako || makoctl reload
notify-send "Test Title" "This is a test notification from Mako"

Arch wiki entry on mako's supported configurations

@pipetogrep pipetogrep marked this pull request as ready for review September 9, 2025 10:48
@@ -0,0 +1,3 @@
echo "Reload notifications"
cp ~/.local/share/omarchy/default/mako/core.ini ~/.config/mako/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is right? We are not supposed to copy the core. Only the current theme one.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, don't even need to copy current theme. That's already in the right place.

@dhh dhh merged commit 1de4a49 into basecamp:dev Sep 9, 2025
jardahrazdera pushed a commit to jardahrazdera/omarchy that referenced this pull request Sep 9, 2025
* 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 <[email protected]>
Co-authored-by: xz <xz>
Co-authored-by: David Heinemeier Hansson <[email protected]>
jardahrazdera pushed a commit to jardahrazdera/omarchy that referenced this pull request Sep 9, 2025
* 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 <[email protected]>
Co-authored-by: xz <xz>
Co-authored-by: David Heinemeier Hansson <[email protected]>
hamidriaz1998 pushed a commit to hamidriaz1998/omarchy that referenced this pull request Sep 12, 2025
* 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 <[email protected]>
Co-authored-by: xz <xz>
Co-authored-by: David Heinemeier Hansson <[email protected]>
manuel1618 pushed a commit to manuel1618/omarchy that referenced this pull request Sep 15, 2025
* 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 <[email protected]>
Co-authored-by: xz <xz>
Co-authored-by: David Heinemeier Hansson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants