diff --git a/.sources/sources.json b/.sources/sources.json index df3ba75..cd6cf06 100644 --- a/.sources/sources.json +++ b/.sources/sources.json @@ -292,13 +292,13 @@ "type": "Git", "repository": { "type": "GitHub", - "owner": "catppuccin", + "owner": "rose-pine", "repo": "starship" }, "branch": "main", - "revision": "3c4749512e7d552adf48e75e5182a271392ab176", - "url": "https://github.com/catppuccin/starship/archive/3c4749512e7d552adf48e75e5182a271392ab176.tar.gz", - "hash": "0w1i9zjngx63khwrdcmw0zzpvp860aznq9dmdh07s1kkcxvydwdp" + "revision": "ed68857c08cf49dcbf2575c5d4f491155750d011", + "url": "https://github.com/rose-pine/starship/archive/ed68857c08cf49dcbf2575c5d4f491155750d011.tar.gz", + "hash": "0ywwyy3j5n3qj39d855sj0iy4dm55j83cmpjgnx1hqx0vp5zynn8" }, "sway": { "type": "Git", @@ -410,4 +410,4 @@ } }, "version": 3 -} +} \ No newline at end of file diff --git a/modules/home-manager/starship.nix b/modules/home-manager/starship.nix index 069d6e8..99957a1 100644 --- a/modules/home-manager/starship.nix +++ b/modules/home-manager/starship.nix @@ -1,17 +1,21 @@ -{ config, lib, ... }: -let - inherit (config.catppuccin) sources; - cfg = config.programs.starship.catppuccin; - enable = cfg.enable && config.programs.starship.enable; -in { - options.programs.starship.catppuccin = lib.ctp.mkCatppuccinOpt { name = "starship"; }; + config, + lib, + ... +}: let + inherit (config.rose-pine) sources; + + cfg = config.programs.starship.rose-pine; + enable = cfg.enable && config.programs.starship.enable; + + themeName = + if (cfg.flavor == "main") + then "rose-pine" + else "rose-pine-${cfg.flavor}"; +in { + options.programs.starship.rose-pine = lib.rp.mkRosePineOpt {name = "starship";}; config.programs.starship.settings = lib.mkIf enable ( - { - format = lib.mkDefault "$all"; - palette = "catppuccin_${cfg.flavor}"; - } - // lib.importTOML "${sources.starship}/themes/${cfg.flavor}.toml" + lib.importTOML "${sources.starship}/${themeName}.toml" ); }