Skip to content

Commit

Permalink
fzf: remove non-working historyWidgetCommand option (nix-community#1818)
Browse files Browse the repository at this point in the history
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`.
  • Loading branch information
berbiche authored and cab404 committed Apr 23, 2021
1 parent 6434c35 commit f68b0df
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions modules/programs/fzf.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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 = [ ];
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f68b0df

Please sign in to comment.