diff --git a/modules/home-manager/fzf.nix b/modules/home-manager/fzf.nix index 7d9b87a..084cae4 100644 --- a/modules/home-manager/fzf.nix +++ b/modules/home-manager/fzf.nix @@ -1,34 +1,36 @@ -{ config, lib, ... }: -let - inherit (config.catppuccin) sources; - - cfg = config.programs.fzf.catppuccin; - enable = cfg.enable && config.programs.fzf.enable; - palette = (lib.importJSON "${sources.palette}/palette.json").${cfg.flavor}.colors; -in { - options.programs.fzf.catppuccin = lib.ctp.mkCatppuccinOpt { name = "fzf"; } // { - accent = lib.ctp.mkAccentOpt "fzf"; - }; + config, + lib, + ... +}: let + cfg = config.programs.fzf.rose-pine; + enable = cfg.enable && config.programs.fzf.enable; + palette = (lib.importJSON "../../.sources/palette.json").${cfg.flavor}.colors; +in { + options.programs.fzf.rose-pine = + lib.rp.mkRosePineOpt {name = "fzf";}; config.programs.fzf.colors = lib.mkIf enable - # Manually populate with colors from catppuccin/fzf - # The ordering is meant to match the order of catppuccin/fzf to make comparison easier - ( - lib.attrsets.mapAttrs (_: color: palette.${color}.hex) { - "bg+" = "surface0"; - bg = "base"; - spinner = "rosewater"; - hl = cfg.accent; - fg = "text"; - header = cfg.accent; - info = cfg.accent; - pointer = cfg.accent; - marker = cfg.accent; - "fg+" = "text"; - prompt = cfg.accent; - "hl+" = cfg.accent; - } - ); + # Manually populate with colors from rose-pine/fzf + # The ordering is meant to match the order of rose-pine/fzf to make + # comparison easier + ( + lib.attrsets.mapAttrs (_: color: palette.${color}.hex) { + fg = "subtle"; + bg = "base"; + hl = "rose"; + "fg+" = "text"; + "bg+" = "overlay"; + "hl+" = "rose"; + border = "highlight-med"; + header = "pine"; + gutter = "base"; + spinner = "gold"; + info = "foam"; + pointer = "iris"; + marker = "love"; + prompt = "subtle"; + } + ); } diff --git a/modules/lib/default.nix b/modules/lib/default.nix index b84c2f5..bb619e7 100644 --- a/modules/lib/default.nix +++ b/modules/lib/default.nix @@ -17,7 +17,7 @@ in { lib.mkOption { inherit type; default = config.rose-pine.${attr}; - description = "Rose Pine ${attr} for ${name}"; + description = "Rosé Pine ${attr} for ${name}"; }; # string -> a