diff --git a/.sources/sources.json b/.sources/sources.json index b6dcdb5..6ffaea9 100644 --- a/.sources/sources.json +++ b/.sources/sources.json @@ -52,13 +52,13 @@ "type": "Git", "repository": { "type": "GitHub", - "owner": "catppuccin", + "owner": "rose-pine", "repo": "cava" }, "branch": "main", - "revision": "0746f77974330338ee2e1e4d1ef9872eba57eb26", - "url": "https://github.com/catppuccin/cava/archive/0746f77974330338ee2e1e4d1ef9872eba57eb26.tar.gz", - "hash": "01jvxv797zvamwm82m5i1m9b92hm1bcjdr2w53wi60ws244iq174" + "revision": "f9a915563d281d4a58e6f9fe701bdb769f1bbf26", + "url": "https://github.com/rose-pine/cava/archive/f9a915563d281d4a58e6f9fe701bdb769f1bbf26.tar.gz", + "hash": "06qzrlbj2kzrbrq6ag9kha0yx3yvixsz79p7x4ib2dxl9rkxk7gf" }, "delta": { "type": "Git", diff --git a/modules/home-manager/cava.nix b/modules/home-manager/cava.nix index 80d63fe..d1a6d92 100644 --- a/modules/home-manager/cava.nix +++ b/modules/home-manager/cava.nix @@ -1,16 +1,19 @@ -{ config, lib, ... }: -let - inherit (config.catppuccin) sources; - cfg = config.programs.cava.catppuccin; - enable = cfg.enable && config.programs.cava.enable; - flavor = "${cfg.flavor}" + lib.optionalString cfg.transparent "-transparent"; -in { - options.programs.cava.catppuccin = lib.ctp.mkCatppuccinOpt { name = "cava"; } // { - transparent = lib.mkEnableOption "transparent version of flavor"; - }; + config, + lib, + ... +}: let + inherit (config.rose-pine) sources; + cfg = config.programs.cava.rose-pine; + enable = cfg.enable && config.programs.cava.enable; + flavor = + if (cfg.flavor == "main") + then "rosepine" + else cfg.flavor; +in { + options.programs.cava.rose-pine = lib.rp.mkRosePineOpt {name = "cava";}; config.programs.cava = lib.mkIf enable { - settings = lib.ctp.fromINIRaw (sources.cava + "/themes/${flavor}.cava"); + settings = lib.rp.fromINIRaw (sources.cava + "/${flavor}.cava"); }; }