From 1ff9d37d27377bfe8994c24a8d6c6c1734ffa116 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 27 Jun 2024 23:59:30 +0200 Subject: [PATCH] fzf: use Home Manager color options (#454) home-manager provides a programs.fzf.colors option to provide colors. This module basically reimplemented the logic Home Manager has as well. --- modules/fzf/hm.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/modules/fzf/hm.nix b/modules/fzf/hm.nix index 586f9de..28ca4c5 100644 --- a/modules/fzf/hm.nix +++ b/modules/fzf/hm.nix @@ -1,9 +1,11 @@ { config, lib, ... }: -let - mkFzfKeyValue = lib.generators.mkKeyValueDefault { } ":"; +{ + options.stylix.targets.fzf = { + enable = config.lib.stylix.mkEnableTarget "Fzf" true; + }; - colorConfig = with config.lib.stylix.colors.withHashtag; - lib.concatStringsSep "," (lib.mapAttrsToList mkFzfKeyValue { + config = lib.mkIf (config.stylix.enable && config.stylix.targets.fzf.enable) { + programs.fzf.colors = with config.lib.stylix.colors.withHashtag; { "bg" = base00; "bg+" = base01; "fg" = base04; @@ -16,14 +18,6 @@ let "pointer" = base0C; "prompt" = base0A; "spinner" = base0C; - }); -in -{ - options.stylix.targets.fzf = { - enable = config.lib.stylix.mkEnableTarget "Fzf" true; - }; - - config = lib.mkIf (config.stylix.enable && config.stylix.targets.fzf.enable) { - programs.fzf.defaultOptions = lib.mkAfter [ "--color=${colorConfig}" ]; + }; }; }