feat(cava): Catppuccin -> Rose Pine

Rose Pine does not have an official bottom port.

.sources/sources.json

@@ -40,25 +40,25 @@
       "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "catppuccin",
+        "owner": "rose-pine",
         "repo": "btop"
       },
       "branch": "main",
-      "revision": "21b8d5956a8b07fa52519e3267fb3a2d2e693d17",
+      "revision": "6d6abdc0a8c8bcd3b056d9fe3256cfbe7e359312",
-      "url": "https://github.com/catppuccin/btop/archive/21b8d5956a8b07fa52519e3267fb3a2d2e693d17.tar.gz",
+      "url": "https://github.com/rose-pine/btop/archive/6d6abdc0a8c8bcd3b056d9fe3256cfbe7e359312.tar.gz",
-      "hash": "1hdh78314axpz96qvnl7dkgjd3b7sjq0l8k5h1iwir1mjz596xsi"
+      "hash": "15s3llr9snrg30fh39a2gfzmjd8p5ki8vaggznm9jirjzdhm0a5i"
     },
     "cava": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "catppuccin",
+        "owner": "rose-pine",
         "repo": "cava"
       },
       "branch": "main",
-      "revision": "0746f77974330338ee2e1e4d1ef9872eba57eb26",
+      "revision": "f9a915563d281d4a58e6f9fe701bdb769f1bbf26",
-      "url": "https://github.com/catppuccin/cava/archive/0746f77974330338ee2e1e4d1ef9872eba57eb26.tar.gz",
+      "url": "https://github.com/rose-pine/cava/archive/f9a915563d281d4a58e6f9fe701bdb769f1bbf26.tar.gz",
-      "hash": "01jvxv797zvamwm82m5i1m9b92hm1bcjdr2w53wi60ws244iq174"
+      "hash": "06qzrlbj2kzrbrq6ag9kha0yx3yvixsz79p7x4ib2dxl9rkxk7gf"
     },
     "delta": {
       "type": "Git",

modules/home-manager/all-modules.nix

@@ -1,7 +1,6 @@
 [
   ./alacritty.nix
   ./bat.nix
-  ./bottom.nix
   ./btop.nix
   ./cava.nix
   ./cursor.nix

modules/home-manager/bottom.nix

@@ -1,15 +0,0 @@
-{ config, lib, ... }:
-let
-  inherit (config.catppuccin) sources;
-  cfg = config.programs.bottom.catppuccin;
-  enable = cfg.enable && config.programs.bottom.enable;
-in
-{
-  options.programs.bottom.catppuccin = lib.ctp.mkCatppuccinOpt { name = "bottom"; };
-
-  config = lib.mkIf enable {
-    programs.bottom = {
-      settings = lib.importTOML "${sources.bottom}/themes/${cfg.flavor}.toml";
-    };
-  };
-}

modules/home-manager/btop.nix

@@ -1,18 +1,23 @@
-{ config, lib, ... }:
+{
-let
+  config,
-  inherit (config.catppuccin) sources;
+  lib,
-  cfg = config.programs.btop.catppuccin;
+  ...
+}: let
+  inherit (config.rose-pine) sources;
+  cfg = config.programs.btop.rose-pine;
   enable = cfg.enable && config.programs.btop.enable;
 
-  themeFile = "catppuccin_${cfg.flavor}.theme";
+  themeFile =
-  themePath = "/themes/${themeFile}";
+    if (cfg.flavor == "main")
+    then "rose-pine.theme"
+    else "rose-pine-${cfg.flavor}.theme";
+  themePath = "/${themeFile}";
   theme = sources.btop + themePath;
-in
+in {
-{
+  options.programs.btop.rose-pine = lib.rp.mkRosePineOpt {name = "btop";};
-  options.programs.btop.catppuccin = lib.ctp.mkCatppuccinOpt { name = "btop"; };
 
   config = lib.mkIf enable {
-    xdg.configFile."btop${themePath}".source = theme;
+    xdg.configFile."btop/themes${themePath}".source = theme;
 
     programs.btop.settings.color_theme = themeFile;
   };

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"; } // {
+  config,
-    transparent = lib.mkEnableOption "transparent version of flavor";
+  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");
   };
 }