From 3389e89ec7b6f42ac4a1a6ddeb47fc5a1628c3bb Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Mon, 9 Mar 2026 20:26:17 +0530 Subject: Some minor code refactoring --- modules/tools/fzf/default.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'modules/tools/fzf') diff --git a/modules/tools/fzf/default.nix b/modules/tools/fzf/default.nix index f971ca9..3d19eca 100644 --- a/modules/tools/fzf/default.nix +++ b/modules/tools/fzf/default.nix @@ -4,11 +4,17 @@ options.tools.fzf = { enable = lib.mkEnableOption "Enables fzf."; }; - - config = lib.mkIf config.tools.fzf.enable { + + config = let + shellIntegration = '' +${if config.tools.zsh.enable then + "eval \"$(fzf --zsh)\"" +else "eval \"$(fzf --bash)\""} + ''; + in lib.mkIf config.tools.fzf.enable { programs.fzf = { enable = true; - + defaultOptions = [ "--height 100%" "--layout=reverse" @@ -21,18 +27,18 @@ "--no-info" "--margin=\"1,2\"" ]; - + colors = with config.scheme.withHashtag; { fg = base05; # Foreground bg = "-1"; # Background (-1 for transparent) hl = base0D; # Highlight - + "fg+" = base07; # Foreground for selected item "bg+" = "-1"; # Background for selected item "hl+" = base0D; # Highlight for selected item - + gutter = "-1"; # Remove the white margin at the left - + info = base0B; # Info text (usually count of items) border = base03; # Border color prompt = base0A; # Prompt text color @@ -41,5 +47,10 @@ spinner = base0C; # Spinner color (during search) }; }; + + programs.zsh.initContent = lib.mkIf config.programs.zsh.enable + (lib.mkAfter shellIntegration); + programs.bash.initExtra = lib.mkIf config.programs.bash.enable + (lib.mkAfter shellIntegration); }; } -- cgit v1.2.3