feat(home-manager/mako): add accent color support (#323)

* feat(mako): add accent color support

* fix(mako): updated theme path

* chore(mako): update source

* fix(mako): add accent option
This commit is contained in:
SchweGELBin 2024-09-21 22:43:11 +02:00 committed by GitHub
parent 78342d11f1
commit 966af28f2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions

View file

@ -248,9 +248,9 @@
"repo": "mako"
},
"branch": "main",
"revision": "33cb59ce8483725e2dd3e818aecbf0bab259bde8",
"url": "https://github.com/catppuccin/mako/archive/33cb59ce8483725e2dd3e818aecbf0bab259bde8.tar.gz",
"hash": "1hy1k5dm8q75i9bqffmg8z4k0qkg9291k73vhpp0msn7bivb1aba"
"revision": "92844f144e72f2dc8727879ec141ffdacf3ff6a1",
"url": "https://github.com/catppuccin/mako/archive/92844f144e72f2dc8727879ec141ffdacf3ff6a1.tar.gz",
"hash": "0nz5x66bv0nhmgh2slw647j69x7pqcw0cyclkpv3bq6c5bw9j24f"
},
"micro": {
"type": "Git",

View file

@ -8,13 +8,15 @@ let
inherit (config.catppuccin) sources;
cfg = config.services.mako.catppuccin;
enable = cfg.enable && config.services.mako.enable;
theme = lib.ctp.fromINI (sources.mako + "/themes/${cfg.flavor}");
theme = lib.ctp.fromINI (sources.mako + "/themes/catppuccin-${cfg.flavor}/catppuccin-${cfg.flavor}-${cfg.accent}");
# Settings that need to be extracted and put in extraConfig
extraConfigAttrs = lib.attrsets.getAttrs [ "urgency=high" ] theme;
in
{
options.services.mako.catppuccin = lib.ctp.mkCatppuccinOpt { name = "mako"; };
options.services.mako.catppuccin = lib.ctp.mkCatppuccinOpt { name = "mako"; } // {
accent = lib.ctp.mkAccentOpt "mako";
};
# Will cause infinite recursion if config.services.mako is directly set as a whole
config.services.mako = lib.mkIf enable {