Compare commits

..

No commits in common. "105a19cf72ad4f9d905328d8eb7e336b3dd7d209" and "29a4f7183aba418247bceb598df855b9bf8b3c96" have entirely different histories.

3 changed files with 5 additions and 8 deletions

View file

@ -235,9 +235,8 @@
[alfarel](https://github.com/alfarelcynthesis): [alfarel](https://github.com/alfarelcynthesis):
[conform.nvim]: https://github.com/stevearc/conform.nvim
- Add missing `yazi.nvim` dependency (`snacks.nvim`). - Add missing `yazi.nvim` dependency (`snacks.nvim`).
- Add [mkdir.nvim](https://github.com/jghauser/mkdir.nvim) plugin for automatic - Add [mkdir.nvim](https://github.com/jghauser/mkdir.nvim) plugin for automatic
creation of parent directories when editing a nested file. creation of parent directories when editing a nested file.
- Add [nix-develop.nvim](https://github.com/figsoda/nix-develop.nvim) plugin for - Add [nix-develop.nvim](https://github.com/figsoda/nix-develop.nvim) plugin for
@ -249,8 +248,6 @@
[friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so [friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so
blink.cmp can source snippets from it. blink.cmp can source snippets from it.
- Fix [blink.cmp] breaking when built-in sources were modified. - Fix [blink.cmp] breaking when built-in sources were modified.
- Fix [conform.nvim] not allowing disabling formatting on and after save.
Use `null` value to disable them if conform is enabled.
[TheColorman](https://github.com/TheColorman): [TheColorman](https://github.com/TheColorman):

View file

@ -31,7 +31,7 @@ in {
''; '';
}; };
}) })
(mkIf (cfg.enable && cfg.lint_after_save) { (mkIf cfg.lint_after_save {
vim = { vim = {
augroups = [{name = "nvf_nvim_lint";}]; augroups = [{name = "nvf_nvim_lint";}];
autocmds = [ autocmds = [

View file

@ -4,7 +4,7 @@
... ...
}: let }: let
inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.types) attrs enum nullOr; inherit (lib.types) attrs enum;
inherit (lib.nvim.types) mkPluginSetupOption; inherit (lib.nvim.types) mkPluginSetupOption;
inherit (lib.nvim.lua) mkLuaInline; inherit (lib.nvim.lua) mkLuaInline;
in { in {
@ -31,7 +31,7 @@ in {
}; };
format_on_save = mkOption { format_on_save = mkOption {
type = nullOr attrs; type = attrs;
default = { default = {
lsp_format = "fallback"; lsp_format = "fallback";
timeout_ms = 500; timeout_ms = 500;
@ -43,7 +43,7 @@ in {
}; };
format_after_save = mkOption { format_after_save = mkOption {
type = nullOr attrs; type = attrs;
default = {lsp_format = "fallback";}; default = {lsp_format = "fallback";};
description = '' description = ''
Table that will be passed to `conform.format()`. If this Table that will be passed to `conform.format()`. If this