From 2ef9022b58e8fb928841e9aa3f51a1d2c2a2662c Mon Sep 17 00:00:00 2001 From: Venkatesan Ravi Date: Sun, 6 Apr 2025 04:46:56 +0000 Subject: [PATCH 1/2] utility/fzf-lua: fix type for fzf-bin --- modules/plugins/utility/fzf-lua/fzf-lua.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/plugins/utility/fzf-lua/fzf-lua.nix b/modules/plugins/utility/fzf-lua/fzf-lua.nix index dbdf320f..0b242864 100644 --- a/modules/plugins/utility/fzf-lua/fzf-lua.nix +++ b/modules/plugins/utility/fzf-lua/fzf-lua.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - inherit (lib.types) enum package; + inherit (lib.types) enum str; inherit (lib.options) mkEnableOption mkOption; inherit (lib.nvim.types) mkPluginSetupOption borderType; in { @@ -12,9 +12,9 @@ in { enable = mkEnableOption "fzf-lua"; setupOpts = mkPluginSetupOption "fzf-lua" { fzf_bin = mkOption { - type = package; + type = str; default = "${lib.getExe pkgs.fzf}"; - description = "fzf package to use"; + description = "Path to fzf executable"; }; winopts.border = mkOption { type = borderType; From edbadf5d5a180ddb2cafa50774c05487146baeed Mon Sep 17 00:00:00 2001 From: Christoph Koehler Date: Sat, 5 Apr 2025 22:45:25 -0600 Subject: [PATCH 2/2] fix: telescope ignore patterns ".git" is a regex, so because of the '.' it matches more than just the .git directory, so escape the dot to make it literal. Here, that's done with a '%'. --- docs/release-notes/rl-0.8.md | 1 + modules/plugins/utility/telescope/telescope.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 8b87ae99..4ce12e95 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -316,6 +316,7 @@ - Fix oil config referencing snacks - Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim` +- Fix default telescope ignore list entry for '.git/' to properly match [rrvsh](https://github.com/rrvsh): diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix index beacc990..9d63c3cf 100644 --- a/modules/plugins/utility/telescope/telescope.nix +++ b/modules/plugins/utility/telescope/telescope.nix @@ -117,7 +117,7 @@ file_ignore_patterns = mkOption { description = "A table of lua regex that define the files that should be ignored."; type = listOf str; - default = ["node_modules" ".git/" "dist/" "build/" "target/" "result/"]; + default = ["node_modules" "%.git/" "dist/" "build/" "target/" "result/"]; }; color_devicons = mkOption { description = "Boolean if devicons should be enabled or not.";