Merge branch 'main' into fix/codecompanion-cmp-defaults

This commit is contained in:
army castillo 2025-04-06 02:49:19 -04:00
commit b1212b77ce
3 changed files with 5 additions and 4 deletions

View file

@ -319,6 +319,7 @@
- Fix oil config referencing snacks - Fix oil config referencing snacks
- Add [flash.nvim] plugin to `vim.utility.motion.flash-nvim` - 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): [rrvsh](https://github.com/rrvsh):

View file

@ -4,7 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (lib.types) enum package; inherit (lib.types) enum str;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.nvim.types) mkPluginSetupOption borderType; inherit (lib.nvim.types) mkPluginSetupOption borderType;
in { in {
@ -12,9 +12,9 @@ in {
enable = mkEnableOption "fzf-lua"; enable = mkEnableOption "fzf-lua";
setupOpts = mkPluginSetupOption "fzf-lua" { setupOpts = mkPluginSetupOption "fzf-lua" {
fzf_bin = mkOption { fzf_bin = mkOption {
type = package; type = str;
default = "${lib.getExe pkgs.fzf}"; default = "${lib.getExe pkgs.fzf}";
description = "fzf package to use"; description = "Path to fzf executable";
}; };
winopts.border = mkOption { winopts.border = mkOption {
type = borderType; type = borderType;

View file

@ -117,7 +117,7 @@
file_ignore_patterns = mkOption { file_ignore_patterns = mkOption {
description = "A table of lua regex that define the files that should be ignored."; description = "A table of lua regex that define the files that should be ignored.";
type = listOf str; type = listOf str;
default = ["node_modules" ".git/" "dist/" "build/" "target/" "result/"]; default = ["node_modules" "%.git/" "dist/" "build/" "target/" "result/"];
}; };
color_devicons = mkOption { color_devicons = mkOption {
description = "Boolean if devicons should be enabled or not."; description = "Boolean if devicons should be enabled or not.";