From 21952f1cab9dcfee92d46448391412701fea4314 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Sun, 21 Feb 2021 23:34:33 -0500 Subject: [PATCH] fzf: remove non-working historyWidgetCommand option (#1818) The environment variable FZF_CTRL_R_COMMAND has never existed and been support by fzf according to `git grep FZF_CTRL_R_COMMAND $(git rev-list --all)` and `git log -G FZF_CTRL_R_COMMAND`. --- modules/programs/fzf.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix index b0a0766ba..f945c7d4d 100644 --- a/modules/programs/fzf.nix +++ b/modules/programs/fzf.nix @@ -7,6 +7,11 @@ let cfg = config.programs.fzf; in { + imports = [ + (mkRemovedOptionModule [ "programs" "fzf" "historyWidgetCommand" ] + "This option is no longer supported by fzf.") + ]; + options.programs.fzf = { enable = mkEnableOption "fzf - a command-line fuzzy finder"; @@ -74,15 +79,6 @@ in { ''; }; - historyWidgetCommand = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The command that gets executed as the source for fzf for the - CTRL-R keybinding. - ''; - }; - historyWidgetOptions = mkOption { type = types.listOf types.str; default = [ ]; @@ -124,7 +120,6 @@ in { (filterAttrs (n: v: v != [ ] && v != null) { FZF_ALT_C_COMMAND = cfg.changeDirWidgetCommand; FZF_ALT_C_OPTS = cfg.changeDirWidgetOptions; - FZF_CTRL_R_COMMAND = cfg.historyWidgetCommand; FZF_CTRL_R_OPTS = cfg.historyWidgetOptions; FZF_CTRL_T_COMMAND = cfg.fileWidgetCommand; FZF_CTRL_T_OPTS = cfg.fileWidgetOptions;