diff --git a/.sources/sources.json b/.sources/sources.json index 95b5e70..8f5332a 100644 --- a/.sources/sources.json +++ b/.sources/sources.json @@ -100,13 +100,13 @@ "type": "Git", "repository": { "type": "GitHub", - "owner": "catppuccin", + "owner": "rose-pine", "repo": "fish" }, "branch": "main", - "revision": "cc8e4d8fffbdaab07b3979131030b234596f18da", - "url": "https://github.com/catppuccin/fish/archive/cc8e4d8fffbdaab07b3979131030b234596f18da.tar.gz", - "hash": "1iqmchnz0gglwsxrqcm300754s84gsxrbwmfxh5mdlm16gcr9n5r" + "revision": "38aab5baabefea1bc7e560ba3fbdb53cb91a6186", + "url": "https://github.com/rose-pine/fish/archive/38aab5baabefea1bc7e560ba3fbdb53cb91a6186.tar.gz", + "hash": "0bwsq9pz1nlhbr3kyz677prgyk973sgis72xamm1737zqa98c8bd" }, "foot": { "type": "Git", diff --git a/modules/home-manager/fish.nix b/modules/home-manager/fish.nix index e32ee3d..c0a963e 100644 --- a/modules/home-manager/fish.nix +++ b/modules/home-manager/fish.nix @@ -1,14 +1,19 @@ -{ config, lib, ... }: -let - inherit (config.catppuccin) sources; - cfg = config.programs.fish.catppuccin; +{ + config, + lib, + ... +}: let + inherit (config.rose-pine) sources; + cfg = config.programs.fish.rose-pine; enable = cfg.enable && config.programs.fish.enable; - themeName = "Catppuccin ${lib.ctp.mkUpper cfg.flavor}"; + themeName = + if (cfg.flavor == "main") + then "Rosé Pine" + else "Rosé Pine ${lib.rp.mkUpper cfg.flavor}"; themePath = "/themes/${themeName}.theme"; -in -{ - options.programs.fish.catppuccin = lib.ctp.mkCatppuccinOpt { name = "fish"; }; +in { + options.programs.fish.rose-pine = lib.rp.mkRosePineOpt {name = "fish";}; config = lib.mkIf enable { xdg.configFile."fish${themePath}".source = "${sources.fish}${themePath}";